Merge revisions 36685:36729 from trunk.

svn path=/branches/kill-bonobo/; revision=36763

75 files changed, 4586 insertions, 10653 deletions

diff --git a/COPYING b/COPYING
index 6d43540090..ff4f32b047 100644
--- a/COPYING
+++ b/COPYING
@@ -1,340 +1,34 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+Code in Evolution is available under a variety of licenses.  Each file should have a license header stating the license. In the absence of that code is available under the LGPLv2 or (at your choice) LGPLv3. See COPYING.LGPL2 and COPYING.LGPL3 for the full license texts.
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+There are a few exceptions to this rule that have an impact on overall licensing. At the present, the code seems GPLv2+ clean.
 
-			    Preamble
+OpenLDAP license
+        addressbook/gui/component/openldap-extract.h
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
+GPLv2+
+        widgets/misc/e-spinner.c
+        plugins/calendar-http/calendar-http.c
+        plugins/calendar-weather/calendar-weather.c
 
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+LGPLv2 only
+        plugins/webdav-account-setup/webdav-contacts-source.c
 
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+LGPLv2+
+        e-util/gconf-bridge.[ch]
+        widgets/misc/e-icon-entry.[ch]
+        widgets/misc/e-hsv-utils.[ch]
+        widgets/text/e-text.[ch]
+        widgets/table/e-cell-tree.[ch]
+        widgets/misc/e-dateedit.[ch]
 
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
+MPL/GPL/LGPLv2+
+        smime/lib/e-asn1-object.c
+        smime/lib/e-cert.c
+        smime/lib/e-cert-db.c
+        smime/lib/e-cert-trust.c
+        smime/lib/e-pkcs12.c
 
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
+In addition there are a few pieces that lurk in the tree, but are not linked as part of evolution, eg. test code:
 
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02110-1301  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+GPLv2 only
+        addressbook/gui/widgets/test-reflow.c
diff --git a/COPYING.OPENLDAP b/COPYING.OPENLDAP
new file mode 100644
index 0000000000..05ad7571e4
--- /dev/null
+++ b/COPYING.OPENLDAP
@@ -0,0 +1,47 @@
+The OpenLDAP Public License
+  Version 2.8, 17 August 2003
+
+Redistribution and use of this software and associated documentation
+("Software"), with or without modification, are permitted provided
+that the following conditions are met:
+
+1. Redistributions in source form must retain copyright statements
+   and notices,
+
+2. Redistributions in binary form must reproduce applicable copyright
+   statements and notices, this list of conditions, and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution, and
+
+3. Redistributions must contain a verbatim copy of this document.
+
+The OpenLDAP Foundation may revise this license from time to time.
+Each revision is distinguished by a version number.  You may use
+this Software under terms of this license revision or under the
+terms of any subsequent revision of the license.
+
+THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND ITS
+CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT
+SHALL THE OPENLDAP FOUNDATION, ITS CONTRIBUTORS, OR THE AUTHOR(S)
+OR OWNER(S) OF THE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+The names of the authors and copyright holders must not be used in
+advertising or otherwise to promote the sale, use or other dealing
+in this Software without specific, written prior permission.  Title
+to copyright in this Software shall at all times remain with copyright
+holders.
+
+OpenLDAP is a registered trademark of the OpenLDAP Foundation.
+
+Copyright 1999-2003 The OpenLDAP Foundation, Redwood City,
+California, USA.  All Rights Reserved.  Permission to copy and
+distribute verbatim copies of this document is granted.
diff --git a/ChangeLog b/ChangeLog
index 70e7f4fcdb..8422a41733 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-03  Sankar P  <psankar@novell.com>
+
+	License Changed from GPL to LGPL
+	Refer COPYING File for more details
+
 2008-10-22  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #549025
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 46f6de9bd2..f061e55515 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-30  Matthew Barnes  <mbarnes@redhat.com>
+
+	* gui/contact-editor/test-editor.c:
+	* gui/widgets/e-minicard-label.c:
+	* gui/widgets/e-minicard-view-widget.c:
+	* gui/widgets/test-reflow.c:
+	Only include the toplevel GTK+ header.
+
 2008-10-17  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #511918
diff --git a/addressbook/gui/component/openldap-extract.h b/addressbook/gui/component/openldap-extract.h
index f11012ec40..010589da1e 100644
--- a/addressbook/gui/component/openldap-extract.h
+++ b/addressbook/gui/component/openldap-extract.h
@@ -22,8 +22,8 @@
  * modification, are permitted only as authorized by the OpenLDAP
  * Public License.
  *
- * A copy of this license is available in file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
+ * A copy of this license is available in file COPYING.OPENLDAP in
+ * the top-level directory of the distribution or, alternatively, at
  * <http://www.OpenLDAP.org/license.html>.
  */
 
diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c
index 7a7e644238..61c6de7174 100644
--- a/addressbook/gui/contact-editor/test-editor.c
+++ b/addressbook/gui/contact-editor/test-editor.c
@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-app.h>
 #include <libgnomeui/gnome-ui-init.h>
 #include <glade/glade.h>
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 89107dafbf..696d42dcd9 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -24,7 +24,7 @@
 
 #include "e-minicard-label.h"
 
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 #include <glib/gi18n.h>
 #include <e-util/e-util.h>
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
index 2d43aca39e..0f9ae7c143 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <misc/e-canvas-background.h>
 #include <misc/e-canvas.h>
 #include <glib/gi18n.h>
diff --git a/addressbook/gui/widgets/test-reflow.c b/addressbook/gui/widgets/test-reflow.c
index 8853e7f748..f0faf7899c 100644
--- a/addressbook/gui/widgets/test-reflow.c
+++ b/addressbook/gui/widgets/test-reflow.c
@@ -50,8 +50,7 @@
 
 #include "config.h"
 
-#include <gtk/gtkmain.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-canvas-rect-ellipse.h>
 #include <libgnomeui/gnome-init.h>
 #include <misc/e-canvas.h>
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 343a76a9e0..b335913d39 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,28 @@
+2008-11-04  Matthew Barnes  <mbarnes@redhat.com>
+
+	* gui/calendar-commands.c:
+	* gui/calendar-component.h:
+	* gui/gnome-cal.c:
+	Fix compiler warnings.
+
+2008-11-02  Matthew Barnes  <mbarnes@redhat.com>
+
+	* gui/e-itip-control.c (write_recurrence_piece):
+	Remove extra space in translated string.
+
+2008-10-31  Matthew Barnes  <mbarnes@redhat.com>
+
+	* gui/itip-utils.c (itip_send_comp):
+	Fix a crash when selecting "Forward as iCalendar".
+
+2008-10-30  Matthew Barnes  <mbarnes@redhat.com>
+
+	* gui/control-factory.c:
+	* gui/e-calendar-table.c:
+	* gui/e-week-view-event-item.c:
+	* gui/weekday-picker.c:
+	Only include the toplevel GTK+ header.
+
 2008-10-20  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes bug #555958 (patch by Anis Elleuch)
@@ -246,6 +271,24 @@ License Changes
 	* gui/e-cal-model.c: (e_cal_view_objects_modified_cb):
 	Use result of g_list_prepend, thus report changes properly.
 
+2008-11-03  Ashish Shrivastava  <shashish@novell.com>
+
+	** Most of the errors are now non-intrusive
+
+	* calendar.error.xml: Added a new error message for
+	  non-intrusive backend_died.
+	* apps_evolution_calendar.schemas.in:
+	* calendar-commands.c: Added new verb for help debug message
+	  (help_debug):
+	* gnome-cal.c: Support for non-intrusive error.
+	  (client_cal_opened_cb), Define fash table and accessing errors:
+	* e-calendar-view.c: (error_response):
+	  (e_calendar_utils_show_error_silent), (e_calendar_utils_show_info_silent):
+	* e-calendar-view.h:
+	* calendar-component.c: Added EActivityHandler and ELogger:
+	(calendar_component_peek_activity_handler), (calendar_component_show_logger):
+	* calendar-component.h:
+
 2008-09-08  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #544187
diff --git a/calendar/calendar.error.xml b/calendar/calendar.error.xml
index d74c27b1fe..996f439a3f 100644
--- a/calendar/calendar.error.xml
+++ b/calendar/calendar.error.xml
@@ -176,6 +176,23 @@
   <_secondary>Your memos will not be available until Evolution is restarted.</_secondary>
  </error>
 
+<error id="backend_died" type="error">
+   <_primary>The Evolution calendars have quit unexpectedly.</_primary>
+   <_secondary>Your calendars will not be available until Evolution is restarted.</_secondary>
+</error>
+
+<error id="unable-to-load-the-calendar" type="error" default="GTK_RESPONSE_YES">
+ <_primary>Unable to load the calendar</_primary>
+ <_secondary>Calendar repository is offline.</_secondary>
+ <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
+</error>
+<error id="error-on-loading-the-calendar" type="error" default="GTK_RESPONSE_YES">
+ <!-- For Translators: {0} is specify the backend server -->
+ <_primary>Error on '{0}'</_primary>
+ <_secondary>No response from the server.</_secondary>
+ <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
+</error>
+
  <error id="editor-error" type="error">
   <_primary>Editor could not be loaded.</_primary>
   <_secondary>{0}.</_secondary>
diff --git a/calendar/gui/apps_evolution_calendar.schemas.in b/calendar/gui/apps_evolution_calendar.schemas.in
index 96bcf173f1..bae4b65ba4 100644
--- a/calendar/gui/apps_evolution_calendar.schemas.in
+++ b/calendar/gui/apps_evolution_calendar.schemas.in
@@ -603,5 +603,30 @@
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/apps/evolution/calendar/display/error_timeout</key>
+      <applyto>/apps/evolution/calendar/display/error_timeout</applyto>
+      <owner>evolution-calendar</owner>
+      <type>int</type>
+      <default>60</default>
+      <locale name="C">
+          <short>Amount of time in seconds the error should be shown on the status bar.</short>
+          <long> Amount of time in seconds the error should be shown on the status bar.
+          </long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/apps/evolution/calendar/display/error_level</key>
+      <applyto>/apps/evolution/calendar/display/error_level</applyto>
+      <owner>evolution-calendar</owner>
+      <type>int</type>
+      <default>0</default>
+      <locale name="C">
+         <short>Level beyond which the message should be logged.</short>
+         <long> This can have three possible values. 0 for errors. 1 for warnings.
+                2 for debug messages.
+         </long>
+      </locale>
+    </schema>
   </schemalist>
 </gconfschemafile>
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index c398b6e12b..6fcada753e 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -47,6 +47,7 @@
 #include <libecal/e-cal-time-util.h>
 #include "shell/Evolution.h"
 #include "calendar-commands.h"
+#include "calendar-component.h"
 #include "calendar-config.h"
 #include "e-day-view.h"
 #include "e-week-view.h"
@@ -333,6 +334,11 @@ gcal_taskpad_focus_change_cb (GnomeCalendar *gcal, gboolean in, gpointer data)
 
 }
 
+static void
+help_debug (BonoboUIComponent *uid, void *data, const char *path)
+{
+	calendar_component_show_logger ((GtkWidget *) data);
+}
 
 static BonoboUIVerb verbs [] = {
 
@@ -343,7 +349,7 @@ static BonoboUIVerb verbs [] = {
 	BONOBO_UI_VERB ("ShowListView", show_list_view_clicked),
 
 	BONOBO_UI_VERB ("CalendarPurge", purge_cmd),
-
+	BONOBO_UI_VERB ("HelpDebug", help_debug),
 	BONOBO_UI_VERB_END
 };
 
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index d22d43e5ff..eafdd8c4b2 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -53,6 +53,8 @@
 #include "dialogs/copy-source-dialog.h"
 #include "dialogs/event-editor.h"
 #include "misc/e-info-label.h"
+#include "e-util/e-non-intrusive-error-dialog.h"
+#include "e-util/gconf-bridge.h"
 #include "e-util/e-error.h"
 #include "e-cal-menu.h"
 #include "e-cal-popup.h"
@@ -62,8 +64,9 @@
 #define CREATE_MEETING_ID      "meeting"
 #define CREATE_ALLDAY_EVENT_ID "allday-event"
 #define CREATE_CALENDAR_ID      "calendar"
+#define CALENDAR_ERROR_LEVEL_KEY "/apps/evolution/calendar/display/error_level"
+#define CALENDAR_ERROR_TIME_OUT_KEY "/apps/evolution/calendar/display/error_timeout" 
 
-#define PARENT_TYPE bonobo_object_get_type ()
 static BonoboObjectClass *parent_class = NULL;
 
 typedef struct
@@ -95,6 +98,9 @@ struct _CalendarComponentPrivate {
 	ESourceList *task_source_list;
 	ESourceList *memo_source_list;
 
+	EActivityHandler *activity_handler;
+        ELogger *logger;
+
 	GList *views;
 
 	ECal *create_ecal;
@@ -571,6 +577,11 @@ impl_dispose (GObject *object)
 		priv->source_list = NULL;
 	}
 
+	if (priv->activity_handler != NULL) {
+		g_object_unref (priv->activity_handler);
+		priv->activity_handler = NULL;
+	}
+
 	if (priv->create_ecal) {
 		g_object_unref (priv->create_ecal);
 		priv->create_ecal = NULL;
@@ -615,6 +626,11 @@ calendar_component_init (CalendarComponent *component)
 								 component);
 	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
 
+	priv->logger = e_logger_create ("calendar");
+	priv->activity_handler = e_activity_handler_new ();
+	e_activity_handler_set_logger (priv->activity_handler, priv->logger);
+	e_activity_handler_set_error_flush_time (priv->activity_handler,eni_config_get_error_timeout (CALENDAR_ERROR_TIME_OUT_KEY)*1000);
+
 	component->priv = priv;
 
 	if (!e_cal_get_sources (&priv->task_source_list, E_CAL_SOURCE_TYPE_TODO, NULL))
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 62a8319935..63740563f9 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -2314,3 +2314,12 @@ draw_curved_rectangle (cairo_t *cr, double x0, double y0,
 	}
 	cairo_close_path (cr);
 }
+
+static void 
+error_response(GtkWidget *widget, gint response, void *data)
+{
+	if (response == GTK_RESPONSE_DELETE_EVENT) 
+		gtk_widget_destroy(widget);
+	else if (response == GTK_RESPONSE_OK) 
+		gtk_widget_destroy(widget);
+}
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 6089e08863..5cafb4a106 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -872,7 +872,7 @@ write_recurrence_piece (EItipControl *itip, ECalComponent *comp,
 	      /* For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit*/
 		g_string_append_printf (
 			buffer, ngettext ("a total of %d time",
-			" a total of %d times", r->count), r->count);
+			"a total of %d times", r->count), r->count);
 	} else if (!icaltime_is_null_time (r->until)) {
 		ECalComponentDateTime dt;
 
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index 248e618bda..dcb3dd96f5 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -33,7 +33,7 @@
 #include "e-util/e-categories-config.h"
 #include "e-week-view-event-item.h"
 
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include "e-calendar-view.h"
 #include "comp-util.h"
 
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 1e396cdf12..3e31e39240 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -89,6 +89,9 @@
 
 #define d(x) x
 
+/* hash table define for non intrusive error dialog */
+static GHashTable *non_intrusive_error_table = NULL;
+
 /* Private part of the GnomeCalendar structure */
 struct _GnomeCalendarPrivate {
 	/* The clients for display */
@@ -1576,6 +1579,9 @@ gnome_calendar_init (GnomeCalendar *gcal)
 	for (i = 0; i < E_CAL_SOURCE_TYPE_LAST; i++)
 		priv->clients[i] = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
 
+	if (non_intrusive_error_table == NULL)
+		non_intrusive_error_table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
+
 	e_categories_register_change_listener (G_CALLBACK (categories_changed_cb), gcal);
 
 	priv->current_view_type = GNOME_CAL_DAY_VIEW;
@@ -1642,7 +1648,7 @@ gnome_calendar_destroy (GtkObject *object)
 		}
 
 		for (i = 0; i < GNOME_CAL_LAST_VIEW; i++) {
-			if (priv->configs[i])
+			if (priv->configs[i]) 
 				g_object_unref (priv->configs[i]);
 			priv->configs[i] = NULL;
 		}
@@ -1664,6 +1670,11 @@ gnome_calendar_destroy (GtkObject *object)
 			priv->dn_queries = NULL;
 		}
 
+		if (non_intrusive_error_table) {
+			g_hash_table_destroy (non_intrusive_error_table);
+			non_intrusive_error_table = NULL;
+		}
+
 		if (priv->sexp) {
 			g_free (priv->sexp);
 			priv->sexp = NULL;
@@ -2157,6 +2168,12 @@ add_mclient (ECalModel *model, ECal *client)
 	message_push ((Message *) msg);
 }
 
+static void 
+non_intrusive_error_remove(GtkWidget *w, void *data)
+{
+	g_hash_table_remove(non_intrusive_error_table, data);
+}
+
 static void
 client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
 {
@@ -2166,6 +2183,8 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
 	ECalModel *model;
 	ECalLoadState state;
 	char *msg;
+	GtkWidget *w = NULL;
+	gchar *id;
 
 	priv = gcal->priv;
 
@@ -2192,14 +2211,26 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
 			e_cal_open_async (ecal, FALSE);
 		return;
 	case E_CALENDAR_STATUS_INVALID_SERVER_VERSION:
-		e_error_run (NULL, "calendar:server-version", NULL);
+		id = g_strdup ("calendar:server-version");
+             
+		if (g_hash_table_lookup(non_intrusive_error_table, id)) {
+			/* We already have it */
+			g_message("Error occurred while existing dialog active:\n");
+			return;
+		}
+
+		w = e_error_new(NULL, "calendar:server-version", NULL);
+		e_calendar_utils_show_error_silent (w);
+		g_hash_table_insert (non_intrusive_error_table, id, g_object_ref(w));
+		g_signal_connect(w, "destroy", G_CALLBACK(non_intrusive_error_remove), id);
+
 		status = E_CALENDAR_STATUS_OK;
 		break;
 	case E_CALENDAR_STATUS_AUTHENTICATION_FAILED: 
 		{
 			const gchar *auth_domain = e_source_get_property (source, "auth-domain");
 			const gchar *component_name;
-
+			
 			component_name = auth_domain ? auth_domain : "Calendar";
 
 			/* Warn the user password is wrong */
@@ -2208,8 +2239,21 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
 		}
 	case E_CALENDAR_STATUS_REPOSITORY_OFFLINE:
 		if (source_type == E_CAL_SOURCE_TYPE_EVENT)
-			e_error_run (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))),
-				"calendar:prompt-no-contents-offline-calendar", NULL);
+		{
+			/* check to see if we have dialog already running for this operation */
+			id = g_strdup ("calendar:unable-to-load-the-calendar");
+
+			if (g_hash_table_lookup(non_intrusive_error_table, id)) {
+				/* We already have it */
+				g_message("Error occurred while existing dialog active:\n");
+				return;
+			}
+
+			w = e_error_new(GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))), "calendar:unable-to-load-the-calendar", e_cal_get_error_message (status), NULL);
+			e_calendar_utils_show_error_silent (w);
+			g_hash_table_insert (non_intrusive_error_table, id, g_object_ref(w));
+			g_signal_connect(w, "destroy", G_CALLBACK(non_intrusive_error_remove), id);
+		}
 	default:
 		/* Make sure the source doesn't disappear on us */
 		g_object_ref (source);
@@ -2289,7 +2333,7 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar
 		g_hash_table_remove (priv->clients[source_type], e_source_peek_uid (source));
 
 		/* FIXME Is there a better way to handle this? */
-		if (priv->default_client[source_type])
+		if (priv->default_client[source_type]) 
 			g_object_unref (priv->default_client[source_type]);
 		priv->default_client[source_type] = NULL;
 
@@ -2355,21 +2399,25 @@ backend_error_cb (ECal *client, const char *message, gpointer data)
 	GnomeCalendar *gcal;
 	GtkDialog *dialog;
 	char *uristr;
+	gchar *id;
 
 	gcal = GNOME_CALENDAR (data);
 
 	uristr = get_uri_without_password (e_cal_get_uri (client));
+	id = g_strdup ("calendar:error-on-loading-the-calendar");
+
+	if (g_hash_table_lookup(non_intrusive_error_table,id)) {
+		/* We already have it */
+		g_message("Error occurred while existing dialog active:\n");
+		return;
+	}
 
-	dialog = GTK_DIALOG (gtk_message_dialog_new (
-		GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))),
-		GTK_DIALOG_DESTROY_WITH_PARENT,
-		GTK_MESSAGE_ERROR,
-		GTK_BUTTONS_OK,
-		_("Error on %s:\n %s"),
-		uristr, message));
-	gtk_dialog_run (GTK_DIALOG (dialog));
-	gtk_widget_destroy (GTK_WIDGET (dialog));
+	dialog = (GtkDialog *)e_error_new(GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))), "calendar:error-on-loading-the-calendar", uristr, message, NULL);
+	e_calendar_utils_show_error_silent(GTK_WIDGET (dialog));
 
+	g_hash_table_insert (non_intrusive_error_table, id, g_object_ref(dialog));
+	g_signal_connect(GTK_WIDGET (dialog), "destroy", G_CALLBACK(non_intrusive_error_remove), id);
+	
 	g_free (uristr);
 }
 
@@ -2382,6 +2430,7 @@ backend_died_cb (ECal *ecal, gpointer data)
 	ECalSourceType source_type;
 	ESource *source;
 	const char *id;
+	GtkWidget *w = NULL;
 
 	gcal = GNOME_CALENDAR (data);
 	priv = gcal->priv;
@@ -2397,7 +2446,7 @@ backend_died_cb (ECal *ecal, gpointer data)
 
 	switch (source_type) {
 	case E_CAL_SOURCE_TYPE_EVENT:
-		id = "calendar:calendar-crashed";
+		id = g_strdup ("calendar:calendar-crashed");
 
 		e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), NULL, -1);
 
@@ -2410,7 +2459,16 @@ backend_died_cb (ECal *ecal, gpointer data)
 
 	g_object_unref (source);
 
-	e_error_run (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))), id, NULL);
+	if (g_hash_table_lookup(non_intrusive_error_table,id)) {
+		/* We already have it */
+		g_message("Error occurred while existing dialog active:\n");
+		return;
+	}
+
+	w = e_error_new(GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))), "calendar:backend_died", NULL);
+	e_calendar_utils_show_error_silent (w);
+	g_hash_table_insert (non_intrusive_error_table, (gpointer) id, g_object_ref(w));
+	g_signal_connect((GtkObject *)w, "destroy", G_CALLBACK(non_intrusive_error_remove), (gpointer) id);
 }
 
 GtkWidget *
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
index 3140d69df5..53fe6dcce6 100644
--- a/calendar/gui/weekday-picker.c
+++ b/calendar/gui/weekday-picker.c
@@ -27,7 +27,7 @@
 #endif
 
 #include <string.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
diff --git a/composer/ChangeLog b/composer/ChangeLog
index cbc01d7bb4..aa88a29e94 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,26 @@
+2008-11-02  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #559028
+
+	* e-msg-composer.c (msg_composer_key_press_event):
+	Skip over the style toolbar when tabbing in reverse.
+
+2008-10-29  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-composer-actions.c:
+	* e-composer-actions.h:
+	* e-composer-autosave.c:
+	* e-composer-autosave.h:
+	* e-composer-header-table.c:
+	* e-composer-header-table.h:
+	* e-composer-header.h:
+	* e-composer-name-header.h:
+	* e-composer-private.c:
+	* e-composer-private.h:
+	* e-composer-text-header.c:
+
 2008-10-13  Bharath Acharya  <abharath@novell.com>
 
 	** Updated fix for bug #555775
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index 4a2f659c99..433a17ab66 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -1,20 +1,18 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
 #include "e-composer-actions.h"
diff --git a/composer/e-composer-actions.h b/composer/e-composer-actions.h
index 9780fd8dc9..c17f3ebc32 100644
--- a/composer/e-composer-actions.h
+++ b/composer/e-composer-actions.h
@@ -1,20 +1,18 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
 #ifndef E_COMPOSER_ACTIONS_H
diff --git a/composer/e-composer-autosave.c b/composer/e-composer-autosave.c
index 298184b60f..78b8134941 100644
--- a/composer/e-composer-autosave.c
+++ b/composer/e-composer-autosave.c
@@ -1,20 +1,18 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
 #include "e-composer-autosave.h"
diff --git a/composer/e-composer-autosave.h b/composer/e-composer-autosave.h
index b57d93a1df..7c97338019 100644
--- a/composer/e-composer-autosave.h
+++ b/composer/e-composer-autosave.h
@@ -1,20 +1,18 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
 #ifndef E_COMPOSER_AUTOSAVE_H
diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
index 1954e92f47..7bce8bb6fb 100644
--- a/composer/e-composer-header-table.c
+++ b/composer/e-composer-header-table.c
@@ -1,20 +1,18 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
 #include "e-composer-header-table.h"
diff --git a/composer/e-composer-header-table.h b/composer/e-composer-header-table.h
index 5e1d3e1922..565880f324 100644
--- a/composer/e-composer-header-table.h
+++ b/composer/e-composer-header-table.h
@@ -1,20 +1,18 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
 #ifndef E_COMPOSER_HEADER_TABLE_H
diff --git a/composer/e-composer-header.h b/composer/e-composer-header.h
index c6bc075d3c..d1edd110fe 100644
--- a/composer/e-composer-header.h
+++ b/composer/e-composer-header.h
@@ -1,20 +1,18 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
 #ifndef E_COMPOSER_HEADER_H
diff --git a/composer/e-composer-name-header.h b/composer/e-composer-name-header.h
index a599029b3e..04f7100241 100644
--- a/composer/e-composer-name-header.h
+++ b/composer/e-composer-name-header.h
@@ -1,20 +1,18 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
 #ifndef E_COMPOSER_NAME_HEADER_H
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index 8985ecd72a..0d2995b9b2 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -1,20 +1,18 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
 #include "e-composer-private.h"
diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h
index 9150bb1da1..2dc9ddb6cd 100644
--- a/composer/e-composer-private.h
+++ b/composer/e-composer-private.h
@@ -1,20 +1,18 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
 #ifndef E_COMPOSER_PRIVATE_H
diff --git a/composer/e-composer-text-header.c b/composer/e-composer-text-header.c
index b62ebe0c33..2945720c90 100644
--- a/composer/e-composer-text-header.c
+++ b/composer/e-composer-text-header.c
@@ -1,20 +1,18 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
 #include "e-composer-text-header.h"
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 4f4285215b..0efcbfcbe9 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2295,6 +2295,11 @@ msg_composer_key_press_event (GtkWidget *widget,
 {
 	EMsgComposer *composer = E_MSG_COMPOSER (widget);
 	GtkWidget *input_widget;
+	GtkhtmlEditor *editor;
+	GtkHTML *html;
+
+	editor = GTKHTML_EDITOR (widget);
+	html = gtkhtml_editor_get_html (editor);
 
 	input_widget =
 		e_composer_header_table_get_header (
@@ -2314,8 +2319,13 @@ msg_composer_key_press_event (GtkWidget *widget,
 	}
 
 	if (event->keyval == GDK_Tab && gtk_widget_is_focus (input_widget)) {
-		gtkhtml_editor_run_command (
-			GTKHTML_EDITOR (composer), "grab-focus");
+		gtkhtml_editor_run_command (editor, "grab-focus");
+		return TRUE;
+	}
+
+	if (event->keyval == GDK_ISO_Left_Tab &&
+		gtk_widget_is_focus (GTK_WIDGET (html))) {
+		gtk_widget_grab_focus (input_widget);
 		return TRUE;
 	}
 
diff --git a/doc/reference/shell/tmpl/e-shell-content.sgml b/doc/reference/shell/tmpl/e-shell-content.sgml
index 35f428f120..bb62b33070 100644
--- a/doc/reference/shell/tmpl/e-shell-content.sgml
+++ b/doc/reference/shell/tmpl/e-shell-content.sgml
@@ -92,270 +92,3 @@ EShellContent
 @Returns: 
 
 
-<!-- ##### FUNCTION e_shell_content_get_shell_view ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_content_get_context ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_content_set_context ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@context: 
-
-
-<!-- ##### FUNCTION e_shell_content_get_filter_action ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_content_set_filter_action ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@filter_action: 
-
-
-<!-- ##### FUNCTION e_shell_content_get_filter_value ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_content_set_filter_value ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@filter_value: 
-
-
-<!-- ##### FUNCTION e_shell_content_get_filter_visible ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_content_set_filter_visible ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@filter_visible: 
-
-
-<!-- ##### FUNCTION e_shell_content_add_filter_separator_after ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@action_value: 
-
-
-<!-- ##### FUNCTION e_shell_content_get_search_context ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_content_get_search_rule ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_content_set_search_rule ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@search_rule: 
-
-
-<!-- ##### FUNCTION e_shell_content_get_search_text ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_content_set_search_text ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@search_text: 
-
-
-<!-- ##### FUNCTION e_shell_content_get_search_value ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_content_set_search_value ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@search_value: 
-
-
-<!-- ##### FUNCTION e_shell_content_get_search_visible ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_content_set_search_visible ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@search_visible: 
-
-
-<!-- ##### FUNCTION e_shell_content_get_scope_action ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_content_set_scope_action ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@scope_action: 
-
-
-<!-- ##### FUNCTION e_shell_content_get_scope_value ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_content_set_scope_value ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@scope_value: 
-
-
-<!-- ##### FUNCTION e_shell_content_get_scope_visible ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_content_set_scope_visible ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@scope_visible: 
-
-
-<!-- ##### FUNCTION e_shell_content_get_view_id ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_content_set_view_id ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-@view_id: 
-
-
-<!-- ##### FUNCTION e_shell_content_run_advanced_search_dialog ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-
-
-<!-- ##### FUNCTION e_shell_content_run_edit_searches_dialog ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-
-
-<!-- ##### FUNCTION e_shell_content_run_save_search_dialog ##### -->
-<para>
-
-</para>
-
-@shell_content: 
-
-
diff --git a/doc/reference/shell/tmpl/e-shell-sidebar.sgml b/doc/reference/shell/tmpl/e-shell-sidebar.sgml
index d5ebdf7467..de7fd21433 100644
--- a/doc/reference/shell/tmpl/e-shell-sidebar.sgml
+++ b/doc/reference/shell/tmpl/e-shell-sidebar.sgml
@@ -47,48 +47,3 @@ EShellSidebar
 @Returns: 
 
 
-<!-- ##### FUNCTION e_shell_sidebar_get_shell_view ##### -->
-<para>
-
-</para>
-
-@shell_sidebar: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_sidebar_get_primary_text ##### -->
-<para>
-
-</para>
-
-@shell_sidebar: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_sidebar_set_primary_text ##### -->
-<para>
-
-</para>
-
-@shell_sidebar: 
-@primary_text: 
-
-
-<!-- ##### FUNCTION e_shell_sidebar_get_secondary_text ##### -->
-<para>
-
-</para>
-
-@shell_sidebar: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_sidebar_set_secondary_text ##### -->
-<para>
-
-</para>
-
-@shell_sidebar: 
-@secondary_text: 
-
-
diff --git a/doc/reference/shell/tmpl/e-shell-taskbar.sgml b/doc/reference/shell/tmpl/e-shell-taskbar.sgml
index 6aa90f1c72..ff99855e5e 100644
--- a/doc/reference/shell/tmpl/e-shell-taskbar.sgml
+++ b/doc/reference/shell/tmpl/e-shell-taskbar.sgml
@@ -42,38 +42,3 @@ EShellTaskbar
 @Returns: 
 
 
-<!-- ##### FUNCTION e_shell_taskbar_get_shell_view ##### -->
-<para>
-
-</para>
-
-@shell_taskbar: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_taskbar_get_message ##### -->
-<para>
-
-</para>
-
-@shell_taskbar: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_taskbar_set_message ##### -->
-<para>
-
-</para>
-
-@shell_taskbar: 
-@message: 
-
-
-<!-- ##### FUNCTION e_shell_taskbar_unset_message ##### -->
-<para>
-
-</para>
-
-@shell_taskbar: 
-
-
diff --git a/doc/reference/shell/tmpl/e-shell-window.sgml b/doc/reference/shell/tmpl/e-shell-window.sgml
index 50349dae87..750f9cf529 100644
--- a/doc/reference/shell/tmpl/e-shell-window.sgml
+++ b/doc/reference/shell/tmpl/e-shell-window.sgml
@@ -57,110 +57,3 @@ EShellWindow
 @Returns: 
 
 
-<!-- ##### FUNCTION e_shell_window_get_shell_view ##### -->
-<para>
-
-</para>
-
-@shell_window: 
-@view_name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_window_get_ui_manager ##### -->
-<para>
-
-</para>
-
-@shell_window: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_window_get_action ##### -->
-<para>
-
-</para>
-
-@shell_window: 
-@action_name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_window_get_action_group ##### -->
-<para>
-
-</para>
-
-@shell_window: 
-@group_name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_window_get_managed_widget ##### -->
-<para>
-
-</para>
-
-@shell_window: 
-@widget_path: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_window_get_active_view ##### -->
-<para>
-
-</para>
-
-@shell_window: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_window_set_active_view ##### -->
-<para>
-
-</para>
-
-@shell_window: 
-@view_name: 
-
-
-<!-- ##### FUNCTION e_shell_window_get_safe_mode ##### -->
-<para>
-
-</para>
-
-@shell_window: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_shell_window_set_safe_mode ##### -->
-<para>
-
-</para>
-
-@shell_window: 
-@safe_mode: 
-
-
-<!-- ##### FUNCTION e_shell_window_register_new_item_actions ##### -->
-<para>
-
-</para>
-
-@shell_window: 
-@module_name: 
-@entries: 
-@n_entries: 
-
-
-<!-- ##### FUNCTION e_shell_window_register_new_source_actions ##### -->
-<para>
-
-</para>
-
-@shell_window: 
-@module_name: 
-@entries: 
-@n_entries: 
-
-
diff --git a/doc/reference/shell/tmpl/eshell-unused.sgml b/doc/reference/shell/tmpl/eshell-unused.sgml
index 5fc4eb685e..47c012875b 100644
--- a/doc/reference/shell/tmpl/eshell-unused.sgml
+++ b/doc/reference/shell/tmpl/eshell-unused.sgml
@@ -1697,6 +1697,243 @@ intelligent
 @revision: 
 @Returns: 
 
+<!-- ##### FUNCTION e_shell_content_add_filter_separator_after ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@action_value: 
+
+<!-- ##### FUNCTION e_shell_content_get_context ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_content_get_filter_action ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_content_get_filter_value ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_content_get_filter_visible ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_content_get_scope_action ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_content_get_scope_value ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_content_get_scope_visible ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_content_get_search_context ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_content_get_search_rule ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_content_get_search_text ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_content_get_search_value ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_content_get_search_visible ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_content_get_shell_view ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_content_get_view_id ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_content_run_advanced_search_dialog ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+
+<!-- ##### FUNCTION e_shell_content_run_edit_searches_dialog ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+
+<!-- ##### FUNCTION e_shell_content_run_save_search_dialog ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+
+<!-- ##### FUNCTION e_shell_content_set_context ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@context: 
+
+<!-- ##### FUNCTION e_shell_content_set_filter_action ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@filter_action: 
+
+<!-- ##### FUNCTION e_shell_content_set_filter_value ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@filter_value: 
+
+<!-- ##### FUNCTION e_shell_content_set_filter_visible ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@filter_visible: 
+
+<!-- ##### FUNCTION e_shell_content_set_scope_action ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@scope_action: 
+
+<!-- ##### FUNCTION e_shell_content_set_scope_value ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@scope_value: 
+
+<!-- ##### FUNCTION e_shell_content_set_scope_visible ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@scope_visible: 
+
+<!-- ##### FUNCTION e_shell_content_set_search_rule ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@search_rule: 
+
+<!-- ##### FUNCTION e_shell_content_set_search_text ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@search_text: 
+
+<!-- ##### FUNCTION e_shell_content_set_search_value ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@search_value: 
+
+<!-- ##### FUNCTION e_shell_content_set_search_visible ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@search_visible: 
+
+<!-- ##### FUNCTION e_shell_content_set_view_id ##### -->
+<para>
+
+</para>
+
+@shell_content: 
+@view_id: 
+
 <!-- ##### FUNCTION e_shell_marshal_BOOLEAN__STRING ##### -->
 <para>
 
@@ -1727,6 +1964,77 @@ intelligent
 @error: 
 @Returns: 
 
+<!-- ##### FUNCTION e_shell_sidebar_get_primary_text ##### -->
+<para>
+
+</para>
+
+@shell_sidebar: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_sidebar_get_secondary_text ##### -->
+<para>
+
+</para>
+
+@shell_sidebar: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_sidebar_get_shell_view ##### -->
+<para>
+
+</para>
+
+@shell_sidebar: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_sidebar_set_primary_text ##### -->
+<para>
+
+</para>
+
+@shell_sidebar: 
+@primary_text: 
+
+<!-- ##### FUNCTION e_shell_sidebar_set_secondary_text ##### -->
+<para>
+
+</para>
+
+@shell_sidebar: 
+@secondary_text: 
+
+<!-- ##### FUNCTION e_shell_taskbar_get_message ##### -->
+<para>
+
+</para>
+
+@shell_taskbar: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_taskbar_get_shell_view ##### -->
+<para>
+
+</para>
+
+@shell_taskbar: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_taskbar_set_message ##### -->
+<para>
+
+</para>
+
+@shell_taskbar: 
+@message: 
+
+<!-- ##### FUNCTION e_shell_taskbar_unset_message ##### -->
+<para>
+
+</para>
+
+@shell_taskbar: 
+
 <!-- ##### FUNCTION e_shell_upgrade_attempt ##### -->
 <para>
 
@@ -1735,6 +2043,102 @@ intelligent
 @shell: 
 @Returns: 
 
+<!-- ##### FUNCTION e_shell_window_get_action ##### -->
+<para>
+
+</para>
+
+@shell_window: 
+@action_name: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_window_get_action_group ##### -->
+<para>
+
+</para>
+
+@shell_window: 
+@group_name: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_window_get_active_view ##### -->
+<para>
+
+</para>
+
+@shell_window: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_window_get_managed_widget ##### -->
+<para>
+
+</para>
+
+@shell_window: 
+@widget_path: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_window_get_safe_mode ##### -->
+<para>
+
+</para>
+
+@shell_window: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_window_get_shell_view ##### -->
+<para>
+
+</para>
+
+@shell_window: 
+@view_name: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_window_get_ui_manager ##### -->
+<para>
+
+</para>
+
+@shell_window: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_window_register_new_item_actions ##### -->
+<para>
+
+</para>
+
+@shell_window: 
+@module_name: 
+@entries: 
+@n_entries: 
+
+<!-- ##### FUNCTION e_shell_window_register_new_source_actions ##### -->
+<para>
+
+</para>
+
+@shell_window: 
+@module_name: 
+@entries: 
+@n_entries: 
+
+<!-- ##### FUNCTION e_shell_window_set_active_view ##### -->
+<para>
+
+</para>
+
+@shell_window: 
+@view_name: 
+
+<!-- ##### FUNCTION e_shell_window_set_safe_mode ##### -->
+<para>
+
+</para>
+
+@shell_window: 
+@safe_mode: 
+
 <!-- ##### VARIABLE e_test_shell_view_type ##### -->
 <para>
 
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 8855115582..c182105e49 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -60,6 +60,7 @@ eutilinclude_HEADERS = 				\
 	e-marshal.h				\
 	e-menu.h				\
 	e-mktemp.h				\
+	e-non-intrusive-error-dialog.h		\
 	e-print.h				\
 	e-plugin.h				\
 	e-plugin-ui.h				\
@@ -100,6 +101,7 @@ libeutil_la_SOURCES =				\
 	e-marshal.c				\
 	e-menu.c				\
 	e-mktemp.c				\
+	e-non-intrusive-error-dialog.c		\
 	e-plugin-ui.c				\
 	e-plugin.c				\
 	e-popup.c				\
diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c
index d26717e9e0..7e9cf4cad7 100644
--- a/e-util/e-icon-factory.c
+++ b/e-util/e-icon-factory.c
@@ -34,7 +34,7 @@
 #include <libgnomeui/gnome-thumbnail.h>
 #endif
 
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>
 
 #include "e-icon-factory.h"
 #include "e-util-private.h"
diff --git a/e-util/e-non-intrusive-error-dialog.c b/e-util/e-non-intrusive-error-dialog.c
new file mode 100644
index 0000000000..070c1e9bef
--- /dev/null
+++ b/e-util/e-non-intrusive-error-dialog.c
@@ -0,0 +1,308 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ *  Authors: Ashish Shrivastava <shashish@novell.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <glib/gstdio.h>
+#include <glib/gstdio.h>
+#include "e-non-intrusive-error-dialog.h"
+
+/* eni - non intrusive error */
+
+static gboolean
+eni_query_tooltip_cb (GtkTreeView *view,
+                  gint x,
+                  gint y,
+                  gboolean keyboard_mode,
+                  GtkTooltip *tooltip)
+{
+        GtkTreeViewColumn *column;
+        GtkTreeModel *model;
+        GtkTreePath *path;
+        GtkTreeIter iter;
+        gint level;
+
+        if (!gtk_tree_view_get_tooltip_context (
+                view, &x, &y, keyboard_mode, NULL, &path, &iter))
+                return FALSE;
+
+        /* Figure out which column we're pointing at. */
+        if (keyboard_mode)
+                gtk_tree_view_get_cursor (view, NULL, &column);
+        else
+                gtk_tree_view_get_path_at_pos (
+                        view, x, y, NULL, &column, NULL, NULL);
+
+        /* Restrict the tip area to a single cell. */
+        gtk_tree_view_set_tooltip_cell (view, tooltip, path, column, NULL);
+
+        /* This only works if the tree view is NOT reorderable. */
+        if (column != gtk_tree_view_get_column (view, 0))
+                return FALSE;
+
+        model = gtk_tree_view_get_model (view);
+        gtk_tree_model_get (model, &iter, COL_LEVEL, &level, -1);
+        gtk_tooltip_set_text (tooltip, ldata[level].key);
+
+        return TRUE;
+}
+
+static void
+eni_render_pixbuf (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
+               GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data)
+{
+        gint level;
+
+        gtk_tree_model_get (model, iter, COL_LEVEL, &level, -1);
+        g_object_set (
+                renderer, "stock-id", ldata[level].stock_id,
+                "stock-size", GTK_ICON_SIZE_MENU, NULL);
+}
+
+static void
+eni_render_date (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
+              GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data)
+{
+        time_t t;
+        char sdt[100]; /* Should be sufficient? */
+
+        gtk_tree_model_get (model, iter, COL_TIME, &t, -1);
+        strftime (sdt, 100, "%x %X", localtime (&t));
+        g_object_set (renderer, "text", sdt, NULL);
+}
+
+static void
+eni_append_logs (const char *txt, GtkListStore *store)
+{
+        char **str;
+
+        str = g_strsplit (txt,  ":", 3);
+        if (str[0] && str[1] && str[2]) {
+                GtkTreeIter iter;
+
+                gtk_list_store_append (store, &iter);
+                gtk_list_store_set (
+                        store, &iter,
+                        COL_LEVEL, atoi (str[0]),
+                        COL_TIME, atol (str[1]),
+                        COL_DATA, g_strstrip (str[2]),
+                        -1);
+        } else
+                g_printerr ("Unable to decode error log: %s\n", txt);
+
+        g_strfreev (str);
+}
+
+static guint
+eni_config_get_error_level (const char *path)
+{
+        GConfClient *gconf_client;
+        guint error_level;
+
+        gconf_client = gconf_client_get_default ();
+        error_level = gconf_client_get_int (gconf_client, path, NULL);
+
+        g_object_unref (gconf_client);
+        return error_level;
+}
+
+guint
+eni_config_get_error_timeout (const char *path)
+{
+        GConfClient *gconf_client;
+        guint error_time;
+
+        gconf_client = gconf_client_get_default ();
+        error_time = gconf_client_get_int (gconf_client, path, NULL);
+
+        g_object_unref (gconf_client);
+        return error_time;
+}
+
+static void
+eni_error_timeout_changed (GtkSpinButton *b, void *data)
+{
+        GConfClient *gconf_client;
+        int value = gtk_spin_button_get_value_as_int (b);
+
+        gconf_client = gconf_client_get_default ();
+
+        gconf_client_set_int (gconf_client, (char *) data, value, NULL);
+        g_object_unref (gconf_client);
+}
+
+static void
+eni_error_level_value_changed (GtkComboBox *w, gpointer *data)
+{
+        GConfClient *gconf_client;
+        int value = gtk_combo_box_get_active (w);
+
+        gconf_client = gconf_client_get_default ();
+
+        gconf_client_set_int (gconf_client, (char *) data, value, NULL);
+
+        g_object_unref (gconf_client);
+}
+
+void 
+eni_show_logger(ELogger *logger, GtkWidget *top,const char *error_timeout_path, const char *error_level_path)
+{
+	GtkWidget *container;
+	GtkWidget *label;
+	GtkWidget *toplevel;
+	GtkWidget *vbox;
+	GtkWidget *widget;
+	GtkWidget *window;
+	GtkListStore *store;
+	GtkCellRenderer *renderer;
+	GtkTreeViewColumn *column;
+	int i;
+
+	toplevel = gtk_widget_get_toplevel (top);
+
+	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+	gtk_window_set_default_size (GTK_WINDOW (window), 500, 400);
+	gtk_window_set_title (GTK_WINDOW (window), _("Debug Logs"));
+	gtk_window_set_transient_for (
+		GTK_WINDOW (window), GTK_WINDOW (toplevel));
+	gtk_container_set_border_width (GTK_CONTAINER (window), 12);
+
+	vbox = gtk_vbox_new (FALSE, 12);
+	gtk_container_add (GTK_CONTAINER (window), vbox);
+
+	container = gtk_hbox_new (FALSE, 6);
+	gtk_box_pack_start (GTK_BOX (vbox), container, FALSE, FALSE, 0);
+
+	/* Translators: This is the first part of the sentence
+	 * "Show _errors in the status bar for" - XXX - "second(s)." */
+	widget = gtk_label_new_with_mnemonic (
+		_("Show _errors in the status bar for"));
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+	label = widget;
+
+	widget = gtk_spin_button_new_with_range (1.0, 60.0, 1.0);
+	gtk_spin_button_set_value (
+		GTK_SPIN_BUTTON (widget),
+		(gdouble) eni_config_get_error_timeout (error_timeout_path));
+	g_signal_connect (
+		widget, "value-changed",
+		G_CALLBACK (eni_error_timeout_changed),
+		(gpointer) error_timeout_path);
+
+	gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+
+	/* Translators: This is the second part of the sentence
+	 * "Show _errors in the status bar for" - XXX - "second(s)." */
+	widget = gtk_label_new_with_mnemonic (_("second(s)."));
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+
+	container = gtk_hbox_new (FALSE, 6);
+	gtk_box_pack_start (GTK_BOX (vbox), container, FALSE, FALSE, 0);
+
+	widget = gtk_label_new_with_mnemonic (_("Log Messages:"));
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+	label = widget;
+
+	widget = gtk_combo_box_new_text ();
+	for (i = E_LOG_ERROR; i <= E_LOG_DEBUG; i++)
+		gtk_combo_box_append_text (
+				GTK_COMBO_BOX (widget), ldata[i].text);
+	gtk_combo_box_set_active ((GtkComboBox *) widget, eni_config_get_error_level(error_level_path));
+
+	g_signal_connect (
+		widget, "changed",
+		G_CALLBACK (eni_error_level_value_changed),
+		(gpointer) error_level_path);
+
+	gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+
+	store = gtk_list_store_new (3, G_TYPE_INT, G_TYPE_LONG, G_TYPE_STRING);
+	e_logger_get_logs (logger, (ELogFunction) eni_append_logs, store);
+	gtk_tree_sortable_set_sort_column_id (
+		GTK_TREE_SORTABLE (store), COL_TIME, GTK_SORT_DESCENDING);
+
+	container = gtk_scrolled_window_new (NULL, NULL);
+	gtk_scrolled_window_set_policy (
+		GTK_SCROLLED_WINDOW (container),
+		GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_shadow_type (
+		GTK_SCROLLED_WINDOW (container), GTK_SHADOW_IN);
+	gtk_box_pack_start (GTK_BOX (vbox), container, TRUE, TRUE, 0);
+
+	widget = gtk_tree_view_new();
+	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (widget), TRUE);
+	gtk_tree_view_set_reorderable (GTK_TREE_VIEW (widget), FALSE);
+	gtk_tree_view_set_model (GTK_TREE_VIEW (widget), GTK_TREE_MODEL (store));
+	gtk_tree_view_set_search_column (GTK_TREE_VIEW (widget), COL_DATA);
+	gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (widget), TRUE);
+	gtk_widget_set_has_tooltip (widget, TRUE);
+	gtk_container_add (GTK_CONTAINER (container), widget);
+
+	g_signal_connect (
+		widget, "query-tooltip",
+		G_CALLBACK (eni_query_tooltip_cb), NULL);
+
+	column = gtk_tree_view_column_new ();
+	gtk_tree_view_column_set_title (column, _("Log Level"));
+	gtk_tree_view_append_column (GTK_TREE_VIEW (widget), column);
+	renderer = gtk_cell_renderer_pixbuf_new ();
+	gtk_tree_view_column_pack_start (column, renderer, TRUE);
+	gtk_tree_view_column_set_cell_data_func (
+		column, renderer, eni_render_pixbuf, NULL, NULL);
+
+	column = gtk_tree_view_column_new ();
+	gtk_tree_view_column_set_title (column, _("Time"));
+	gtk_tree_view_append_column (GTK_TREE_VIEW (widget), column);
+
+	renderer = gtk_cell_renderer_text_new ();
+	gtk_tree_view_column_pack_start (column, renderer, FALSE);
+	gtk_tree_view_column_set_cell_data_func (
+		column, renderer, eni_render_date, NULL, NULL);
+
+	renderer = gtk_cell_renderer_text_new ();
+	gtk_tree_view_insert_column_with_attributes(
+		GTK_TREE_VIEW (widget), -1, _("Messages"),
+		renderer, "markup", COL_DATA, NULL);
+
+	container = gtk_hbutton_box_new ();
+	gtk_button_box_set_layout (
+		GTK_BUTTON_BOX (container), GTK_BUTTONBOX_END);
+	gtk_box_pack_start (GTK_BOX (vbox), container, FALSE, FALSE, 0);
+
+	widget = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
+	gtk_widget_set_tooltip_text (widget, _("Close this window"));
+	g_signal_connect_swapped (
+		widget, "clicked",
+		G_CALLBACK (gtk_widget_destroy), window);
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+
+	gtk_widget_show_all (window);
+}
+
diff --git a/e-util/e-non-intrusive-error-dialog.h b/e-util/e-non-intrusive-error-dialog.h
new file mode 100644
index 0000000000..159242c0fa
--- /dev/null
+++ b/e-util/e-non-intrusive-error-dialog.h
@@ -0,0 +1,61 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ *  Authors: Ashish Shrivastava <shashish@novell.com>
+ *
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef __E_ERROR_DIALOG_H__
+#define __E_ERROR_DIALOG_H__
+
+#include <glib-object.h>
+#include "e-error.h"
+#include "e-icon-factory.h"
+#include "e-logger.h"
+#include "e-util/gconf-bridge.h"
+
+G_BEGIN_DECLS
+
+struct _log_data {
+        int level;
+        char *key;
+        char *text;
+        char *stock_id;
+        GdkPixbuf *pbuf;
+} ldata [] = {
+        { E_LOG_ERROR, N_("Error"), N_("Errors"), GTK_STOCK_DIALOG_ERROR },
+        { E_LOG_WARNING, N_("Warning"), N_("Warnings and Errors"), GTK_STOCK_DIALOG_WARNING },
+        { E_LOG_DEBUG, N_("Debug"), N_("Error, Warnings and Debug messages"), GTK_STOCK_DIALOG_INFO }
+};
+
+enum
+{
+        COL_LEVEL = 0,
+        COL_TIME,
+        COL_DATA
+};
+
+/* eni - error non intrusive*/
+guint		eni_config_get_error_timeout	(const char *path);
+void		eni_show_logger			(ELogger *logger,
+						 GtkWidget *widget,
+						 const char *error_timeout_path,
+						 const char *error_level_path);
+
+G_END_DECLS
+
+#endif /* __E_ERROR_DIALOG_H__ */
diff --git a/e-util/e-plugin-ui.c b/e-util/e-plugin-ui.c
index 467b71628c..0b28adda5d 100644
--- a/e-util/e-plugin-ui.c
+++ b/e-util/e-plugin-ui.c
@@ -1,20 +1,18 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
 #include "e-plugin-ui.h"
diff --git a/e-util/e-plugin-ui.h b/e-util/e-plugin-ui.h
index ea41eb67b7..00e6ed5fcf 100644
--- a/e-util/e-plugin-ui.h
+++ b/e-util/e-plugin-ui.h
@@ -1,20 +1,18 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
 #ifndef E_PLUGIN_UI_H
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 2e46128a5a..adfd7bf807 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -390,94 +390,6 @@ e_format_number (gint number)
 	}
 }
 
-static gchar *
-do_format_number_as_float (gdouble number)
-{
-	GList *iterator, *list = NULL;
-	struct lconv *locality;
-	gint char_length = 0;
-	gint group_count = 0;
-	gchar *grouping;
-	gint last_count = 3;
-	gint divider;
-	gchar *value;
-	gchar *value_iterator;
-	gdouble fractional;
-
-	locality = localeconv();
-	grouping = locality->grouping;
-	while (number >= 1.0) {
-		gchar *group;
-		switch (*grouping) {
-		default:
-			last_count = *grouping;
-			grouping++;
-			/* Fall through */
-		case 0:
-			divider = epow10(last_count);
-			number /= divider;
-			fractional = modf (number, &number);
-			fractional *= divider;
-			fractional = floor (fractional);
-
-			if (number >= 1.0) {
-				group = g_strdup_printf("%0*d", last_count, (int) fractional);
-			} else {
-				group = g_strdup_printf("%d", (gint) fractional);
-			}
-			break;
-		case CHAR_MAX:
-			divider = epow10(last_count);
-			number /= divider;
-			fractional = modf (number, &number);
-			fractional *= divider;
-			fractional = floor (fractional);
-
-			while (number >= 1.0) {
-				group = g_strdup_printf("%0*d", last_count, (gint) fractional);
-
-				char_length += strlen(group);
-				list = g_list_prepend(list, group);
-				group_count ++;
-
-				divider = epow10(last_count);
-				number /= divider;
-				fractional = modf (number, &number);
-				fractional *= divider;
-				fractional = floor (fractional);
-			}
-
-			group = g_strdup_printf("%d", (gint) fractional);
-			break;
-		}
-		char_length += strlen(group);
-		list = g_list_prepend(list, group);
-		group_count ++;
-	}
-
-	if (list) {
-		value = g_new(gchar, 1 + char_length + (group_count - 1) * strlen(locality->thousands_sep));
-
-		iterator = list;
-		value_iterator = value;
-
-		strcpy(value_iterator, iterator->data);
-		value_iterator += strlen(iterator->data);
-		for (iterator = iterator->next; iterator; iterator = iterator->next) {
-			strcpy(value_iterator, locality->thousands_sep);
-			value_iterator += strlen(locality->thousands_sep);
-
-			strcpy(value_iterator, iterator->data);
-			value_iterator += strlen(iterator->data);
-		}
-		g_list_foreach (list, (GFunc) g_free, NULL);
-		g_list_free (list);
-		return value;
-	} else {
-		return g_strdup("0");
-	}
-}
-
 /* Perform a binary search for key in base which has nmemb elements
    of size bytes each.  The comparisons are done by (*compare)().  */
 void
diff --git a/help/ChangeLog b/help/ChangeLog
index ca1d2cdaa0..ce35c4df91 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-26  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es/es.po: Updated Spanish translation
+
 2008-09-29  Petr Kovar  <pknbe@volny.cz>
 
 	* cs.po: Updated Czech translation of manual by Jiri Eischmann.
diff --git a/help/es/es.po b/help/es/es.po
index ef5174d5b7..fc23fff2da 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.help.HEAD\n"
-"POT-Creation-Date: 2008-09-16 05:27+0000\n"
-"PO-Revision-Date: 2008-09-17 19:27+0200\n"
+"POT-Creation-Date: 2008-09-17 17:36+0000\n"
+"PO-Revision-Date: 2008-10-24 16:03+0200\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -22,10 +22,8 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:230(None)
-msgid ""
-"@@image: 'figures/evo_identity_a.png'; md5=51fef803bd3083b0b2c2583221d1c151"
-msgstr ""
-"@@image: 'figures/evo_identity_a.png'; md5=51fef803bd3083b0b2c2583221d1c151"
+msgid "@@image: 'figures/evo_identity_a.png'; md5=51fef803bd3083b0b2c2583221d1c151"
+msgstr "@@image: 'figures/evo_identity_a.png'; md5=51fef803bd3083b0b2c2583221d1c151"
 
 #. 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.
@@ -40,18 +38,14 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:418(None)
-msgid ""
-"@@image: 'figures/evo_gwreceive_a.png'; md5=ef64e581e652d0f03e4e6dd4a3b6d5a2"
-msgstr ""
-"@@image: 'figures/evo_gwreceive_a.png'; md5=ef64e581e652d0f03e4e6dd4a3b6d5a2"
+msgid "@@image: 'figures/evo_gwreceive_a.png'; md5=ef64e581e652d0f03e4e6dd4a3b6d5a2"
+msgstr "@@image: 'figures/evo_gwreceive_a.png'; md5=ef64e581e652d0f03e4e6dd4a3b6d5a2"
 
 #. 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/evolution.xml:428(None)
-msgid ""
-"@@image: 'figures/evo_mereceive_a.png'; md5=c3c759f902c2584ee218dc40d6e46806"
-msgstr ""
-"@@image: 'figures/evo_mereceive_a.png'; md5=c3c759f902c2584ee218dc40d6e46806"
+msgid "@@image: 'figures/evo_mereceive_a.png'; md5=c3c759f902c2584ee218dc40d6e46806"
+msgstr "@@image: 'figures/evo_mereceive_a.png'; md5=c3c759f902c2584ee218dc40d6e46806"
 
 #. 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.
@@ -66,26 +60,20 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:512(None)
-msgid ""
-"@@image: 'figures/evo_popreceive_a.png'; md5=a635f0e8d9bb4f0bcda34221c258f273"
-msgstr ""
-"@@image: 'figures/evo_popreceive_a.png'; md5=a635f0e8d9bb4f0bcda34221c258f273"
+msgid "@@image: 'figures/evo_popreceive_a.png'; md5=a635f0e8d9bb4f0bcda34221c258f273"
+msgstr "@@image: 'figures/evo_popreceive_a.png'; md5=a635f0e8d9bb4f0bcda34221c258f273"
 
 #. 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/evolution.xml:534(None)
-msgid ""
-"@@image: 'figures/evo_usereceive_a.png'; md5=3c14cafdde81fca95d480851aee9db0f"
-msgstr ""
-"@@image: 'figures/evo_usereceive_a.png'; md5=3c14cafdde81fca95d480851aee9db0f"
+msgid "@@image: 'figures/evo_usereceive_a.png'; md5=3c14cafdde81fca95d480851aee9db0f"
+msgstr "@@image: 'figures/evo_usereceive_a.png'; md5=3c14cafdde81fca95d480851aee9db0f"
 
 #. 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/evolution.xml:584(None)
-msgid ""
-"@@image: 'figures/evo_mhreceive_a.png'; md5=c7b97b4a2e9b9cf1c550244cca15a189"
-msgstr ""
-"@@image: 'figures/evo_mhreceive_a.png'; md5=c7b97b4a2e9b9cf1c550244cca15a189"
+msgid "@@image: 'figures/evo_mhreceive_a.png'; md5=c7b97b4a2e9b9cf1c550244cca15a189"
+msgstr "@@image: 'figures/evo_mhreceive_a.png'; md5=c7b97b4a2e9b9cf1c550244cca15a189"
 
 #. 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.
@@ -110,18 +98,14 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:678(None)
-msgid ""
-"@@image: 'figures/evo_send_setup_a.png'; md5=82760a1733ccb49ffa8424d265278b42"
-msgstr ""
-"@@image: 'figures/evo_send_setup_a.png'; md5=82760a1733ccb49ffa8424d265278b42"
+msgid "@@image: 'figures/evo_send_setup_a.png'; md5=82760a1733ccb49ffa8424d265278b42"
+msgstr "@@image: 'figures/evo_send_setup_a.png'; md5=82760a1733ccb49ffa8424d265278b42"
 
 #. 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/evolution.xml:725(None)
-msgid ""
-"@@image: 'figures/evo_timezone_a.png'; md5=4ee80aae45be18c238c25329ab5ce59a"
-msgstr ""
-"@@image: 'figures/evo_timezone_a.png'; md5=4ee80aae45be18c238c25329ab5ce59a"
+msgid "@@image: 'figures/evo_timezone_a.png'; md5=4ee80aae45be18c238c25329ab5ce59a"
+msgstr "@@image: 'figures/evo_timezone_a.png'; md5=4ee80aae45be18c238c25329ab5ce59a"
 
 #. 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.
@@ -137,8 +121,7 @@ msgstr ""
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:928(None)
 msgid "@@image: 'figures/evo_mail_a.png'; md5=cf315e85737412c6ee3c3202b8807701"
-msgstr ""
-"@@image: 'figures/evo_mail_a.png'; md5=cf315e85737412c6ee3c3202b8807701"
+msgstr "@@image: 'figures/evo_mail_a.png'; md5=cf315e85737412c6ee3c3202b8807701"
 
 #. 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.
@@ -164,8 +147,7 @@ msgstr ""
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:980(None)
 msgid "@@image: 'figures/evo_backup.png'; md5=45f1608179074557b35d6a31fbd49cec"
-msgstr ""
-"@@image: 'figures/evo_backup.png'; md5=45f1608179074557b35d6a31fbd49cec"
+msgstr "@@image: 'figures/evo_backup.png'; md5=45f1608179074557b35d6a31fbd49cec"
 
 #. 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.
@@ -190,18 +172,14 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:1009(None)
-msgid ""
-"@@image: 'figures/evo_restore.png'; md5=95ef78344a50e05dbf01da9633dcd71f"
-msgstr ""
-"@@image: 'figures/evo_restore.png'; md5=95ef78344a50e05dbf01da9633dcd71f"
+msgid "@@image: 'figures/evo_restore.png'; md5=95ef78344a50e05dbf01da9633dcd71f"
+msgstr "@@image: 'figures/evo_restore.png'; md5=95ef78344a50e05dbf01da9633dcd71f"
 
 #. 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/evolution.xml:1181(None)
-msgid ""
-"@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
-msgstr ""
-"@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
+msgid "@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
+msgstr "@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
 
 #. 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.
@@ -217,32 +195,25 @@ msgstr ""
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:1258(None)
 msgid "@@image: 'figures/ver_view_a.png'; md5=f3075b70b9eebf8f2b8f3b587143ef8b"
-msgstr ""
-"@@image: 'figures/ver_view_a.png'; md5=f3075b70b9eebf8f2b8f3b587143ef8b"
+msgstr "@@image: 'figures/ver_view_a.png'; md5=f3075b70b9eebf8f2b8f3b587143ef8b"
 
 #. 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/evolution.xml:1273(None)
-msgid ""
-"@@image: 'figures/collap_head_a.png'; md5=82c5d5ae3f5499f17bdb08eebfe9c557"
-msgstr ""
-"@@image: 'figures/collap_head_a.png'; md5=82c5d5ae3f5499f17bdb08eebfe9c557"
+msgid "@@image: 'figures/collap_head_a.png'; md5=82c5d5ae3f5499f17bdb08eebfe9c557"
+msgstr "@@image: 'figures/collap_head_a.png'; md5=82c5d5ae3f5499f17bdb08eebfe9c557"
 
 #. 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/evolution.xml:1448(None)
-msgid ""
-"@@image: 'figures/evo_newmess_a.png'; md5=3bd7f656fa4d7fa3d5b337241e56f575"
-msgstr ""
-"@@image: 'figures/evo_newmess_a.png'; md5=3bd7f656fa4d7fa3d5b337241e56f575"
+msgid "@@image: 'figures/evo_newmess_a.png'; md5=3bd7f656fa4d7fa3d5b337241e56f575"
+msgstr "@@image: 'figures/evo_newmess_a.png'; md5=3bd7f656fa4d7fa3d5b337241e56f575"
 
 #. 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/evolution.xml:1506(None)
-msgid ""
-"@@image: 'figures/evo_customheader.png'; md5=469f72793711212ce624d602e08e3a98"
-msgstr ""
-"@@image: 'figures/evo_customheader.png'; md5=469f72793711212ce624d602e08e3a98"
+msgid "@@image: 'figures/evo_customheader.png'; md5=469f72793711212ce624d602e08e3a98"
+msgstr "@@image: 'figures/evo_customheader.png'; md5=469f72793711212ce624d602e08e3a98"
 
 #. 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.
@@ -257,10 +228,8 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:1560(None)
-msgid ""
-"@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb"
-msgstr ""
-"@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb"
+msgid "@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb"
+msgstr "@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb"
 
 #. 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.
@@ -295,10 +264,8 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:1995(None)
-msgid ""
-"@@image: 'figures/account_editor_a.png'; md5=cd9c4e71a53f8f03424c1432d7d46e30"
-msgstr ""
-"@@image: 'figures/account_editor_a.png'; md5=cd9c4e71a53f8f03424c1432d7d46e30"
+msgid "@@image: 'figures/account_editor_a.png'; md5=cd9c4e71a53f8f03424c1432d7d46e30"
+msgstr "@@image: 'figures/account_editor_a.png'; md5=cd9c4e71a53f8f03424c1432d7d46e30"
 
 #. 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.
@@ -313,10 +280,8 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:2564(None)
-msgid ""
-"@@image: 'figures/mail-threaded.png'; md5=ab1b9eb0f0735f4fcc4c51ead5ce1ff2"
-msgstr ""
-"@@image: 'figures/mail-threaded.png'; md5=ab1b9eb0f0735f4fcc4c51ead5ce1ff2"
+msgid "@@image: 'figures/mail-threaded.png'; md5=ab1b9eb0f0735f4fcc4c51ead5ce1ff2"
+msgstr "@@image: 'figures/mail-threaded.png'; md5=ab1b9eb0f0735f4fcc4c51ead5ce1ff2"
 
 #. 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.
@@ -351,41 +316,32 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:2898(None)
-msgid ""
-"@@image: 'figures/evo_adv_search_a.png'; md5=676d35d686745650c9bcfa832763362c"
-msgstr ""
-"@@image: 'figures/evo_adv_search_a.png'; md5=676d35d686745650c9bcfa832763362c"
+msgid "@@image: 'figures/evo_adv_search_a.png'; md5=676d35d686745650c9bcfa832763362c"
+msgstr "@@image: 'figures/evo_adv_search_a.png'; md5=676d35d686745650c9bcfa832763362c"
 
 #. 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/evolution.xml:2928(None)
-msgid ""
-"@@image: 'figures/evo_edit_search.png'; md5=2ce150b3eb63cc4ec0f0292e13167be8"
-msgstr ""
-"@@image: 'figures/evo_edit_search.png'; md5=2ce150b3eb63cc4ec0f0292e13167be8"
+msgid "@@image: 'figures/evo_edit_search.png'; md5=2ce150b3eb63cc4ec0f0292e13167be8"
+msgstr "@@image: 'figures/evo_edit_search.png'; md5=2ce150b3eb63cc4ec0f0292e13167be8"
 
 #. 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/evolution.xml:2934(None)
-msgid ""
-"@@image: 'figures/evo_edit_rule_a.png'; md5=0ae423517b27dfd34cfcb54550335fbb"
-msgstr ""
-"@@image: 'figures/evo_edit_rule_a.png'; md5=0ae423517b27dfd34cfcb54550335fbb"
+msgid "@@image: 'figures/evo_edit_rule_a.png'; md5=0ae423517b27dfd34cfcb54550335fbb"
+msgstr "@@image: 'figures/evo_edit_rule_a.png'; md5=0ae423517b27dfd34cfcb54550335fbb"
 
 #. 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/evolution.xml:2961(None)
-msgid ""
-"@@image: 'figures/filter-new-fig.png'; md5=75a2b8ccfe0f7a4982859827c867d578"
-msgstr ""
-"@@image: 'figures/filter-new-fig.png'; md5=75a2b8ccfe0f7a4982859827c867d578"
+msgid "@@image: 'figures/filter-new-fig.png'; md5=75a2b8ccfe0f7a4982859827c867d578"
+msgstr "@@image: 'figures/filter-new-fig.png'; md5=75a2b8ccfe0f7a4982859827c867d578"
 
 #. 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/evolution.xml:3209(None)
 msgid "@@image: 'figures/evo_rule_a.png'; md5=5f8fb34b77c0d3abe7aff767edd53aaa"
-msgstr ""
-"@@image: 'figures/evo_rule_a.png'; md5=5f8fb34b77c0d3abe7aff767edd53aaa"
+msgstr "@@image: 'figures/evo_rule_a.png'; md5=5f8fb34b77c0d3abe7aff767edd53aaa"
 
 #. 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.
@@ -410,10 +366,8 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:3431(None)
-msgid ""
-"@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252"
-msgstr ""
-"@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252"
+msgid "@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252"
+msgstr "@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252"
 
 #. 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.
@@ -428,10 +382,8 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:3744(None)
-msgid ""
-"@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77"
-msgstr ""
-"@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77"
+msgid "@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77"
+msgstr "@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77"
 
 #. 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.
@@ -442,18 +394,14 @@ msgstr "@@image: 'figures/evo_cal_a.png'; md5=08a60dd21a8c52bace4a9d1d606b3ff5"
 #. 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/evolution.xml:3922(None)
-msgid ""
-"@@image: 'figures/evo_cal_prop_a.png'; md5=f28511f098847b4fc9278ba6c54c9c3d"
-msgstr ""
-"@@image: 'figures/evo_cal_prop_a.png'; md5=f28511f098847b4fc9278ba6c54c9c3d"
+msgid "@@image: 'figures/evo_cal_prop_a.png'; md5=f28511f098847b4fc9278ba6c54c9c3d"
+msgstr "@@image: 'figures/evo_cal_prop_a.png'; md5=f28511f098847b4fc9278ba6c54c9c3d"
 
 #. 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/evolution.xml:3954(None)
-msgid ""
-"@@image: 'figures/google_cal_view.png'; md5=6574c207d4b219a80da96982ee650ce2"
-msgstr ""
-"@@image: 'figures/google_cal_view.png'; md5=6574c207d4b219a80da96982ee650ce2"
+msgid "@@image: 'figures/google_cal_view.png'; md5=6574c207d4b219a80da96982ee650ce2"
+msgstr "@@image: 'figures/google_cal_view.png'; md5=6574c207d4b219a80da96982ee650ce2"
 
 #. 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.
@@ -468,10 +416,8 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:4121(None)
-msgid ""
-"@@image: 'figures/evo_allday_a.png'; md5=3641b70c5110bb275d553c00d559636f"
-msgstr ""
-"@@image: 'figures/evo_allday_a.png'; md5=3641b70c5110bb275d553c00d559636f"
+msgid "@@image: 'figures/evo_allday_a.png'; md5=3641b70c5110bb275d553c00d559636f"
+msgstr "@@image: 'figures/evo_allday_a.png'; md5=3641b70c5110bb275d553c00d559636f"
 
 #. 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.
@@ -495,24 +441,19 @@ msgstr ""
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:4876(None)
 msgid "@@image: 'figures/evo_memo_a.png'; md5=d3e1bb4520b51afabc1b396fdd4ab82c"
-msgstr ""
-"@@image: 'figures/evo_memo_a.png'; md5=d3e1bb4520b51afabc1b396fdd4ab82c"
+msgstr "@@image: 'figures/evo_memo_a.png'; md5=d3e1bb4520b51afabc1b396fdd4ab82c"
 
 #. 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/evolution.xml:5272(None)
-msgid ""
-"@@image: 'figures/exchng-identity.png'; md5=51fef803bd3083b0b2c2583221d1c151"
-msgstr ""
-"@@image: 'figures/exchng-identity.png'; md5=51fef803bd3083b0b2c2583221d1c151"
+msgid "@@image: 'figures/exchng-identity.png'; md5=51fef803bd3083b0b2c2583221d1c151"
+msgstr "@@image: 'figures/exchng-identity.png'; md5=51fef803bd3083b0b2c2583221d1c151"
 
 #. 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/evolution.xml:5277(None)
-msgid ""
-"@@image: 'figures/exchng-rec-mails.png'; md5=29dcaf684be7ea3554afe4f96885bc4e"
-msgstr ""
-"@@image: 'figures/exchng-rec-mails.png'; md5=29dcaf684be7ea3554afe4f96885bc4e"
+msgid "@@image: 'figures/exchng-rec-mails.png'; md5=29dcaf684be7ea3554afe4f96885bc4e"
+msgstr "@@image: 'figures/exchng-rec-mails.png'; md5=29dcaf684be7ea3554afe4f96885bc4e"
 
 #. 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.
@@ -527,18 +468,14 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:5298(None)
-msgid ""
-"@@image: 'figures/exchg-identity.png'; md5=3733884734da6765870c652f1651bbd2"
-msgstr ""
-"@@image: 'figures/exchg-identity.png'; md5=3733884734da6765870c652f1651bbd2"
+msgid "@@image: 'figures/exchg-identity.png'; md5=3733884734da6765870c652f1651bbd2"
+msgstr "@@image: 'figures/exchg-identity.png'; md5=3733884734da6765870c652f1651bbd2"
 
 #. 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/evolution.xml:5306(None)
-msgid ""
-"@@image: 'figures/exchng-rec-mail.png'; md5=fe7f5e7b758b0306998ec477abf790f3"
-msgstr ""
-"@@image: 'figures/exchng-rec-mail.png'; md5=fe7f5e7b758b0306998ec477abf790f3"
+msgid "@@image: 'figures/exchng-rec-mail.png'; md5=fe7f5e7b758b0306998ec477abf790f3"
+msgstr "@@image: 'figures/exchng-rec-mail.png'; md5=fe7f5e7b758b0306998ec477abf790f3"
 
 #. 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.
@@ -553,10 +490,8 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:5347(None) C/evolution.xml:5584(None)
-msgid ""
-"@@image: 'figures/exchng-settings.png'; md5=7e82c0934afd2de5fca76c164d6342f4"
-msgstr ""
-"@@image: 'figures/exchng-settings.png'; md5=7e82c0934afd2de5fca76c164d6342f4"
+msgid "@@image: 'figures/exchng-settings.png'; md5=7e82c0934afd2de5fca76c164d6342f4"
+msgstr "@@image: 'figures/exchng-settings.png'; md5=7e82c0934afd2de5fca76c164d6342f4"
 
 #. 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.
@@ -597,10 +532,8 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:5543(None)
-msgid ""
-"@@image: 'figures/sub-pub-fold.png'; md5=e8e8b7d0b6ae8214ca1ef51dac06a1f7"
-msgstr ""
-" @@image: 'figures/filter-new-fig.png'; md5=8816e3bdeb3a4e936b7cf877f51c033c"
+msgid "@@image: 'figures/sub-pub-fold.png'; md5=e8e8b7d0b6ae8214ca1ef51dac06a1f7"
+msgstr " @@image: 'figures/filter-new-fig.png'; md5=8816e3bdeb3a4e936b7cf877f51c033c"
 
 #. 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.
@@ -635,16 +568,13 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:5939(None)
-msgid ""
-"@@image: 'figures/evo_rmdrnotes_a.png'; md5=ae24ed3554b8359af96ef2374ccd261a"
-msgstr ""
-"@@image: 'figures/evo_rmdrnotes_a.png'; md5=ae24ed3554b8359af96ef2374ccd261a"
+msgid "@@image: 'figures/evo_rmdrnotes_a.png'; md5=ae24ed3554b8359af96ef2374ccd261a"
+msgstr "@@image: 'figures/evo_rmdrnotes_a.png'; md5=ae24ed3554b8359af96ef2374ccd261a"
 
 #. 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/evolution.xml:5971(None)
-msgid ""
-"@@image: 'figures/evo_shd_memo_a.png'; md5=dd7069c9f52641dd13101c1dd935feb8"
+msgid "@@image: 'figures/evo_shd_memo_a.png'; md5=dd7069c9f52641dd13101c1dd935feb8"
 msgstr ""
 " @@image: 'figures/evo_send_setup_a.png'; "
 "md5=956fcc991274e17196342801de1f55a4"
@@ -662,24 +592,19 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:6097(None)
-msgid ""
-"@@image: 'figures/evo_sendstatus_a.png'; md5=36ca2211056c859eb776124bfc364705"
-msgstr ""
-"@@image: 'figures/evo_sendstatus_a.png'; md5=36ca2211056c859eb776124bfc364705"
+msgid "@@image: 'figures/evo_sendstatus_a.png'; md5=36ca2211056c859eb776124bfc364705"
+msgstr "@@image: 'figures/evo_sendstatus_a.png'; md5=36ca2211056c859eb776124bfc364705"
 
 #. 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/evolution.xml:6155(None)
-msgid ""
-"@@image: 'figures/evo_calstatus_a.png'; md5=99fb98faa3e644f6433c078ba71a0353"
-msgstr ""
-"@@image: 'figures/evo_calstatus_a.png'; md5=99fb98faa3e644f6433c078ba71a0353"
+msgid "@@image: 'figures/evo_calstatus_a.png'; md5=99fb98faa3e644f6433c078ba71a0353"
+msgstr "@@image: 'figures/evo_calstatus_a.png'; md5=99fb98faa3e644f6433c078ba71a0353"
 
 #. 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/evolution.xml:6296(None)
-msgid ""
-"@@image: 'figures/evo_proxyadd_a.png'; md5=51357617967f0610eb95dab5814540ad"
+msgid "@@image: 'figures/evo_proxyadd_a.png'; md5=51357617967f0610eb95dab5814540ad"
 msgstr ""
 " @@image: 'figures/evo_imapreceive_a.png'; "
 "md5=0b35b1fc693bb79aefe7dcfb5f354faf"
@@ -687,10 +612,8 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:6319(None)
-msgid ""
-"@@image: 'figures/proxy-login.png'; md5=7adee93cffbeea4636df9bb1a8923b07"
-msgstr ""
-"@@image: 'figures/proxy-login.png'; md5=7adee93cffbeea4636df9bb1a8923b07"
+msgid "@@image: 'figures/proxy-login.png'; md5=7adee93cffbeea4636df9bb1a8923b07"
+msgstr "@@image: 'figures/proxy-login.png'; md5=7adee93cffbeea4636df9bb1a8923b07"
 
 #. 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.
@@ -711,57 +634,44 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/evolution.xml:6573(None)
-msgid ""
-"@@image: 'figures/evo_imapheader_a.png'; md5=b11aa6167ce03769ce3084d32f4b4459"
-msgstr ""
-"@@image: 'figures/evo_imapheader_a.png'; md5=b11aa6167ce03769ce3084d32f4b4459"
+msgid "@@image: 'figures/evo_imapheader_a.png'; md5=b11aa6167ce03769ce3084d32f4b4459"
+msgstr "@@image: 'figures/evo_imapheader_a.png'; md5=b11aa6167ce03769ce3084d32f4b4459"
 
 #. 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/evolution.xml:6668(None)
-msgid ""
-"@@image: 'figures/evo_labels_a.png'; md5=847d1bebd5d64b9f63e14d6d88f741de"
-msgstr ""
-"@@image: 'figures/evo_labels_a.png'; md5=847d1bebd5d64b9f63e14d6d88f741de"
+msgid "@@image: 'figures/evo_labels_a.png'; md5=847d1bebd5d64b9f63e14d6d88f741de"
+msgstr "@@image: 'figures/evo_labels_a.png'; md5=847d1bebd5d64b9f63e14d6d88f741de"
 
 #. 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/evolution.xml:6694(None)
-msgid ""
-"@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
-msgstr ""
-"@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
+msgid "@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
+msgstr "@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
 
 #. 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/evolution.xml:6739(None)
 msgid "@@image: 'figures/evo_junk_a.png'; md5=9ea63d33ed9dae0df3a8a62a85063340"
-msgstr ""
-"@@image: 'figures/evo_junk_a.png'; md5=9ea63d33ed9dae0df3a8a62a85063340"
+msgstr "@@image: 'figures/evo_junk_a.png'; md5=9ea63d33ed9dae0df3a8a62a85063340"
 
 #. 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/evolution.xml:6930(None)
-msgid ""
-"@@image: 'figures/network_pref.png'; md5=477a6b35cd47e61b32b9aee6451ec2e1"
-msgstr ""
-"@@image: 'figures/network_pref.png'; md5=477a6b35cd47e61b32b9aee6451ec2e1"
+msgid "@@image: 'figures/network_pref.png'; md5=477a6b35cd47e61b32b9aee6451ec2e1"
+msgstr "@@image: 'figures/network_pref.png'; md5=477a6b35cd47e61b32b9aee6451ec2e1"
 
 #. 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/evolution.xml:7207(None)
-msgid ""
-"@@image: 'figures/evo_debuglogs_a.png'; md5=07f28e4574670558cf11897915b2ce7e"
-msgstr ""
-"@@image: 'figures/evo_debuglogs_a.png'; md5=07f28e4574670558cf11897915b2ce7e"
+msgid "@@image: 'figures/evo_debuglogs_a.png'; md5=07f28e4574670558cf11897915b2ce7e"
+msgstr "@@image: 'figures/evo_debuglogs_a.png'; md5=07f28e4574670558cf11897915b2ce7e"
 
 #. 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/evolution.xml:7359(None)
-msgid ""
-"@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
-msgstr ""
-"@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
+msgid "@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
+msgstr "@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
 
 #: C/evolution.xml:15(title) C/evolution.xml:7749(para)
 msgid "Evolution 2.24 User Guide"
@@ -1124,16 +1034,14 @@ msgstr ""
 "«Responder a»."
 
 #: C/evolution.xml:245(para)
-msgid ""
-"Use this field if you want replies to messages sent to a different address."
+msgid "Use this field if you want replies to messages sent to a different address."
 msgstr ""
 "Use este campo si quiere que las respuestas a los correos-e se envíen a una "
 "dirección diferente."
 
 #: C/evolution.xml:248(para)
 msgid "(Optional) Type your organization name in the Organization field."
-msgstr ""
-"(Opcional) Teclee el nombre de su organización en el campo «Organización»."
+msgstr "(Opcional) Teclee el nombre de su organización en el campo «Organización»."
 
 #: C/evolution.xml:249(para)
 msgid ""
@@ -1176,8 +1084,7 @@ msgstr "Seleccione un tipo de servidor en la lista «Tipo de servidor»."
 
 #: C/evolution.xml:265(para)
 msgid "The following is a list of server types that are available:"
-msgstr ""
-"Lo siguiente es una lista de tipos de servidores que están disponibles:"
+msgstr "Lo siguiente es una lista de tipos de servidores que están disponibles:"
 
 #: C/evolution.xml:267(title)
 msgid "Novell GroupWise:"
@@ -1271,7 +1178,7 @@ msgid ""
 "\">Local Configuration Options</link>."
 msgstr ""
 "Elija esta opciones si quiere mover el correo desde el buzón local a su "
-"directorio de inicio. Necesita propocinar la ruta al buzón de correo que "
+"directorio de inicio. Necesita proporcionar la ruta al buzón de correo que "
 "quiere usar, Si quiere dejar el correo en los archivos de spools del "
 "sistema, elija la opción «Mbox estándar de Unix». Para las instrucciones de "
 "configuración , consulte <link linkend=\"bstgbqn\">Opciones de configuración "
@@ -1369,8 +1276,7 @@ msgstr ""
 
 #: C/evolution.xml:318(para) C/evolution.xml:681(para)
 msgid "Type the server name of your email server in the Server field."
-msgstr ""
-"Teclee el nombre del servidor de su correo electrónico en el campo «Servidor»."
+msgstr "Teclee el nombre del servidor de su correo electrónico en el campo «Servidor»."
 
 #: C/evolution.xml:319(para) C/evolution.xml:682(para)
 msgid ""
@@ -1382,7 +1288,7 @@ msgstr ""
 
 #: C/evolution.xml:322(para) C/evolution.xml:694(para)
 msgid "Type your username in the Username field."
-msgstr "Teclee el usario en el campo Usuario."
+msgstr "Teclee el usuario en el campo Usuario."
 
 #: C/evolution.xml:325(para) C/evolution.xml:702(para)
 msgid "Select if you want to use a secure connection (SSL or TLS)."
@@ -1546,8 +1452,7 @@ msgstr ""
 #: C/evolution.xml:616(para) C/evolution.xml:639(para)
 #: C/evolution.xml:5891(para)
 msgid "Select if you want Evolution to automatically check for new mail."
-msgstr ""
-"Marque si quiere que Evolution compruebe automáticamente si hay correo nuevo."
+msgstr "Marque si quiere que Evolution compruebe automáticamente si hay correo nuevo."
 
 #: C/evolution.xml:391(para) C/evolution.xml:432(para)
 #: C/evolution.xml:473(para) C/evolution.xml:517(para)
@@ -1565,8 +1470,7 @@ msgstr ""
 #: C/evolution.xml:394(para) C/evolution.xml:435(para)
 #: C/evolution.xml:5897(para)
 msgid "Select if you want to check for new messages in all folders."
-msgstr ""
-"Marque si quiere que compruebe si hay mensajes nuevos en todas las carpetas."
+msgstr "Marque si quiere que compruebe si hay mensajes nuevos en todas las carpetas."
 
 #: C/evolution.xml:397(para) C/evolution.xml:453(para)
 #: C/evolution.xml:488(para) C/evolution.xml:600(para)
@@ -1606,8 +1510,7 @@ msgstr ""
 
 #: C/evolution.xml:405(para) C/evolution.xml:5908(para)
 msgid "Select if you want to only check for junk messages in the Inbox folder."
-msgstr ""
-"Marque si sólo quiere comprobar el correo basura en la Bandeja de entrada."
+msgstr "Marque si sólo quiere comprobar el correo basura en la Bandeja de entrada."
 
 #: C/evolution.xml:408(para) C/evolution.xml:450(para)
 #: C/evolution.xml:499(para)
@@ -1670,7 +1573,7 @@ msgid ""
 "When you have finished, continue with <link linkend=\"third-step\">Sending "
 "Mail</link>."
 msgstr ""
-"Cuando haya terminado, continúe con <link linkend=\"third-step\">Envio de "
+"Cuando haya terminado, continúe con <link linkend=\"third-step\">Envío de "
 "correo</link>."
 
 #: C/evolution.xml:427(para)
@@ -1762,8 +1665,7 @@ msgstr ""
 "suscribiéndose a ellas."
 
 #: C/evolution.xml:484(para)
-msgid ""
-"Select if you want Evolution to override server-supplied folder namespaces."
+msgid "Select if you want Evolution to override server-supplied folder namespaces."
 msgstr ""
 "Marque si quiere que Evolution no haga caso de los espacios de nombres de "
 "carpetas suministrados por el servidor."
@@ -1797,8 +1699,7 @@ msgstr "Marque si quiere dejar los mensajes en el servidor."
 
 #: C/evolution.xml:523(para)
 msgid "Select if you want to disable support for all POP3 extensions."
-msgstr ""
-"Seleccione si quiere desactivar el soporte para todas las extensiones POP3."
+msgstr "Seleccione si quiere desactivar el soporte para todas las extensiones POP3."
 
 #: C/evolution.xml:535(para)
 msgid ""
@@ -1851,8 +1752,7 @@ msgstr ""
 "recepción, necesita especificar las opciones siguientes:"
 
 #: C/evolution.xml:580(para)
-msgid ""
-"Select if you want to use the <emphasis>.folders</emphasis> summary file."
+msgid "Select if you want to use the <emphasis>.folders</emphasis> summary file."
 msgstr ""
 "Seleccione si quiere usar el archivo de resumen <emphasis>.folders</"
 "emphasis>."
@@ -1866,16 +1766,14 @@ msgstr ""
 "recepción, necesita especificar las opciones siguientes:"
 
 #: C/evolution.xml:623(para) C/evolution.xml:646(para)
-msgid ""
-"Select if you want to store status headers in Elm, Pine, and Mutt formats."
+msgid "Select if you want to store status headers in Elm, Pine, and Mutt formats."
 msgstr ""
 "Seleccione si quiere almacenar las cabeceras de estado en los formatos Elm, "
 "Pine y Mutt."
 
 #: C/evolution.xml:635(title)
 msgid "Standard Unix mbox spool directory Receiving Options"
-msgstr ""
-"Opciones de recepción para directorios de correo en formato estándar de Unix"
+msgstr "Opciones de recepción para directorios de correo en formato estándar de Unix"
 
 #: C/evolution.xml:636(para)
 msgid ""
@@ -1949,7 +1847,7 @@ msgstr ""
 
 #: C/evolution.xml:708(para)
 msgid "Continue with <link linkend=\"bsti1ty\">Account Management</link>."
-msgstr "Continue con <link linkend=\"bsti1ty\">Gestión de cuentas</link>."
+msgstr "Continúe con <link linkend=\"bsti1ty\">Gestión de cuentas</link>."
 
 #: C/evolution.xml:714(para)
 msgid ""
@@ -1966,7 +1864,7 @@ msgid ""
 "Continue with <link linkend=\"step-three-b\">Time Zone</link><link linkend="
 "\"step-three-b\"/>."
 msgstr ""
-"Continue con la <link linkend=\"step-three-b\">Zona horaria</link><link "
+"Continúe con la <link linkend=\"step-three-b\">Zona horaria</link><link "
 "linkend=\"step-three-b\"/>."
 
 #: C/evolution.xml:722(para)
@@ -2189,7 +2087,7 @@ msgstr ""
 "La barra de esto muestra periódicamente un mensaje o informa del progreso de "
 "alguna tarea. Esto ocurre sobre todo a la hora de descargar o enviar el "
 "correo.Las colas de progreso se muestran en la figura anterior. El indicador "
-"de Conextado/Desconectado está aquí también, en la esquina inferior "
+"de Conectado/Desconectado está aquí también, en la esquina inferior "
 "izquierda de la ventana."
 
 #: C/evolution.xml:787(title) C/evolution.xml:934(title)
@@ -2546,8 +2444,7 @@ msgstr ""
 "sistema local para operación desconectada."
 
 #: C/evolution.xml:905(para)
-msgid ""
-"You can also rearrange folders and messages by dragging and dropping them."
+msgid "You can also rearrange folders and messages by dragging and dropping them."
 msgstr ""
 "También puede reorganizar las carpetas y los mensajes arrastrándolos y "
 "soltándolos donde desee."
@@ -2727,7 +2624,7 @@ msgid ""
 msgstr ""
 "En el panel del mes se muestra una pequeña vista mensual de su calendario. "
 "Para ver más meses arrastre hacia la derecha el borde. Puede seleccionar un "
-"rango de dias en el panel del mes para mostrar un rango de días en la lista "
+"rango de días en el panel del mes para mostrar un rango de días en la lista "
 "de citas."
 
 #: C/evolution.xml:956(title)
@@ -2950,8 +2847,7 @@ msgstr "evolution --disable-preview"
 
 #: C/evolution.xml:1048(para)
 msgid "Disables all the preview panes when you launch Evolution."
-msgstr ""
-"Deshabilita todos los paneles de vista preliminar cuando inicie Evolution."
+msgstr "Deshabilita todos los paneles de vista preliminar cuando inicie Evolution."
 
 #: C/evolution.xml:1049(para)
 msgid ""
@@ -2969,8 +2865,7 @@ msgid "evolution mailto:<varname>joe@somewhere.net</varname>"
 msgstr "evolution mailto:<varname>joe@somewhere.net</varname>"
 
 #: C/evolution.xml:1057(para)
-msgid ""
-"Starts Evolution and begins composing a message to the email address listed."
+msgid "Starts Evolution and begins composing a message to the email address listed."
 msgstr ""
 "Inicia Evolution y empieza redactando un mensaje a la dirección de correo "
 "listada."
@@ -3073,7 +2968,7 @@ msgstr ""
 "Si no está viendo ya el correo, cambie la la herramienta de correo pulsando "
 "en el botón Correo, o pulsando Ctrl+1. Para leer un mensaje, selecciónelo en "
 "la lista de mensajes, si quiere verlo en su propia ventana, puede o bien "
-"pulsar dos veces en él, pulsar Intro o pulsar Ctrol+O."
+"pulsar dos veces en él, pulsar Intro o pulsar Ctrl+O."
 
 #: C/evolution.xml:1134(para)
 msgid ""
@@ -3327,15 +3222,14 @@ msgstr "Reproducir un sonido cuando llegue correo nuevo:"
 
 #: C/evolution.xml:1212(para)
 msgid "You have two options to select from:"
-msgstr "Hay dos aopciones que puede seleccionar:"
+msgstr "Hay dos opciones que puede seleccionar:"
 
 #: C/evolution.xml:1217(title) C/evolution.xml:3109(title)
 msgid "Beep:"
 msgstr "Pitar:"
 
 #: C/evolution.xml:1218(para)
-msgid ""
-"Select this option to play a beep sound on the arrival of a new message."
+msgid "Select this option to play a beep sound on the arrival of a new message."
 msgstr ""
 "Seleccione esta opción para reproducir un pitido cuando llegue un mensaje de "
 "correo nuevo."
@@ -3445,8 +3339,7 @@ msgstr ""
 "de direcciones para mostrar en el panel de vista previa."
 
 #: C/evolution.xml:1274(para)
-msgid ""
-"Use the following procedure to set the limit of addresses to be displayed:"
+msgid "Use the following procedure to set the limit of addresses to be displayed:"
 msgstr ""
 "Use el siguiente procedimiento para establecer el límite de direcciones a "
 "mostrar:"
@@ -3524,7 +3417,7 @@ msgid ""
 msgstr ""
 "Bajo la solapa Recepción de correo elija el tipo de archivo de correo que "
 "usa su otra aplicación y escriba la ruta de directorios completa a ese "
-"lugar. Una eleción habitual son los archivos mbox, con la ruta «/home/"
+"lugar. Una elección habitual son los archivos mbox, con la ruta «/home/"
 "<varname>nombresdelusuario</varname>/Mail»."
 
 #: C/evolution.xml:1311(para)
@@ -3580,7 +3473,7 @@ msgid ""
 msgstr ""
 "Evolution muestra un icono con una flecha a la derecha, el número de "
 "adjuntos, y un botón Guardar o Guardar todos para guardar todos los "
-"adjuntos. Pulse en el icono de la flecha derecha para mostar la barra de "
+"adjuntos. Pulse en el icono de la flecha derecha para mostrar la barra de "
 "adjuntos."
 
 #: C/evolution.xml:1322(para)
@@ -3601,7 +3494,7 @@ msgstr "Pulse Guardar como."
 
 #: C/evolution.xml:1331(para)
 msgid "Select a location and name for the file."
-msgstr "Seleccine una ubicación y un nombre para el archivo."
+msgstr "Seleccione una ubicación y un nombre para el archivo."
 
 #: C/evolution.xml:1337(para)
 msgid "To open an attachment using another application:"
@@ -4081,8 +3974,7 @@ msgstr ""
 "ventana del Editor de mensajes."
 
 #: C/evolution.xml:1513(para)
-msgid ""
-"Select Insert &gt; Custom Header to open the Email Custom Header window."
+msgid "Select Insert &gt; Custom Header to open the Email Custom Header window."
 msgstr ""
 "Seleccione Insertar &gt; Cabecera personalizada para abrir la ventana "
 "Cabeceras personalizadas del correo-e."
@@ -4096,8 +3988,7 @@ msgstr ""
 "de cabeceras y valores que puede añadir."
 
 #: C/evolution.xml:1518(para)
-msgid ""
-"Set the values for the header fields by using the respective drop-down list."
+msgid "Set the values for the header fields by using the respective drop-down list."
 msgstr ""
 "Establezca los valores para los campos de cabecera usando la lista "
 "desplegable respectiva."
@@ -4177,8 +4068,7 @@ msgstr ""
 
 #: C/evolution.xml:1551(para)
 msgid "Click Copy Folder Content Locally for Offline Operation."
-msgstr ""
-"Pulse Copiar el contenido de la carpeta localmente para operar desconectado."
+msgstr "Pulse Copiar el contenido de la carpeta localmente para operar desconectado."
 
 #: C/evolution.xml:1554(para)
 msgid ""
@@ -4604,7 +4494,7 @@ msgstr "Responder a la lista"
 
 #: C/evolution.xml:1715(para)
 msgid "Clrl+L"
-msgstr "Clrl+L"
+msgstr "Ctrl+L"
 
 #: C/evolution.xml:1720(para)
 msgid "Reply to All"
@@ -4625,8 +4515,7 @@ msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
 #: C/evolution.xml:1742(para)
-msgid ""
-"The message composer makes several text searching features available to you."
+msgid "The message composer makes several text searching features available to you."
 msgstr ""
 "El editor de mensajes le proporciona varias características de búsqueda de "
 "texto."
@@ -4661,8 +4550,7 @@ msgstr "Buscar de nuevo:"
 
 #: C/evolution.xml:1753(para)
 msgid "Select this item to repeat the last search you performed."
-msgstr ""
-"Seleccione este elemento para repetir la última búsqueda que haya realizado."
+msgstr "Seleccione este elemento para repetir la última búsqueda que haya realizado."
 
 #: C/evolution.xml:1756(title)
 msgid "Replace:"
@@ -4948,10 +4836,8 @@ msgid "Inserting a Rule"
 msgstr "Insertar una regla"
 
 #: C/evolution.xml:1894(para)
-msgid ""
-"You can insert a horizontal line into the text to help divide two sections:"
-msgstr ""
-"Insertar una línea horizontal en el texto para dividirlo en dos secciones:"
+msgid "You can insert a horizontal line into the text to help divide two sections:"
+msgstr "Insertar una línea horizontal en el texto para dividirlo en dos secciones:"
 
 #: C/evolution.xml:1897(para)
 msgid "Click Insert &gt; Rule in the menubar."
@@ -4999,8 +4885,7 @@ msgstr ""
 
 #: C/evolution.xml:1938(para)
 msgid "You can set the following options when sending mail in Evolution."
-msgstr ""
-"Puede establecer las siguientes opciones cuando envía correos con Evolution."
+msgstr "Puede establecer las siguientes opciones cuando envía correos con Evolution."
 
 #: C/evolution.xml:1940(title)
 msgid "Read Receipts:"
@@ -5086,16 +4971,14 @@ msgstr ""
 "correo-e que quiere usar para los campos Cc y Cco."
 
 #: C/evolution.xml:1974(para)
-msgid ""
-"Select the desired option for send message receipts from the drop-down list."
+msgid "Select the desired option for send message receipts from the drop-down list."
 msgstr ""
 "Seleccione la opción que desea para la notificación de recepción de mensajes "
 "de la lista desplegable."
 
 #: C/evolution.xml:1979(title)
 msgid "Changing Default Folder for Sent and Draft Items"
-msgstr ""
-"Cambiar la carpeta predeterminada para el Correo enviado y los Borradores"
+msgstr "Cambiar la carpeta predeterminada para el Correo enviado y los Borradores"
 
 #: C/evolution.xml:1980(para)
 msgid ""
@@ -5234,8 +5117,7 @@ msgstr ""
 
 #: C/evolution.xml:2051(para)
 msgid "Don't send nasty emails (flames). If you get one, don't write back."
-msgstr ""
-"No envíe correos desagradables. Si recibe alguno, mejor no lo responda."
+msgstr "No envíe correos desagradables. Si recibe alguno, mejor no lo responda."
 
 #: C/evolution.xml:2054(para)
 msgid ""
@@ -5299,8 +5181,7 @@ msgstr "Seleccione la carpeta local de la plantilla."
 
 #: C/evolution.xml:2100(para)
 msgid "You can also edit an existing message and save it as a template."
-msgstr ""
-"También puede editar un mensaje existente y guardarlo como una plantilla."
+msgstr "También puede editar un mensaje existente y guardarlo como una plantilla."
 
 #: C/evolution.xml:2103(para)
 msgid "Open the message and click Reply."
@@ -5308,8 +5189,7 @@ msgstr "Abra el mensaje y pulse Responder."
 
 #: C/evolution.xml:2106(para)
 msgid "Edit the message body or the addresses according to your requirements."
-msgstr ""
-"Edite el cuerpo del mensaje o las direcciones de acuerdo con sus necesidades."
+msgstr "Edite el cuerpo del mensaje o las direcciones de acuerdo con sus necesidades."
 
 #: C/evolution.xml:2109(para) C/evolution.xml:2121(para)
 msgid "Select File &gt; Save as Template."
@@ -5331,12 +5211,10 @@ msgstr ""
 
 #: C/evolution.xml:2131(para)
 msgid "This option lists all the message templates in the Template folder."
-msgstr ""
-"Esta opción lista todas las plantillas de mensajes en la carpeta Plantilla."
+msgstr "Esta opción lista todas las plantillas de mensajes en la carpeta Plantilla."
 
 #: C/evolution.xml:2134(para)
-msgid ""
-"Select Open the message template of your choice and make changes if required."
+msgid "Select Open the message template of your choice and make changes if required."
 msgstr ""
 "Seleccione Abrir el mensaje de plantilla a su elección y realice los cambios "
 "si es necesario."
@@ -5493,8 +5371,7 @@ msgid "Send reply to sender:"
 msgstr "Responder al remitente:"
 
 #: C/evolution.xml:2183(para)
-msgid ""
-"Select this option if you want your response sent to the meeting organizers."
+msgid "Select this option if you want your response sent to the meeting organizers."
 msgstr ""
 "Marque esta casilla si quiere que su respuesta llegue a los organizadores de "
 "la reunión."
@@ -5547,8 +5424,7 @@ msgstr ""
 "problema."
 
 #: C/evolution.xml:2203(para)
-msgid ""
-"Enable the corresponding checkbox to add a folder to the subscribed list."
+msgid "Enable the corresponding checkbox to add a folder to the subscribed list."
 msgstr ""
 "Active la correspondiente casilla de verificación para añadir una carpeta a "
 "su lista de suscripción."
@@ -5619,7 +5495,7 @@ msgid ""
 "PGP."
 msgstr ""
 "Evolution no soporta versiones antiguas de PGP, tales como OpenPGP y PGP "
-"inluido."
+"incluido."
 
 #: C/evolution.xml:2226(para)
 msgid "You can use encryption in two different ways:"
@@ -5679,8 +5555,7 @@ msgstr ""
 
 #: C/evolution.xml:2242(para)
 msgid "Open a terminal and enter <command>gpg --gen-key</command>."
-msgstr ""
-"Abra una terminal e instroduzca el comando <command>gpg --gen-key</command>."
+msgstr "Abra una terminal e introduzca el comando <command>gpg --gen-key</command>."
 
 #: C/evolution.xml:2245(para)
 msgid "Select an algorithm, then press Enter."
@@ -5704,7 +5579,7 @@ msgstr ""
 
 #: C/evolution.xml:2253(para)
 msgid "Enter how long your key should be valid for."
-msgstr "Introduzca el timepo para la cual su clave deberá ser válida."
+msgstr "Introduzca el tiempo para la cual su clave deberá ser válida."
 
 #: C/evolution.xml:2255(para)
 msgid ""
@@ -5728,8 +5603,7 @@ msgstr "(Opcional) Escriba un comentario, después pulse Intro."
 
 #: C/evolution.xml:2267(para)
 msgid "Review your selected user ID. If it is correct, press O."
-msgstr ""
-"Compruebe el ID de usuario que ha seleccionado. Si es correcto pulse O."
+msgstr "Compruebe el ID de usuario que ha seleccionado. Si es correcto pulse O."
 
 #: C/evolution.xml:2270(para)
 msgid "Type a passphrase, then press Enter."
@@ -5776,8 +5650,8 @@ msgid ""
 "on the line beginning with pub. In the example above, it is 32j38dk2."
 msgstr ""
 "Compruebe su identificador de clave pública con gpg --list-keys. Su "
-"identificador será la cadena que está detras de 1024D en la línea que "
-"empieza con «pub». En estte ejemplo es 32j38dk2."
+"identificador será la cadena que está detrás de 1024D en la línea que "
+"empieza con «pub». En este ejemplo es 32j38dk2."
 
 #: C/evolution.xml:2284(para)
 msgid ""
@@ -5785,7 +5659,7 @@ msgid ""
 "<varname>32j38dk2</varname></command>. Substitute your key ID for "
 "<varname>32j38dk2</varname>. You need your password to do this."
 msgstr ""
-"Escirba el comando <command>gpg --send-keys --keyserver wwwkeys.pgp.net "
+"Escriba el comando <command>gpg --send-keys --keyserver wwwkeys.pgp.net "
 "<varname>32j38dk2</varname></command>. Sustituya el identificador de su "
 "clave por <varname>32j38dk2</varname>. Necesitará su contraseña para poder "
 "hacerlo."
@@ -5840,7 +5714,7 @@ msgstr ""
 "comando <command> gpg --recv-keys --keyserver wwwkeys.pgp.net "
 "<varname>keyid</varname></command>, sustituyendo <varname>keyid</varname> "
 "por el identificador del destinatario. Necesitará escribir su contraseña y "
-"su identificador se añadirá automáticamente a su llavero."
+"su identificador se añadirá automáticamente a su depósito de claves."
 
 #: C/evolution.xml:2296(para)
 msgid ""
@@ -5885,8 +5759,7 @@ msgstr "Configurar el cifrado GPG"
 
 #: C/evolution.xml:2314(para) C/evolution.xml:2353(para)
 msgid "Select the account you want to use securely, then click Edit."
-msgstr ""
-"Seleccione la cuenta que quiere usar de forma segura, después pulse Editar."
+msgstr "Seleccione la cuenta que quiere usar de forma segura, después pulse Editar."
 
 #: C/evolution.xml:2317(para) C/evolution.xml:2356(para)
 msgid "Click the Security tab."
@@ -5937,8 +5810,7 @@ msgstr ""
 # index.docbook:172, index.docbook:216
 #: C/evolution.xml:2359(para)
 msgid "Select Always Sign Outgoing Messages When Using This Account."
-msgstr ""
-"Seleccione Firmar siempre los mensajes salientes cuando se use esta cuenta."
+msgstr "Seleccione Firmar siempre los mensajes salientes cuando se use esta cuenta."
 
 #: C/evolution.xml:2371(title)
 msgid "Unencrypting a Received Message"
@@ -6011,12 +5883,11 @@ msgstr ""
 "identificación de su navegador Mozilla* o Netscape*. Para obtener más "
 "información acerca de certificados consulte la <ulink url=\"http://www."
 "mozilla.org/projects/security/pki/psm/help_21/using_certs_help.html\">ayuda "
-"de mozilla</ulink>."
+"de Mozilla</ulink>."
 
 #: C/evolution.xml:2381(para)
 msgid "The certificate file is a password-protected file on your computer."
-msgstr ""
-"El archivo certificado es un archivo protegido por contraseña en su equipo."
+msgstr "El archivo certificado es un archivo protegido por contraseña en su equipo."
 
 #: C/evolution.xml:2384(title)
 msgid "Adding a Signing Certificate"
@@ -6174,7 +6045,7 @@ msgstr ""
 
 #: C/evolution.xml:2482(title)
 msgid "iCalendar or iCal (.ics):"
-msgstr "iCalendar or iCal (.ics):"
+msgstr "iCalendar o iCal (.ics):"
 
 #: C/evolution.xml:2483(para)
 msgid ""
@@ -6190,8 +6061,7 @@ msgid "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):"
 msgstr "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):"
 
 #: C/evolution.xml:2487(para)
-msgid ""
-"CSV or Tab files saved by using Evolution, Microsoft Outlook and Mozilla."
+msgid "CSV or Tab files saved by using Evolution, Microsoft Outlook and Mozilla."
 msgstr ""
 "Los archivos CSV o Tab guardados al usar Evolution, Microsoft Outlook y "
 "Mozilla."
@@ -6260,8 +6130,7 @@ msgstr ""
 "que puede reconocer."
 
 #: C/evolution.xml:2532(para)
-msgid ""
-"Select Import Data and Settings From Older Programs, then click Forward."
+msgid "Select Import Data and Settings From Older Programs, then click Forward."
 msgstr ""
 "Seleccione Importar datos y configuración de programas antiguos, después "
 "pulse Adelante."
@@ -6304,16 +6173,14 @@ msgstr ""
 "Eudora)."
 
 #: C/evolution.xml:2546(para)
-msgid ""
-"Copy the files to the system or partition that Evolution is installed on."
+msgid "Copy the files to the system or partition that Evolution is installed on."
 msgstr ""
 "Copie los archivos al sistema o a la partición en la que esté instalado "
 "Evolution."
 
 #: C/evolution.xml:2549(para)
 msgid "Use the Evolution import tool to import the files."
-msgstr ""
-"Use la herramienta de importar de Evolution para importar los archivos."
+msgstr "Use la herramienta de importar de Evolution para importar los archivos."
 
 #: C/evolution.xml:2552(para)
 msgid ""
@@ -6464,8 +6331,7 @@ msgstr "Ordenar por:"
 
 #: C/evolution.xml:2588(para)
 msgid "Sorts the message by different criteria as listed below:"
-msgstr ""
-"Ordena los mensajes por diferentes criterios tal y como se lista debajo:"
+msgstr "Ordena los mensajes por diferentes criterios tal y como se lista debajo:"
 
 #: C/evolution.xml:2592(para)
 msgid "Recipients"
@@ -6696,8 +6562,7 @@ msgid "Select Follow Up or press Shift+Ctrl+G."
 msgstr "Seleccione Marcar para seguimiento o pulse Mayús+Ctrl+G."
 
 #: C/evolution.xml:2712(para)
-msgid ""
-"A dialog box opens to allow you to set the type of flag and the due date."
+msgid "A dialog box opens to allow you to set the type of flag and the due date."
 msgstr ""
 "Se abrirá una caja de diálogo para permitirle establecer el tipo de marca y "
 "la fecha de vencimiento."
@@ -7025,16 +6890,14 @@ msgstr "El asunto contiene:"
 
 #: C/evolution.xml:2846(para)
 msgid "Shows messages where the search text is in the subject line."
-msgstr ""
-"Muestra los mensajes donde el texto de búsqueda está en la línea del asunto."
+msgstr "Muestra los mensajes donde el texto de búsqueda está en la línea del asunto."
 
 #: C/evolution.xml:2849(title)
 msgid "Sender Contain:"
 msgstr "El remitente contiene:"
 
 #: C/evolution.xml:2850(para)
-msgid ""
-"Finds messages whose From: header contains a match for your search text."
+msgid "Finds messages whose From: header contains a match for your search text."
 msgstr ""
 "Busca mensajes cuya cabecera De: contiene coincidencias con el texto que ha "
 "introducido."
@@ -7130,8 +6993,7 @@ msgstr "Seleccione el menú Buscar."
 
 #: C/evolution.xml:2897(para)
 msgid "Click Advanced Search to open Advanced Search dialog box."
-msgstr ""
-"Pulse Búsqueda avanzada para abrir el cuadro de diálogo Búsqueda avanzada."
+msgstr "Pulse Búsqueda avanzada para abrir el cuadro de diálogo Búsqueda avanzada."
 
 #: C/evolution.xml:2902(para)
 msgid "Enter the Search name."
@@ -7179,8 +7041,7 @@ msgstr "Seleccione Buscar en la barra de menú."
 
 #: C/evolution.xml:2927(para)
 msgid "Click Edit Saved Searches to open the Searches dialog box."
-msgstr ""
-"Pulse Editar búsquedas guardadas para abrir el cuadro de diálogo Búsquedas."
+msgstr "Pulse Editar búsquedas guardadas para abrir el cuadro de diálogo Búsquedas."
 
 #: C/evolution.xml:2932(para)
 msgid "Click the Edit button to open the Edit Rule dialog box."
@@ -7251,8 +7112,7 @@ msgstr "Remitente:"
 
 #: C/evolution.xml:2969(para)
 msgid "The sender's email address or the name of the sender."
-msgstr ""
-"La dirección de correo electrónico del remitente o el nombre del remitente."
+msgstr "La dirección de correo electrónico del remitente o el nombre del remitente."
 
 #: C/evolution.xml:2972(title)
 msgid "Recipient:"
@@ -7465,7 +7325,7 @@ msgstr ""
 
 #: C/evolution.xml:3033(title)
 msgid "Source Account:"
-msgstr "Cuenta de orígen:"
+msgstr "Cuenta de origen:"
 
 #: C/evolution.xml:3034(para)
 msgid ""
@@ -7504,8 +7364,7 @@ msgid "Select the Criteria for the Condition:"
 msgstr "Seleccione el Criterio para la Condición:"
 
 #: C/evolution.xml:3046(para)
-msgid ""
-"If you want multiple criteria for this filter, click Add and repeat step 4."
+msgid "If you want multiple criteria for this filter, click Add and repeat step 4."
 msgstr ""
 "Si quiere utilizar múltiples criterios para este filtro, pulse Añadir y "
 "repita el paso 4."
@@ -7516,7 +7375,7 @@ msgstr "Seleccione las Acciones para el filtro en la sección Entonces:"
 
 #: C/evolution.xml:3050(para)
 msgid "Select any of the following options."
-msgstr "Seleccione cualqueira de la siguientes opciones."
+msgstr "Seleccione cualquiera de la siguientes opciones."
 
 #: C/evolution.xml:3055(title)
 msgid "Move to Folder:"
@@ -7637,8 +7496,7 @@ msgstr "Evolution ejecutar una aplicación."
 
 #: C/evolution.xml:3134(para)
 msgid "Click Add if you need multiple actions and click OK."
-msgstr ""
-"Pulse Añadir si necesita añadir múltiples acciones y después pulse Aceptar."
+msgstr "Pulse Añadir si necesita añadir múltiples acciones y después pulse Aceptar."
 
 #: C/evolution.xml:3140(para)
 msgid "There is an easy shortcut for fast filter or search folder creation:"
@@ -7885,10 +7743,8 @@ msgid "Checks whether the message matchs all the criteria listed."
 msgstr "Comprueba si el mensaje coincide con todos los criterios listados."
 
 #: C/evolution.xml:3279(para)
-msgid ""
-"Select which folders will be used for the search folder. Your options are:"
-msgstr ""
-"Seleccione qué carpetas usará la carpeta de búsqueda. Sus opciones son:"
+msgid "Select which folders will be used for the search folder. Your options are:"
+msgstr "Seleccione qué carpetas usará la carpeta de búsqueda. Sus opciones son:"
 
 #: C/evolution.xml:3281(title)
 msgid "All local folders:"
@@ -8282,8 +8138,7 @@ msgstr "Pulse Archivo &gt; Nuevo &gt; Contacto."
 
 #: C/evolution.xml:3403(para)
 msgid "Enter the contact information to the entry boxes provided."
-msgstr ""
-"Introduzca la información del contacto en las cajas de texto proporcionadas."
+msgstr "Introduzca la información del contacto en las cajas de texto proporcionadas."
 
 #: C/evolution.xml:3409(para)
 msgid "If you want to change a card that already exists,"
@@ -8313,8 +8168,7 @@ msgstr ""
 
 #: C/evolution.xml:3427(para)
 msgid "Right click on the address from Message Header."
-msgstr ""
-"Pulse con el botón derecho en la dirección desde Cabeceras del mensaje."
+msgstr "Pulse con el botón derecho en la dirección desde Cabeceras del mensaje."
 
 #: C/evolution.xml:3430(para)
 msgid "Select Add to Address Book to bring up the Contact Quick-Add window."
@@ -8350,10 +8204,9 @@ msgstr ""
 "Evolution:"
 
 #: C/evolution.xml:3451(para)
-msgid ""
-"Select File &gt; New &gt; Address book to open the New Address Book window."
+msgid "Select File &gt; New &gt; Address book to open the New Address Book window."
 msgstr ""
-"Seleccione Archivo &gt; Nuevo &gt; Lubreta de direcciones para abrir la "
+"Seleccione Archivo &gt; Nuevo &gt; Libreta de direcciones para abrir la "
 "ventana Libreta de direcciones nueva."
 
 #: C/evolution.xml:3456(para) C/evolution.xml:3953(para)
@@ -8409,8 +8262,7 @@ msgid "Use SSL:"
 msgstr "Usar SSL:"
 
 #: C/evolution.xml:3485(para)
-msgid ""
-"Select Use SSL to enable a secure connection between Evolution and the server"
+msgid "Select Use SSL to enable a secure connection between Evolution and the server"
 msgstr ""
 "Seleccione Usar SSL para activar una conexión segura entre Evolution y el "
 "servidor."
@@ -8438,8 +8290,7 @@ msgstr ""
 #: C/evolution.xml:3514(para) C/evolution.xml:4385(para)
 #: C/evolution.xml:4701(para) C/evolution.xml:4937(para)
 msgid "Specify the search criteria from any of the following:"
-msgstr ""
-"Especifique el criterio de búsqueda entre cualquiera de los siguientes:"
+msgstr "Especifique el criterio de búsqueda entre cualquiera de los siguientes:"
 
 #: C/evolution.xml:3517(para)
 msgid "Name begins with"
@@ -8705,7 +8556,7 @@ msgid ""
 "from Microsoft Outlook, Thunderbird, Mozilla, and Evolution."
 msgstr ""
 "Actualmente se soportan VCF y LDIF. Los formatos CSV y TAB están soportados "
-"desde Miscrosoft Outlook, Thunderbird, Mozilla  y Evolution."
+"desde Microsoft Outlook, Thunderbird, Mozilla  y Evolution."
 
 #: C/evolution.xml:3696(para)
 msgid ""
@@ -8810,8 +8661,7 @@ msgstr ""
 
 #: C/evolution.xml:3723(para)
 msgid "Evolution cannot store contact lists on Microsoft Exchange servers."
-msgstr ""
-"Evolution no puede almacenar listas de contactos en servidores Exchange."
+msgstr "Evolution no puede almacenar listas de contactos en servidores Exchange."
 
 #: C/evolution.xml:3728(para)
 msgid ""
@@ -8863,8 +8713,7 @@ msgstr ""
 
 #: C/evolution.xml:3754(para)
 msgid "Enter the new category in the entry box at the top."
-msgstr ""
-"Introduzca la nueva categoría en la caja de entrada de la parte superior."
+msgstr "Introduzca la nueva categoría en la caja de entrada de la parte superior."
 
 #: C/evolution.xml:3758(para)
 msgid ""
@@ -9290,8 +9139,7 @@ msgstr ""
 "localmente para trabajar desconectado."
 
 #: C/evolution.xml:3985(para)
-msgid ""
-"If you select this option, you cannot modify or create the calendar items."
+msgid "If you select this option, you cannot modify or create the calendar items."
 msgstr ""
 "Si selecciona esta opción, no podrá modificar o crear elementos en el "
 "calendario."
@@ -9331,8 +9179,7 @@ msgid "Using the Free/Busy View"
 msgstr "Uso de la característica de disponibilidad"
 
 #: C/evolution.xml:4013(link) C/evolution.xml:4334(title)
-msgid ""
-"Publishing Calendar and Free/Busy Information Without a Groupware Server"
+msgid "Publishing Calendar and Free/Busy Information Without a Groupware Server"
 msgstr ""
 "Publicar la información de Disponibilidad de calendario sin un servidor "
 "Groupware"
@@ -9343,8 +9190,7 @@ msgstr "Acceder a datos de Disponibilidad sin un servidor Groupware"
 
 #: C/evolution.xml:4022(para)
 msgid "In Evolution, an appointment is an event you schedule for yourself."
-msgstr ""
-"En Evolution, una cita es un acontecimiento que programa para si mismo."
+msgstr "En Evolution, una cita es un acontecimiento que programa para si mismo."
 
 #: C/evolution.xml:4025(link) C/evolution.xml:4039(title)
 msgid "Creating Appointments"
@@ -9368,8 +9214,7 @@ msgid "Click File &gt; New &gt; Appointment."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Cita."
 
 #: C/evolution.xml:4044(para)
-msgid ""
-"Click Calendars on the Switcher, then click File &gt; New &gt; Appointment."
+msgid "Click Calendars on the Switcher, then click File &gt; New &gt; Appointment."
 msgstr ""
 "Pulse el Calendario en el Selector, después pulse Archivo &gt; Nuevo &gt; "
 "Cita."
@@ -9385,8 +9230,7 @@ msgstr ""
 "vista del calendario sobre la que haya pulsado dos veces."
 
 #: C/evolution.xml:4048(para)
-msgid ""
-"Select the required duration on the calender view and enter the summary."
+msgid "Select the required duration on the calender view and enter the summary."
 msgstr ""
 "Seleccione la duración requerida en la vista del calendario y escriba el "
 "resumen."
@@ -9420,12 +9264,10 @@ msgstr ""
 
 #: C/evolution.xml:4068(para) C/evolution.xml:4229(para)
 msgid "Click the All Day Event button on the toolbar."
-msgstr ""
-"Pulse el botón Acontecimiento para todo el día de la barra de herramientas."
+msgstr "Pulse el botón Acontecimiento para todo el día de la barra de herramientas."
 
 #: C/evolution.xml:4071(para) C/evolution.xml:4232(para)
-msgid ""
-"If the event is an all day event, specify a starting date and an ending date."
+msgid "If the event is an all day event, specify a starting date and an ending date."
 msgstr ""
 "Si el acontecimiento es un acontecimiento para todo el día, especifique la "
 "fecha de comienzo y la fecha de finalización."
@@ -9444,8 +9286,7 @@ msgstr "Seleccione Durante para especificar la duración."
 
 #: C/evolution.xml:4079(para) C/evolution.xml:4240(para)
 msgid "Select Until to specify the ending time of the event."
-msgstr ""
-"Seleccione Hasta para especificar la hora de finalización del acontecimiento."
+msgstr "Seleccione Hasta para especificar la hora de finalización del acontecimiento."
 
 #: C/evolution.xml:4082(para) C/evolution.xml:4243(para)
 #: C/evolution.xml:4613(para) C/evolution.xml:4664(para)
@@ -9460,8 +9301,7 @@ msgstr "Pulse el globo terráqueo para personalizar la zona horaria."
 #: C/evolution.xml:4085(para) C/evolution.xml:4246(para)
 #: C/evolution.xml:4616(para) C/evolution.xml:4667(para)
 msgid "To hide or show the Time Zone field, click View &gt; Time Zone."
-msgstr ""
-"Para ocultar o mostrar el campo Zona horaria, pulse Ver &gt; Zona horaria."
+msgstr "Para ocultar o mostrar el campo Zona horaria, pulse Ver &gt; Zona horaria."
 
 #: C/evolution.xml:4088(para)
 msgid "To show the time as busy, click Options &gt; Show Time as Busy."
@@ -9596,10 +9436,8 @@ msgid "Display:"
 msgstr "Mostrar:"
 
 #: C/evolution.xml:4133(para)
-msgid ""
-"A notification pops up on your screen to remind you of your appointment."
-msgstr ""
-"Se abrirá una ventana emergente en su pantalla para recordarle su cita."
+msgid "A notification pops up on your screen to remind you of your appointment."
+msgstr "Se abrirá una ventana emergente en su pantalla para recordarle su cita."
 
 #: C/evolution.xml:4138(title)
 msgid "Audio:"
@@ -9607,7 +9445,7 @@ msgstr "Sonido:"
 
 #: C/evolution.xml:4139(para)
 msgid "Your computer delivers a sound alarm."
-msgstr "Su sistema emitirça un sonido como alerta."
+msgstr "Su sistema emitirá un sonido como alerta."
 
 #: C/evolution.xml:4144(title)
 msgid "Program:"
@@ -9687,10 +9525,8 @@ msgstr ""
 "muestran como Ocupado."
 
 #: C/evolution.xml:4166(para)
-msgid ""
-"You can categorize appointments in the same way you can categorize contacts."
-msgstr ""
-"Puede categorizar las citas de la misma manera que categoriza contactos."
+msgid "You can categorize appointments in the same way you can categorize contacts."
+msgstr "Puede categorizar las citas de la misma manera que categoriza contactos."
 
 #: C/evolution.xml:4172(para)
 msgid ""
@@ -9827,8 +9663,7 @@ msgstr ""
 "que quiere invitar."
 
 #: C/evolution.xml:4212(para)
-msgid ""
-"To remove an attendee from the list, select an attendee and press Remove."
+msgid "To remove an attendee from the list, select an attendee and press Remove."
 msgstr ""
 "Para quitar un participante de la lista, seleccione un participante y pulse "
 "Quitar."
@@ -9862,8 +9697,7 @@ msgid "Click Save to save the meeting."
 msgstr "Pulse Guardar para guardar la reunión."
 
 #: C/evolution.xml:4275(para)
-msgid ""
-"An email is sent out to all the recipients, inviting them to your event."
+msgid "An email is sent out to all the recipients, inviting them to your event."
 msgstr ""
 "Se enviará un correo-e a todos los destinatarios, invitándoles a su "
 "acontecimiento."
@@ -9962,8 +9796,7 @@ msgid "To access the free/busy view:"
 msgstr "Para acceder a la vista de disponibilidad:"
 
 #: C/evolution.xml:4316(para)
-msgid ""
-"Click the Free/Busy button on the toolbar, or click Options &gt; Free/Busy."
+msgid "Click the Free/Busy button on the toolbar, or click Options &gt; Free/Busy."
 msgstr ""
 "Pulse el botón Disponibilidad en la barra de herramientas o pulse Opciones "
 "&gt; Disponibilidad."
@@ -9986,8 +9819,7 @@ msgid "Attendee List:"
 msgstr "Lista de asistentes:"
 
 #: C/evolution.xml:4326(para)
-msgid ""
-"The Attendee List shows the people who have been invited to the appointment."
+msgid "The Attendee List shows the people who have been invited to the appointment."
 msgstr ""
 "La Lista de asistentes muestra a las personas que han sido invitadas a la "
 "reunión."
@@ -10012,7 +9844,7 @@ msgstr ""
 "tienen su información de planificación visible sólo si usan el mismo "
 "servidor Novell GruopWise o Microsoft Exchange que usted (esto es, si están "
 "en la misma compañía) o si han publicado su información de Disponibilidad en "
-"un URL y ha indtroducido ese URL en la tarjeta del contacto usando el editor "
+"un URL y ha introducido ese URL en la tarjeta del contacto usando el editor "
 "de contactos."
 
 #: C/evolution.xml:4335(para)
@@ -10023,7 +9855,7 @@ msgid ""
 "this functionality."
 msgstr ""
 "Puede publicar la información de Disponibilidad y el Calendario a un WebDAV, "
-"servidor FTPo a una máquina remota a traes de Secure Shell u otro servidor "
+"servidor FTP o a una máquina remota a traes de Secure Shell u otro servidor "
 "web con soporte HTTP PUT. Compruebe con el administrador de su sistema si no "
 "está seguro de disponer de esta funcionalidad."
 
@@ -10328,8 +10160,7 @@ msgid "Specify the name and color for the task list."
 msgstr "Especifique el nombre y el color para la lista de tareas."
 
 #: C/evolution.xml:4585(para)
-msgid ""
-"(Optional) If the task is an online list, specify the URL of the task list."
+msgid "(Optional) If the task is an online list, specify the URL of the task list."
 msgstr ""
 "(Opcional) Si la tarea es una lista en línea, especifique el URL de la lista "
 "de tareas."
@@ -10444,8 +10275,7 @@ msgid "Searching for Task Items"
 msgstr "Buscar elementos de las tareas"
 
 #: C/evolution.xml:4694(para)
-msgid ""
-"Evolution enables you to find the task items by using Customized Search."
+msgid "Evolution enables you to find the task items by using Customized Search."
 msgstr ""
 "Evolution le permite buscar los elementos de las tareas usando la Búsqueda "
 "personalizada."
@@ -10499,8 +10329,7 @@ msgstr "Tareas de los próximos 7 días:"
 
 #: C/evolution.xml:4752(para)
 msgid "Displays all the active tasks that are due within the next seven days."
-msgstr ""
-"Muestra todas las tareas activas que vencerán en los próximos siete días."
+msgstr "Muestra todas las tareas activas que vencerán en los próximos siete días."
 
 #: C/evolution.xml:4755(title)
 msgid "Active Tasks:"
@@ -10661,8 +10490,7 @@ msgstr ""
 "rápida para buscar elementos de las notas."
 
 #: C/evolution.xml:4930(para)
-msgid ""
-"Evolution enables you to find the Memo items by using a Customized Search."
+msgid "Evolution enables you to find the Memo items by using a Customized Search."
 msgstr ""
 "Evolution le permite buscar los elementos de las notas usando la Búsqueda "
 "personalizada."
@@ -10694,8 +10522,7 @@ msgstr ""
 
 #: C/evolution.xml:5076(para)
 msgid "Click the icon next to the Time Zone field, then select your location."
-msgstr ""
-"Pulse el icono junto al campo Zona horaria, después seleccione su ubicación."
+msgstr "Pulse el icono junto al campo Zona horaria, después seleccione su ubicación."
 
 #: C/evolution.xml:5077(para)
 msgid "Each red dot represents a major city."
@@ -10777,8 +10604,7 @@ msgstr ""
 "una cuenta válida en el servidor Microsoft Exchange, incluida la licencia."
 
 #: C/evolution.xml:5118(para)
-msgid ""
-"Evolution Exchange supports the following basic Microsoft Exchange features:"
+msgid "Evolution Exchange supports the following basic Microsoft Exchange features:"
 msgstr ""
 "Evolution Exchange soporta las siguientes características básicas de "
 "Microsoft Exchange:"
@@ -11078,13 +10904,12 @@ msgid ""
 msgstr ""
 "Cree la cuenta siguiendo el procedimiento en <link linkend=\"usage-"
 "mainwindow-starting\">Inicio de Evolution por primera vez</link>. Recuerde "
-"seleccionar el servidor Miscrosoft Exchange como el tipo de servidor en la "
+"seleccionar el servidor Microsoft Exchange como el tipo de servidor en la "
 "sección Recepción de correo."
 
 #: C/evolution.xml:5282(para)
 msgid "Only one Microsoft Exchange account can be configured in Evolution."
-msgstr ""
-"Sólo se puede configurar una cuenta de Microsoft Exchange con Evolution."
+msgstr "Sólo se puede configurar una cuenta de Microsoft Exchange con Evolution."
 
 #: C/evolution.xml:5290(para)
 msgid ""
@@ -11428,7 +11253,7 @@ msgid ""
 "manage theirs. Delegation allows people to do anything from check on each "
 "other's schedules to completely manage their personal information."
 msgstr ""
-"Puede permitir a otras personas anotadas en la lista gobal de direcciones de "
+"Puede permitir a otras personas anotadas en la lista global de direcciones de "
 "su organización acceso a su calendario, libreta de direcciones y mensajes. Y "
 "ellos pueden darle a usted acceso a los suyos. La delegación permite a los "
 "usuarios hacer cualquier cosa, desde consultarse mutuamente sus planes hasta "
@@ -11450,8 +11275,7 @@ msgstr ""
 
 #: C/evolution.xml:5473(para)
 msgid "Click Add, then search for a contact in the Global Address List."
-msgstr ""
-"Pulse Añadir, después busque un contacto en la Lista de direcciones global."
+msgstr "Pulse Añadir, después busque un contacto en la Lista de direcciones global."
 
 #: C/evolution.xml:5474(para)
 msgid ""
@@ -11566,8 +11390,7 @@ msgstr ""
 
 #: C/evolution.xml:5533(para)
 msgid "You can subscribe to public folders available on the Exchange server."
-msgstr ""
-"Puede suscribirse a carpetas públicas disponibles en el servidor Exchange."
+msgstr "Puede suscribirse a carpetas públicas disponibles en el servidor Exchange."
 
 #: C/evolution.xml:5539(para)
 msgid "Select the Exchange account."
@@ -11578,8 +11401,7 @@ msgid "Check the folders you want to subscribe to."
 msgstr "Seleccione las carpetas a las que se quiere suscribir."
 
 #: C/evolution.xml:5548(para)
-msgid ""
-"The folders you have subscribed to appear in the folder list at the left."
+msgid "The folders you have subscribed to appear in the folder list at the left."
 msgstr ""
 "Las carpetas a las que se ha suscrito para aparecer en la lista de carpetas "
 "a la izquierda."
@@ -11694,8 +11516,7 @@ msgstr ""
 "de direcciones globales (GAL)."
 
 #: C/evolution.xml:5605(para)
-msgid ""
-"You can directly select the participants from the following address lists."
+msgid "You can directly select the participants from the following address lists."
 msgstr ""
 "Puede seleccionar directamente a los participantes de la siguiente lista de "
 "direcciones."
@@ -12315,8 +12136,7 @@ msgstr "Activar el seguimiento de estado"
 #: C/evolution.xml:6040(para) C/evolution.xml:6080(para)
 #: C/evolution.xml:6096(para)
 msgid "In the Compose Message window, click Insert &gt; Send Options."
-msgstr ""
-"En la ventana de Edición de mensaje pulse Insertar &gt; Opciones de envío."
+msgstr "En la ventana de Edición de mensaje pulse Insertar &gt; Opciones de envío."
 
 #: C/evolution.xml:6041(para)
 msgid "Select Status Tracking."
@@ -12333,7 +12153,7 @@ msgid ""
 "Select any of the options given (Delivered, Delivered and opened, All "
 "information)"
 msgstr ""
-"Seleccione cualqueira de las opciones dadas (Entregado, Entregado y abierto, "
+"Seleccione cualquiera de las opciones dadas (Entregado, Entregado y abierto, "
 "Toda la información)"
 
 #: C/evolution.xml:6050(para) C/evolution.xml:6162(para)
@@ -12367,8 +12187,7 @@ msgstr ""
 "recibir."
 
 #: C/evolution.xml:6069(para)
-msgid ""
-"Right-click an email in your Sent folder, then click Track Message Status."
+msgid "Right-click an email in your Sent folder, then click Track Message Status."
 msgstr ""
 "Pulse con el botón derecho sobre un correo-e en su carpeta de Correo "
 "enviado, después pulse Seguir el estado del mensaje."
@@ -12473,8 +12292,7 @@ msgid "Delegating an Item"
 msgstr "Borrar un elemento"
 
 #: C/evolution.xml:6139(para)
-msgid ""
-"In the Calendar, right-click the meeting or appointment you want to delegate."
+msgid "In the Calendar, right-click the meeting or appointment you want to delegate."
 msgstr ""
 "En el Calendario, pulse con el botón derecho sobre la reunión o cita que "
 "quiere delegar."
@@ -12707,8 +12525,7 @@ msgstr ""
 
 #: C/evolution.xml:6315(para)
 msgid "Right-click on the GroupWise account in the folder list."
-msgstr ""
-"Pulse con el botón derecho sobre la cuenta GroupWise en la lista de carpetas."
+msgstr "Pulse con el botón derecho sobre la cuenta GroupWise en la lista de carpetas."
 
 #: C/evolution.xml:6318(para)
 msgid "Click Proxy Login."
@@ -12773,8 +12590,7 @@ msgstr ""
 
 #: C/evolution.xml:6341(para)
 msgid "In an open item, click Actions, then click Mark Private."
-msgstr ""
-"En un elemento abierto, pulse Acciones, después pulse Marcar como privado."
+msgstr "En un elemento abierto, pulse Acciones, después pulse Marcar como privado."
 
 #: C/evolution.xml:6343(para)
 msgid ""
@@ -12816,12 +12632,10 @@ msgstr "Añadir una dirección de correo electrónico a su lista de correo basur
 
 #: C/evolution.xml:6366(link) C/evolution.xml:6425(title)
 msgid "Removing an Email Address from Your Junk List"
-msgstr ""
-"Quitar una dirección de correo electrónico de su lista de correo basura"
+msgstr "Quitar una dirección de correo electrónico de su lista de correo basura"
 
 #: C/evolution.xml:6374(para)
-msgid ""
-"Select the message to mark as junk, then click the Junk icon or press Ctrl+J."
+msgid "Select the message to mark as junk, then click the Junk icon or press Ctrl+J."
 msgstr ""
 "Seleccione el mensaje marcado como spam, después pulse el icono de SPAM o "
 "pulse Ctrl+J."
@@ -12869,8 +12683,7 @@ msgstr "Seleccione si quiere activar o desactivar el manejo del correo basura."
 
 #: C/evolution.xml:6416(para)
 msgid "Type the email address to block in the Email field."
-msgstr ""
-"Escriba la dirección de correo electrónico a bloquear en el campo Correo-e."
+msgstr "Escriba la dirección de correo electrónico a bloquear en el campo Correo-e."
 
 #: C/evolution.xml:6419(para)
 msgid "Click Add, then click OK."
@@ -12932,7 +12745,7 @@ msgid ""
 "changes."
 msgstr ""
 "Puede llegar a la ventana de ajustes de Evolution pulsando Editar &gt; "
-"Preferencias. En la parte izqueirda de la ventana de preferencias hay una "
+"Preferencias. En la parte izquierda de la ventana de preferencias hay una "
 "columna, similar al Selector de Evolution, que le permite elegir qué porción "
 "de Evolution personalizar. La parte derecha de la ventana es donde realmente "
 "realizará cambios."
@@ -13139,7 +12952,7 @@ msgstr ""
 "través de un puerto específico de su servidor. Para especificarlo, a "
 "continuación del nombre del servidor, escriba un signo de dos puntos y el "
 "número de puerto. Por ejemplo, para conectar a través del puerto 143 del "
-"servidor smtp.ejemplo.net, especifique smtp.ejemplo.net:142 como nombre del "
+"servidor SMTP.ejemplo.net, especifique SMTP.ejemplo.net:142 como nombre del "
 "servidor."
 
 #: C/evolution.xml:6514(para)
@@ -13376,8 +13189,7 @@ msgstr "Para establecer las cabeceras de correo IMAP:"
 
 #: C/evolution.xml:6569(para)
 msgid "Select the IMAP account and click Edit to open the Account Editor."
-msgstr ""
-"Seleccione la cuenta IMAP y pulse Editar para abrir el editor de cuentas."
+msgstr "Seleccione la cuenta IMAP y pulse Editar para abrir el editor de cuentas."
 
 #: C/evolution.xml:6572(para)
 msgid ""
@@ -13388,8 +13200,7 @@ msgstr ""
 "Cabeceras IMAP en el Editor de cuentas."
 
 #: C/evolution.xml:6577(para)
-msgid ""
-"Click Fetch All Headers to download all the available header information."
+msgid "Click Fetch All Headers to download all the available header information."
 msgstr ""
 "Pulse Obtener todas las cabeceras para descargar toda la información "
 "disponible sobre las cabeceras."
@@ -13657,8 +13468,7 @@ msgstr "Para asignar una etiqueta a un mensaje de correo-e específico:"
 
 #: C/evolution.xml:6690(para)
 msgid "Right-click the message from the message preview."
-msgstr ""
-"Pulse con el botón derecho sobre el mensaje desde la vista previa del mismo."
+msgstr "Pulse con el botón derecho sobre el mensaje desde la vista previa del mismo."
 
 #: C/evolution.xml:6693(para)
 msgid "Click Label and select the desired label for the message."
@@ -13774,8 +13584,7 @@ msgstr "Detectar si el correo entrante es spam:"
 
 #: C/evolution.xml:6729(para)
 msgid "This option turns automatic junk mail filtering on or off."
-msgstr ""
-"Esta opción activa los filtros de comprobación automática de correo basura."
+msgstr "Esta opción activa los filtros de comprobación automática de correo basura."
 
 #: C/evolution.xml:6732(title)
 msgid "Delete junk mail on exit:"
@@ -13974,8 +13783,7 @@ msgstr "Preguntar al mandar mensajes con el asunto vacío:"
 
 #: C/evolution.xml:6801(para)
 msgid "The composer warns you if you try to send a message without a subject."
-msgstr ""
-"El editor muestra una advertencia si intenta enviar un mensaje sin asunto."
+msgstr "El editor muestra una advertencia si intenta enviar un mensaje sin asunto."
 
 #: C/evolution.xml:6806(title)
 msgid "Prompt When Sending Messages with Only Bcc Recipients Defined:"
@@ -14120,8 +13928,7 @@ msgstr ""
 
 #: C/evolution.xml:6880(title)
 msgid "Show appointment end times in week and month views:"
-msgstr ""
-"Mostrar la hora del final de las citas en las vistas semanales y mensuales:"
+msgstr "Mostrar la hora del final de las citas en las vistas semanales y mensuales:"
 
 #: C/evolution.xml:6881(para)
 msgid ""
@@ -14195,7 +14002,7 @@ msgid ""
 "in this calendar."
 msgstr ""
 "Selecciona los calendarios para los que quiere una notificación de alerta. "
-"Si no selecciona el calendario no tendrça notificaciones de alerta para "
+"Si no selecciona el calendario no tendrá notificaciones de alerta para "
 "ningún acontecimiento en este calendario."
 
 #: C/evolution.xml:6914(title)
@@ -14227,8 +14034,7 @@ msgstr "Esta interfaz le permite configurar sus ajustes del proxy de la red."
 
 #: C/evolution.xml:6931(para)
 msgid "Use the following four options to configure the proxy settings:"
-msgstr ""
-"Use las siguientes cuatro opciones para configurar los ajustes del proxy:"
+msgstr "Use las siguientes cuatro opciones para configurar los ajustes del proxy:"
 
 #: C/evolution.xml:6933(title)
 msgid "Use system defaults:"
@@ -14318,13 +14124,11 @@ msgstr "Proxy HTTP seguro"
 
 #: C/evolution.xml:6983(para)
 msgid "The machine name to proxy secure HTTP through."
-msgstr ""
-"El nombre de la máquina sobre la que pasar a través del proxy HTTP seguro"
+msgstr "El nombre de la máquina sobre la que pasar a través del proxy HTTP seguro"
 
 #: C/evolution.xml:6991(para)
 msgid "The port for the machine defined by the Secure HTTP Proxy port field."
-msgstr ""
-"El puerto para la máquina definida por el campo puerto del Proxy HTTP seguro."
+msgstr "El puerto para la máquina definida por el campo puerto del Proxy HTTP seguro."
 
 #: C/evolution.xml:6996(para)
 msgid "SOCKS Host"
@@ -14454,8 +14258,7 @@ msgstr ""
 
 #: C/evolution.xml:7070(para)
 msgid "There are two main tasks for configuring contact information:"
-msgstr ""
-"Existen dos tareas principales para configurar la información de un contacto:"
+msgstr "Existen dos tareas principales para configurar la información de un contacto:"
 
 #: C/evolution.xml:7073(link) C/evolution.xml:7081(title)
 msgid "Creating a Contact"
@@ -14673,8 +14476,7 @@ msgid "Search Filter:"
 msgstr "Filtro de búsquedas:"
 
 #: C/evolution.xml:7185(para)
-msgid ""
-"The search filter can be set here for all the LDAP queries. For example:"
+msgid "The search filter can be set here for all the LDAP queries. For example:"
 msgstr ""
 "Se puede establecer aquí el filtro de búsqueda para todas las consultas "
 "LDAP. Por ejemplo:"
@@ -14733,8 +14535,7 @@ msgstr "Especifique la duración del mostrado de los mensajes de error."
 
 #: C/evolution.xml:7211(para)
 msgid "The messages remain in the statusbar for this specified time."
-msgstr ""
-"El mensaje permanece en la barra de estado durante el tiempo especificado."
+msgstr "El mensaje permanece en la barra de estado durante el tiempo especificado."
 
 #: C/evolution.xml:7215(para)
 msgid ""
@@ -14851,8 +14652,7 @@ msgid "Copy From Pilot:"
 msgstr "Copiar desde Pilot:"
 
 #: C/evolution.xml:7254(para)
-msgid ""
-"If there is any new data on the handheld device, copy it to the computer."
+msgid "If there is any new data on the handheld device, copy it to the computer."
 msgstr "Si el dispositivo de mano contiene datos nuevos, los copia al equipo."
 
 #: C/evolution.xml:7257(title)
@@ -15019,8 +14819,7 @@ msgstr ""
 "correo."
 
 #: C/evolution.xml:7305(para)
-msgid ""
-"Copy all the mail files into your home directory or another convenient place."
+msgid "Copy all the mail files into your home directory or another convenient place."
 msgstr ""
 "Copie todos los archivos de correo en su carpeta personal o cualquier otro "
 "lugar conveniente."
@@ -15031,16 +14830,14 @@ msgstr "Inicie Evolution."
 
 #: C/evolution.xml:7311(para)
 msgid "Select File &gt; New &gt; Mail Folder to create the folders you want."
-msgstr ""
-"Seleccione Archivo &gt; Nueva carpeta para crear las carpetas que desee."
+msgstr "Seleccione Archivo &gt; Nueva carpeta para crear las carpetas que desee."
 
 #: C/evolution.xml:7314(para)
 msgid "To import the data files:"
 msgstr "Importar los archivos de datos:"
 
 #: C/evolution.xml:7317(para)
-msgid ""
-"In Evolution, open the File Import assistant by clicking File &gt; Import."
+msgid "In Evolution, open the File Import assistant by clicking File &gt; Import."
 msgstr ""
 "En Evolution, abra el asistente de Importación de archivos pulsando Archivo "
 "&gt; Importar."
@@ -15061,13 +14858,11 @@ msgstr ""
 
 #: C/evolution.xml:7327(para)
 msgid "Select the folder where you want to put the imported data file."
-msgstr ""
-"Seleccione la carpeta donde quiere poner sus archivos de datos importados."
+msgstr "Seleccione la carpeta donde quiere poner sus archivos de datos importados."
 
 #: C/evolution.xml:7333(para)
 msgid "Repeat the import steps until you have imported all your mail."
-msgstr ""
-"Repita los pasos de importación hasta que haya importado todo su correo."
+msgstr "Repita los pasos de importación hasta que haya importado todo su correo."
 
 #: C/evolution.xml:7341(para)
 msgid ""
@@ -15179,8 +14974,7 @@ msgid "Moving the Display Up and Down in the Preview Pane:"
 msgstr "Moverse adelante y atrás en el panel de visualización de mensajes:"
 
 #: C/evolution.xml:7394(para)
-msgid ""
-"Press the Spacebar to move down a page. Press Backspace to move up a page."
+msgid "Press the Spacebar to move down a page. Press Backspace to move up a page."
 msgstr ""
 "Pulse la barra espaciadora para avanzar una página. Pulse la tecla Retroceso "
 "para volver hacia atrás una página."
@@ -15453,8 +15247,7 @@ msgid "Daniel Persson for Swedish (.se)"
 msgstr "Daniel Persson al sueco"
 
 #: C/evolution.xml:7507(para)
-msgid ""
-"Hector Garcia Alvarez and Francisco Javier F. Serrador for Spanish (.es)"
+msgid "Hector Garcia Alvarez and Francisco Javier F. Serrador for Spanish (.es)"
 msgstr ""
 "Hector García Álvarez, Franciso Javier F. Serrador y Jorge González para el "
 "español (.es)"
@@ -16135,8 +15928,7 @@ msgstr ""
 
 #: C/evolution.xml:7758(member)
 msgid "SUSE is a registered trademark of SUSE AG, a Novell company."
-msgstr ""
-"SUSE es una marca comercial registrada de SUSE AG, una filial de Novell."
+msgstr "SUSE es una marca comercial registrada de SUSE AG, una filial de Novell."
 
 #: C/evolution.xml:7759(member)
 msgid ""
@@ -16159,31 +15951,3 @@ msgstr ""
 "Jorge González <jorgegonz@svn.gnome.org>, 2007-2008\n"
 "Francisco Javier F. Serrador <serrador@openshine.com>, 2005, 2006"
 
-#~ msgid ""
-#~ "Select SSL for a highly secured connection between your client and "
-#~ "server. Contact your administrator for further details."
-#~ msgstr ""
-#~ "Seleccione SSL para una conexión segura entre su cliente y el servidor. "
-#~ "Contacte con el administrador de su sistema para obtener más detalles."
-
-#~ msgid ""
-#~ "These are the extra headers in addition to the above standard headers. "
-#~ "You can add custom headers in addition to the standard headers. If you "
-#~ "want to have filters based on some specific custom headers and you do not "
-#~ "want to compromise on the network speed by downloading-all-mail-headers, "
-#~ "Evolution provides a handy way of achieving this by the Custom Headers "
-#~ "Option. Here, you can selectively Add/Remove headers based on your needs."
-#~ msgstr ""
-#~ "Estas son las cabeceras adicionales además de las cabeceras estándar "
-#~ "precedentes. Puede añadir cabeceras personalizadas además de las "
-#~ "cabeceras estándar. Si quiere tener filtros basados en alguna cabecera "
-#~ "personalizada específica y no quiere comprometer la velocidad de la red "
-#~ "descargando todas las cabeceras, Evolution proporciona una manera "
-#~ "sencilla de conseguir esto con la opción Cabeceras personalizadas. Aquí "
-#~ "podrá seleccionar Añadir/Quitar cabeceras según sus necesidades."
-
-#~ msgid ""
-#~ "This option may not be needed if you have chosen to download ALL Headers."
-#~ msgstr ""
-#~ "Puede que esta opción no sea necesaria si ha elegido descargar Todas las "
-#~ "cabeceras."
diff --git a/mail/ChangeLog b/mail/ChangeLog
index a5a277b527..76ed190ad0 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,33 @@
+2008-11-02  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #559042
+
+	* mail-config.glade:
+	Remove extra space in translated string.
+
+2008-11-02  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #557613
+
+	* em-utils.c (try_open_e_book):
+	Wait for try_open_e_book_cb() to run before freeing the EFlag.
+	It will run regardless of whether the EBook operation completes.
+
+2008-10-31  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #558726 (patch by Frederic van Starbmann)
+
+	* em-format-html.c (emfh_multipart_related_check):
+	Fix a potential format string crash.
+
+2008-10-31  Sankar P  <psankar@novell.com>
+
+	** Patch by Bharath Acharya <abharath@novell.com> 
+
+	* em-folder-tree.c (emft_popup):
+	Disable delete and rename on 
+	right click menu for the system folders 
+
 2008-10-22  Matthew Barnes  <mbarnes@redhat.com>
 
 	* mail-send-recv.c:
@@ -321,6 +351,14 @@ License Changes
 	* em-format-html-display.c: (efhd_image): Do not try to access widget
 	of the pury when the operation has been cancelled.
 
+2008-11-03  Ashish Shrivastava  <shashish@novell.com>
+
+	** Support for Non-intrusive error in calendar.
+
+	* mail-component.c: Remove common code between
+	  mailer and calendar and moved to
+	  e-util/e-non-intrusive-error-dialog.c
+
 2008-09-08  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #328216
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index b2d95cd71b..ac0455c13d 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -2243,6 +2243,10 @@ emft_popup (EMFolderTree *emft, GdkEvent *event)
 			info_flags |= CAMEL_FOLDER_VIRTUAL | CAMEL_FOLDER_NOINFERIORS;
 
 		selfolder = em_folder_tree_get_selected_folder (emft);
+
+		if (folder_type_flags & CAMEL_FOLDER_SYSTEM)
+			flags &= ~EM_POPUP_FOLDER_DELETE;
+
 		if (em_utils_folder_is_outbox (selfolder, NULL))
 			info_flags |= CAMEL_FOLDER_TYPE_OUTBOX;
 	}
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 12e2b5975c..3ad759bfef 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -1056,7 +1056,7 @@ emfh_multipart_related_check(struct _EMFormatHTMLJob *job, int cancelled)
 		if (puri->use_count == 0) {
 			d(printf("part '%s' '%s' used '%d'\n", puri->uri?puri->uri:"", puri->cid, puri->use_count));
 			if (puri->func == emfh_write_related) {
-				g_string_printf(((EMFormat *)job->format)->part_id, puri->part_id);
+				g_string_printf(((EMFormat *)job->format)->part_id, "%s", puri->part_id);
 				em_format_part((EMFormat *)job->format, (CamelStream *)job->stream, puri->part);
 			}
 			/* else it was probably added by a previous format this loop */
diff --git a/mail/em-utils.c b/mail/em-utils.c
index b5c629ad1f..5f93e39361 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -2101,14 +2101,14 @@ try_open_e_book (EBook *book, gboolean only_if_exists, GError **error)
 		e_flag_timed_wait (flag, &wait);
 	}
 
-	e_flag_free (flag);
-
 	if (canceled) {
 		g_set_error (error, E_BOOK_ERROR, E_BOOK_ERROR_CANCELLED, "Operation has been canceled.");
 		e_book_cancel_async_op (book, NULL);
-		return FALSE;
 	}
 
+	e_flag_wait (flag);
+	e_flag_free (flag);
+
 	return data.result;
 }
 
@@ -2203,7 +2203,7 @@ em_utils_in_addressbook (CamelInternetAddress *iaddr, gboolean local_only)
 			stop = err && err->domain == E_BOOK_ERROR && err->code == E_BOOK_ERROR_CANCELLED;
 			mail_cancel_hook_remove(hook);
 			g_object_unref(book);
-			d(g_warning("Can't get contacts: %s", err->message));
+			g_warning("Can't get contacts: %s", err->message);
 			g_clear_error(&err);
 			continue;
 		}
@@ -2287,7 +2287,7 @@ em_utils_contact_photo (struct _CamelInternetAddress *cia, gboolean local)
 		    || !e_book_get_contacts(book, query, &contacts, &err)) {
 			stop = err && err->domain == E_BOOK_ERROR && err->code == E_BOOK_ERROR_CANCELLED;
 			g_object_unref(book);
-			d(g_warning("Can't get contacts: %s", err->message));
+			g_warning("Can't get contacts: %s", err->message);
 			g_clear_error(&err);
 			continue;
 		}
diff --git a/mail/mail-component.c b/mail/mail-component.c
index 45bafd3719..e210a2613a 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -90,6 +90,11 @@
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-widget.h>
 
+#include "e-util/e-non-intrusive-error-dialog.h"
+
+#define MAILER_ERROR_LEVEL_KEY "/apps/evolution/mail/display/error_level"
+#define MAILER_ERROR_TIME_OUT_KEY "/apps/evolution/mail/display/error_timeout"
+
 #define d(x)
 
 static void create_local_item_cb(EUserCreatableItemsHandler *handler, const char *item_type_name, void *data);
@@ -1586,254 +1591,13 @@ mail_component_stores_foreach (MailComponent *component, GHFunc func, void *user
 //		e_component_view_set_button_icon (mc->priv->component_view, icon);
 //}
 
-struct _log_data {
-	int level;
-	char *key;
-	char *text;
-	char *stock_id;
-	GdkPixbuf *pbuf;
-} ldata [] = {
-	{ E_LOG_ERROR, N_("Error"), N_("Errors"), GTK_STOCK_DIALOG_ERROR },
-	{ E_LOG_WARNINGS, N_("Warning"), N_("Warnings and Errors"), GTK_STOCK_DIALOG_WARNING },
-	{ E_LOG_DEBUG, N_("Debug"), N_("Error, Warnings and Debug messages"), GTK_STOCK_DIALOG_INFO }
-};
-
-enum
-{
-	COL_LEVEL = 0,
-	COL_TIME,
-	COL_DATA
-};
-
-static gboolean
-query_tooltip_cb (GtkTreeView *view,
-                  gint x,
-                  gint y,
-                  gboolean keyboard_mode,
-                  GtkTooltip *tooltip)
-{
-	GtkTreeViewColumn *column;
-	GtkTreeModel *model;
-	GtkTreePath *path;
-	GtkTreeIter iter;
-	gint level;
-
-	if (!gtk_tree_view_get_tooltip_context (
-		view, &x, &y, keyboard_mode, NULL, &path, &iter))
-		return FALSE;
-
-	/* Figure out which column we're pointing at. */
-	if (keyboard_mode)
-		gtk_tree_view_get_cursor (view, NULL, &column);
-	else
-		gtk_tree_view_get_path_at_pos (
-			view, x, y, NULL, &column, NULL, NULL);
-
-	/* Restrict the tip area to a single cell. */
-	gtk_tree_view_set_tooltip_cell (view, tooltip, path, column, NULL);
-
-	/* This only works if the tree view is NOT reorderable. */
-	if (column != gtk_tree_view_get_column (view, 0))
-		return FALSE;
-
-	model = gtk_tree_view_get_model (view);
-	gtk_tree_model_get (model, &iter, COL_LEVEL, &level, -1);
-	gtk_tooltip_set_text (tooltip, ldata[level].key);
-
-	return TRUE;
-}
-
-static void
-render_pixbuf (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
-	       GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data)
-{
-	gint level;
-
-	gtk_tree_model_get (model, iter, COL_LEVEL, &level, -1);
-	g_object_set (
-		renderer, "stock-id", ldata[level].stock_id,
-		"stock-size", GTK_ICON_SIZE_MENU, NULL);
-}
-
-static void
-render_date (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
-	      GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data)
-{
-	time_t t;
-	char sdt[100]; /* Should be sufficient? */
-	
-	gtk_tree_model_get (model, iter, COL_TIME, &t, -1);
-	strftime (sdt, 100, "%x %X", localtime (&t));
-	g_object_set (renderer, "text", sdt, NULL);
-}
-
-
-
-static void
-append_logs (const char *txt, GtkListStore *store)
-{
-	char **str;
-	
-	str = g_strsplit (txt, 	":", 3);
-	if (str[0] && str[1] && str[2]) {
-		GtkTreeIter iter;
-
-		gtk_list_store_append (store, &iter);
-		gtk_list_store_set (
-			store, &iter,
-			COL_LEVEL, atoi (str[0]),
-			COL_TIME, atol (str[1]),
-			COL_DATA, g_strstrip (str[2]),
-			-1);
-	} else 
-		g_printerr ("Unable to decode error log: %s\n", txt);
-	
-	g_strfreev (str);
-}
-
-static void
-spin_value_changed (GtkSpinButton *b, gpointer data)
-{
-	int value = gtk_spin_button_get_value_as_int (b);
-	GConfClient *client = mail_config_get_gconf_client ();
-
-	gconf_client_set_int (client, "/apps/evolution/mail/display/error_timeout", value, NULL);
-}
-
 void
 mail_component_show_logger (gpointer top)
 {
 	MailComponent *mc = mail_component_peek ();
-	GConfBridge *bridge;
-	GtkWidget *container;
-	GtkWidget *label;
-	GtkWidget *toplevel;
-	GtkWidget *vbox;
-	GtkWidget *widget;
-	GtkWidget *window;
 	ELogger *logger = mc->priv->logger;
-	int i;
-	GtkListStore *store;
-	GtkCellRenderer *renderer;
-	GtkTreeViewColumn *column;
-
-	bridge = gconf_bridge_get ();
-	toplevel = gtk_widget_get_toplevel (top);
-
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_default_size (GTK_WINDOW (window), 500, 400);
-	gtk_window_set_title (GTK_WINDOW (window), _("Debug Logs"));
-	gtk_window_set_transient_for (
-		GTK_WINDOW (window), GTK_WINDOW (toplevel));
-	gtk_container_set_border_width (GTK_CONTAINER (window), 12);
-
-	vbox = gtk_vbox_new (FALSE, 12);
-	gtk_container_add (GTK_CONTAINER (window), vbox);
-
-	container = gtk_hbox_new (FALSE, 6);	
-	gtk_box_pack_start (GTK_BOX (vbox), container, FALSE, FALSE, 0);
-
-	/* Translators: This is the first part of the sentence
-	 * "Show _errors in the status bar for" - XXX - "second(s)." */
-	widget = gtk_label_new_with_mnemonic (
-		_("Show _errors in the status bar for"));
-	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
-	label = widget;
-
-	widget = gtk_spin_button_new_with_range (1.0, 60.0, 1.0);
-	gtk_spin_button_set_value (
-		GTK_SPIN_BUTTON (widget),
-		(gdouble) mail_config_get_error_timeout ());
-	g_signal_connect (
-		widget, "value-changed",
-		G_CALLBACK (spin_value_changed), NULL);
-	gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
-	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
-
-	/* Translators: This is the second part of the sentence
-	 * "Show _errors in the status bar for" - XXX - "second(s)." */
-	widget = gtk_label_new_with_mnemonic (_("second(s)."));
-	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
-
-	container = gtk_hbox_new (FALSE, 6);
-	gtk_box_pack_start (GTK_BOX (vbox), container, FALSE, FALSE, 0);
-
-	widget = gtk_label_new_with_mnemonic (_("Log Messages:"));
-	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
-	label = widget;
-
-	widget = gtk_combo_box_new_text ();
-	for (i = E_LOG_ERROR; i <= E_LOG_DEBUG; i++)
-		gtk_combo_box_append_text (
-			GTK_COMBO_BOX (widget), ldata[i].text);
-	gconf_bridge_bind_property (
-		bridge, "/apps/evolution/mail/display/error_level",
-		G_OBJECT (widget), "active");
-	gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
-	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
-
-	store = gtk_list_store_new (3, G_TYPE_INT, G_TYPE_LONG, G_TYPE_STRING);
-	e_logger_get_logs (logger, (ELogFunction) append_logs, store); 
-	gtk_tree_sortable_set_sort_column_id (
-		GTK_TREE_SORTABLE (store), COL_TIME, GTK_SORT_DESCENDING);
-
-	container = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (
-		GTK_SCROLLED_WINDOW (container),
-		GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_shadow_type (
-		GTK_SCROLLED_WINDOW (container), GTK_SHADOW_IN);
-	gtk_box_pack_start (GTK_BOX (vbox), container, TRUE, TRUE, 0);
-
-	widget = gtk_tree_view_new();
-	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (widget), TRUE);	
-	gtk_tree_view_set_reorderable (GTK_TREE_VIEW (widget), FALSE);
-	gtk_tree_view_set_model (GTK_TREE_VIEW (widget), GTK_TREE_MODEL (store));
-	gtk_tree_view_set_search_column (GTK_TREE_VIEW (widget), COL_DATA);
-	gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (widget), TRUE);
-	gtk_widget_set_has_tooltip (widget, TRUE);
-	gtk_container_add (GTK_CONTAINER (container), widget);
-
-	g_signal_connect (
-		widget, "query-tooltip",
-		G_CALLBACK (query_tooltip_cb), NULL);
-
-	column = gtk_tree_view_column_new ();
-	gtk_tree_view_column_set_title (column, _("Log Level"));
-	gtk_tree_view_append_column (GTK_TREE_VIEW (widget), column);
-
-	renderer = gtk_cell_renderer_pixbuf_new ();
-	gtk_tree_view_column_pack_start (column, renderer, TRUE);
-	gtk_tree_view_column_set_cell_data_func (
-		column, renderer, render_pixbuf, NULL, NULL);
-
-	column = gtk_tree_view_column_new ();
-	gtk_tree_view_column_set_title (column, _("Time"));	
-	gtk_tree_view_append_column (GTK_TREE_VIEW (widget), column);
-
-	renderer = gtk_cell_renderer_text_new ();
-	gtk_tree_view_column_pack_start (column, renderer, FALSE);
-	gtk_tree_view_column_set_cell_data_func (
-		column, renderer, render_date, NULL, NULL);
-
-	renderer = gtk_cell_renderer_text_new ();
-	gtk_tree_view_insert_column_with_attributes(
-		GTK_TREE_VIEW (widget), -1, _("Messages"),
-		renderer, "markup", COL_DATA, NULL);
-
-	container = gtk_hbutton_box_new ();
-	gtk_button_box_set_layout (
-		GTK_BUTTON_BOX (container), GTK_BUTTONBOX_END);
-	gtk_box_pack_start (GTK_BOX (vbox), container, FALSE, FALSE, 0);
-
-	widget = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
-	gtk_widget_set_tooltip_text (widget, _("Close this window"));
-	g_signal_connect_swapped (
-		widget, "clicked",
-		G_CALLBACK (gtk_widget_destroy), window);
-	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
-
-	gtk_widget_show_all (window);
+
+	eni_show_logger(logger, top, MAILER_ERROR_TIME_OUT_KEY, MAILER_ERROR_LEVEL_KEY);
 }
 
 BONOBO_TYPE_FUNC_FULL (MailComponent, GNOME_Evolution_MailComponent, PARENT_TYPE, mail_component)
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index 445f0bb175..69a9016535 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -5108,7 +5108,7 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
 			    <widget class="GtkCheckButton" id="magic_spacebar_checkbox">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Enable Magic S_pacebar </property>
+			      <property name="label" translatable="yes">Enable Magic S_pacebar</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">True</property>
diff --git a/plugins/google-account-setup/google-contacts-source.c b/plugins/google-account-setup/google-contacts-source.c
index c54bf66d7f..3220933098 100644
--- a/plugins/google-account-setup/google-contacts-source.c
+++ b/plugins/google-account-setup/google-contacts-source.c
@@ -1,19 +1,20 @@
 /*
- * Copyright 2008, Joergen Scheibengruber <joergen.scheibengruber@googlemail.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
  *
- * * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * Copyright 2008, Joergen Scheibengruber <joergen.scheibengruber@googlemail.com>
  *
  */
 
diff --git a/plugins/google-account-setup/google-contacts-source.h b/plugins/google-account-setup/google-contacts-source.h
index 17421fb232..54c21d18a6 100644
--- a/plugins/google-account-setup/google-contacts-source.h
+++ b/plugins/google-account-setup/google-contacts-source.h
@@ -1,19 +1,20 @@
 /*
- * Copyright 2008, Joergen Scheibengruber <joergen.scheibengruber@googlemail.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
  *
- * * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * Copyright 2008, Joergen Scheibengruber <joergen.scheibengruber@googlemail.com>
  *
  */
 
diff --git a/plugins/mail-to-task/ChangeLog b/plugins/mail-to-task/ChangeLog
index 7b9ac83950..ad020a8f0c 100644
--- a/plugins/mail-to-task/ChangeLog
+++ b/plugins/mail-to-task/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-31  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #558726 (patch by Frederic van Starbmann)
+
+	* mail-to-task.c (do_mail_to_task):
+	Fix a potential format string crash.
+
 2008-08-27  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index 89075dfd28..2717bb29be 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -287,7 +287,7 @@ do_mail_to_task (AsyncData *data)
 		e_notice (NULL, GTK_MESSAGE_ERROR, _("Cannot open calendar. %s"), err ? err->message : "");
 	} else if (!e_cal_is_read_only (client, &readonly, &err) || readonly) {
 		if (err)
-			e_notice (NULL, GTK_MESSAGE_ERROR, err->message);
+			e_notice (NULL, GTK_MESSAGE_ERROR, "%s", err->message);
 		else
 			e_notice (NULL, GTK_MESSAGE_ERROR, _("Selected source is read only, thus cannot create task there. Select other source, please."));
 	} else {
diff --git a/plugins/plugin-manager/ChangeLog b/plugins/plugin-manager/ChangeLog
index 1b3d52084a..45dd1105d6 100644
--- a/plugins/plugin-manager/ChangeLog
+++ b/plugins/plugin-manager/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-31  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #558726 (patch by Frederic van Starbmann)
+
+	* plugin-manager.c (eppm_enable_toggled):
+	Fix a potential format string crash.
+
 2008-09-04  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/plugin-manager/plugin-manager.c b/plugins/plugin-manager/plugin-manager.c
index 4658291679..19af3eeb7e 100644
--- a/plugins/plugin-manager/plugin-manager.c
+++ b/plugins/plugin-manager/plugin-manager.c
@@ -196,7 +196,7 @@ eppm_enable_toggled (GtkCellRendererToggle *renderer, const char *path_string, M
 		gtk_tree_model_get (m->model, &iter, COL_PLUGIN_DATA, &plugin, -1);
 		e_plugin_enable (plugin, !plugin->enabled);
 
-		g_warning (plugin->name);
+		g_warning ("%s", plugin->name);
 
 		gtk_list_store_set (GTK_LIST_STORE(m->model), &iter,
 				    COL_PLUGIN_ENABLED, plugin->enabled,
diff --git a/po/ChangeLog b/po/ChangeLog
index 36f375afbf..849e2990df 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,22 @@
+2008-11-03  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
+
+	* pt_BR.po: Merged Brazilian Portuguese translation from branch
+	gnome-2-24. Fixes capitalization, verb tense in descriptions, some
+	terminology errors, double spaces and random errors. Improves 
+	access keys.
+
+2008-11-02  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated.
+
+2008-10-30 Kenneth Nielsen <k.nielsen81@gmail.com>
+
+	* da.po: Updated Danish translation by Kenneth Nielsen
+
+2008-10-25  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Ivar Smolin
+
 2008-10-24  Priit Laes  <plaes at svn dot gnome dot org>
 
 	* et.po: Translation updated by Ivar Smolin
diff --git a/po/da.po b/po/da.po
index 89e9c298cb..f062f9e868 100644
--- a/po/da.po
+++ b/po/da.po
@@ -51,8 +51,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-20 21:54+0200\n"
-"PO-Revision-Date: 2008-09-20 16:56+0200\n"
+"POT-Creation-Date: 2008-10-30 01:26+0100\n"
+"PO-Revision-Date: 2008-10-30 01:23+0100\n"
 "Last-Translator: Kenneth Nielsen <k.nielsen81@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "MIME-Version: 1.0\n"
@@ -194,7 +194,7 @@ msgid "calendar view for one or more days"
 msgstr "kalenderoversigt for en eller flere dage"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:757
+#: ../calendar/gui/calendar-component.c:784
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y"
 
@@ -205,8 +205,8 @@ msgstr "%A, %d. %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:760
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1583
+#: ../calendar/gui/calendar-component.c:787
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1577
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a %d. %b"
@@ -214,9 +214,9 @@ msgstr "%a %d. %b"
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:762
-#: ../calendar/gui/calendar-component.c:767
-#: ../calendar/gui/calendar-component.c:769
+#: ../calendar/gui/calendar-component.c:789
+#: ../calendar/gui/calendar-component.c:794
+#: ../calendar/gui/calendar-component.c:796
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %b %Y"
 
@@ -224,10 +224,10 @@ msgstr "%a, %d. %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../a11y/calendar/ea-gnome-calendar.c:227
 #: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:781
-#: ../calendar/gui/calendar-component.c:788
-#: ../calendar/gui/calendar-component.c:794
-#: ../calendar/gui/calendar-component.c:796
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:815
+#: ../calendar/gui/calendar-component.c:821
+#: ../calendar/gui/calendar-component.c:823
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -237,15 +237,15 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:786
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1599
+#: ../calendar/gui/calendar-component.c:813
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1593
 #: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:245
 #: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:766
+#: ../calendar/importers/icalendar-importer.c:780
 msgid "Gnome Calendar"
 msgstr "Gnome-kalenderen"
 
@@ -309,19 +309,19 @@ msgstr "slå til og fra"
 msgid "toggle the cell"
 msgstr "slå cellen til og fra"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
 msgid "expand"
 msgstr "udvid"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
 msgid "expands the row in the ETree containing this cell"
 msgstr "udvid rækken i ETree'et der indeholder denne celle"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
 msgid "collapse"
 msgstr "sammenfolde"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
 msgid "collapses the row in the ETree containing this cell"
 msgstr "sammenfolder rækken i ETree'et der indeholder denne celle"
 
@@ -470,6 +470,7 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP-serveren svarede ikke med gyldig skemainformation."
 
 #: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:50
 msgid "Server Version"
 msgstr "Serverudgave"
 
@@ -610,17 +611,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:299
+#: ../addressbook/conduit/address-conduit.c:300
 msgid "Default Sync Address:"
 msgstr "Standardsynkroniseringsadresse:"
 
-#: ../addressbook/conduit/address-conduit.c:1320
 #: ../addressbook/conduit/address-conduit.c:1321
+#: ../addressbook/conduit/address-conduit.c:1322
 msgid "Could not load address book"
 msgstr "Kunne ikke indlæse adressebogen"
 
-#: ../addressbook/conduit/address-conduit.c:1398
-#: ../addressbook/conduit/address-conduit.c:1401
+#: ../addressbook/conduit/address-conduit.c:1399
+#: ../addressbook/conduit/address-conduit.c:1402
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke læse pilotens adresseapplikationsblok"
 
@@ -642,9 +643,9 @@ msgstr "Konfigurér automatisk fuldførelse her"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../addressbook/gui/component/addressbook-view.c:1325
 #: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
 msgstr "Adressebog"
@@ -690,8 +691,8 @@ msgstr "Håndtér dine S/MIME-certifikater her"
 #: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
 #: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
 #: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
-#: ../mail/mail-component.c:311 ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1457
+#: ../mail/mail-component.c:311 ../mail/mail-vfolder.c:223
+#: ../mail/message-list.c:1518
 msgid "On This Computer"
 msgstr "På denne maskine"
 
@@ -702,7 +703,7 @@ msgstr "På denne maskine"
 #. orange
 #: ../addressbook/gui/component/addressbook-component.c:151
 #: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/caltypes.xml.h:29
 #: ../calendar/gui/memos-component.c:208 ../calendar/gui/memotypes.xml.h:27
@@ -727,7 +728,7 @@ msgid "Create a new contact list"
 msgstr "Opret en ny kontaktliste"
 
 #: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1207
+#: ../addressbook/gui/component/addressbook-config.c:1223
 msgid "New Address Book"
 msgstr "Ny adressebog"
 
@@ -740,61 +741,61 @@ msgid "Failed upgrading Address Book settings or folders."
 msgstr ""
 "Opgradering af indstillinger eller mapper for adressebogen mislykkedes."
 
-#: ../addressbook/gui/component/addressbook-config.c:316
+#: ../addressbook/gui/component/addressbook-config.c:332
 msgid "Base"
 msgstr "Basis"
 
-#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../addressbook/gui/component/addressbook-config.c:533
 #: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "T_ype:"
 
-#: ../addressbook/gui/component/addressbook-config.c:619
+#: ../addressbook/gui/component/addressbook-config.c:635
 msgid "Copy _book content locally for offline operation"
 msgstr "Kopiér _bogindholdet lokalt til brug i afkoblet tilstand"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/component/addressbook-config.c:998
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 #: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2367
+#: ../plugins/itip-formatter/itip-formatter.c:2441
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Alment"
 
-#: ../addressbook/gui/component/addressbook-config.c:983
-#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/widgets/e-addressbook-view.c:556
 #: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Adressebog"
 
-#: ../addressbook/gui/component/addressbook-config.c:987
+#: ../addressbook/gui/component/addressbook-config.c:1003
 msgid "Server Information"
 msgstr "Serverinformation"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:1005
 msgid "Authentication"
 msgstr "Godkendelse"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../addressbook/gui/component/addressbook-config.c:1008
 #: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detaljer"
 
-#: ../addressbook/gui/component/addressbook-config.c:993
-#: ../mail/em-folder-browser.c:983
+#: ../addressbook/gui/component/addressbook-config.c:1009
+#: ../mail/em-folder-browser.c:985
 msgid "Searching"
 msgstr "Søgning"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
+#: ../addressbook/gui/component/addressbook-config.c:1011
 msgid "Downloading"
 msgstr "Henter"
 
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-config.c:1221
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Egenskaber for adressebog"
@@ -861,36 +862,36 @@ msgstr ""
 "\n"
 "Vent venligst mens Evolution overflytter dine mapper..."
 
-#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:501
+#: ../addressbook/gui/component/addressbook-view.c:424
+#: ../mail/em-folder-utils.c:448
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Omdøb mappe \"%s\" til:"
 
-#: ../addressbook/gui/component/addressbook-view.c:428
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:427
+#: ../mail/em-folder-utils.c:450
 msgid "Rename Folder"
 msgstr "Omdøb mappe"
 
-#: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:509
+#: ../addressbook/gui/component/addressbook-view.c:432
+#: ../mail/em-folder-utils.c:456
 msgid "Folder names cannot contain '/'"
 msgstr "Mappenavne kan ikke indeholde \"/\""
 
-#: ../addressbook/gui/component/addressbook-view.c:942
+#: ../addressbook/gui/component/addressbook-view.c:941
 msgid "_New Address Book"
 msgstr "_Ny adressebog"
 
-#: ../addressbook/gui/component/addressbook-view.c:943
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "Save As vCard..."
 msgstr "Gem som vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:946
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:619
-#: ../calendar/gui/e-calendar-table.c:1595
+#: ../addressbook/gui/component/addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../calendar/gui/calendar-component.c:644
+#: ../calendar/gui/e-calendar-table.c:1598
 #: ../calendar/gui/e-calendar-view.c:1692 ../calendar/gui/e-memo-table.c:940
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
+#: ../calendar/gui/memos-component.c:493 ../calendar/gui/tasks-component.c:484
 #: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1340
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
@@ -898,16 +899,16 @@ msgstr "Gem som vCard..."
 msgid "_Delete"
 msgstr "_Slet"
 
-#: ../addressbook/gui/component/addressbook-view.c:949
-#: ../calendar/gui/calendar-component.c:622
-#: ../calendar/gui/dialogs/comp-editor.c:2035
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1044 ../mail/em-folder-tree.c:2120
+#: ../addressbook/gui/component/addressbook-view.c:948
+#: ../calendar/gui/calendar-component.c:649
+#: ../calendar/gui/dialogs/comp-editor.c:2043
+#: ../calendar/gui/memos-component.c:498 ../calendar/gui/tasks-component.c:489
+#: ../composer/e-msg-composer.c:1041 ../mail/em-folder-tree.c:2120
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Egenskaber"
 
-#: ../addressbook/gui/component/addressbook-view.c:1337
+#: ../addressbook/gui/component/addressbook-view.c:1336
 msgid "Contact Source Selector"
 msgstr "Kontaktkilde-vælger"
 
@@ -929,7 +930,7 @@ msgstr "Angiv adgangskode for %s (bruger %s)"
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
 #: ../plugins/google-account-setup/google-source.c:444
-#: ../plugins/publish-calendar/publish-calendar.c:190
+#: ../plugins/publish-calendar/publish-calendar.c:191
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Indtast adgangskode"
@@ -955,30 +956,40 @@ msgstr ""
 "listeoversigterne og forhåndsvisningsruden."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid "Show preview pane"
 msgstr "Vis forhåndsvisningsruden"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr ""
 "Antal tegn som skal skrives før Evolution forsøger automatisk fuldførelse."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI for mappen der sidst blev brugt i \"vælg navne\"-vinduet"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
 msgid "URI for the folder last used in the select names dialog."
 msgstr "URI for mappen der sidst blev brugt i \"vælg navne\"-vinduet."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Vertical pane position"
 msgstr "Rudens lodrette placering"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
 msgid "Whether to show the preview pane."
 msgstr "Om forhåndsvisningsruden vises."
 
@@ -1177,8 +1188,9 @@ msgstr ""
 "under din søgebase."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
-"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Dette er det fulde navn på din ldap-server. For eksempel \"ldap.mitfirma.dk"
@@ -1193,9 +1205,10 @@ msgstr ""
 "sænkes hastigheden på adressebogen."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:43
+#, fuzzy
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
 "server."
 msgstr ""
 "Dette er metoden som Evolution vil anvende til at godkende dig. Bemærk at "
@@ -1250,7 +1263,7 @@ msgstr "_Logind-metode:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:177
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1265,7 +1278,7 @@ msgid "_Search scope:"
 msgstr "Udstrækning af _søgning:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:186
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Server:"
@@ -1330,7 +1343,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Arbejde</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1342,16 +1355,16 @@ msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/widgets/e-minicard.c:199
 msgid "Contact"
 msgstr "Kontaktperson"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:555
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2421
 msgid "Contact Editor"
 msgstr "Redigering af kontaktperson"
 
@@ -1378,132 +1391,137 @@ msgstr "Kæle_navn:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#, fuzzy
+msgid "Novell GroupWise"
+msgstr "Novell Groupwise"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Personal Information"
 msgstr "Personlige oplysninger"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Telephone"
 msgstr "Telefon"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
 #: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Arbejde"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Anniversary:"
 msgstr "_Jubilæum:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Assistant:"
 msgstr "_Assistent:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Birthday:"
 msgstr "_Fødselsdag:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:787
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../calendar/gui/dialogs/event-page.c:791
 #: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1868
 msgid "_Calendar:"
 msgstr "_Kalender:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "B_y:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "_Firma:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_Land:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "_Afdeling:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "_Arkivér under:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "_Ledig/optaget:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "_Hjemmeside:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "_Leder:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_Notater:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "Kont_or:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "_Postboks:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "_Erhverv:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "_Ægtefælle:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "_Stat/Provins:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 #: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Titel:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "_Video-samtale:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "_Ønsker at modtage breve i HTML-format"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "_Weblog:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "_Hvor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "_Postnummer:"
 
@@ -1516,17 +1534,17 @@ msgstr "Adresse"
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:292
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:312
+#: ../addressbook/gui/widgets/e-addressbook-model.c:325
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
 #: ../addressbook/gui/widgets/e-minicard-label.c:165
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
 #: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:191
+#: ../addressbook/gui/widgets/e-minicard.c:192
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1836 ../widgets/text/e-text.c:3687
-#: ../widgets/text/e-text.c:3688
+#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3688
+#: ../widgets/text/e-text.c:3689
 msgid "Editable"
 msgstr "Redigerbar"
 
@@ -2518,7 +2536,7 @@ msgid "AOL Instant Messenger"
 msgstr "AOL-kvikbesked"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
@@ -2532,7 +2550,7 @@ msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
@@ -2544,7 +2562,7 @@ msgstr "Tjeneste"
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
 #: ../calendar/gui/caltypes.xml.h:25
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/publish-calendar/publish-calendar.c:694
 #: ../plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "Sted"
@@ -2554,77 +2572,77 @@ msgid "Username"
 msgstr "Brugernavn"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Hjem"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 #: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Anden"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Source Book"
 msgstr "Kildebog"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Target Book"
 msgstr "Målbog"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
 msgid "Is New Contact"
 msgstr "Er ny kontaktperson"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Writable Fields"
 msgstr "Skrivbare felter"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Required Fields"
 msgstr "Obligatoriske felter"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Ændret"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2416
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Redigering af kontaktperson - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "Please select an image for this contact"
 msgstr "Vælg venligst et billede til denne kontaktperson"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
 msgid "_No image"
 msgstr "_Intet billede"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3086
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2632,43 +2650,43 @@ msgstr ""
 "Data om kontaktperson er ugyldige:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3090
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "\"%s\" er i et ugyldigt format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s\"%s\" er i et ugyldigt format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s\"%s\" har intet indhold"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3138
 msgid "Invalid contact."
 msgstr "Ugyldig kontaktperson."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "Contact Quick-Add"
 msgstr "Hurtig tilføjelse af kontaktperson"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:328
 msgid "_Edit Full"
 msgstr "_Redigér alt"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:402
 msgid "_Full name"
 msgstr "_Fulde navn"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:413
 msgid "E_mail"
 msgstr "E-_post"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:424
 msgid "_Select Address Book"
 msgstr "_Vælg adressebog"
 
@@ -2806,8 +2824,8 @@ msgstr "_Kvikbesked-tjeneste:"
 #: ../addressbook/gui/contact-editor/im.glade.h:4
 #: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:243
-#: ../plugins/exchange-operations/exchange-contacts.c:234
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
 msgid "_Location:"
 msgstr "_Sted:"
 
@@ -2847,9 +2865,9 @@ msgid "_Members"
 msgstr "_Medlemmer"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:298
+#: ../addressbook/gui/widgets/e-addressbook-model.c:311
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-addressbook-view.c:213
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
 #: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
@@ -2911,19 +2929,19 @@ msgstr "Flet kontakt"
 #: ../addressbook/gui/widgets/eab-contact-display.c:597
 #: ../addressbook/gui/widgets/eab-contact-display.c:600
 #: ../addressbook/gui/widgets/eab-contact-display.c:879
-#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:827
+#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "E-post"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
-#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.c:162
+#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:3
 #: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Et felt indeholder"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Email begins with"
 msgstr "E-postadresse begynder med"
 
@@ -2931,35 +2949,35 @@ msgstr "E-postadresse begynder med"
 msgid "Name contains"
 msgstr "Navn indeholder"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
 msgid "No contacts"
 msgstr "Ingen kontaktpersoner"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d kontaktperson"
 msgstr[1] "%d kontaktpersoner"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:305
+#: ../addressbook/gui/widgets/e-addressbook-model.c:318
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
-#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-addressbook-view.c:227
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
 #: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "Forespørgsel"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:448
+#: ../addressbook/gui/widgets/e-addressbook-model.c:461
 msgid "Error getting book view"
 msgstr "Fejl ved bogvisning"
 
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
 #: ../widgets/table/e-table-click-to-add.c:509
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3353
-#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3551
-#: ../widgets/text/e-text.c:3552
+#: ../widgets/table/e-table.c:3354
+#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3552
+#: ../widgets/text/e-text.c:3553
 msgid "Model"
 msgstr "Model"
 
@@ -2967,15 +2985,15 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Fejl ved ændring af kort"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Name begins with"
 msgstr "Navn begynder med"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:219
+#: ../addressbook/gui/widgets/e-addressbook-view.c:220
 msgid "Source"
 msgstr "Kilde"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:233
+#: ../addressbook/gui/widgets/e-addressbook-view.c:234
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 #: ../calendar/gui/e-meeting-list-view.c:508
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
@@ -2983,87 +3001,87 @@ msgstr "Kilde"
 msgid "Type"
 msgstr "Type"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:813
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "Gem som vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/e-calendar-table.c:1573
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../calendar/gui/dialogs/comp-editor.c:2041
+#: ../calendar/gui/e-calendar-table.c:1576
 #: ../calendar/gui/e-calendar-view.c:1670 ../calendar/gui/e-memo-table.c:923
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Åbn"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "_New Contact..."
 msgstr "N_y kontaktperson..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "New Contact _List..."
 msgstr "Ny _liste over kontaktpersoner..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Save as vCard..."
 msgstr "_Gem som vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contact"
 msgstr "_Videresend kontaktperson"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contacts"
 msgstr "Vider_esend kontaktpersoner"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contact"
 msgstr "Send _brev til kontaktperson"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to List"
 msgstr "Send _brev til liste"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Send _Message to Contacts"
 msgstr "Send _brev til kontaktpersoner"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "_Print"
 msgstr "_Udskriv"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Cop_y to Address Book..."
 msgstr "Kopiér til _adressebog..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Mo_ve to Address Book..."
 msgstr "_Flyt til adressebog..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "Cu_t"
 msgstr "Klip u_d"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:480
-#: ../calendar/gui/e-calendar-table.c:1581
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/dialogs/comp-editor.c:484
+#: ../calendar/gui/e-calendar-table.c:1584
 #: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
-#: ../composer/e-msg-composer.c:2055 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2044
+#: ../composer/e-msg-composer.c:2052 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2106
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopiér"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
 msgid "P_aste"
 msgstr "Ind_sæt"
 
 #. All, unmatched, separator
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1524
-#: ../calendar/gui/cal-search-bar.c:625 ../calendar/gui/cal-search-bar.c:668
-#: ../calendar/gui/cal-search-bar.c:687
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
 msgid "Any Category"
 msgstr "Alle kategorier"
 
@@ -3237,38 +3255,38 @@ msgid "Web Site"
 msgstr "Websted"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:116
-#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../addressbook/gui/widgets/e-minicard.c:155
 #: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
+#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
 #: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-col.c:99
+#: ../widgets/table/e-table-col.c:98
 #: ../widgets/table/e-table-field-chooser-item.c:654
 #: ../widgets/table/e-table-group-container.c:992
 #: ../widgets/table/e-table-group-container.c:993
 #: ../widgets/table/e-table-group-leaf.c:637
 #: ../widgets/table/e-table-group-leaf.c:638
-#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
-#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
+#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Width"
 msgstr "Bredde"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:123
-#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../addressbook/gui/widgets/e-minicard.c:162
 #: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
+#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
 #: ../widgets/table/e-table-click-to-add.c:530
 #: ../widgets/table/e-table-field-chooser-item.c:661
 #: ../widgets/table/e-table-group-container.c:985
 #: ../widgets/table/e-table-group-container.c:986
 #: ../widgets/table/e-table-group-leaf.c:630
 #: ../widgets/table/e-table-group-leaf.c:631
-#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
-#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
+#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
+#: ../widgets/text/e-text.c:3738 ../widgets/text/e-text.c:3739
 msgid "Height"
 msgstr "Højde"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:130
-#: ../addressbook/gui/widgets/e-minicard.c:169
+#: ../addressbook/gui/widgets/e-minicard.c:170
 msgid "Has Focus"
 msgstr "Har fokus"
 
@@ -3354,24 +3372,24 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapter"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "E-post / arbejde"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "E-post / hjemme"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:830
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:831
 msgid "Other Email"
 msgstr "Anden E-post"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
+#: ../addressbook/gui/widgets/e-minicard.c:178
 msgid "Selected"
 msgstr "Valgt"
 
-#: ../addressbook/gui/widgets/e-minicard.c:184
+#: ../addressbook/gui/widgets/e-minicard.c:185
 msgid "Has Cursor"
 msgstr "Har markør"
 
@@ -3380,7 +3398,7 @@ msgid "_Open Link in Browser"
 msgstr "_Åbn link i browser"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2795
+#: ../mail/em-folder-view.c:2792
 msgid "_Copy Link Location"
 msgstr "_Kopiér adresse"
 
@@ -3427,10 +3445,10 @@ msgid "Video Chat"
 msgstr "Video-samtale"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/calendar-commands.c:93
+#: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/gnome-cal.c:2451
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:576
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
@@ -3489,56 +3507,56 @@ msgid "Blog"
 msgstr "Blog"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Success"
 msgstr "Lykkedes"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Backend busy"
 msgstr "Database optaget"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Repository offline"
 msgstr "Arkiv er afkoblet"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Address Book does not exist"
 msgstr "Adressebogen findes ikke"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "No Self Contact defined"
 msgstr "Du er ikke defineret som kontaktperson"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Tilladelse nægtet"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact not found"
 msgstr "Kontaktperson ikke fundet"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Contact ID already exists"
 msgstr "Kontaktpersonens id findes allerede"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke tilgængelig"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:256
 #: ../calendar/gui/e-cal-model-tasks.c:364
@@ -3549,53 +3567,53 @@ msgid "Canceled"
 msgstr "Afbrudt"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Could not cancel"
 msgstr "Kunne ikke annullere"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 #: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Failed"
 msgstr "Godkendelse mislykkedes"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "Authentication Required"
 msgstr "Godkendelse kræves"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "TLS not Available"
 msgstr "TLS er ikke tilgængelig"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "No such source"
 msgstr "Ingen sådan kilde"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Not available in offline mode"
 msgstr "Ikke tilgængelig i afkoblet tilstand"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Other error"
 msgstr "Anden fejl"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:78
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
 msgid "Invalid server version"
 msgstr "Ugyldig serverversion"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
 msgid "Unsupported authentication method"
 msgstr "Ikke-understøttet godkendelsesmetode"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:109
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
 "We were unable to open this address book. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3605,7 +3623,7 @@ msgstr ""
 "markeret til afkoblet brug eller ikke er blevet overført til afkoblet brug. "
 "Indlæs venligst bogen i opkoblet tilstand for at overføre dens indhold"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:118
+#: ../addressbook/gui/widgets/eab-gui-util.c:119
 #, c-format
 msgid ""
 "We were unable to open this address book.  Please check that the path %s "
@@ -3614,7 +3632,7 @@ msgstr ""
 "Kunne ikke åbne denne adressebog. Kontrollér venligst at stien %s findes og "
 "at du har rettigheder til at tilgå den."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:127
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid ""
 "We were unable to open this address book.  This either means you have "
 "entered an incorrect URI, or the LDAP server is unreachable."
@@ -3622,7 +3640,7 @@ msgstr ""
 "Kunne ikke åbne adressebogen. Dette betyder enten at du har angivet en "
 "forkert adresse eller at LDAP-serveren ikke kan nås."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:133
+#: ../addressbook/gui/widgets/eab-gui-util.c:134
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3632,7 +3650,7 @@ msgstr ""
 "ønsker at bruge LDAP i Evolution, må du installere en Evolution-pakke med "
 "LDAP indbygget."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:141
 msgid ""
 "We were unable to open this address book.  This either means you have "
 "entered an incorrect URI, or the server is unreachable."
@@ -3640,11 +3658,11 @@ msgstr ""
 "Vi kunne ikke åbne adressebogen. Dette betyder enten at du har angivet en "
 "ukorrekt adresse eller at serveren ikke kan nås."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:149
 msgid "Detailed error:"
 msgstr "Detaljeret fejl:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3656,7 +3674,7 @@ msgstr ""
 "Gør din søgning mere specifik eller forøg resultatgrænsen i\n"
 "katalogserverens indstillinger for denne adressebog."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this address book.  Please make your search\n"
@@ -3668,48 +3686,48 @@ msgstr ""
 "mere specifik eller forøg tidsgrænsen i katalogserverens indstillinger\n"
 "for denne adressebog."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "The backend for this address book was unable to parse this query."
 msgstr ""
 "Modulet til håndtering af denne adressebog kunne ikke fortolke forespørgslen."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
 msgid "The backend for this address book refused to perform this query."
 msgstr ""
 "Modulet til håndtering af denne adressebog nægtede at gennemføre denne "
 "forespørgsel."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:189
+#: ../addressbook/gui/widgets/eab-gui-util.c:190
 msgid "This query did not complete successfully."
 msgstr "Denne forespørgsel lykkedes ikke."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error adding list"
 msgstr "Fejl ved tilføjelse af liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:687
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
+#: ../addressbook/gui/widgets/eab-gui-util.c:688
 msgid "Error adding contact"
 msgstr "Fejl ved tilføjelse af kontaktperson"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
 msgid "Error modifying list"
 msgstr "Fejl ved ændring af liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
 msgid "Error modifying contact"
 msgstr "Fejl ved ændring af kontaktperson"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
 msgid "Error removing list"
 msgstr "Fejl ved fjernelse af liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:637
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
+#: ../addressbook/gui/widgets/eab-gui-util.c:638
 msgid "Error removing contact"
 msgstr "Fejl ved fjernelse af kontaktperson"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
+#: ../addressbook/gui/widgets/eab-gui-util.c:317
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3724,16 +3742,16 @@ msgstr[1] ""
 "Ved at åbne %d kontaktpersoner, vil yderligere %d nye vinduer åbnes.\n"
 "Ønsker du virkelig at vise alle disse kontaktpersoner?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "_Don't Display"
 msgstr "Vis _ikke"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
+#: ../addressbook/gui/widgets/eab-gui-util.c:326
 msgid "Display _All Contacts"
 msgstr "Vis _alle kontakter"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:351
+#: ../addressbook/gui/widgets/eab-gui-util.c:352
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3742,65 +3760,65 @@ msgstr ""
 "%s eksisterer allerede\n"
 "Vil du overskrive den?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:355
+#: ../addressbook/gui/widgets/eab-gui-util.c:356
 msgid "Overwrite"
 msgstr "Overskriv"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:396
-#: ../addressbook/gui/widgets/eab-gui-util.c:399
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
+#: ../addressbook/gui/widgets/eab-gui-util.c:400
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "kontaktperson"
 msgstr[1] "kontaktpersoner"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:445
+#: ../addressbook/gui/widgets/eab-gui-util.c:446
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:482
+#: ../addressbook/gui/widgets/eab-gui-util.c:483
 msgid "Select Address Book"
 msgstr "Vælg adressebog"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
+#: ../addressbook/gui/widgets/eab-gui-util.c:597
 msgid "list"
 msgstr "liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:749
 msgid "Move contact to"
 msgstr "Flyt kontaktperson til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Copy contact to"
 msgstr "Kopiér kontaktperson til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:754
 msgid "Move contacts to"
 msgstr "Flyt kontaktpersoner til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Copy contacts to"
 msgstr "Kopiér kontaktpersoner til"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:900
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
 msgid "Multiple vCards"
 msgstr "Flere vCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:907
+#: ../addressbook/gui/widgets/eab-gui-util.c:909
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard for %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:919
-#: ../addressbook/gui/widgets/eab-gui-util.c:945
+#: ../addressbook/gui/widgets/eab-gui-util.c:921
+#: ../addressbook/gui/widgets/eab-gui-util.c:947
 #, c-format
 msgid "Contact information"
 msgstr "Information om kontaktperson"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:947
+#: ../addressbook/gui/widgets/eab-gui-util.c:949
 #, c-format
 msgid "Contact information for %s"
 msgstr "Information om kontaktpersonen %s"
@@ -3809,23 +3827,23 @@ msgstr "Information om kontaktpersonen %s"
 msgid "Querying Address Book..."
 msgstr "Forespørger adressebogen..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:143
+#: ../addressbook/gui/widgets/eab-vcard-control.c:141
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Der er én anden kontaktperson."
 msgstr[1] "Der er %d andre kontaktpersoner."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:228
-#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+#: ../addressbook/gui/widgets/eab-vcard-control.c:226
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
 msgid "Show Full vCard"
 msgstr "Vis hele vCard-kortet"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+#: ../addressbook/gui/widgets/eab-vcard-control.c:230
 msgid "Show Compact vCard"
 msgstr "Vis vCard-kortet kompakt"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:284
+#: ../addressbook/gui/widgets/eab-vcard-control.c:282
 msgid "Save in address book"
 msgstr "Gem i adressebog"
 
@@ -3834,10 +3852,10 @@ msgid "Card View"
 msgstr "Visitkortvisning"
 
 #: ../addressbook/importers/evolution-csv-importer.c:661
-#: ../addressbook/importers/evolution-ldif-importer.c:498
-#: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:306
-#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../calendar/importers/icalendar-importer.c:308
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "Importerer..."
 
@@ -3865,19 +3883,19 @@ msgstr "Evolution CSV eller Tab (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV- og Tab-importør"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:665
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP-dataudvekslingsformat (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:681
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF-importør"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:547
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:550
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard-importør"
 
@@ -3926,7 +3944,7 @@ msgstr "Format"
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
 #: ../widgets/table/e-table-field-chooser-item.c:647
 #: ../widgets/table/e-table-field-chooser.c:80
-#: ../widgets/table/e-table-header-item.c:1908
+#: ../widgets/table/e-table-header-item.c:1907
 #: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Teksthoved"
@@ -4029,9 +4047,9 @@ msgstr "Skyggelægning"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1069
-#: ../plugins/exchange-operations/exchange-calendar.c:232
-#: ../plugins/exchange-operations/exchange-contacts.c:217
+#: ../plugins/exchange-operations/exchange-account-setup.c:1080
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
 msgid "Size:"
 msgstr "Størrelse:"
 
@@ -4082,8 +4100,8 @@ msgstr "Test af udskrivning af kontaktperson"
 msgid "This should test the contact print code"
 msgstr "Dette bør teste udskriftskoden for kontaktperson"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "Kan ikke åbne filen"
@@ -4273,19 +4291,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Er du sikker på du vil slette denne aftale?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:178
+#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Er du sikker på du vil slette dette møde?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:184
+#: ../calendar/gui/dialogs/delete-comp.c:188
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Er du sikker på du vil slette denne huskeseddel?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:181
+#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Er du sikker på du vil slette denne opgave?"
@@ -4390,6 +4408,18 @@ msgstr ""
 "vil de måske ikke vide det."
 
 #: ../calendar/calendar.error.xml.h:45
+msgid "Save Appointment"
+msgstr "Gem aftale"
+
+#: ../calendar/calendar.error.xml.h:46
+msgid "Save Memo"
+msgstr "Gem huskeseddel"
+
+#: ../calendar/calendar.error.xml.h:47
+msgid "Save Task"
+msgstr "Gem opgave"
+
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4397,7 +4427,7 @@ msgstr ""
 "Ved at sende opdateret information vil andre deltagere kunne holde deres "
 "kalendere opdateret."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4405,7 +4435,7 @@ msgstr ""
 "Ved at sende opdateret information, vil de andre deltagere kunne opdatere "
 "deres opgavelister."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:51
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4413,7 +4443,7 @@ msgstr ""
 "Nogle bilag er ved at blive hentet. Gemmer du denne aftale nu, vil bilagene "
 "ikke blive gemt sammen med aftalen."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4421,84 +4451,84 @@ msgstr ""
 "Nogle bilag er ved at blive hentet. Gem er du denne opgave nu, vil bilagene "
 "ikke blive gemt sammen med opgaven."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:53
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Visse faciliteter vil måske ikke virke ordentligt med din nuværende server."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolutions kalender afsluttedes uventet."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolutions huskeseddel afsluttedes uventet."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolutions opgaver afsluttedes uventet."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:57
 msgid "The calendar is not marked for offline usage."
 msgstr "Kalenderen er ikke markeret til brug i afkoblet tilstand."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:58
 msgid "The memo list is not marked for offline usage."
 msgstr "Huskeseddel-listen er ikke markeret til brug i afkoblet tilstand."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:59
 msgid "The task list is not marked for offline usage."
 msgstr "Opgavelisten er ikke markeret til brug i afkoblet tilstand."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:60
 msgid "This calendar will be removed permanently."
 msgstr "Denne kalender vil blive fjernet permanent."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:61
 msgid "This memo list will be removed permanently."
 msgstr "Denne liste over huskesedler vil blive fjernet permanent."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:62
 msgid "This task list will be removed permanently."
 msgstr "Denne opgaveliste vil blive fjernet permanent."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Vil du gemme dine ændringer for denne aftale?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this memo?"
 msgstr "Vil du gemme dine ændringer af denne huskeseddel?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this task?"
 msgstr "Vil du gemme dine ændringer af opgaven?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Vil du sende en aflysningsnotits for denne huskeseddel?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Vil du sende en aflysningsnotits til alle deltagerne?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Vil du sende mødeinvitationer til deltagerne?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send this task to participants?"
 msgstr "Vil du sende denne opgave til deltagerne?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Vil du sende opdateret mødeinformation til alle deltagerne?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send updated task information to participants?"
 msgstr "Vil du sende opdateret opgaveinformation til deltagerne?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:72
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4508,107 +4538,107 @@ msgstr ""
 "muligvis opleve problemer med Evolution. For at få det bedste resultat skal "
 "serveren opgraderes til en understøttet version."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Du har ændret denne aftale, men ikke gemt ændringerne endnu."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this task, but not yet saved it."
 msgstr "Du har lavet ændringer af opgaven, men ikke gemt dem endnu."
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Du har lavet ændringer af huskesedlen, men ikke gemt dem endnu."
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:76
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Dine kalendere vil ikke være tilgængelige før Evolution genstartes."
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Dine huskesedler vil ikke være tilgængelige før Evolution genstartes."
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Dine opgaver vil ikke være tilgængelige før Evolution genstartes."
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:79
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Forkast ændringer"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
+#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:497
 msgid "_Save"
 msgstr "_Gem"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:81
 msgid "_Save Changes"
 msgstr "_Gem ændringer"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:82
 #: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Send"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:83
 msgid "_Send Notice"
 msgstr "_Send notits"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:84
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:256
+#: ../calendar/conduits/calendar/calendar-conduit.c:258
 msgid "Split Multi-Day Events:"
 msgstr "Dél flerdagsbegivenheder:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1521
-#: ../calendar/conduits/calendar/calendar-conduit.c:1522
-#: ../calendar/conduits/memo/memo-conduit.c:820
+#: ../calendar/conduits/calendar/calendar-conduit.c:1523
+#: ../calendar/conduits/calendar/calendar-conduit.c:1524
 #: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/todo/todo-conduit.c:1018
+#: ../calendar/conduits/memo/memo-conduit.c:822
 #: ../calendar/conduits/todo/todo-conduit.c:1019
+#: ../calendar/conduits/todo/todo-conduit.c:1020
 msgid "Could not start evolution-data-server"
 msgstr "Kunne ikke starte evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1629
-#: ../calendar/conduits/calendar/calendar-conduit.c:1632
+#: ../calendar/conduits/calendar/calendar-conduit.c:1631
+#: ../calendar/conduits/calendar/calendar-conduit.c:1634
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke læse pilotens kalender-programblok"
 
-#: ../calendar/conduits/memo/memo-conduit.c:914
-#: ../calendar/conduits/memo/memo-conduit.c:917
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
 msgid "Could not read pilot's Memo application block"
 msgstr "Kunne ikke læse pilotens programblok for huskeseddel"
 
-#: ../calendar/conduits/memo/memo-conduit.c:961
-#: ../calendar/conduits/memo/memo-conduit.c:964
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
 msgid "Could not write pilot's Memo application block"
 msgstr "Kunne ikke skrive til pilotens programblok for huskeseddel"
 
-#: ../calendar/conduits/todo/todo-conduit.c:240
+#: ../calendar/conduits/todo/todo-conduit.c:241
 msgid "Default Priority:"
 msgstr "Standardprioritet:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1102
-#: ../calendar/conduits/todo/todo-conduit.c:1105
+#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1106
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke læse pilotens programblok for opgaveliste"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1147
-#: ../calendar/conduits/todo/todo-conduit.c:1150
+#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1151
 msgid "Could not write pilot's ToDo application block"
 msgstr "Kunne ikke skrive til pilotens programblok for opgaveliste"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2358
+#: ../plugins/itip-formatter/itip-formatter.c:2432
 msgid "Calendar and Tasks"
 msgstr "Kalender og opgaver"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:805
-#: ../calendar/gui/calendar-component.c:1402
+#: ../calendar/gui/calendar-component.c:832
+#: ../calendar/gui/calendar-component.c:1429
 msgid "Calendars"
 msgstr "Kalendere"
 
@@ -4650,8 +4680,8 @@ msgstr "H_uskesedler"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: ../calendar/gui/e-memo-table.c:279 ../calendar/gui/e-memos.c:1120
-#: ../calendar/gui/gnome-cal.c:1774 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:354
+#: ../calendar/gui/gnome-cal.c:1774 ../calendar/gui/memos-component.c:575
+#: ../calendar/gui/memos-component.c:1128 ../calendar/gui/memos-control.c:354
 #: ../calendar/gui/memos-control.c:370
 msgid "Memos"
 msgstr "Huskesedler"
@@ -4659,12 +4689,12 @@ msgstr "Huskesedler"
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
 #: ../calendar/gui/e-calendar-table.c:703 ../calendar/gui/e-tasks.c:1429
 #: ../calendar/gui/gnome-cal.c:1642 ../calendar/gui/print.c:1984
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:492
+#: ../calendar/gui/tasks-component.c:566
+#: ../calendar/gui/tasks-component.c:1117 ../calendar/gui/tasks-control.c:492
 #: ../calendar/gui/tasks-control.c:508
-#: ../calendar/importers/icalendar-importer.c:74
-#: ../calendar/importers/icalendar-importer.c:735
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:588
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
@@ -4727,9 +4757,9 @@ msgid "Snooze _time:"
 msgstr "Udsæt_tid:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1332
+#: ../calendar/gui/dialogs/comp-editor.c:1336
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:169
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
@@ -4821,7 +4851,7 @@ msgid "invalid time"
 msgstr "ugyldig tidsangivelse"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -4830,7 +4860,7 @@ msgstr[0] "%d time"
 msgstr[1] "%d timer"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -4841,7 +4871,7 @@ msgstr[1] "%d minutter"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -5287,66 +5317,66 @@ msgstr "Minut for arbejdsdagens start"
 msgid "daylight savings time"
 msgstr "sommertid"
 
-#: ../calendar/gui/cal-search-bar.c:71
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Summary contains"
 msgstr "Sammendrag indeholder"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Description contains"
 msgstr "Beskrivelse indeholder"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Category is"
 msgstr "Kategorien er"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Comment contains"
 msgstr "Kommentar indeholder"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:79
 msgid "Location contains"
 msgstr "Sted indeholder"
 
-#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
-#: ../calendar/gui/cal-search-bar.c:691
+#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
+#: ../calendar/gui/cal-search-bar.c:694
 msgid "Unmatched"
 msgstr "Ingen træffere"
 
-#: ../calendar/gui/cal-search-bar.c:637
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Next 7 Days' Tasks"
 msgstr "Næste 7 dages opgaver"
 
-#: ../calendar/gui/cal-search-bar.c:641
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Active Tasks"
 msgstr "Aktive opgaver"
 
-#: ../calendar/gui/cal-search-bar.c:645
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Overdue Tasks"
 msgstr "For sene opgaver"
 
-#: ../calendar/gui/cal-search-bar.c:649
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Completed Tasks"
 msgstr "Fuldførte opgaver"
 
-#: ../calendar/gui/cal-search-bar.c:653
+#: ../calendar/gui/cal-search-bar.c:656
 msgid "Tasks with Attachments"
 msgstr "Opgaver med bilag"
 
-#: ../calendar/gui/cal-search-bar.c:699
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Active Appointments"
 msgstr "Aktive aftaler"
 
-#: ../calendar/gui/cal-search-bar.c:703
+#: ../calendar/gui/cal-search-bar.c:706
 msgid "Next 7 Days' Appointments"
 msgstr "Næste 7 dages aftaler"
 
-#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
+#: ../calendar/gui/calendar-commands.c:93 ../ui/evolution-addressbook.xml.h:26
 #: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Udskriv"
 
-#: ../calendar/gui/calendar-commands.c:317
+#: ../calendar/gui/calendar-commands.c:318
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5356,11 +5386,11 @@ msgstr ""
 "valgte tid. Hvis du fortsætter vil du ikke længere kunne tilvejebringe disse "
 "begivenheder."
 
-#: ../calendar/gui/calendar-commands.c:323
+#: ../calendar/gui/calendar-commands.c:324
 msgid "Purge events older than"
 msgstr "Fjern begivenheder der er ældre end"
 
-#: ../calendar/gui/calendar-commands.c:328
+#: ../calendar/gui/calendar-commands.c:329
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
 #: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:563
@@ -5391,64 +5421,74 @@ msgstr "Fødselsdage og jubilæer"
 msgid "Weather"
 msgstr "Vejr"
 
-#: ../calendar/gui/calendar-component.c:615
+#: ../calendar/gui/calendar-component.c:640
 msgid "_New Calendar"
 msgstr "_Ny kalender"
 
-#: ../calendar/gui/calendar-component.c:616
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
+#: ../calendar/gui/calendar-component.c:641
+#: ../calendar/gui/memos-component.c:490 ../calendar/gui/tasks-component.c:481
 #: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Kopiér..."
 
-#: ../calendar/gui/calendar-component.c:949
+#: ../calendar/gui/calendar-component.c:645
+#: ../calendar/gui/memos-component.c:494 ../calendar/gui/tasks-component.c:485
+msgid "_Make available for offline use"
+msgstr "_Gør tilgængelig i afkoblet tilstand"
+
+#: ../calendar/gui/calendar-component.c:646
+#: ../calendar/gui/memos-component.c:495 ../calendar/gui/tasks-component.c:486
+msgid "_Do not make available for offline use"
+msgstr "Gør _ikke tilgængelig i afkoblet tilstand"
+
+#: ../calendar/gui/calendar-component.c:976
 msgid "Failed upgrading calendars."
 msgstr "Opgradering af kalenderne mislykkedes."
 
-#: ../calendar/gui/calendar-component.c:1248
+#: ../calendar/gui/calendar-component.c:1275
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Kan ikke åbne kalenderen \"%s\" for oprettelse af begivenheder og møder"
 
-#: ../calendar/gui/calendar-component.c:1264
+#: ../calendar/gui/calendar-component.c:1291
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 "Der er ingen kalender tilgængelig for oprettelse af begivenheder og møder"
 
-#: ../calendar/gui/calendar-component.c:1377
+#: ../calendar/gui/calendar-component.c:1404
 msgid "Calendar Source Selector"
 msgstr "Kalenderkilde-vælger"
 
-#: ../calendar/gui/calendar-component.c:1596
+#: ../calendar/gui/calendar-component.c:1623
 msgid "New appointment"
 msgstr "Ny aftale"
 
-#: ../calendar/gui/calendar-component.c:1598
+#: ../calendar/gui/calendar-component.c:1625
 msgid "Create a new appointment"
 msgstr "Opret en ny aftale"
 
-#: ../calendar/gui/calendar-component.c:1604
+#: ../calendar/gui/calendar-component.c:1631
 msgid "New meeting"
 msgstr "Nyt møde"
 
-#: ../calendar/gui/calendar-component.c:1606
+#: ../calendar/gui/calendar-component.c:1633
 msgid "Create a new meeting request"
 msgstr "Opret en ny mødeindkaldelse"
 
-#: ../calendar/gui/calendar-component.c:1612
+#: ../calendar/gui/calendar-component.c:1639
 msgid "New all day appointment"
 msgstr "Ny heldagsaftale"
 
-#: ../calendar/gui/calendar-component.c:1614
+#: ../calendar/gui/calendar-component.c:1641
 msgid "Create a new all-day appointment"
 msgstr "Opret en ny helddagsaftale"
 
-#: ../calendar/gui/calendar-component.c:1620
+#: ../calendar/gui/calendar-component.c:1647
 msgid "New calendar"
 msgstr "Ny kalender"
 
-#: ../calendar/gui/calendar-component.c:1622
+#: ../calendar/gui/calendar-component.c:1649
 msgid "Create a new calendar"
 msgstr "Opret en ny kalender"
 
@@ -5474,7 +5514,7 @@ msgid "Any Field"
 msgstr "Ethvert felt"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:21
 msgid "Attachments"
 msgstr "Brevdele"
 
@@ -5524,12 +5564,12 @@ msgid "Description Contains"
 msgstr "Beskrivelse indeholder"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:38
 msgid "Do Not Exist"
 msgstr "Eksisterer ikke"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:41
 msgid "Exist"
 msgstr "Eksisterer"
 
@@ -5620,7 +5660,7 @@ msgstr "Tilbagevenden"
 #: ../calendar/gui/e-meeting-list-view.c:545
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
-#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:17
+#: ../mail/em-filter-i18n.h:86 ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Status"
 
@@ -5664,22 +5704,22 @@ msgid "Waiting"
 msgstr "Venter"
 
 #: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
-#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:26
 msgid "contains"
 msgstr "indeholder"
 
 #: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
-#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:32
 msgid "does not contain"
 msgstr "indeholder ikke"
 
 #: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
-#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:46
 msgid "is"
 msgstr "er"
 
 #: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
-#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:52
 msgid "is not"
 msgstr "er ikke"
 
@@ -5695,7 +5735,7 @@ msgstr "Metode ikke understøttet under åbning af kalenderen"
 msgid "Permission denied to open the calendar"
 msgstr "Du har ikke rettigheder til at åbne kalenderen"
 
-#: ../calendar/gui/comp-editor-factory.c:433 ../shell/e-shell.c:1308
+#: ../calendar/gui/comp-editor-factory.c:433 ../shell/e-shell.c:1272
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
@@ -5732,17 +5772,17 @@ msgid "Mes_sage:"
 msgstr "Be_sked:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:442
+#: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Afspil en lyd"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Vis en advarsel"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Kør et program"
 
@@ -5755,7 +5795,7 @@ msgid "Send To:"
 msgstr "Send til:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Send et brev"
 
@@ -5825,7 +5865,7 @@ msgid "Alarms"
 msgstr "Påmindelser"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
-#: ../composer/e-composer-actions.c:64
+#: ../composer/e-composer-actions.c:62
 msgid "_Suggest automatic display of attachment"
 msgstr "F_oreslå automatisk visning af bilag"
 
@@ -5833,7 +5873,7 @@ msgstr "F_oreslå automatisk visning af bilag"
 msgid "Attach file(s)"
 msgstr "Vedhæft fil(er)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:484
 msgid "Selected Calendars for Alarms"
 msgstr "Kalendere hvor påmindelser er aktiveret"
 
@@ -5899,7 +5939,7 @@ msgid "Display"
 msgstr "Vis"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Fredag"
@@ -5915,7 +5955,7 @@ msgstr ""
 "Dage"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Mandag"
@@ -5949,7 +5989,7 @@ msgid "S_un"
 msgstr "_Søn"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1090
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Lørdag"
@@ -5967,7 +6007,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Vis uge_numre i datonavigeringen"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/dialogs/recurrence-page.c:1091
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Søndag"
@@ -5986,7 +6026,7 @@ msgid "Template:"
 msgstr "Skabelon:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Torsdag"
@@ -6001,13 +6041,13 @@ msgid "Time format:"
 msgstr "Tidsformat:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Tirsdag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Onsdag"
@@ -6086,52 +6126,52 @@ msgstr "_Ons"
 msgid "before every appointment"
 msgstr "før hver aftale"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:270
+#: ../calendar/gui/dialogs/calendar-setup.c:271
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Kopiér _kalenderindhold lokalt til brug i afkoblet tilstand"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:273
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "Kopiér _opgavelistens indhold lokalt til brug i afkoblet tilstand"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:275
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr ""
 "Kopiér _huskeseddel-listens indhold lokalt til brug i afkoblet tilstand"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:345
 msgid "Colo_r:"
 msgstr "_Farve:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:380
 msgid "Task List"
 msgstr "Opgaveliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:391
 msgid "Memo List"
 msgstr "Liste over huskesedler"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "Calendar Properties"
 msgstr "Kalenderegenskaber"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:476
 msgid "New Calendar"
 msgstr "Ny kalender"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "Task List Properties"
 msgstr "Opgavelisteegenskaber"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:532
 msgid "New Task List"
 msgstr "Ny opgaveliste"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "Memo List Properties"
 msgstr "Opgavelisteegenskaber"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:588
 msgid "New Memo List"
 msgstr "Ny liste over huskesedler"
 
@@ -6208,274 +6248,274 @@ msgstr " (Forfalder "
 msgid "Due "
 msgstr "Forfalder "
 
-#: ../calendar/gui/dialogs/comp-editor.c:232
+#: ../calendar/gui/dialogs/comp-editor.c:236
 #, c-format
 msgid "Attached message - %s"
 msgstr "Vedlagt brev - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:237
-#: ../calendar/gui/dialogs/comp-editor.c:410 ../composer/e-msg-composer.c:1769
-#: ../composer/e-msg-composer.c:1988
+#: ../calendar/gui/dialogs/comp-editor.c:241
+#: ../calendar/gui/dialogs/comp-editor.c:414 ../composer/e-msg-composer.c:1766
+#: ../composer/e-msg-composer.c:1985
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Vedlagt brev"
 msgstr[1] "%d vedlagte breve"
 
-#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2056
+#: ../calendar/gui/dialogs/comp-editor.c:485 ../composer/e-msg-composer.c:2053
 #: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2107
 msgid "_Move"
 msgstr "_Flyt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2058
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
+#: ../calendar/gui/dialogs/comp-editor.c:487 ../composer/e-msg-composer.c:2055
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2109
 msgid "Cancel _Drag"
 msgstr "Annullér _træk"
 
-#: ../calendar/gui/dialogs/comp-editor.c:616
-#: ../calendar/gui/dialogs/comp-editor.c:3249 ../mail/em-utils.c:371
+#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:3257 ../mail/em-utils.c:372
 #: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "bilag"
 
-#: ../calendar/gui/dialogs/comp-editor.c:842
+#: ../calendar/gui/dialogs/comp-editor.c:846
 msgid "Could not update object"
 msgstr "Kunne ikke opdatere objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:930
+#: ../calendar/gui/dialogs/comp-editor.c:934
 msgid "Edit Appointment"
 msgstr "Redigér aftale"
 
-#: ../calendar/gui/dialogs/comp-editor.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:941
 #, c-format
 msgid "Meeting - %s"
 msgstr "Møde - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:943
 #, c-format
 msgid "Appointment - %s"
 msgstr "Aftale - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:949
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tildelt opgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Task - %s"
 msgstr "Opgave - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952
+#: ../calendar/gui/dialogs/comp-editor.c:956
 #, c-format
 msgid "Memo - %s"
 msgstr "Huskeseddel - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:968
+#: ../calendar/gui/dialogs/comp-editor.c:972
 msgid "No Summary"
 msgstr "Intet sammendrag"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1266
 msgid "Click here to close the current window"
 msgstr "Klik her for at lukke det aktive vindue"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1269
+#: ../calendar/gui/dialogs/comp-editor.c:1273
 msgid "Copy selected text to the clipboard"
 msgstr "Kopiér markerede meddelelser til klippebord"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1280
 msgid "Cut selected text to the clipboard"
 msgstr "Klip markerede meddelelser ud til klippebord"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1283
+#: ../calendar/gui/dialogs/comp-editor.c:1287
 msgid "Click here to view help available"
 msgstr "Klik her for at læse den tilgængelige hjælpedokumentation"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1294
 msgid "Paste text from the clipboard"
 msgstr "Kopiér tekst fra klippebord"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1315
 msgid "Click here to save the current window"
 msgstr "Klik her for at gemme det aktive vindue"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1322
 msgid "Select all text"
 msgstr "Vælg hele teksten"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1329
 msgid "_Classification"
 msgstr "K_lassificering"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../calendar/gui/dialogs/comp-editor.c:1343
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Fil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../calendar/gui/dialogs/comp-editor.c:1350
 #: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_Hjælp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1353
+#: ../calendar/gui/dialogs/comp-editor.c:1357
 msgid "_Insert"
 msgstr "_Indsæt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1360
+#: ../calendar/gui/dialogs/comp-editor.c:1364
 msgid "_Options"
 msgstr "_Indstillinger"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1367 ../mail/em-folder-tree.c:2098
+#: ../calendar/gui/dialogs/comp-editor.c:1371 ../mail/em-folder-tree.c:2098
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_Vis"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1377
-#: ../composer/e-composer-actions.c:471
+#: ../calendar/gui/dialogs/comp-editor.c:1381
+#: ../composer/e-composer-actions.c:469
 msgid "_Attachment..."
 msgstr "_Bilag..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1383
 msgid "Click here to attach a file"
 msgstr "Klik her for at vedlægge en fil"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1391
 msgid "_Categories"
 msgstr "_Kategorier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
+#: ../calendar/gui/dialogs/comp-editor.c:1393
 msgid "Toggles whether to display categories"
 msgstr "Slå visning af kategorier fra/til"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../calendar/gui/dialogs/comp-editor.c:1399
 msgid "Time _Zone"
 msgstr "Tids_zone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1397
+#: ../calendar/gui/dialogs/comp-editor.c:1401
 msgid "Toggles whether the time zone is displayed"
 msgstr "Slå visning af Tidszone-feltet fra/til"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1406
+#: ../calendar/gui/dialogs/comp-editor.c:1410
 msgid "Pu_blic"
 msgstr "Of_fentlig"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1408
+#: ../calendar/gui/dialogs/comp-editor.c:1412
 msgid "Classify as public"
 msgstr "Klassificér som offentlig"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1413
+#: ../calendar/gui/dialogs/comp-editor.c:1417
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1415
+#: ../calendar/gui/dialogs/comp-editor.c:1419
 msgid "Classify as private"
 msgstr "Klassificér som privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1424
 msgid "_Confidential"
 msgstr "_Fortroligt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1426
 msgid "Classify as confidential"
 msgstr "Klassificér som fortroligt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1434
 msgid "R_ole Field"
 msgstr "_Rolle-felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1432
+#: ../calendar/gui/dialogs/comp-editor.c:1436
 msgid "Toggles whether the Role field is displayed"
 msgstr "Slå visning af Rolle-feltet fra/til"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1442
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1440
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Slå visning af RSVP-feltet fra/til"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1450
 msgid "_Status Field"
 msgstr "_Status-felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1448
+#: ../calendar/gui/dialogs/comp-editor.c:1452
 msgid "Toggles whether the Status field is displayed"
 msgstr "Slå visning af Status-feltet fra/til"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1454
+#: ../calendar/gui/dialogs/comp-editor.c:1458
 msgid "_Type Field"
 msgstr "_Type-felt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1460
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Slå visning af deltagertype fra/til"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1766
-#: ../composer/e-composer-private.c:65 ../widgets/misc/e-attachment-bar.c:1381
+#: ../calendar/gui/dialogs/comp-editor.c:1774
+#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1381
 msgid "Recent _Documents"
 msgstr "Seneste _dokumenter"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1785
-#: ../composer/e-composer-actions.c:699
+#: ../calendar/gui/dialogs/comp-editor.c:1793
+#: ../composer/e-composer-actions.c:697
 msgid "Attach"
 msgstr "Vedlæg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1880
+#: ../calendar/gui/dialogs/comp-editor.c:1888
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> Bilag"
 msgstr[1] "<b>%d</b> Bilag"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1912
+#: ../calendar/gui/dialogs/comp-editor.c:1920
 msgid "Hide Attachment _Bar"
-msgstr "_Skjlu bilagslinje"
+msgstr "_Skjul bilagslinje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1915
-#: ../calendar/gui/dialogs/comp-editor.c:2223
+#: ../calendar/gui/dialogs/comp-editor.c:1923
+#: ../calendar/gui/dialogs/comp-editor.c:2231
 msgid "Show Attachment _Bar"
 msgstr "_Vis bilagslinje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/dialogs/event-page.c:1871
-#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1043
+#: ../calendar/gui/dialogs/comp-editor.c:2042
+#: ../calendar/gui/dialogs/event-page.c:1875
+#: ../calendar/gui/dialogs/task-page.c:1197 ../composer/e-msg-composer.c:1040
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2037
-#: ../composer/e-msg-composer.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:2045
+#: ../composer/e-msg-composer.c:1043
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Tilføj bilag..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../calendar/gui/dialogs/comp-editor.c:2253
 #: ../mail/em-format-html-display.c:2201
 msgid "Show Attachments"
 msgstr "Vis bilag"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2246
+#: ../calendar/gui/dialogs/comp-editor.c:2254
 msgid "Press space key to toggle attachment bar"
 msgstr "Tast mellemrum for at vise/skjule bilagslinjen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2390
-#: ../calendar/gui/dialogs/comp-editor.c:2437
-#: ../calendar/gui/dialogs/comp-editor.c:3282
+#: ../calendar/gui/dialogs/comp-editor.c:2398
+#: ../calendar/gui/dialogs/comp-editor.c:2445
+#: ../calendar/gui/dialogs/comp-editor.c:3290
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Ændringer af dette element bliver muligvis ignoreret hvis en opdatering "
 "ankommer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3311
+#: ../calendar/gui/dialogs/comp-editor.c:3319
 msgid "Unable to use current version!"
 msgstr "Kan ikke bruge nuværende version!"
 
@@ -6491,7 +6531,7 @@ msgstr "Kunne ikke åbne mål"
 msgid "Destination is read only"
 msgstr "Mål er skrivebeskyttet"
 
-#: ../calendar/gui/dialogs/delete-comp.c:201
+#: ../calendar/gui/dialogs/delete-comp.c:205
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Slet dette element fra alle øvrige modtageres brevbakker?"
 
@@ -6574,6 +6614,7 @@ msgstr "Gør denne begivenhed tilbagevendende"
 
 #: ../calendar/gui/dialogs/event-editor.c:210
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr "Afsendelsesindstillinger"
@@ -6611,125 +6652,125 @@ msgstr "Forespørg om deltagere er ledige eller optagede"
 msgid "Appoint_ment"
 msgstr "_Aftale"
 
-#: ../calendar/gui/dialogs/event-page.c:731
-#: ../calendar/gui/dialogs/event-page.c:2714
+#: ../calendar/gui/dialogs/event-page.c:735
+#: ../calendar/gui/dialogs/event-page.c:2718
 msgid "This event has alarms"
 msgstr "Denne begivenhed har påmindelser"
 
-#: ../calendar/gui/dialogs/event-page.c:794
+#: ../calendar/gui/dialogs/event-page.c:798
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/event-page.c:840
+#: ../calendar/gui/dialogs/event-page.c:844
 msgid "_Delegatees"
 msgstr "_Delegerede"
 
-#: ../calendar/gui/dialogs/event-page.c:842
+#: ../calendar/gui/dialogs/event-page.c:846
 msgid "Atte_ndees"
 msgstr "D_eltagere"
 
-#: ../calendar/gui/dialogs/event-page.c:1026
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no start date"
 msgstr "Begivenhed uden startdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1029
+#: ../calendar/gui/dialogs/event-page.c:1033
 msgid "Event with no end date"
 msgstr "Begivenhed uden slutdato"
 
-#: ../calendar/gui/dialogs/event-page.c:1198
-#: ../calendar/gui/dialogs/memo-page.c:636
-#: ../calendar/gui/dialogs/task-page.c:808
+#: ../calendar/gui/dialogs/event-page.c:1202
+#: ../calendar/gui/dialogs/memo-page.c:640
+#: ../calendar/gui/dialogs/task-page.c:812
 msgid "Start date is wrong"
 msgstr "Startdatoen er forkert"
 
-#: ../calendar/gui/dialogs/event-page.c:1208
+#: ../calendar/gui/dialogs/event-page.c:1212
 msgid "End date is wrong"
 msgstr "Slutdatoen er forkert"
 
-#: ../calendar/gui/dialogs/event-page.c:1231
+#: ../calendar/gui/dialogs/event-page.c:1235
 msgid "Start time is wrong"
 msgstr "Starttiden er forkert"
 
-#: ../calendar/gui/dialogs/event-page.c:1238
+#: ../calendar/gui/dialogs/event-page.c:1242
 msgid "End time is wrong"
 msgstr "Sluttiden er forkert"
 
-#: ../calendar/gui/dialogs/event-page.c:1401
-#: ../calendar/gui/dialogs/memo-page.c:677
-#: ../calendar/gui/dialogs/task-page.c:868
+#: ../calendar/gui/dialogs/event-page.c:1405
+#: ../calendar/gui/dialogs/memo-page.c:681
+#: ../calendar/gui/dialogs/task-page.c:872
 msgid "The organizer selected no longer has an account."
 msgstr "Den valgte organisator har ikke længere en konto."
 
-#: ../calendar/gui/dialogs/event-page.c:1407
-#: ../calendar/gui/dialogs/memo-page.c:683
-#: ../calendar/gui/dialogs/task-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:1411
+#: ../calendar/gui/dialogs/memo-page.c:687
+#: ../calendar/gui/dialogs/task-page.c:878
 msgid "An organizer is required."
 msgstr "En organisator er påkrævet."
 
-#: ../calendar/gui/dialogs/event-page.c:1432
-#: ../calendar/gui/dialogs/task-page.c:898
+#: ../calendar/gui/dialogs/event-page.c:1436
+#: ../calendar/gui/dialogs/task-page.c:902
 msgid "At least one attendee is required."
 msgstr "Mindst en deltager er nødvendig."
 
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1194
+#: ../calendar/gui/dialogs/event-page.c:1876
+#: ../calendar/gui/dialogs/task-page.c:1198
 msgid "_Add "
 msgstr "_Tilføj "
 
-#: ../calendar/gui/dialogs/event-page.c:2590
+#: ../calendar/gui/dialogs/event-page.c:2594
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kan ikke åbne kalenderen \"%s\"."
 
-#: ../calendar/gui/dialogs/event-page.c:2634
-#: ../calendar/gui/dialogs/memo-page.c:886
-#: ../calendar/gui/dialogs/task-page.c:1793
+#: ../calendar/gui/dialogs/event-page.c:2638
+#: ../calendar/gui/dialogs/memo-page.c:890
+#: ../calendar/gui/dialogs/task-page.c:1797
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Du udfører en handlig på vegne af %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2914
+#: ../calendar/gui/dialogs/event-page.c:2918
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dag før aftalen"
 msgstr[1] "%d dage før aftalen"
 
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d time før aftalen"
 msgstr[1] "%d timer før aftalen"
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2930
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minut før aftale"
 msgstr[1] "%d minutter før aftale"
 
-#: ../calendar/gui/dialogs/event-page.c:2939
+#: ../calendar/gui/dialogs/event-page.c:2943
 msgid "Customize"
 msgstr "Tilpas"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2944
+#: ../calendar/gui/dialogs/event-page.c:2948
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:945
 #: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
 #: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:193
+#: ../plugins/exchange-operations/exchange-delegates-user.c:195
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1517
-#: ../widgets/misc/e-dateedit.c:1731
+#: ../plugins/itip-formatter/itip-formatter.c:2088
+#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1511
+#: ../widgets/misc/e-dateedit.c:1725
 #: ../widgets/misc/e-signature-combo-box.c:70
 msgid "None"
 msgstr "Ingen"
@@ -6813,15 +6854,15 @@ msgstr "Organisator:"
 msgid "Memo"
 msgstr "Huskeseddel"
 
-#: ../calendar/gui/dialogs/memo-page.c:847
+#: ../calendar/gui/dialogs/memo-page.c:851
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Kan ikke åbne huskesedler i \"%s\"."
 
-#: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
+#: ../calendar/gui/dialogs/memo-page.c:1006 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
 #: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
+#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "Til"
 
@@ -6835,7 +6876,7 @@ msgid "T_o:"
 msgstr "T_il:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:360
+#: ../calendar/gui/dialogs/task-page.c:364
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Gruppe:"
@@ -6877,19 +6918,19 @@ msgstr "Dette og fremtidige tilfælde"
 msgid "All Instances"
 msgstr "Alle tilfælde"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:560
+#: ../calendar/gui/dialogs/recurrence-page.c:562
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Denne aftale har tilbagevendende elementer som ikke kan redigeres af "
 "Evolution."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "Dato for tilbagevendende aftale er ugyldig"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#: ../calendar/gui/dialogs/recurrence-page.c:930
 msgid "on"
 msgstr "på"
 
@@ -6897,7 +6938,7 @@ msgstr "på"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:994
 msgid "first"
 msgstr "første"
 
@@ -6906,7 +6947,7 @@ msgstr "første"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:998
+#: ../calendar/gui/dialogs/recurrence-page.c:1000
 msgid "second"
 msgstr "anden"
 
@@ -6914,7 +6955,7 @@ msgstr "anden"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:1005
 msgid "third"
 msgstr "tredje"
 
@@ -6922,7 +6963,7 @@ msgstr "tredje"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1008
+#: ../calendar/gui/dialogs/recurrence-page.c:1010
 msgid "fourth"
 msgstr "fjerde"
 
@@ -6930,13 +6971,13 @@ msgstr "fjerde"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1013
+#: ../calendar/gui/dialogs/recurrence-page.c:1015
 msgid "last"
 msgstr "sidste"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "Other Date"
 msgstr "Anden dato"
 
@@ -6944,7 +6985,7 @@ msgstr "Anden dato"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
 msgid "1st to 10th"
 msgstr "1. til 10."
 
@@ -6952,7 +6993,7 @@ msgstr "1. til 10."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1053
+#: ../calendar/gui/dialogs/recurrence-page.c:1055
 msgid "11th to 20th"
 msgstr "11. til 20."
 
@@ -6960,45 +7001,45 @@ msgstr "11. til 20."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1059
+#: ../calendar/gui/dialogs/recurrence-page.c:1061
 msgid "21st to 31st"
 msgstr "21. til 31."
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
 msgid "day"
 msgstr "dag"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1208
+#: ../calendar/gui/dialogs/recurrence-page.c:1210
 msgid "on the"
 msgstr "den"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1384
+#: ../calendar/gui/dialogs/recurrence-page.c:1386
 msgid "occurrences"
 msgstr "forekomster"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2087
+#: ../calendar/gui/dialogs/recurrence-page.c:2089
 msgid "Add exception"
 msgstr "Tilføj undtagelse"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2130
 msgid "Could not get a selection to modify."
 msgstr "Der er ikke markeret noget til redigering."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2134
+#: ../calendar/gui/dialogs/recurrence-page.c:2136
 msgid "Modify exception"
 msgstr "Undtagelse fra redigering"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2178
+#: ../calendar/gui/dialogs/recurrence-page.c:2180
 msgid "Could not get a selection to delete."
 msgstr "Der er ikke markeret noget til sletning."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2302
+#: ../calendar/gui/dialogs/recurrence-page.c:2304
 msgid "Date/Time"
 msgstr "Dato/Tid"
 
@@ -7083,7 +7124,7 @@ msgstr "Fuldført"
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:272
 #: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1066
 msgid "High"
 msgstr "Høj"
 
@@ -7100,14 +7141,14 @@ msgstr "I gang"
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:276
 #: ../calendar/gui/e-calendar-table.c:568 ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1063
+#: ../mail/message-list.c:1064
 msgid "Low"
 msgstr "Lav"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:274
 #: ../calendar/gui/e-cal-model.c:985 ../calendar/gui/e-calendar-table.c:567
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1064
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1065
 msgid "Normal"
 msgstr "Normal"
 
@@ -7156,7 +7197,7 @@ msgid "Click to change or view the status details of the task"
 msgstr "Klik for at ændre eller vise statusdetaljer om opgaven"
 
 #: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:527
+#: ../composer/e-composer-actions.c:525
 msgid "_Send Options"
 msgstr "_Afsendelsesindstillinger"
 
@@ -7168,16 +7209,16 @@ msgstr "_Opgave"
 msgid "Task Details"
 msgstr "Opgavedetaljer"
 
-#: ../calendar/gui/dialogs/task-page.c:368
+#: ../calendar/gui/dialogs/task-page.c:372
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Organi_sator:"
 
-#: ../calendar/gui/dialogs/task-page.c:781
+#: ../calendar/gui/dialogs/task-page.c:785
 msgid "Due date is wrong"
 msgstr "Forfaldsdatoen er forkert"
 
-#: ../calendar/gui/dialogs/task-page.c:1750
+#: ../calendar/gui/dialogs/task-page.c:1754
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan ikke åbne opgaver i \"%s\"."
@@ -7199,7 +7240,7 @@ msgid "Time zone:"
 msgstr "Tidszone:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:392
+#: ../calendar/gui/e-alarm-list.c:394
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -7207,81 +7248,81 @@ msgstr[0] "%d dag"
 msgstr[1] "%d dage"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:398
+#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d uge"
 msgstr[1] "%d uger"
 
-#: ../calendar/gui/e-alarm-list.c:460
+#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Ukendt handling som skal udføres"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:474
+#: ../calendar/gui/e-alarm-list.c:476
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s før aftalen starter"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:479
+#: ../calendar/gui/e-alarm-list.c:481
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s efter aftalen er startet"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:486
+#: ../calendar/gui/e-alarm-list.c:488
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ved aftalens start"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:497
+#: ../calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s før aftalen slutter"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:502
+#: ../calendar/gui/e-alarm-list.c:504
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s efter aftalens slutning"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:509
+#: ../calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s ved aftalens slutning"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:533
+#: ../calendar/gui/e-alarm-list.c:535
 #, c-format
 msgid "%s at %s"
 msgstr "%s ved %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:541
+#: ../calendar/gui/e-alarm-list.c:543
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s for en ukendt udløsertype"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3312
 #, c-format
 msgid "Click to open %s"
 msgstr "Klik for at åbne %s"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:858
 msgid "Untitled"
 msgstr "Unavngiven"
 
@@ -7318,7 +7359,7 @@ msgstr "Forfaldsdato:"
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:246
 #: ../calendar/gui/e-itip-control.c:1186
-#: ../plugins/exchange-operations/exchange-account-setup.c:267
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Status:"
@@ -7380,9 +7421,9 @@ msgstr "Nej"
 #: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
 #: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:987
-#: ../calendar/gui/print.c:1004 ../mail/em-utils.c:1340
-#: ../plugins/itip-formatter/itip-formatter.c:409
-#: ../plugins/itip-formatter/itip-formatter.c:2046
+#: ../calendar/gui/print.c:1004 ../mail/em-utils.c:1341
+#: ../plugins/itip-formatter/itip-formatter.c:447
+#: ../plugins/itip-formatter/itip-formatter.c:2113
 #: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
@@ -7410,7 +7451,7 @@ msgstr "Vælg mappen hvor de valgte bilag skal gemmes..."
 msgid "untitled_image.%s"
 msgstr "billede_uden_titel.%s"
 
-#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1575
+#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1578
 #: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:925
 #: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
@@ -7425,7 +7466,7 @@ msgstr "Vælg som _baggrund"
 msgid "_Save Selected"
 msgstr "Gem _valgte"
 
-#: ../calendar/gui/e-cal-popup.c:429 ../mail/em-popup.c:831
+#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:832
 #, c-format
 msgid "Open in %s..."
 msgstr "Åbn i %s..."
@@ -7511,34 +7552,34 @@ msgstr "Sletter de valgte objekter"
 msgid "Updating objects"
 msgstr "Opdaterer objekter"
 
-#: ../calendar/gui/e-calendar-table.c:1347
+#: ../calendar/gui/e-calendar-table.c:1350
 #: ../calendar/gui/e-calendar-view.c:1220 ../calendar/gui/e-memo-table.c:820
-#: ../composer/e-composer-actions.c:277
+#: ../composer/e-composer-actions.c:275
 msgid "Save as..."
 msgstr "Gem som..."
 
-#: ../calendar/gui/e-calendar-table.c:1570
+#: ../calendar/gui/e-calendar-table.c:1573
 #: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Task"
 msgstr "_Ny opgave"
 
-#: ../calendar/gui/e-calendar-table.c:1574 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/e-calendar-table.c:1577 ../calendar/gui/e-memo-table.c:924
 msgid "Open _Web Page"
 msgstr "Åbn _hjemmeside"
 
-#: ../calendar/gui/e-calendar-table.c:1576
+#: ../calendar/gui/e-calendar-table.c:1579
 #: ../calendar/gui/e-calendar-view.c:1656 ../calendar/gui/e-memo-table.c:926
 msgid "P_rint..."
 msgstr "Ud_skriv..."
 
-#: ../calendar/gui/e-calendar-table.c:1580
+#: ../calendar/gui/e-calendar-table.c:1583
 #: ../calendar/gui/e-calendar-view.c:1676 ../calendar/gui/e-memo-table.c:930
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Klip _ud"
 
-#: ../calendar/gui/e-calendar-table.c:1582
+#: ../calendar/gui/e-calendar-table.c:1585
 #: ../calendar/gui/e-calendar-view.c:1659
 #: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:932
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
@@ -7546,36 +7587,36 @@ msgstr "Klip _ud"
 msgid "_Paste"
 msgstr "_Indsæt"
 
-#: ../calendar/gui/e-calendar-table.c:1586 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1589 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Tildel opgave"
 
-#: ../calendar/gui/e-calendar-table.c:1587 ../calendar/gui/e-memo-table.c:936
+#: ../calendar/gui/e-calendar-table.c:1590 ../calendar/gui/e-memo-table.c:936
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Videresend som iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Complete"
 msgstr "_Markér som fuldført"
 
-#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Markér valgte opgaver som fuldførte"
 
-#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-table.c:1593
 msgid "_Mark as Incomplete"
 msgstr "_Markér som ikke-fuldført"
 
-#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-table.c:1594
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Markér valgte opgaver som ikke-fuldførte"
 
-#: ../calendar/gui/e-calendar-table.c:1596
+#: ../calendar/gui/e-calendar-table.c:1599
 msgid "_Delete Selected Tasks"
 msgstr "Sle_t valgte opgaver"
 
-#: ../calendar/gui/e-calendar-table.c:1833
+#: ../calendar/gui/e-calendar-table.c:1836
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klik for at tilføje en opgave"
@@ -7732,19 +7773,19 @@ msgstr "%02i minutters inddeling"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1566
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1560
 #: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1674
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:806 ../calendar/gui/e-week-view.c:542
+#: ../calendar/gui/e-day-view.c:800 ../calendar/gui/e-week-view.c:540
 #: ../calendar/gui/print.c:831
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:809 ../calendar/gui/e-week-view.c:545
+#: ../calendar/gui/e-day-view.c:803 ../calendar/gui/e-week-view.c:543
 #: ../calendar/gui/print.c:833
 msgid "pm"
 msgstr "pm"
@@ -7863,12 +7904,12 @@ msgstr ""
 #: ../calendar/gui/e-meeting-list-view.c:203
 #: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
 #: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2034
+#: ../plugins/itip-formatter/itip-formatter.c:2101
 msgid "Accepted"
 msgstr "Accepteret"
 
 #: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../plugins/itip-formatter/itip-formatter.c:2104
 msgid "Tentatively Accepted"
 msgstr "Forsøgsvist godtaget"
 
@@ -7876,7 +7917,7 @@ msgstr "Forsøgsvist godtaget"
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
 #: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2040
+#: ../plugins/itip-formatter/itip-formatter.c:2107
 msgid "Declined"
 msgstr "Afslået"
 
@@ -8095,7 +8136,7 @@ msgid "Attendee status updated\n"
 msgstr "Deltagerstatus opdateret\n"
 
 #: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1253
+#: ../plugins/itip-formatter/itip-formatter.c:1301
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltagerstatus kan ikke opdateres, fordi elementet ikke længere eksisterer"
@@ -8254,7 +8295,7 @@ msgstr "Forsøgsvis"
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
 #: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2043
+#: ../plugins/itip-formatter/itip-formatter.c:2110
 msgid "Delegated"
 msgstr "Uddelegeret"
 
@@ -8588,64 +8629,64 @@ msgstr "iCalendar-information"
 msgid "You must be an attendee of the event."
 msgstr "Du må være en deltager i arrangementet."
 
-#: ../calendar/gui/memos-component.c:464
+#: ../calendar/gui/memos-component.c:489
 msgid "_New Memo List"
 msgstr "N_y liste over huskesedler"
 
-#: ../calendar/gui/memos-component.c:544
+#: ../calendar/gui/memos-component.c:571
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d huskeseddel"
 msgstr[1] "%d huskesedler"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
+#: ../calendar/gui/memos-component.c:573 ../calendar/gui/tasks-component.c:564
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d valgt"
 msgstr[1] ", %d valgte"
 
-#: ../calendar/gui/memos-component.c:593
+#: ../calendar/gui/memos-component.c:620
 msgid "Failed upgrading memos."
 msgstr "Opgradering af huskesedler mislykkedes."
 
-#: ../calendar/gui/memos-component.c:953
+#: ../calendar/gui/memos-component.c:980
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "Kan ikke åbne listen over huskesedler \"%s\" til oprettelse af begivenheder "
 "og møder"
 
-#: ../calendar/gui/memos-component.c:966
+#: ../calendar/gui/memos-component.c:993
 msgid "There is no calendar available for creating memos"
 msgstr "Ingen kalender tilgængelig for oprettelse af huskesedler"
 
-#: ../calendar/gui/memos-component.c:1076
+#: ../calendar/gui/memos-component.c:1103
 msgid "Memo Source Selector"
 msgstr "Huskeseddel-kildevælger"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1287
 msgid "New memo"
 msgstr "Ny huskeseddel"
 
-#: ../calendar/gui/memos-component.c:1262
+#: ../calendar/gui/memos-component.c:1289
 msgid "Create a new memo"
 msgstr "Opret en ny huskeseddel"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1295
 msgid "New shared memo"
 msgstr "Ny fælles huskeseddel"
 
-#: ../calendar/gui/memos-component.c:1270
+#: ../calendar/gui/memos-component.c:1297
 msgid "Create a shared new memo"
 msgstr "Opret en ny, fælles huskeseddel"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1303
 msgid "New memo list"
 msgstr "Ny liste over huskesedler"
 
-#: ../calendar/gui/memos-component.c:1278
+#: ../calendar/gui/memos-component.c:1305
 msgid "Create a new memo list"
 msgstr "Opret en ny liste over huskesedler"
 
@@ -8905,56 +8946,56 @@ msgstr "Kategorier: %s"
 msgid "Contacts: "
 msgstr "Kontaktpersoner: "
 
-#: ../calendar/gui/tasks-component.c:455
+#: ../calendar/gui/tasks-component.c:480
 msgid "_New Task List"
 msgstr "_Ny opgaveliste"
 
-#: ../calendar/gui/tasks-component.c:535
+#: ../calendar/gui/tasks-component.c:562
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d opgave"
 msgstr[1] "%d opgaver"
 
-#: ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/tasks-component.c:611
 msgid "Failed upgrading tasks."
 msgstr "Opgradering af opgaver mislykkedes."
 
-#: ../calendar/gui/tasks-component.c:941
+#: ../calendar/gui/tasks-component.c:968
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Kan ikke åbne opgavelisten \"%s\" for oprettelse af begivenheder og møder"
 
-#: ../calendar/gui/tasks-component.c:954
+#: ../calendar/gui/tasks-component.c:981
 msgid "There is no calendar available for creating tasks"
 msgstr "Ingen kalender tilgængelig for oprettelse af opgaver"
 
-#: ../calendar/gui/tasks-component.c:1065
+#: ../calendar/gui/tasks-component.c:1092
 msgid "Task Source Selector"
 msgstr "Opgavekilde-vælger"
 
-#: ../calendar/gui/tasks-component.c:1325
+#: ../calendar/gui/tasks-component.c:1352
 msgid "New task"
 msgstr "Ny opgave"
 
-#: ../calendar/gui/tasks-component.c:1327
+#: ../calendar/gui/tasks-component.c:1354
 msgid "Create a new task"
 msgstr "Opret en ny opgave"
 
-#: ../calendar/gui/tasks-component.c:1333
+#: ../calendar/gui/tasks-component.c:1360
 msgid "New assigned task"
 msgstr "Ny tildelt opgave"
 
-#: ../calendar/gui/tasks-component.c:1335
+#: ../calendar/gui/tasks-component.c:1362
 msgid "Create a new assigned task"
 msgstr "Opret en ny tildelt opgave"
 
-#: ../calendar/gui/tasks-component.c:1341
+#: ../calendar/gui/tasks-component.c:1368
 msgid "New task list"
 msgstr "Ny opgaveliste"
 
-#: ../calendar/gui/tasks-component.c:1343
+#: ../calendar/gui/tasks-component.c:1370
 msgid "Create a new task list"
 msgstr "Opret en ny opgaveliste"
 
@@ -8992,49 +9033,49 @@ msgstr "Afbrudt"
 msgid "In progress"
 msgstr "I gang"
 
-#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:50
 msgid "is greater than"
 msgstr "er større end"
 
-#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:51
 msgid "is less than"
 msgstr "er mindre end"
 
-#: ../calendar/importers/icalendar-importer.c:73
+#: ../calendar/importers/icalendar-importer.c:75
 msgid "Appointments and Meetings"
 msgstr "Aftaler og møder"
 
-#: ../calendar/importers/icalendar-importer.c:331
-#: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../calendar/importers/icalendar-importer.c:333
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1635
 msgid "Opening calendar"
 msgstr "Åbner kalender"
 
-#: ../calendar/importers/icalendar-importer.c:438
+#: ../calendar/importers/icalendar-importer.c:440
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar-filer (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:439
+#: ../calendar/importers/icalendar-importer.c:441
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar-importør"
 
-#: ../calendar/importers/icalendar-importer.c:515
+#: ../calendar/importers/icalendar-importer.c:529
 msgid "Reminder!"
 msgstr "Påmindelse!"
 
-#: ../calendar/importers/icalendar-importer.c:567
+#: ../calendar/importers/icalendar-importer.c:581
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar-filer (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:568
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar-importør"
 
-#: ../calendar/importers/icalendar-importer.c:730
+#: ../calendar/importers/icalendar-importer.c:744
 msgid "Calendar Events"
 msgstr "Kalenderbegivenheder"
 
-#: ../calendar/importers/icalendar-importer.c:767
+#: ../calendar/importers/icalendar-importer.c:781
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution intelligent kalender-importør"
 
@@ -10587,213 +10628,213 @@ msgstr "Stillehavet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stillehavet/Yap"
 
-#: ../composer/e-composer-autosave.c:275
+#: ../composer/e-composer-autosave.c:273
 msgid "Could not open autosave file"
 msgstr "Kunne ikke åbne auto-gemningsfil"
 
-#: ../composer/e-composer-autosave.c:282
+#: ../composer/e-composer-autosave.c:280
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente brev fra editor"
 
-#: ../composer/e-composer-actions.c:47
+#: ../composer/e-composer-actions.c:45
 msgid "Insert Attachment"
 msgstr "Indsæt bilag"
 
-#: ../composer/e-composer-actions.c:51
+#: ../composer/e-composer-actions.c:49
 msgid "A_ttach"
 msgstr "_Vedlæg"
 
-#: ../composer/e-composer-actions.c:142
+#: ../composer/e-composer-actions.c:140
 msgid "Untitled Message"
 msgstr "Brev uden titel"
 
-#: ../composer/e-composer-actions.c:473
+#: ../composer/e-composer-actions.c:471
 msgid "Attach a file"
 msgstr "Vedlæg en fil"
 
-#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:476 ../mail/mail-signature-editor.c:194
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "_Luk"
 
-#: ../composer/e-composer-actions.c:480
+#: ../composer/e-composer-actions.c:478
 msgid "Close the current file"
 msgstr "Luk aktiv fil"
 
-#: ../composer/e-composer-actions.c:485 ../mail/em-folder-view.c:1337
+#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1337
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "_Udskriv..."
 
-#: ../composer/e-composer-actions.c:492 ../ui/evolution-addressbook.xml.h:27
+#: ../composer/e-composer-actions.c:490 ../ui/evolution-addressbook.xml.h:27
 #: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "V_is udskrift"
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:499
 msgid "Save the current file"
 msgstr "Gem aktiv fil"
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:504
 msgid "Save _As..."
 msgstr "_Gem som..."
 
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:506
 msgid "Save the current file with a different name"
 msgstr "Gem aktiv fil med et nyt navn"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:511
 msgid "Save _Draft"
 msgstr "_Gem udkast"
 
-#: ../composer/e-composer-actions.c:515
+#: ../composer/e-composer-actions.c:513
 msgid "Save as draft"
 msgstr "Gem som kladde"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:518
 msgid "S_end"
 msgstr "S_end"
 
-#: ../composer/e-composer-actions.c:522
+#: ../composer/e-composer-actions.c:520
 msgid "Send this message"
 msgstr "Send dette brev"
 
-#: ../composer/e-composer-actions.c:529
+#: ../composer/e-composer-actions.c:527
 msgid "Insert Send options"
 msgstr "Indsæt afsendelsesindstillinger"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:532
 msgid "New _Message"
 msgstr "Nyt _brev"
 
-#: ../composer/e-composer-actions.c:536
+#: ../composer/e-composer-actions.c:534
 msgid "Open New Message window"
 msgstr "Åbn vinduet \"Nyt brev\""
 
-#: ../composer/e-composer-actions.c:543
+#: ../composer/e-composer-actions.c:541
 msgid "Character _Encoding"
 msgstr "Tegn_kodning"
 
-#: ../composer/e-composer-actions.c:550
+#: ../composer/e-composer-actions.c:548
 msgid "_Security"
 msgstr "_Sikkerhed"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:558
 msgid "PGP _Encrypt"
 msgstr "_Kryptér med PGP"
 
-#: ../composer/e-composer-actions.c:562
+#: ../composer/e-composer-actions.c:560
 msgid "Encrypt this message with PGP"
 msgstr "Kryptér dette brev med PGP"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:566
 msgid "PGP _Sign"
 msgstr "_Signér med PGP"
 
-#: ../composer/e-composer-actions.c:570
+#: ../composer/e-composer-actions.c:568
 msgid "Sign this message with your PGP key"
 msgstr "Underskriv dette brev med din PGP-nøgle"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:574
 msgid "_Prioritize Message"
 msgstr "_Prioritér brev"
 
-#: ../composer/e-composer-actions.c:578
+#: ../composer/e-composer-actions.c:576
 msgid "Set the message priority to high"
 msgstr "Angiv brevets prioritet som høj"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:582
 msgid "Re_quest Read Receipt"
 msgstr "_Anmod om læsningskvittering"
 
-#: ../composer/e-composer-actions.c:586
+#: ../composer/e-composer-actions.c:584
 msgid "Get delivery notification when your message is read"
 msgstr "Anmod om kvittering for at dit brev er blevet åbnet"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:590
 msgid "S/MIME En_crypt"
 msgstr "Kry_ptér med S/MIME"
 
-#: ../composer/e-composer-actions.c:594
+#: ../composer/e-composer-actions.c:592
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Kryptér dette brev med dit S/MIME krypteringscertifikat"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:598
 msgid "S/MIME Sig_n"
 msgstr "Sig_nér med S/MIME"
 
-#: ../composer/e-composer-actions.c:602
+#: ../composer/e-composer-actions.c:600
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Signér dette brev med dit S/MIME signaturcertifikat"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:606
 msgid "_Bcc Field"
 msgstr "_Bcc-felt"
 
-#: ../composer/e-composer-actions.c:610
+#: ../composer/e-composer-actions.c:608
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Slå visning af BCC-feltet fra/til"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:614
 msgid "_Cc Field"
 msgstr "_Cc-felt"
 
-#: ../composer/e-composer-actions.c:618
+#: ../composer/e-composer-actions.c:616
 msgid "Toggles whether the CC field is displayed"
 msgstr "Slå visning af CC-feltet fra/til"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:622
 msgid "_From Field"
 msgstr "_Fra-felt"
 
-#: ../composer/e-composer-actions.c:626
+#: ../composer/e-composer-actions.c:624
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Slå visning af Fra-feltet fra/til"
 
-#: ../composer/e-composer-actions.c:632
+#: ../composer/e-composer-actions.c:630
 msgid "_Post-To Field"
 msgstr "_Post-til-felt"
 
-#: ../composer/e-composer-actions.c:634
+#: ../composer/e-composer-actions.c:632
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Slå visning af Send-til-feltet fra/til"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:638
 msgid "_Reply-To Field"
 msgstr "Sva_r-til felt"
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:640
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Slå visning af Svar-til feltet fra/til"
 
-#: ../composer/e-composer-actions.c:648
+#: ../composer/e-composer-actions.c:646
 msgid "_Subject Field"
 msgstr "_Emnefelt"
 
-#: ../composer/e-composer-actions.c:650
+#: ../composer/e-composer-actions.c:648
 msgid "Toggles whether the Subject field is displayed"
 msgstr "Slå visning af emnefeltet fra/til"
 
-#: ../composer/e-composer-actions.c:656
+#: ../composer/e-composer-actions.c:654
 msgid "_To Field"
 msgstr "_Til-felt"
 
-#: ../composer/e-composer-actions.c:658
+#: ../composer/e-composer-actions.c:656
 msgid "Toggles whether the To field is displayed"
 msgstr "Slå visning af Til-feltet fra/til"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-header-table.c:64
 msgid "Enter the recipients of the message"
 msgstr "Indtast brevets modtagere"
 
-#: ../composer/e-composer-header-table.c:68
+#: ../composer/e-composer-header-table.c:66
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Indtast adresserne som skal modtage en kopi af brevet"
 
-#: ../composer/e-composer-header-table.c:71
+#: ../composer/e-composer-header-table.c:69
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -10801,35 +10842,35 @@ msgstr ""
 "Indtast adresserne som skal modtage en kopi af brevet, uden at blive vist i "
 "listen over modtagere"
 
-#: ../composer/e-composer-header-table.c:645
+#: ../composer/e-composer-header-table.c:643
 msgid "Fr_om:"
 msgstr "_Fra:"
 
-#: ../composer/e-composer-header-table.c:654
+#: ../composer/e-composer-header-table.c:652
 msgid "_Reply-To:"
 msgstr "_Svar-til:"
 
-#: ../composer/e-composer-header-table.c:658
+#: ../composer/e-composer-header-table.c:656
 msgid "_To:"
 msgstr "_Til:"
 
-#: ../composer/e-composer-header-table.c:663
+#: ../composer/e-composer-header-table.c:661
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:668
+#: ../composer/e-composer-header-table.c:666
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:673
+#: ../composer/e-composer-header-table.c:671
 msgid "_Post To:"
 msgstr "_Post-til:"
 
-#: ../composer/e-composer-header-table.c:677
+#: ../composer/e-composer-header-table.c:675
 msgid "S_ubject:"
 msgstr "_Emne:"
 
-#: ../composer/e-composer-header-table.c:686
+#: ../composer/e-composer-header-table.c:684
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
@@ -10849,24 +10890,24 @@ msgstr "Vælg mapperne som brevet skal sendes til."
 msgid "Click here to select folders to post to"
 msgstr "Klik her for at vælge mapper at sende til"
 
-#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1556
+#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1553
 msgid "Show _Attachment Bar"
 msgstr "_Vis bilagspanel"
 
-#: ../composer/e-msg-composer.c:870
+#: ../composer/e-msg-composer.c:867
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Kan ikke underskrive udgående brev: Intet signaturcertifikat for denne konto"
 
-#: ../composer/e-msg-composer.c:877
+#: ../composer/e-msg-composer.c:874
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr ""
 "Kan ikke kryptere udgående brev: Intet krypteringscertifikat for denne konto"
 
-#: ../composer/e-msg-composer.c:1498 ../mail/em-format-html-display.c:1919
+#: ../composer/e-msg-composer.c:1495 ../mail/em-format-html-display.c:1919
 #: ../mail/em-format-html-display.c:2411 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
@@ -10874,15 +10915,15 @@ msgid_plural "Attachments"
 msgstr[0] "Bilag"
 msgstr[1] "Bilag"
 
-#: ../composer/e-msg-composer.c:1554
+#: ../composer/e-msg-composer.c:1551
 msgid "Hide _Attachment Bar"
 msgstr "Skj_ul bilagspanel"
 
-#: ../composer/e-msg-composer.c:1571 ../composer/e-msg-composer.c:2778
+#: ../composer/e-msg-composer.c:1568 ../composer/e-msg-composer.c:2775
 msgid "Compose Message"
 msgstr "Skriv brev"
 
-#: ../composer/e-msg-composer.c:4053
+#: ../composer/e-msg-composer.c:4050
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10975,8 +11016,9 @@ msgstr ""
 "Genoprettelse af brevet vil lade dig fortsætte hvor du slap."
 
 #: ../composer/mail-composer.error.xml.h:17
+#, fuzzy
 msgid ""
-"Send options available only for Novell Groupwise and Microsoft Exchange "
+"Send options available only for Novell GroupWise and Microsoft Exchange "
 "accounts."
 msgstr ""
 "Send tilvalg tilgængelig for Novell Groupwise og Microsoft Exchange konti."
@@ -11087,18 +11129,18 @@ msgstr "Evolution forespørgsel"
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Intern fejl, ukendt fejl \"%s\" forespurgt"
 
-#: ../e-util/e-logger.c:156
+#: ../e-util/e-logger.c:161
 msgid "Component"
 msgstr "Komponent"
 
-#: ../e-util/e-logger.c:157
+#: ../e-util/e-logger.c:162
 msgid "Name of the component being logged"
 msgstr "Navn på den komponent som logges"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
 #: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
 #: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:689
+#: ../plugins/publish-calendar/publish-calendar.c:690
 msgid "Enabled"
 msgstr "Aktiveret"
 
@@ -11147,7 +11189,7 @@ msgstr "Overskriv fil?"
 msgid "_Overwrite"
 msgstr "_Overskriv"
 
-#: ../e-util/e-util.c:97
+#: ../e-util/e-util.c:96
 msgid "Could not display help for Evolution."
 msgstr "Kunne ikke vise hjælp for Evolution."
 
@@ -11208,119 +11250,119 @@ msgstr "GConf-fejl: %s"
 msgid "All further errors shown only on terminal."
 msgstr "Alle følgende fejl vises kun i terminalen."
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 sekund siden"
 msgstr[1] "%d sekunder siden"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 sekund ude i fremtiden"
 msgstr[1] "%d sekunder ude i fremtiden"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minut siden"
 msgstr[1] "%d minutter siden"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 minut ude i fremtiden"
 msgstr[1] "%d minutter ude i fremtiden"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 time siden"
 msgstr[1] "%d timer siden"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 time ude i fremtiden"
 msgstr[1] "%d timer ude i fremtiden"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 dag siden"
 msgstr[1] "%d dage siden"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "1 dag ude i fremtiden"
 msgstr[1] "%d dage ude i fremtiden"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 uge siden"
 msgstr[1] "%d uger siden"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 uge ude i fremtiden"
 msgstr[1] "%d uger ude i fremtiden"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 måned siden"
 msgstr[1] "%d måneder siden"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 måned ude i fremtiden"
 msgstr[1] "%d måneder ude i fremtiden"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 år siden"
 msgstr[1] "%d år siden"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 år ude i fremtiden"
 msgstr[1] "%d år ude i fremtiden"
 
-#: ../filter/filter-datespec.c:287
+#: ../filter/filter-datespec.c:288
 msgid "<click here to select a date>"
 msgstr "<klik her for at vælge en dato>"
 
-#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
-#: ../filter/filter-datespec.c:312
+#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
+#: ../filter/filter-datespec.c:313
 msgid "now"
 msgstr "nu"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:297
+#: ../filter/filter-datespec.c:298
 msgid "%d-%b-%Y"
 msgstr "%d %b %Y"
 
-#: ../filter/filter-datespec.c:451
+#: ../filter/filter-datespec.c:452
 msgid "Select a time to compare against"
 msgstr "Vælg en tid at sammenligne med"
 
@@ -11333,56 +11375,60 @@ msgstr "Vælg en fil"
 msgid "Test"
 msgstr "Test"
 
-#: ../filter/filter-rule.c:852
+#: ../filter/filter-rule.c:853
 msgid "R_ule name:"
 msgstr "R_egelnavn:"
 
-#: ../filter/filter-rule.c:880
-msgid "Find items that meet the following criteria"
+#: ../filter/filter-rule.c:881
+#, fuzzy
+msgid "Find items that meet the following conditions"
 msgstr "Find punkter der opfylder følgende betingelser"
 
-#: ../filter/filter-rule.c:914
-msgid "A_dd Filter Criteria"
-msgstr "T_ilføj filterregler"
+#: ../filter/filter-rule.c:915
+#, fuzzy
+msgid "A_dd Condition"
+msgstr "Tilføj hand_ling"
 
-#: ../filter/filter-rule.c:920
-msgid "If all criteria are met"
+#: ../filter/filter-rule.c:921
+#, fuzzy
+msgid "If all conditions are met"
 msgstr "Hvis alle betingelser er mødt"
 
-#: ../filter/filter-rule.c:920
-msgid "If any criteria are met"
+#: ../filter/filter-rule.c:921
+#, fuzzy
+msgid "If any conditions are met"
 msgstr "Hvis en betingelse er opfyldt"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/filter-rule.c:923
 msgid "_Find items:"
 msgstr "_Find punkter:"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "All related"
 msgstr "Alle relaterede"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies"
 msgstr "Svar"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "Replies and parents"
 msgstr "Svar og forældre"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/filter-rule.c:945
 msgid "No reply or parent"
 msgstr "Intet svar eller forældre"
 
-#: ../filter/filter-rule.c:946
+#: ../filter/filter-rule.c:947
 msgid "I_nclude threads"
 msgstr "I_nkludér tråde"
 
-#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:308
+#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "Indkommende"
 
-#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "Udgående"
 
@@ -11483,7 +11529,7 @@ msgstr "ude i fremtiden"
 msgid "months"
 msgstr "måneder"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:197
 msgid "seconds"
 msgstr "sekunder"
 
@@ -11506,15 +11552,15 @@ msgstr "uger"
 msgid "years"
 msgstr "år"
 
-#: ../filter/rule-editor.c:380
+#: ../filter/rule-editor.c:381
 msgid "Add Rule"
 msgstr "Tilføj regel"
 
-#: ../filter/rule-editor.c:459
+#: ../filter/rule-editor.c:462
 msgid "Edit Rule"
 msgstr "Redigér regel"
 
-#: ../filter/rule-editor.c:786
+#: ../filter/rule-editor.c:808
 msgid "Rule name"
 msgstr "Regelnavn"
 
@@ -11643,7 +11689,7 @@ msgstr "Hent _nye breve automatisk hver(t)"
 msgid "minu_tes"
 msgstr "minut_ter"
 
-#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:136
+#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "Afsendelse af e-post"
 
@@ -11653,7 +11699,7 @@ msgstr "Standarder"
 
 #. Security settings
 #: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:131
-#: ../plugins/exchange-operations/exchange-account-setup.c:315
+#: ../plugins/exchange-operations/exchange-account-setup.c:323
 msgid "Security"
 msgstr "Sikkerhed"
 
@@ -11731,48 +11777,64 @@ msgstr "-----Oprindelige besked-----"
 msgid "_Filter Rules"
 msgstr "_Filterregler"
 
+#.
+#. * This program is free software; you can redistribute it and/or
+#. * modify it under the terms of the GNU Lesser General Public
+#. * License as published by the Free Software Foundation; either
+#. * version 2 of the License, or (at your option) version 3.
+#. *
+#. * This program is distributed in the hope that it will be useful,
+#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
+#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#. * Lesser General Public License for more details.
+#. *
+#. * You should have received a copy of the GNU Lesser General Public
+#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
+#. *
+#. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+#.
 #. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:2
+#: ../mail/em-filter-i18n.h:18
 msgid "Adjust Score"
 msgstr "Justér point"
 
-#: ../mail/em-filter-i18n.h:3
+#: ../mail/em-filter-i18n.h:19
 msgid "Assign Color"
 msgstr "Tilknyt farve"
 
-#: ../mail/em-filter-i18n.h:4
+#: ../mail/em-filter-i18n.h:20
 msgid "Assign Score"
 msgstr "Giv point"
 
-#: ../mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:22
 msgid "BCC"
 msgstr "BCC"
 
-#: ../mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:23
 msgid "Beep"
 msgstr "Bippelyd"
 
-#: ../mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:24
 msgid "CC"
 msgstr "CC"
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:25
 msgid "Completed On"
 msgstr "Fuldført den"
 
-#: ../mail/em-filter-i18n.h:11
+#: ../mail/em-filter-i18n.h:27
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:28
 msgid "Date received"
 msgstr "Dato modtaget"
 
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:29
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: ../mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:30
 #: ../plugins/groupwise-features/share-folder.c:768
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
@@ -11780,210 +11842,210 @@ msgstr "Dato sendt"
 msgid "Delete"
 msgstr "Slet"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:31
 msgid "Deleted"
 msgstr "Slettet"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:33
 msgid "does not end with"
 msgstr "slutter ikke med"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:34
 msgid "does not exist"
 msgstr "eksisterer ikke"
 
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:35
 msgid "does not return"
 msgstr "returnerer ikke"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:36
 msgid "does not sound like"
 msgstr "ligner ikke"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:37
 msgid "does not start with"
 msgstr "starter ikke med"
 
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:39
 msgid "Draft"
 msgstr "Skitse"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:40
 msgid "ends with"
 msgstr "slutter med"
 
-#: ../mail/em-filter-i18n.h:26
+#: ../mail/em-filter-i18n.h:42
 msgid "exists"
 msgstr "eksisterer"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:43
 msgid "Expression"
 msgstr "Udtryk"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:44
 msgid "Follow Up"
 msgstr "Følg op"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:45 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Vigtig"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:47
 msgid "is after"
 msgstr "er efter"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:48
 msgid "is before"
 msgstr "er inden"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:49
 msgid "is Flagged"
 msgstr "har markering"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:53
 msgid "is not Flagged"
 msgstr "har ingen markering"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:54
 msgid "is not set"
 msgstr "er ikke indstillet"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:55
 msgid "is set"
 msgstr "er indstillet"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
+#: ../mail/em-filter-i18n.h:56 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Spam"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:57
 msgid "Junk Test"
 msgstr "Spamtest"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
+#: ../mail/em-filter-i18n.h:58 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "Mærkning"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:59
 msgid "Mailing list"
 msgstr "Postliste"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:60
 msgid "Match All"
 msgstr "Match alt"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:61
 msgid "Message Body"
 msgstr "Brevindhold"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:62
 msgid "Message Header"
 msgstr "Brevhoved"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:63
 msgid "Message is Junk"
 msgstr "Brevet er spam"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:64
 msgid "Message is not Junk"
 msgstr "Brevet er ikke-spam"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:65
 msgid "Move to Folder"
 msgstr "Flyt til mappe"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:66
 msgid "Pipe to Program"
 msgstr "Videreled til programmet"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:67
 msgid "Play Sound"
 msgstr "Afspil lyd"
 
 #. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
+#: ../mail/em-filter-i18n.h:69 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Læst"
 
-#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Modtagere"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:71
 msgid "Regex Match"
 msgstr "Træffer på regulært udtryk"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:72
 msgid "Replied to"
 msgstr "Svaret til"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:73
 msgid "returns"
 msgstr "returnerer"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:74
 msgid "returns greater than"
 msgstr "returnerer større end"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:75
 msgid "returns less than"
 msgstr "returnerer mindre end"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:76
 msgid "Run Program"
 msgstr "Kør program"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Point"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:78 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Afsender"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:79
 msgid "Set Label"
 msgstr "Brug mærkat"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:80
 msgid "Set Status"
 msgstr "Sæt status"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:81
 msgid "Size (kB)"
 msgstr "Størrelse (kB)"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:82
 msgid "sounds like"
 msgstr "lyder som"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:83
 msgid "Source Account"
 msgstr "Kildekonto"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:84
 msgid "Specific header"
 msgstr "Nærmere angivet linje i brevhoved"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:85
 msgid "starts with"
 msgstr "starter med"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:87
 msgid "Stop Processing"
 msgstr "Stop behandling"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
+#: ../mail/em-filter-i18n.h:88 ../mail/em-format-quote.c:342
 #: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
 #: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:312
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1132
+#: ../smime/lib/e-cert.c:1115
 msgid "Subject"
 msgstr "Emne"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:89
 msgid "Unset Status"
 msgstr "Nulstil status"
 
@@ -11996,51 +12058,51 @@ msgstr "Så"
 msgid "Add Ac_tion"
 msgstr "Tilføj hand_ling"
 
-#: ../mail/em-folder-browser.c:190
+#: ../mail/em-folder-browser.c:192
 msgid "C_reate Search Folder From Search..."
 msgstr "Opret _søgemappe fra søgning..."
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:217
 msgid "All Messages"
 msgstr "Alle breve"
 
-#: ../mail/em-folder-browser.c:216
+#: ../mail/em-folder-browser.c:218
 msgid "Unread Messages"
 msgstr "Ulæste breve"
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:220
 msgid "No Label"
 msgstr "Ingen mærkning"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:227
 msgid "Read Messages"
 msgstr "Læste breve"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:228
 msgid "Recent Messages"
 msgstr "Nyere breve"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:229
 msgid "Last 5 Days' Messages"
 msgstr "Breve fra de sidste 5 dage"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:230
 msgid "Messages with Attachments"
 msgstr "Breve med bilag"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:231
 msgid "Important Messages"
 msgstr "Vigtige breve"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:232
 msgid "Messages Not Junk"
 msgstr "Breve som ikke er spam"
 
-#: ../mail/em-folder-browser.c:1171
+#: ../mail/em-folder-browser.c:1173
 msgid "Account Search"
 msgstr "Kontosøgning"
 
-#: ../mail/em-folder-browser.c:1224
+#: ../mail/em-folder-browser.c:1226
 msgid "All Account Search"
 msgstr "Søgning i alle konti"
 
@@ -12073,7 +12135,7 @@ msgstr "Kvote-brug"
 #: ../mail/em-folder-properties.c:358 ../mail/em-folder-tree-model.c:507
 #: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:159
 #: ../mail/mail-component.c:580
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-delegates-user.c:78
 #: ../plugins/exchange-operations/exchange-folder.c:594
 msgid "Inbox"
 msgstr "Indbakke"
@@ -12097,7 +12159,7 @@ msgstr "Mappe_navn:"
 
 #. load store to mail component
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1027
+#: ../mail/mail-vfolder.c:975 ../mail/mail-vfolder.c:1042
 msgid "Search Folders"
 msgstr "Søgemapper"
 
@@ -12136,12 +12198,12 @@ msgstr "Flytter mappen %s"
 msgid "Copying folder %s"
 msgstr "Kopierer mappen %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2015
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter breve til mappen %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2017
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer breve til mappen %s"
@@ -12160,7 +12222,7 @@ msgstr "Kop_iér til mappe"
 msgid "_Move to Folder"
 msgstr "Fl_yt til mappe"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
@@ -12209,19 +12271,19 @@ msgstr "Vælg mappe"
 msgid "C_opy"
 msgstr "_Kopiér"
 
-#: ../mail/em-folder-utils.c:585
+#: ../mail/em-folder-utils.c:532
 #: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Opretter mappen \"%s\""
 
-#: ../mail/em-folder-utils.c:743
+#: ../mail/em-folder-utils.c:690
 #: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Opret mappe"
 
-#: ../mail/em-folder-utils.c:743
+#: ../mail/em-folder-utils.c:690
 #: ../plugins/groupwise-features/install-shared.c:169
 #: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
@@ -12295,7 +12357,7 @@ msgstr "Mær_kning"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:478
 msgid "_None"
 msgstr "_Ingen"
 
@@ -12367,33 +12429,33 @@ msgstr "Kan ikke hente brevet"
 msgid "Retrieving Message..."
 msgstr "Henter brev..."
 
-#: ../mail/em-folder-view.c:2794
+#: ../mail/em-folder-view.c:2791
 msgid "C_all To..."
 msgstr "Opk_ald til..."
 
-#: ../mail/em-folder-view.c:2797
+#: ../mail/em-folder-view.c:2794
 msgid "Create _Search Folder"
 msgstr "Opret søge_mappe"
 
-#: ../mail/em-folder-view.c:2798
+#: ../mail/em-folder-view.c:2795
 msgid "_From this Address"
 msgstr "_Fra denne adresse"
 
-#: ../mail/em-folder-view.c:2799
+#: ../mail/em-folder-view.c:2796
 msgid "_To this Address"
 msgstr "_Til denne adresse"
 
-#: ../mail/em-folder-view.c:3296
+#: ../mail/em-folder-view.c:3293
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klik for at skrive til %s"
 
-#: ../mail/em-folder-view.c:3308
+#: ../mail/em-folder-view.c:3305
 #, c-format
 msgid "Click to call %s"
 msgstr "Klik for at ringe til %s"
 
-#: ../mail/em-folder-view.c:3313
+#: ../mail/em-folder-view.c:3310
 msgid "Click to hide/unhide addresses"
 msgstr "Klik for at vise/skjule adresser"
 
@@ -12719,8 +12781,8 @@ msgid "Reply-To"
 msgstr "Svar-til"
 
 #: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
-#: ../widgets/misc/e-dateedit.c:353
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
+#: ../widgets/misc/e-dateedit.c:347
 msgid "Date"
 msgstr "Dato"
 
@@ -12897,8 +12959,9 @@ msgid "Failed to create local mail storage `%s': %s"
 msgstr "Kunne ikke oprette opbevaringssted \"%s\": %s til lokal e-post"
 
 #: ../mail/em-migrate.c:2898
+#, fuzzy
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to sqlite "
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
@@ -12931,7 +12994,7 @@ msgid "Reply to _List"
 msgstr "Svar til _listen"
 
 #. make it first item
-#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:853
 msgid "_Add to Address Book"
 msgstr "_Føj til adressebogen"
 
@@ -12959,29 +13022,29 @@ msgid "No server has been selected"
 msgstr "Ingen server er valgt"
 
 #. Check buttons
-#: ../mail/em-utils.c:120
-#: ../plugins/attachment-reminder/attachment-reminder.c:127
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "_Vis ikke denne meddelelse igen."
 
-#: ../mail/em-utils.c:316
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "Brevfiltre"
 
-#: ../mail/em-utils.c:369
+#: ../mail/em-utils.c:370
 msgid "message"
 msgstr "brev"
 
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:654
 msgid "Save Message..."
 msgstr "Gem brev..."
 
-#: ../mail/em-utils.c:703
+#: ../mail/em-utils.c:704
 msgid "Add address"
 msgstr "Tilføj adresse"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1224
+#: ../mail/em-utils.c:1225
 #, c-format
 msgid "Messages from %s"
 msgstr "Breve fra %s"
@@ -13007,7 +13070,8 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "Bredde af \"Send og modtag e-post\"-vindue"
 
 #: ../mail/evolution-mail.schemas.in.h:4
-msgid "Allows evolution to display text part of limited size"
+#, fuzzy
+msgid "Allows Evolution to display text part of limited size"
 msgstr "Tillader evolution at vise tekstdel af begrænset størrelse"
 
 #: ../mail/evolution-mail.schemas.in.h:5
@@ -13292,10 +13356,11 @@ msgstr ""
 "ovenfor."
 
 #: ../mail/evolution-mail.schemas.in.h:61
+#, fuzzy
 msgid ""
-"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
-"any mime-types appearing in this list which map to a bonobo-component viewer "
-"in GNOME's mime-type database may be used for displaying content."
+"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
+"any MIME types appearing in this list which map to a Bonobo component viewer "
+"in GNOME's MIME type database may be used for displaying content."
 msgstr ""
 "Hvis der ikke er indbygget visning for en specifik mime-type inden i "
 "Evolution, vil en hvilken som helst mime-type i denne liste, som er "
@@ -13370,14 +13435,20 @@ msgid "List of Labels and their associated colors"
 msgstr "Liste over mærkninger og deres associerede farver"
 
 #: ../mail/evolution-mail.schemas.in.h:72
+#, fuzzy
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr ""
+"Liste over mime-typer som skal kontrolleres for bonobo komponent-fremvisere"
+
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accepted licenses"
 msgstr "Liste over accepterede licenser"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of accounts"
 msgstr "Liste over konti"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13385,15 +13456,15 @@ msgstr ""
 "Liste over konti som Evolutions e-post-komponent kender. Listen indeholder "
 "navnene på undermapperne i /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of custom headers and whether they are enabled."
 msgstr "Liste over tilpassede hoveder og om de er aktiveret."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Liste af ordbogs-sprogkoder som bruges ved stavekontrol."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -13402,22 +13473,19 @@ msgstr ""
 "indeholder strenge indeholdende navn:farve, hvor farve benytter sig af HTML-"
 "hex-kodning."
 
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid "List of mime types to check for bonobo component viewers"
-msgstr ""
-"Liste over mime-typer som skal kontrolleres for bonobo komponent-fremvisere"
-
 #: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "Liste over protokolnavne hvis licens er blevet accepteret."
 
 #: ../mail/evolution-mail.schemas.in.h:80
-msgid "Load images for HTML messages over http"
+#, fuzzy
+msgid "Load images for HTML messages over HTTP"
 msgstr "Indlæs billeder for HTML-breve via http"
 
 #: ../mail/evolution-mail.schemas.in.h:81
+#, fuzzy
 msgid ""
-"Load images for HTML messages over http(s). Possible values are: \"0\" - "
+"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
 "contacts. \"2\" - Always load images off the net."
 msgstr ""
@@ -13665,9 +13733,10 @@ msgstr ""
 "for fejlsøgningsbeskeder."
 
 #: ../mail/evolution-mail.schemas.in.h:141
+#, fuzzy
 msgid ""
 "This decides the max size of the text part that can be formatted under "
-"evolution. The default is 4MB / 4096 KB and is specified interms of KB."
+"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgstr ""
 "Dette bestemmer største størrelse af tekstdelen som kan blive formateret i "
 "evolution. Standarden er 4Mb / 4096Kb og er angivet i Kb."
@@ -13902,16 +13971,16 @@ msgstr "Berkeley Mailbox (mbox)"
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importør til mapper i Berkeley Mailbox-formatet (mbox)"
 
-#: ../mail/importers/mail-importer.c:148
+#: ../mail/importers/mail-importer.c:147
 msgid "Importing mailbox"
 msgstr "Importerer brevbakke"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
+#: ../mail/importers/mail-importer.c:231 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importerer \"%s\""
 
-#: ../mail/importers/mail-importer.c:372
+#: ../mail/importers/mail-importer.c:371
 #, c-format
 msgid "Scanning %s"
 msgstr "Søger i %s"
@@ -13952,8 +14021,7 @@ msgstr "%s e-post-liste"
 msgid "Add Filter Rule"
 msgstr "Tilføj filterregel"
 
-#: ../mail/mail-component.c:163 ../plugins/templates/templates.c:519
-#: ../plugins/templates/templates.c:689 ../plugins/templates/templates.c:724
+#: ../mail/mail-component.c:163
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "Skabeloner"
@@ -14076,11 +14144,11 @@ msgstr "Log breve:"
 msgid "Log Level"
 msgstr "Logniveau"
 
-#: ../mail/mail-component.c:1810 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1810 ../widgets/misc/e-dateedit.c:389
 msgid "Time"
 msgstr "Tid"
 
-#: ../mail/mail-component.c:1820 ../mail/message-list.c:2454
+#: ../mail/mail-component.c:1820 ../mail/message-list.c:2519
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Breve"
@@ -14565,73 +14633,81 @@ msgid "S_tandard Font:"
 msgstr "Stan_dard-skrifttype:"
 
 #: ../mail/mail-config.glade.h:132
+msgid "Select Drafts Folder"
+msgstr "Vælg udkastmappe"
+
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font"
 msgstr "Vælg HTML-skrifttype med fast bredde"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font for printing"
 msgstr "Vælg HTML-skrifttype med fast bredde til udskrivning"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font"
 msgstr "Vælg HTML-skrifttype med variabel bredde"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font for printing"
 msgstr "Vælg HTML-skrifttype med variabel bredde til udskrift"
 
 #: ../mail/mail-config.glade.h:137
+msgid "Select Sent Folder"
+msgstr "Vælg \"Afsendte\"-mappen"
+
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr "Sender brev(e)"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
 msgstr "Mappe til sendte _breve:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr "Server kræver _godkendelse"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:142
 msgid "Server _Type: "
 msgstr "Server_type: "
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
 msgstr "_Certifikat til signatur:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
 msgstr "Signat_ur:"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:145
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
 msgstr "Signaturtabel"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
 msgstr "Stavekontrol"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:148
 msgid "Start _typing at the bottom on replying"
 msgstr "Påbegynd _skrivning i bunden når der svares"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:149
 msgid "T_ype: "
 msgstr "_Type: "
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:150
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Listen med sprog viser kun de sprog for hvilke en ordbog er installeret."
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14641,7 +14717,7 @@ msgstr ""
 "din signatur. Navnet du angiver vil kun blive\n"
 "brugt ved visning. "
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:154
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14649,26 +14725,26 @@ msgstr ""
 "Indtast navnet som skal henvise til denne konto.\n"
 "For eksempel: \"Job\" eller \"Personlig\""
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:156
 msgid "Us_ername:"
 msgstr "Bruger_navn:"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:157
 msgid "Use Authe_ntication"
 msgstr "Brug godkendelse"
 
-#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
+#: ../mail/mail-config.glade.h:158 ../plugins/caldav/caldav-source.c:284
 #: ../plugins/google-account-setup/google-source.c:625
 #: ../plugins/google-account-setup/google-contacts-source.c:278
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
 msgstr "Bruger_navn:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:159
 msgid "V_ariable-width:"
 msgstr "V_ariabel bredde:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:160
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14678,124 +14754,124 @@ msgstr ""
 "\n"
 "Klik \"Fremad\" for at begynde. "
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:163
 msgid "_Add Signature"
 msgstr "_Tilføj signatur"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:164
 msgid "_Always load images from the Internet"
 msgstr "_Indlæs altid billeder fra internettet"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:165
 msgid "_Automatic proxy configuration URL:"
 msgstr "URL for _automatisk proxykonfiguration:"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:166
 msgid "_Default junk plugin:"
 msgstr "_Forvalgt spam-udvidelsesmodul:"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:167
 msgid "_Direct connection to the Internet"
 msgstr "_Direkte forbindelse til internettet"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:168
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Signér _ikke mødeindkaldelser (for kompatibilitet med Outlook)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:170
 msgid "_Forward style:"
 msgstr "_Videresendelsesformat:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:171
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Hold signaturen over den oprindelige besked ved svar"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:172
 msgid "_Load images in messages from contacts"
 msgstr "_Indlæs billeder i breve fra kontaktpersoner"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:173
 msgid "_Lookup in local address book only"
 msgstr "_Søg kun i lokale adressebøger"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:174
 msgid "_Make this my default account"
 msgstr "_Gør dette til min standardkonto"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:175
 msgid "_Manual proxy configuration:"
 msgstr "_Manuel proxykonfiguration:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:176
 msgid "_Mark messages as read after"
 msgstr "Markér breve som l_æste efter"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:178
 msgid "_Never load images from the Internet"
 msgstr "Indlæs _aldrig billeder fra internettet"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:179
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:180
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Spørg når HTML-breve sendes til kontaktpersoner som ikke vil have dem"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:181
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Spørg når breve sendes med en _tom emnelinie"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:182
 msgid "_Reply style:"
 msgstr "_Svarsstil:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:183
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:184
 msgid "_Secure HTTP Proxy:"
 msgstr "_Sikker HTTP-proxy:"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:185
 msgid "_Select..."
 msgstr "_Vælg..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:188
 msgid "_Show image animations"
 msgstr "_Vis billed-animationer"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:189
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Vis afsenderens foto i forhåndsvisning af e-breve"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:190
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "Begræns synlige _To-/CC-/Bcc-linjer til "
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:191
 msgid "_Use Secure Connection:"
 msgstr "_Brug sikker forbindelse:"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:192
 msgid "_Use system defaults"
 msgstr "_Benyt systemforvalg"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:193
 msgid "_Use the same fonts as other applications"
 msgstr "Br_ug de samme skrifttyper som andre programmer"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:194
 msgid "addresses"
 msgstr "adresser"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr "farve"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "beskrivelse"
 
@@ -14895,26 +14971,26 @@ msgstr "_Markering:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Afkryds dette for at acceptere licensaftalen"
 
-#: ../mail/mail-folder-cache.c:832
+#: ../mail/mail-folder-cache.c:833
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:106
 msgid "Filtering Selected Messages"
 msgstr "Filtrerer valgte beskeder"
 
-#: ../mail/mail-ops.c:264
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:560
+#: ../mail/mail-ops.c:561
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Det mislykkedes at anvende de udgående filtre: %s"
 
-#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14923,123 +14999,123 @@ msgstr ""
 "Det mislykkedes at føje til %s: %s\n"
 "Føjer til lokal \"Sendt\"-mappe i stedet."
 
-#: ../mail/mail-ops.c:618
+#: ../mail/mail-ops.c:619
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Det mislykkedes at føje til den lokale \"sendt\"-mappe: %s"
 
-#: ../mail/mail-ops.c:724
+#: ../mail/mail-ops.c:725
 msgid "Sending message"
 msgstr "Sender brev"
 
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender brev %d af %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:762
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Det mislykkedes at sende %d af %d breve"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
+#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:698
 msgid "Canceled."
 msgstr "Annulleret."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
+#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:700
 msgid "Complete."
 msgstr "Fuldført."
 
-#: ../mail/mail-ops.c:871
+#: ../mail/mail-ops.c:872
 msgid "Saving message to folder"
 msgstr "Gemmer brev i mappe"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter breve til %s"
 
-#: ../mail/mail-ops.c:949
+#: ../mail/mail-ops.c:950
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer breve til %s"
 
-#: ../mail/mail-ops.c:1166
+#: ../mail/mail-ops.c:1167
 msgid "Forwarded messages"
 msgstr "Videresendte breve"
 
-#: ../mail/mail-ops.c:1207
+#: ../mail/mail-ops.c:1208
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åbner mappe %s"
 
-#: ../mail/mail-ops.c:1272
+#: ../mail/mail-ops.c:1273
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Henter kvoteinformation for mappen %s"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1342
 #, c-format
 msgid "Opening store %s"
 msgstr "Åbner opbevaringssted %s"
 
-#: ../mail/mail-ops.c:1412
+#: ../mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: ../mail/mail-ops.c:1501
+#: ../mail/mail-ops.c:1531
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Gemmer mappe \"%s\""
 
-#: ../mail/mail-ops.c:1564
+#: ../mail/mail-ops.c:1594
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Tømmer og arkiverer kontoen \"%s\""
 
-#: ../mail/mail-ops.c:1565
+#: ../mail/mail-ops.c:1595
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Arkiverer konto \"%s\""
 
-#: ../mail/mail-ops.c:1619
+#: ../mail/mail-ops.c:1649
 msgid "Refreshing folder"
 msgstr "Opfrisker mappe"
 
-#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
+#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
 msgid "Expunging folder"
 msgstr "Fjerner slettede breve fra mappe"
 
-#: ../mail/mail-ops.c:1706
+#: ../mail/mail-ops.c:1736
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømmer affald i \"%s\""
 
-#: ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1737
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: ../mail/mail-ops.c:1788
+#: ../mail/mail-ops.c:1818
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter brev %s"
 
-#: ../mail/mail-ops.c:1895
+#: ../mail/mail-ops.c:1925
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Henter %d brev"
 msgstr[1] "Henter %d breve"
 
-#: ../mail/mail-ops.c:1980
+#: ../mail/mail-ops.c:2010
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Gemmer %d besked"
 msgstr[1] "Gemmer %d beskeder"
 
-#: ../mail/mail-ops.c:2058
+#: ../mail/mail-ops.c:2088
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15048,11 +15124,11 @@ msgstr ""
 "Fejl under gemning af breve til: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2130
+#: ../mail/mail-ops.c:2160
 msgid "Saving attachment"
 msgstr "Gemmer bilag"
 
-#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
+#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15061,27 +15137,27 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2171
+#: ../mail/mail-ops.c:2201
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kunne ikke skrive data: %s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Afkobler fra %s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2347
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s igen"
 
-#: ../mail/mail-ops.c:2413
+#: ../mail/mail-ops.c:2443
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Forbereder konto \"%s\" til afkoblet tilstand"
 
-#: ../mail/mail-ops.c:2499
+#: ../mail/mail-ops.c:2529
 msgid "Checking Service"
 msgstr "Undersøger tjeneste"
 
@@ -15097,39 +15173,39 @@ msgstr "Send & modtag e-post"
 msgid "Cancel _All"
 msgstr "Afbryd _alle"
 
-#: ../mail/mail-send-recv.c:498
+#: ../mail/mail-send-recv.c:502
 msgid "Updating..."
 msgstr "Opdaterer..."
 
-#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
+#: ../mail/mail-send-recv.c:502 ../mail/mail-send-recv.c:578
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: ../mail/mail-send-recv.c:799
+#: ../mail/mail-send-recv.c:804
 #, c-format
 msgid "Checking for new mail"
 msgstr "Kontrollerer om der er ny e-post"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Indtast løsen for %s"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:211
 msgid "Enter Passphrase"
 msgstr "Indtast løsen"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 #: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Indtast adgangskode for %s"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:216
 msgid "Enter Password"
 msgstr "Indtast adgangskode"
 
-#: ../mail/mail-session.c:256
+#: ../mail/mail-session.c:258
 msgid "User canceled operation."
 msgstr "Operation afbrudt af bruger."
 
@@ -15174,21 +15250,21 @@ msgstr "Ugyldig mappe: \"%s\""
 msgid "Setting up Search Folder: %s"
 msgstr "Opsætter søgemappe: %s"
 
-#: ../mail/mail-vfolder.c:233
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Opdaterer søgemapper for \"%s:%s\""
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:247
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Opdaterer søgemapper for \"%s\""
 
-#: ../mail/mail-vfolder.c:1066
+#: ../mail/mail-vfolder.c:1081
 msgid "Edit Search Folder"
 msgstr "Rediger søgemappe"
 
-#: ../mail/mail-vfolder.c:1155
+#: ../mail/mail-vfolder.c:1170
 msgid "New Search Folder"
 msgstr "Ny søgemappe"
 
@@ -15806,79 +15882,79 @@ msgstr "_Tøm"
 msgid "_Open Messages"
 msgstr "_Åbn breve"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Unseen"
 msgstr "Ulæst"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 msgid "Seen"
 msgstr "Læst"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 msgid "Answered"
 msgstr "Besvaret"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Forwarded"
 msgstr "Videresendt"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1057
 msgid "Multiple Unseen Messages"
 msgstr "Flere ulæste breve"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1058
 msgid "Multiple Messages"
 msgstr "Flere breve"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1062
 msgid "Lowest"
 msgstr "Lavest"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1063
 msgid "Lower"
 msgstr "Lavere"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1067
 msgid "Higher"
 msgstr "Højere"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1068
 msgid "Highest"
 msgstr "Højest"
 
-#: ../mail/message-list.c:1596 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1657 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1603 ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1664 ../plugins/itip-formatter/itip-view.c:203
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "I dag %H:%M"
 
-#: ../mail/message-list.c:1612 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1673 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "I går %H:%M"
 
-#: ../mail/message-list.c:1624 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1685 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1693 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
-#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1695 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3916 ../mail/message-list.c:4376
+#: ../mail/message-list.c:3981 ../mail/message-list.c:4452
 msgid "Generating message list"
 msgstr "Danner brevindeks"
 
-#: ../mail/message-list.c:4224
+#: ../mail/message-list.c:4291
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -15886,7 +15962,7 @@ msgstr ""
 "Ingen beskeder passer til dine søgekriterier. Ryd enten søgningen med "
 "menuvalget Søg->Ryd eller ændr den."
 
-#: ../mail/message-list.c:4226
+#: ../mail/message-list.c:4293
 msgid "There are no messages in this folder."
 msgstr "Der er ingen beskeder i denne mappe."
 
@@ -15919,6 +15995,11 @@ msgstr "Sendte breve"
 msgid "Size"
 msgstr "Størrelse"
 
+#: ../mail/message-list.etspec.h:19
+#, fuzzy
+msgid "Subject - Trimmed"
+msgstr "_Emnefelt"
+
 #: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Ring"
@@ -16007,8 +16088,8 @@ msgstr ""
 "Liste af spor som udvidelsesmodulet til påmindelse om bilag skal kigge efter "
 "i brevkroppen."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:474
-#: ../plugins/templates/templates.c:392
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/templates/templates.c:390
 msgid "Keywords"
 msgstr "Nøgleord"
 
@@ -16042,9 +16123,10 @@ msgid "_Edit Message"
 msgstr "Re_digér brev"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
+#, fuzzy
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from evolution."
+"play them directly from Evolution."
 msgstr ""
 "Et formateringsudvidelsesmodul der viser lyd-bilag indlejret og tillader dig "
 "at afspille dem direkte i Evolution."
@@ -16276,37 +16358,37 @@ msgstr "G_enopret indstillinger..."
 msgid "_Backup Settings..."
 msgstr "_Sikkerhedskopi-indstillinger..."
 
-#: ../plugins/bbdb/bbdb.c:532 ../plugins/bbdb/bbdb.c:541
+#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatisk tilføjede kontaktpersoner"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:556
+#: ../plugins/bbdb/bbdb.c:639
 msgid "_Auto-create address book entries when replying to messages"
 msgstr "Føj kontaktpersoner _automatisk til adressebog ved besvarelse af breve"
 
-#: ../plugins/bbdb/bbdb.c:562
+#: ../plugins/bbdb/bbdb.c:645
 msgid "Select Address book for Automatic Contacts"
 msgstr "Vælg adressebog til automatisk tilføjede kontaktpersoner"
 
-#: ../plugins/bbdb/bbdb.c:577
+#: ../plugins/bbdb/bbdb.c:660
 msgid "Instant Messaging Contacts"
 msgstr "Kvikbesked-kontaktpersoner"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:592
+#: ../plugins/bbdb/bbdb.c:675
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "Synkronisér information om kontaktpersoner og billeder fra en Pidgin-"
 "venneliste"
 
-#: ../plugins/bbdb/bbdb.c:598
+#: ../plugins/bbdb/bbdb.c:681
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Vælg adressebog til Pidgin-venneliste"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:609
+#: ../plugins/bbdb/bbdb.c:692
 msgid "Synchronize with _buddy list now"
 msgstr "Synkronisér med _venneliste nu"
 
@@ -16325,27 +16407,27 @@ msgid "BBDB"
 msgstr "BBDB"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:119
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Fejl opstod under opstart af %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:143
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Bogofilter-underproces svarer ikke, afslutter den..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:145
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Venten på Bogofilter-underproces afbrudt, afslutter den..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Rør til Bogofilter fejlede, fejlkode: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:318
 msgid "Convert message text to _Unicode"
 msgstr "Konvertér brevtekst til _Unicode"
 
@@ -16556,7 +16638,7 @@ msgid "Key"
 msgstr "Nøgle"
 
 #: ../plugins/email-custom-header/email-custom-header.c:892
-#: ../plugins/templates/templates.c:398
+#: ../plugins/templates/templates.c:396
 msgid "Values"
 msgstr "Værdier"
 
@@ -16615,12 +16697,12 @@ msgid "_User:"
 msgstr "_Bruger:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:61
+#: ../plugins/exchange-operations/exchange-account-setup.c:63
 msgid "Secure Password"
 msgstr "Sikker adgangskode"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:64
+#: ../plugins/exchange-operations/exchange-account-setup.c:66
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -16628,11 +16710,11 @@ msgstr ""
 "Dette alternativ vil tilslutte Exchange-serveren ved hjælp af sikker "
 "adgangskode (NTLM)-godkendelse."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:72
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 msgstr "Adgangskode i klartekst"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:76
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -16640,11 +16722,11 @@ msgstr ""
 "Dette alternativ vil tilslutte Exchange-serveren ved hjælp af "
 "standardgodkendelse med adgangskode i klartekst."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:255
+#: ../plugins/exchange-operations/exchange-account-setup.c:263
 msgid "Out Of Office"
 msgstr "Fraværende"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:262
+#: ../plugins/exchange-operations/exchange-account-setup.c:270
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16652,88 +16734,88 @@ msgstr ""
 "Nedenstående brev sendes automatisk til alle som sender dig\n"
 "e-post mens du er borte fra kontoret."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:282
+#: ../plugins/exchange-operations/exchange-account-setup.c:287
 msgid "I am out of the office"
 msgstr "Jeg er ikke på kontoret"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
+#: ../plugins/exchange-operations/exchange-account-setup.c:283
+#: ../plugins/exchange-operations/exchange-account-setup.c:286
 msgid "I am in the office"
 msgstr "Jeg er på kontoret"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:334
 msgid "Change the password for Exchange account"
 msgstr "Skift adgangskoden for Exchange-konto"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:336
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Skift adgangskode"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:341
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Håndtér uddelegerings-indstillinger for Exchange-konto"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:343
 msgid "Delegation Assistant"
 msgstr "Delegeringsassistent"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
+#: ../plugins/exchange-operations/exchange-account-setup.c:355
 msgid "Miscelleneous"
 msgstr "Diverse"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:365
 msgid "View the size of all Exchange folders"
 msgstr "Vis alle Exchange-mappers størrelse"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:367
 msgid "Folders Size"
 msgstr "Mappestørrelse"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/exchange-account-setup.c:374
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchange-indstillinger"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:688
+#: ../plugins/exchange-operations/exchange-account-setup.c:696
 msgid "_OWA URL:"
 msgstr "_OWA-adresse:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:714
+#: ../plugins/exchange-operations/exchange-account-setup.c:722
 msgid "A_uthenticate"
 msgstr "_Godkend"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#: ../plugins/exchange-operations/exchange-account-setup.c:743
 msgid "_Mailbox:"
 msgstr "_Brevbakke"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:944
 msgid "_Authentication Type"
 msgstr "_Godkendelsestype"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:950
+#: ../plugins/exchange-operations/exchange-account-setup.c:958
 msgid "Ch_eck for Supported Types"
 msgstr "_Søg efter understøttede typer"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1062
-#: ../plugins/exchange-operations/exchange-contacts.c:212
+#: ../plugins/exchange-operations/exchange-account-setup.c:1073
+#: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s Kb"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1064
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-account-setup.c:1075
+#: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 kB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:165
+#: ../plugins/exchange-operations/exchange-calendar.c:196
+#: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -16777,32 +16859,32 @@ msgstr "Din nuværende adgangskode er udløbet. Skift din adgangskode nu."
 msgid "Your password will expire in the next %d days"
 msgstr "Din adgangskode vil udløbe indenfor de næste %d dage"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-delegates-user.c:154
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "Tilpasset"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:182
+#: ../plugins/exchange-operations/exchange-delegates-user.c:184
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Redaktør (læs, opret, redigér)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:186
+#: ../plugins/exchange-operations/exchange-delegates-user.c:188
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Forfatter (læs, opret)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+#: ../plugins/exchange-operations/exchange-delegates-user.c:192
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Gennemlæser (skrivebeskyttet)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:240
+#: ../plugins/exchange-operations/exchange-delegates-user.c:242
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Rettigheder for delegater"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-delegates-user.c:253
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
@@ -16811,7 +16893,7 @@ msgstr "Rettigheder for %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:341
+#: ../plugins/exchange-operations/exchange-delegates-user.c:343
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -16821,25 +16903,25 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:346
+#: ../plugins/exchange-operations/exchange-delegates-user.c:348
 msgid "You have been given the following permissions on my folders:"
 msgstr "Du har fået tildelt følgende rettigheder over mine mapper:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:364
+#: ../plugins/exchange-operations/exchange-delegates-user.c:366
 msgid "You are also permitted to see my private items."
 msgstr "Du har også lov til at se mine private objekter."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+#: ../plugins/exchange-operations/exchange-delegates-user.c:373
 msgid "However you are not permitted to see my private items."
 msgstr "Men du har ikke lov til at se mine private objekter."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:403
+#: ../plugins/exchange-operations/exchange-delegates-user.c:405
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "Du er blevet udnævnt som delegat for %s"
@@ -17042,7 +17124,7 @@ msgstr "Tilføj bruger:"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:934
+#: ../plugins/groupwise-features/proxy.c:937
 #: ../plugins/groupwise-features/share-folder.c:716
 msgid "Add User"
 msgstr "Tilføj bruger"
@@ -17325,7 +17407,7 @@ msgid "Folder offline"
 msgstr "Arbejder afkoblet"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1306
+#: ../shell/e-shell.c:1270
 msgid "Generic error"
 msgstr "Generel fejl"
 
@@ -17674,7 +17756,8 @@ msgid "<b>Server</b>"
 msgstr "<b>Server</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar and contacts."
+#, fuzzy
+msgid "A plugin to setup Google Calendar and Contacts."
 msgstr ""
 "Et udvidelsesmodul til opsætning af google-kalender og -kontaktpersoner."
 
@@ -17687,12 +17770,14 @@ msgid "Checklist"
 msgstr "Afkrydsningsliste"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup groupwise calendar and contacts sources."
+#, fuzzy
+msgid "A plugin to setup GroupWise calendar and contacts sources."
 msgstr ""
 "Et udvidelsesmodul til opsætning af groupwise-kalender og kontaktkilder."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "Groupwise Account Setup"
+#, fuzzy
+msgid "GroupWise Account Setup"
 msgstr "GroupWise-kontoopsætning"
 
 #: ../plugins/groupwise-features/install-shared.c:220
@@ -17750,7 +17835,7 @@ msgid "Email:"
 msgstr "E-post:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
+#: ../plugins/mail-account-disable/mail-account-disable.c:45
 msgid "_Disable"
 msgstr "_Deaktivér"
 
@@ -17783,15 +17868,18 @@ msgid "Retract Mail"
 msgstr "Tilbagetræk brev"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to groupwise messages"
+#, fuzzy
+msgid "Add Send Options to GroupWise messages"
 msgstr "Føj afsendelsesindstillinger til Groupwise-beskeder"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in Groupwise accounts."
+#, fuzzy
+msgid "A plugin for the features in GroupWise accounts."
 msgstr "Et udvidelsesmodul til faciliteterne i GroupWise-konti."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "Groupwise Features"
+#, fuzzy
+msgid "GroupWise Features"
 msgstr "GroupWise-faciliteter"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
@@ -17808,20 +17896,23 @@ msgstr "Serveren tillod ikke at det valgte brev kunne tilbagetrækkes."
 msgid "Invalid user"
 msgstr "Ugyldig bruger"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "Proxyadgang kan ikke gives til bruger &quot;{0}&quot;."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
 msgid "Specify User"
 msgstr "Specificér bruger"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:6
 msgid "You have already given proxy permissions to this user."
 msgstr "Du har allerede tildelt denne bruger proxytilladelser."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr "Du skal angive et gyldigt brugernavn for at tildele proxyrettigheder."
 
@@ -17846,20 +17937,24 @@ msgstr ""
 msgid "This is a recurring meeting"
 msgstr "Dette er et tilbagevendende møde"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
 msgid "Would you like to accept it?"
 msgstr "Accepterer du?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "Would you like to decline it?"
 msgstr "Afviser du?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
-msgid "You cannot share folder with specified user &quot;{0}&quot;"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
+#, fuzzy
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
 msgstr "Du kan ikke dele en mappe med brugeren &quot;{0}&quot;"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
-msgid "You have to specify a user name whom you want to add to the list"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
+#, fuzzy
+msgid "You have to specify a user name which you want to add to the list"
 msgstr "Du skal angive et brugernavn, som du vil tilføje til listen"
 
 #: ../plugins/groupwise-features/process-meeting.c:52
@@ -17960,8 +18055,8 @@ msgstr "<b>Kontonavn</b>"
 msgid "Proxy Login"
 msgstr "Logind på proxy"
 
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy-login.c:206
+#: ../plugins/groupwise-features/proxy-login.c:248
 #: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:85
 #, c-format
@@ -17971,18 +18066,24 @@ msgstr "%sIndtast adgangskode for %s (bruger %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:509
+#: ../plugins/groupwise-features/proxy-login.c:510
 msgid "_Proxy Login..."
 msgstr "_Proxylogind..."
 
-#: ../plugins/groupwise-features/proxy.c:691
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:692
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Proxy-fanebladet vil kun være tilgængeligt når kontoen er opkoblet."
 
-#: ../plugins/groupwise-features/proxy.c:696
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Proxy-fanebladet vil kun være tilgængeligt når kontoen er aktiveret."
 
+#: ../plugins/groupwise-features/send-options.c:214
+msgid "Advanced send options"
+msgstr "Avancerede afsendelsesindstillinger"
+
 #: ../plugins/groupwise-features/share-folder-common.c:321
 #: ../plugins/groupwise-features/share-folder.c:751
 msgid "Users"
@@ -18209,130 +18310,130 @@ msgstr "Synkronisér med iPod"
 msgid "iPod Synchronization"
 msgstr "iPod-synkronisering"
 
-#: ../plugins/itip-formatter/itip-formatter.c:443
-#: ../plugins/itip-formatter/itip-formatter.c:568
+#: ../plugins/itip-formatter/itip-formatter.c:481
+#: ../plugins/itip-formatter/itip-formatter.c:606
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Kunne ikke indlæse kalenderen \"%s\""
 
-#: ../plugins/itip-formatter/itip-formatter.c:588
+#: ../plugins/itip-formatter/itip-formatter.c:626
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "En aftale i kalenderen \"%s\" er i konflikt med dette møde"
 
-#: ../plugins/itip-formatter/itip-formatter.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:652
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Fandt aftalen i kalenderen \"%s\""
 
-#: ../plugins/itip-formatter/itip-formatter.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:738
 msgid "Unable to find any calendars"
 msgstr "Kunne ikke finde nogen kalendere"
 
-#: ../plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:745
 msgid "Unable to find this meeting in any calendar"
 msgstr "Kunne ikke finde dette møde i nogen kalender"
 
-#: ../plugins/itip-formatter/itip-formatter.c:701
+#: ../plugins/itip-formatter/itip-formatter.c:749
 msgid "Unable to find this task in any task list"
 msgstr "Kunne ikke finde denne opgave i nogen opgaveliste"
 
-#: ../plugins/itip-formatter/itip-formatter.c:705
+#: ../plugins/itip-formatter/itip-formatter.c:753
 msgid "Unable to find this memo in any memo list"
 msgstr "Kunne ikke finde denne huskeseddel i nogen huskeseddelliste"
 
-#: ../plugins/itip-formatter/itip-formatter.c:776
+#: ../plugins/itip-formatter/itip-formatter.c:824
 msgid "Searching for an existing version of this appointment"
 msgstr "Søger efter en eksisterende udgave af denne aftale"
 
-#: ../plugins/itip-formatter/itip-formatter.c:945
+#: ../plugins/itip-formatter/itip-formatter.c:993
 msgid "Unable to parse item"
 msgstr "Kan ikke fortolke elementet"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1003
+#: ../plugins/itip-formatter/itip-formatter.c:1051
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kan ikke sende elementet til kalenderen \"%s\". %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1015
+#: ../plugins/itip-formatter/itip-formatter.c:1063
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sendt til kalenderen \"%s\" som accepteret"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1067
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sendt forsøgsvist til kalenderen \"%s\""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1072
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sendt til kalenderen \"%s\" som afslået"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1029
+#: ../plugins/itip-formatter/itip-formatter.c:1077
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Sendt til kalenderen \"%s\" som annulleret"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1171
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organisator har fjernet delegat %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1178
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Sendte en aflysningsnotits til delegaten"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1180
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Kunne ikke sende en aflysningsnotits til delegaten"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1218
+#: ../plugins/itip-formatter/itip-formatter.c:1266
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Deltagerstatus kunne ikke opdateres pga. ugyldig status"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1245
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Kunne ikke opdatere deltager. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1249
+#: ../plugins/itip-formatter/itip-formatter.c:1297
 msgid "Attendee status updated"
 msgstr "Deltagerstatus opdateret"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1323
 msgid "Meeting information sent"
 msgstr "Mødeinformation afsendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1326
 msgid "Task information sent"
 msgstr "Opgaveinformation afsendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1329
 msgid "Memo information sent"
 msgstr "Huskeseddel-information afsendt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1338
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Ude af stand til at sende mødeinformation, mødet eksisterer ikke"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1293
+#: ../plugins/itip-formatter/itip-formatter.c:1341
 msgid "Unable to send task information, the task does not exist"
 msgstr "Ude af stand til at sende opgaveinformation, opgaven eksisterer ikke"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1296
+#: ../plugins/itip-formatter/itip-formatter.c:1344
 msgid "Unable to send memo information, the memo does not exist"
 msgstr ""
 "Ude af stand til at sende huskeseddel-information, huskesedlen eksisterer "
 "ikke"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1365
-#: ../plugins/itip-formatter/itip-formatter.c:1376
+#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1424
 msgid "The calendar attached is not valid"
 msgstr "Den vedlagte kalender er ikke gyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1414
+#: ../plugins/itip-formatter/itip-formatter.c:1425
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18340,15 +18441,15 @@ msgstr ""
 "Brevet påstår at indeholde en kalender, men kalenderen er ikke i et gyldigt "
 "iCalender-format."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
-#: ../plugins/itip-formatter/itip-formatter.c:1435
-#: ../plugins/itip-formatter/itip-formatter.c:1517
+#: ../plugins/itip-formatter/itip-formatter.c:1465
+#: ../plugins/itip-formatter/itip-formatter.c:1493
+#: ../plugins/itip-formatter/itip-formatter.c:1575
 msgid "The item in the calendar is not valid"
 msgstr "Posten i kalenderen er ikke gyldig"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1418
-#: ../plugins/itip-formatter/itip-formatter.c:1436
-#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1466
+#: ../plugins/itip-formatter/itip-formatter.c:1494
+#: ../plugins/itip-formatter/itip-formatter.c:1576
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18356,11 +18457,11 @@ msgstr ""
 "Brevet indeholder en kalender, men kalenderen indeholder ikke nogen "
 "begivenheder eller ledig/optaget-information"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1447
+#: ../plugins/itip-formatter/itip-formatter.c:1505
 msgid "The calendar attached contains multiple items"
 msgstr "Den vedlagte kalender indeholder flere punkter"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1506
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18368,31 +18469,31 @@ msgstr ""
 "For at gennemarbejde alle disse punkter skal filen gemmes og kalenderen "
 "importeres"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2148
+#: ../plugins/itip-formatter/itip-formatter.c:2215
 msgid "This meeting recurs"
 msgstr "Dette møde er tilbagevendende"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2218
 msgid "This task recurs"
 msgstr "Denne opgave er tilbagevendende"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2221
 msgid "This memo recurs"
 msgstr "Denne huskeseddel er tilbagevendende"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2383
+#: ../plugins/itip-formatter/itip-formatter.c:2457
 msgid "_Delete message after acting"
 msgstr "_Slet brev efter handling"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2393
-#: ../plugins/itip-formatter/itip-formatter.c:2425
+#: ../plugins/itip-formatter/itip-formatter.c:2467
+#: ../plugins/itip-formatter/itip-formatter.c:2499
 msgid "Conflict Search"
 msgstr "Konfliktsøgning"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2408
+#: ../plugins/itip-formatter/itip-formatter.c:2482
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Vælg kalendere for at søge efter mødekonflikter"
 
@@ -18859,11 +18960,11 @@ msgstr "An_vend på alle forekomster"
 msgid "Show time as _free"
 msgstr "Vis tid som _fri"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1870
 msgid "_Tasks :"
 msgstr "_Opgaver :"
 
-#: ../plugins/itip-formatter/itip-view.c:1854
+#: ../plugins/itip-formatter/itip-view.c:1872
 msgid "Memos :"
 msgstr "Huskesedler :"
 
@@ -18894,7 +18995,7 @@ msgstr ""
 "Dette svar er ikke fra en nuværende mødedeltager. Tilføj afsender som "
 "mødedeltager?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:47
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "Proxy _Logout"
 msgstr "Logud af _proxy"
 
@@ -19318,22 +19419,6 @@ msgstr "Markér _breve som læst"
 msgid "Used for marking all the messages under a folder as read"
 msgstr "Bruges til at markere alle breve i en mappe som læste"
 
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
-msgid "Mark calendar offline"
-msgstr "Markér kalender som afkoblet"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-msgid "Marks the selected calendar for offline viewing."
-msgstr "Markér den valgte kalender til afkoblet visning."
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make available for offline use"
-msgstr "Gør _ikke tilgængelig i afkoblet tilstand"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Make available for offline use"
-msgstr "_Gør tilgængelig i afkoblet tilstand"
-
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
 msgstr "Et udvidelsesmodul som muliggør Mono-udvidelsesmoduler."
@@ -19444,8 +19529,9 @@ msgstr "Steder"
 msgid "_Publish Calendar Information"
 msgstr "Information om kalender-_offentliggørelse"
 
-#: ../plugins/publish-calendar/publish-calendar.c:595
-msgid "Are you sure you want to remove this URL?"
+#: ../plugins/publish-calendar/publish-calendar.c:596
+#, fuzzy
+msgid "Are you sure you want to remove this location?"
 msgstr "Er du sikker på du vil slette denne adresse?"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
@@ -19483,8 +19569,9 @@ msgid "Publishing _Frequency:"
 msgstr "Offentliggørelses_hyppighed:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
+#, fuzzy
 msgid ""
-"SSH\n"
+"Secure FTP (SSH)\n"
 "Public FTP\n"
 "FTP (with login)\n"
 "Windows share\n"
@@ -19551,7 +19638,8 @@ msgstr ""
 "(EPlugin)."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using python."
+#, fuzzy
+msgid "A plugin which loads other plugins written using Python."
 msgstr ""
 "Et udvidelsesmodul som indlæser andre udvidelsesmoduler som er skrevet i "
 "Python."
@@ -19560,51 +19648,51 @@ msgstr ""
 msgid "Python Loader"
 msgstr "Python-indlæsningsinstans"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (indbygget)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin ikke fundet, kode: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Kunne ikke danne rør: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Fejl efter forgrening: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "SpamAssassin-underproces svarer ikke, afslutter den..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
-#, c-format
-msgid "Wait for Spamassassin child process interrupted, terminating..."
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
+#, fuzzy, c-format
+msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Venten på SpamAssassin-underproces afbrudt, afslutter den..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Rør til SpamAssassin fejlede, fejlkode: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "SpamAssassin er ikke tilgængelig."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Dette vil gøre SpamAssassin mere pålidelig, men langsommere"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
 msgid "I_nclude remote tests"
 msgstr "_Inkludér fjerntest"
 
@@ -19617,12 +19705,13 @@ msgstr ""
 "SpamAssassin er installeret."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin junk plugin"
-msgstr "SpamAssassin-udvidelsesmodul til spam"
+#, fuzzy
+msgid "SpamAssassin Options"
+msgstr "Spamassassin-indstillinger"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "Spamassassin Options"
-msgstr "Spamassassin-indstillinger"
+msgid "SpamAssassin junk plugin"
+msgstr "SpamAssassin-udvidelsesmodul til spam"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
@@ -19863,15 +19952,15 @@ msgstr ""
 "Liste af nøgleord/værdi-par som skabelonudvidelsesmodulet kan substituere "
 "ind i en brevkrop."
 
-#: ../plugins/templates/templates.c:613
+#: ../plugins/templates/templates.c:603
 msgid "No title"
 msgstr "Ingen titel"
 
-#: ../plugins/templates/templates.c:741
+#: ../plugins/templates/templates.c:711
 msgid "Save as _Template"
 msgstr "Gem som _skabelon"
 
-#: ../plugins/templates/templates.c:743
+#: ../plugins/templates/templates.c:713
 msgid "Save as Template"
 msgstr "Gem som skabelon"
 
@@ -19880,7 +19969,8 @@ msgid "Drafts based template plugin"
 msgstr "Kladdebaseret skabelonudvidelsesmodul"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses ytnef to decode tnef attachments."
+#, fuzzy
+msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
 msgstr "Et simpelt udvidelsesmodul som bruger ytnef til at afkode tnef bilag."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
@@ -19906,7 +19996,8 @@ msgid "URL:"
 msgstr "URL:"
 
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
-msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
+#, fuzzy
+msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Undgå IfMatch (påkrævet i apache < 2.2.8)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
@@ -20267,7 +20358,7 @@ msgstr "Evolution-indstillinger"
 
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:328
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -20320,19 +20411,19 @@ msgstr "Evolutions webside"
 msgid "Error opening the FAQ webpage."
 msgstr "Fejl under åbning af OSS-websiden."
 
-#: ../shell/e-shell-window-commands.c:1168
+#: ../shell/e-shell-window-commands.c:1174
 msgid "_Work Online"
 msgstr "_Arbejd opkoblet"
 
-#: ../shell/e-shell-window-commands.c:1181 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1187 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Ar_bejd afkoblet"
 
-#: ../shell/e-shell-window-commands.c:1194
+#: ../shell/e-shell-window-commands.c:1200
 msgid "Work Offline"
 msgstr "Arbejd afkoblet"
 
-#: ../shell/e-shell-window.c:381
+#: ../shell/e-shell-window.c:377
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -20340,11 +20431,11 @@ msgstr ""
 "Evolution er nu opkoblet.\n"
 "Klik på denne knap for at arbejde afkoblet."
 
-#: ../shell/e-shell-window.c:388
+#: ../shell/e-shell-window.c:384
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution er i færd med at afkoble."
 
-#: ../shell/e-shell-window.c:395
+#: ../shell/e-shell-window.c:391
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -20352,7 +20443,7 @@ msgstr ""
 "Evolution er nu afkoblet.\n"
 "Klik på denne knap for at arbejde opkoblet."
 
-#: ../shell/e-shell-window.c:786
+#: ../shell/e-shell-window.c:787
 #, c-format
 msgid "Switch to %s"
 msgstr "Skift til %s"
@@ -20366,19 +20457,19 @@ msgstr "Ukendt systemfejl."
 msgid "%ld KB"
 msgstr "%ld kB"
 
-#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
+#: ../shell/e-shell.c:1262 ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "O.k."
 
-#: ../shell/e-shell.c:1300
+#: ../shell/e-shell.c:1264
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: ../shell/e-shell.c:1302
+#: ../shell/e-shell.c:1266
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: ../shell/e-shell.c:1304
+#: ../shell/e-shell.c:1268
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabase ikke fundet"
 
@@ -20417,8 +20508,9 @@ msgid "Importer Type"
 msgstr "Importér type"
 
 #: ../shell/import.glade.h:6
-msgid "Select Importers"
-msgstr "Vælg importører"
+#, fuzzy
+msgid "Select Information to Import"
+msgstr "Vælg mappen der skal importeres til"
 
 #: ../shell/import.glade.h:7
 msgid "Select a File"
@@ -20532,18 +20624,22 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Er du sikker på du vil glemme alle huskede adgangskoder?"
 
 #: ../shell/shell.error.xml.h:2
+msgid "Cannot start Evolution"
+msgstr "Kan ikke starte Evolution"
+
+#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "Fortsæt"
 
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
 msgid "Delete old data from version {0}?"
 msgstr "Slet gamle data fra version {0}?"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
 msgid "Evolution can not start."
 msgstr "Evolution kan ikke starte."
 
-#: ../shell/shell.error.xml.h:5
+#: ../shell/shell.error.xml.h:6
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
@@ -20551,15 +20647,15 @@ msgstr ""
 "Hvis du \"glemmer\" dine adgangskoder, vil alle huskede adgangskoder blive "
 "fjernet.  Du vil blive spurgt igen, næste gang der er brug for dem."
 
-#: ../shell/shell.error.xml.h:7
+#: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
 msgstr "Der er ikke nok diskplads til opgraderingen."
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:9
 msgid "Really delete old data?"
 msgstr "Skal gamle data virkelig slettes?"
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -20581,9 +20677,10 @@ msgstr ""
 "Når dataene er slettet, kan du ikke nedgradere til en tidligere version af "
 "Evolution, uden manuel indgriben.\n"
 
-#: ../shell/shell.error.xml.h:15
+#: ../shell/shell.error.xml.h:16
+#, fuzzy
 msgid ""
-"The previous version of evolution stored its data in a different location.\n"
+"The previous version of Evolution stored its data in a different location.\n"
 "\n"
 "If you choose to remove this data, the entire contents of the &quot;"
 "evolution&quot; directory will be removed permanently. If you choose to keep "
@@ -20597,11 +20694,11 @@ msgstr ""
 "disse data, kan du manuelt fjerne indholdet af &quot;evolution&quot; når du "
 "har lyst.\n"
 
-#: ../shell/shell.error.xml.h:19
+#: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
 msgstr "Opgradering fra forrige version mislykkedes: {0}"
 
-#: ../shell/shell.error.xml.h:20
+#: ../shell/shell.error.xml.h:21
 msgid ""
 "Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
@@ -20614,7 +20711,7 @@ msgstr ""
 "\n"
 "Du må gøre mere plads tilgængelig i dit hjemmekatalog før du kan fortsætte."
 
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:24
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
@@ -20624,7 +20721,7 @@ msgstr ""
 "\n"
 "Klik på hjælp for detaljer"
 
-#: ../shell/shell.error.xml.h:26
+#: ../shell/shell.error.xml.h:27
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -20638,19 +20735,19 @@ msgstr ""
 "\n"
 "Klik på hjælp for detaljer."
 
-#: ../shell/shell.error.xml.h:31
+#: ../shell/shell.error.xml.h:32
 msgid "_Forget"
 msgstr "_Glem"
 
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:33
 msgid "_Keep Data"
 msgstr "_Behold data"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:34
 msgid "_Remind Me Later"
 msgstr "_Påmind mig senere"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:35
 msgid ""
 "{1}\n"
 "\n"
@@ -20721,7 +20818,7 @@ msgid "Purposes"
 msgstr "Formål"
 
 #: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:570
+#: ../smime/lib/e-cert.c:553
 msgid "Serial Number"
 msgstr "Serienummer"
 
@@ -20839,7 +20936,7 @@ msgstr ""
 "Før du stoler på denne CA til noget formål, bør du undersøge dens "
 "certifikat, regelsæt og procedurer (hvis de er tilgængelige)."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
 msgid "Certificate"
 msgstr "Certifikat"
 
@@ -20915,11 +21012,11 @@ msgstr "Organisationsenhed (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1-fingeraftryk"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
 msgid "SSL Client Certificate"
 msgstr "Certifikat for SSL-klient"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
 msgid "SSL Server Certificate"
 msgstr "Certifikat for SSL-server"
 
@@ -20966,182 +21063,182 @@ msgid "_Edit CA Trust"
 msgstr "_Redigér troværdighed for certificeringsmyndighed"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:672
+#: ../smime/lib/e-cert-db.c:656
 msgid "Certificate already exists"
 msgstr "Certifikatet findes allerede"
 
-#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:408
 msgid "Sign"
 msgstr "Underskriv"
 
-#: ../smime/lib/e-cert.c:426
+#: ../smime/lib/e-cert.c:409
 msgid "Encrypt"
 msgstr "Kryptér"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:514
 msgid "Version"
 msgstr "Version"
 
-#: ../smime/lib/e-cert.c:546
+#: ../smime/lib/e-cert.c:529
 msgid "Version 1"
 msgstr "Version 1"
 
-#: ../smime/lib/e-cert.c:549
+#: ../smime/lib/e-cert.c:532
 msgid "Version 2"
 msgstr "Version 2"
 
-#: ../smime/lib/e-cert.c:552
+#: ../smime/lib/e-cert.c:535
 msgid "Version 3"
 msgstr "Version 3"
 
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-cert.c:617
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 med RSA-kryptering"
 
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-cert.c:620
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 med RSA-kryptering"
 
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-cert.c:623
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 med RSA-kryptering"
 
-#: ../smime/lib/e-cert.c:667
+#: ../smime/lib/e-cert.c:650
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA-kryptering"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:653
 msgid "Certificate Key Usage"
 msgstr "Certifikat-nøglebenyttelse"
 
-#: ../smime/lib/e-cert.c:673
+#: ../smime/lib/e-cert.c:656
 msgid "Netscape Certificate Type"
 msgstr "Netscape certifikat-type"
 
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:659
 msgid "Certificate Authority Key Identifier"
 msgstr "Certificeringsmyndighed til nøgleidentifikation"
 
-#: ../smime/lib/e-cert.c:688
+#: ../smime/lib/e-cert.c:671
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Objekt-identifikation (%s)"
 
-#: ../smime/lib/e-cert.c:739
+#: ../smime/lib/e-cert.c:722
 msgid "Algorithm Identifier"
 msgstr "Algoritme-identifikation"
 
-#: ../smime/lib/e-cert.c:747
+#: ../smime/lib/e-cert.c:730
 msgid "Algorithm Parameters"
 msgstr "Parametre for algoritme"
 
-#: ../smime/lib/e-cert.c:769
+#: ../smime/lib/e-cert.c:752
 msgid "Subject Public Key Info"
 msgstr "Information om emnets offentlige nøgle"
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:757
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritme for emnets offentlige nøgle"
 
-#: ../smime/lib/e-cert.c:789
+#: ../smime/lib/e-cert.c:772
 msgid "Subject's Public Key"
 msgstr "Emnets offentlige nøgle"
 
-#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
 msgid "Error: Unable to process extension"
 msgstr "Fejl: Kan ikke behandle udvidelsen"
 
-#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
 msgid "Object Signer"
 msgstr "Indehaver af signatur for objekt"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:818
 msgid "SSL Certificate Authority"
 msgstr "SSL-certificeringsmyndighed"
 
-#: ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:822
 msgid "Email Certificate Authority"
 msgstr "E-post-certificeringsmyndighed"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:850
 msgid "Signing"
 msgstr "Underskriver"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:854
 msgid "Non-repudiation"
 msgstr "Ingen-tilbagevisning"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:858
 msgid "Key Encipherment"
 msgstr "Nøgle-kodning"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:862
 msgid "Data Encipherment"
 msgstr "Data-kodning"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:866
 msgid "Key Agreement"
 msgstr "Nøgle-aftale"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:870
 msgid "Certificate Signer"
 msgstr "Certifikat for indehaver af signatur"
 
-#: ../smime/lib/e-cert.c:891
+#: ../smime/lib/e-cert.c:874
 msgid "CRL Signer"
 msgstr "Indehaver af CRL-signatur"
 
-#: ../smime/lib/e-cert.c:939
+#: ../smime/lib/e-cert.c:922
 msgid "Critical"
 msgstr "Kritisk"
 
-#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
 msgid "Not Critical"
 msgstr "Ukritisk"
 
-#: ../smime/lib/e-cert.c:965
+#: ../smime/lib/e-cert.c:948
 msgid "Extensions"
 msgstr "Udvidelser"
 
-#: ../smime/lib/e-cert.c:1036
+#: ../smime/lib/e-cert.c:1019
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
+#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
 msgid "Certificate Signature Algorithm"
 msgstr "Certifikat-signaturalgoritme"
 
-#: ../smime/lib/e-cert.c:1101
+#: ../smime/lib/e-cert.c:1084
 msgid "Issuer"
 msgstr "Udsteder"
 
-#: ../smime/lib/e-cert.c:1155
+#: ../smime/lib/e-cert.c:1138
 msgid "Issuer Unique ID"
 msgstr "Unik id for udsteder"
 
-#: ../smime/lib/e-cert.c:1174
+#: ../smime/lib/e-cert.c:1157
 msgid "Subject Unique ID"
 msgstr "Emnets entydige id"
 
-#: ../smime/lib/e-cert.c:1217
+#: ../smime/lib/e-cert.c:1200
 msgid "Certificate Signature Value"
 msgstr "Certifikat-signaturværdi"
 
-#: ../smime/lib/e-pkcs12.c:244
+#: ../smime/lib/e-pkcs12.c:249
 msgid "PKCS12 File Password"
 msgstr "Adgangskode for PKCS12-fil"
 
-#: ../smime/lib/e-pkcs12.c:244
+#: ../smime/lib/e-pkcs12.c:249
 msgid "Enter password for PKCS12 file:"
 msgstr "Indtast adgangskode for PKCS12-filen:"
 
-#: ../smime/lib/e-pkcs12.c:343
+#: ../smime/lib/e-pkcs12.c:348
 msgid "Imported Certificate"
 msgstr "Importeret certifikat"
 
@@ -21277,7 +21374,7 @@ msgstr "Gem valgte kontaktpersoner som et VCard."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Gem kontaktpersonerne i den valgte mappe som et VCard"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2724
 msgid "Select All"
 msgstr "Marker alt"
 
@@ -22601,7 +22698,7 @@ msgid "Define Views for \"%s\""
 msgstr "Definér oversigter for \"%s\""
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1922
+#: ../widgets/table/e-table-header-item.c:1921
 #: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
@@ -22687,13 +22784,13 @@ msgstr "Type af oversigt:"
 msgid "Attachment Bar"
 msgstr "Bilagslinje"
 
-#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
-#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
+#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
+#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Kan ikke vedlægge fil %s: %s"
 
-#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
+#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Kan ikke vedlægge fil %s: ikke en almindelig fil"
@@ -22723,63 +22820,63 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "Månedskalender"
 
-#: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
-#: ../widgets/text/e-text.c:3644
+#: ../widgets/misc/e-canvas-background.c:454
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3644
+#: ../widgets/text/e-text.c:3645
 msgid "Fill color"
 msgstr "Udfyldningsfarve"
 
-#: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
-#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
-#: ../widgets/text/e-text.c:3659
+#: ../widgets/misc/e-canvas-background.c:462
+#: ../widgets/misc/e-canvas-background.c:468
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3651
+#: ../widgets/text/e-text.c:3652 ../widgets/text/e-text.c:3659
+#: ../widgets/text/e-text.c:3660
 msgid "GDK fill color"
 msgstr "GDK-udfyldningsfarve"
 
-#: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
-#: ../widgets/text/e-text.c:3666
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3666
+#: ../widgets/text/e-text.c:3667
 msgid "Fill stipple"
 msgstr "Udfyldningssting"
 
-#: ../widgets/misc/e-canvas-background.c:481
 #: ../widgets/misc/e-canvas-background.c:482
+#: ../widgets/misc/e-canvas-background.c:483
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:488
 #: ../widgets/misc/e-canvas-background.c:489
+#: ../widgets/misc/e-canvas-background.c:490
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:495
 #: ../widgets/misc/e-canvas-background.c:496
+#: ../widgets/misc/e-canvas-background.c:497
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:502
 #: ../widgets/misc/e-canvas-background.c:503
+#: ../widgets/misc/e-canvas-background.c:504
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1426
+#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
 #: ../widgets/table/e-table-group-container.c:999
 #: ../widgets/table/e-table-group-leaf.c:644
-#: ../widgets/table/e-table-item.c:3074
+#: ../widgets/table/e-table-item.c:3070
 msgid "Minimum width"
 msgstr "Min. bredde"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1427
+#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
 #: ../widgets/table/e-table-group-container.c:1000
 #: ../widgets/table/e-table-group-leaf.c:645
-#: ../widgets/table/e-table-item.c:3075
+#: ../widgets/table/e-table-item.c:3071
 msgid "Minimum Width"
 msgstr "Mindste bredde"
 
 #: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:204
+#: ../widgets/misc/e-expander.c:206
 msgid "Spacing"
 msgstr "Mellemrum"
 
@@ -22891,55 +22988,55 @@ msgstr "Andre..."
 msgid "Ch_aracter Encoding"
 msgstr "Tegnk_odning"
 
-#: ../widgets/misc/e-dateedit.c:309
+#: ../widgets/misc/e-dateedit.c:303
 msgid "Date and Time"
 msgstr "Dato og tidspunkt"
 
-#: ../widgets/misc/e-dateedit.c:330
+#: ../widgets/misc/e-dateedit.c:324
 msgid "Text entry to input date"
 msgstr "Tekstindtastningsfelt til indtastning af dato"
 
-#: ../widgets/misc/e-dateedit.c:352
+#: ../widgets/misc/e-dateedit.c:346
 msgid "Click this button to show a calendar"
 msgstr "Klík på denne knap for at vise en kalender"
 
-#: ../widgets/misc/e-dateedit.c:394
+#: ../widgets/misc/e-dateedit.c:388
 msgid "Drop-down combination box to select time"
 msgstr "Rullegardin-kombinationsfelt for valg af tid"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:464
 msgid "No_w"
 msgstr "N_u"
 
-#: ../widgets/misc/e-dateedit.c:476
+#: ../widgets/misc/e-dateedit.c:470
 msgid "_Today"
 msgstr "I _dag"
 
-#: ../widgets/misc/e-dateedit.c:1641
+#: ../widgets/misc/e-dateedit.c:1635
 msgid "Invalid Date Value"
 msgstr "Ugyldig datoværdi"
 
-#: ../widgets/misc/e-dateedit.c:1670
+#: ../widgets/misc/e-dateedit.c:1664
 msgid "Invalid Time Value"
 msgstr "Ugyldig tidsværdi"
 
-#: ../widgets/misc/e-expander.c:180
+#: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
 msgstr "Udvidet"
 
-#: ../widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-expander.c:183
 msgid "Whether or not the expander is expanded"
 msgstr "Om udfolderen er udvidet eller ej"
 
-#: ../widgets/misc/e-expander.c:189
+#: ../widgets/misc/e-expander.c:191
 msgid "Text of the expander's label"
 msgstr "Tekst til mærkning af udfolder"
 
-#: ../widgets/misc/e-expander.c:196
+#: ../widgets/misc/e-expander.c:198
 msgid "Use underline"
 msgstr "Benyt understregning"
 
-#: ../widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:199
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -22947,33 +23044,33 @@ msgstr ""
 "Hvis sat indikerer en understregning i teksten at det næste tegn skal bruges "
 "som genvejstast"
 
-#: ../widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:207
 msgid "Space to put between the label and the child"
 msgstr "Mellemrum mellem etiketten og barnet"
 
-#: ../widgets/misc/e-expander.c:214
+#: ../widgets/misc/e-expander.c:216
 msgid "Label widget"
 msgstr "Grafisk komponent til mærkning"
 
-#: ../widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:217
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 "En grafisk komponent som vises i stedet for den sædvanlige mærkningsliste"
 
 # se næste for forklaring
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3390
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
 msgid "Expander Size"
 msgstr "Pilstørrelse"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3391
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
 msgid "Size of the expander arrow"
 msgstr "Størrelsen af udvidelsespilen"
 
-#: ../widgets/misc/e-expander.c:230
+#: ../widgets/misc/e-expander.c:232
 msgid "Indicator Spacing"
 msgstr "Indikatormellemrum"
 
-#: ../widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:233
 msgid "Spacing around expander arrow"
 msgstr "Mellemrum omkring udviderpil"
 
@@ -23060,15 +23157,15 @@ msgstr "Synkroniser private poster:"
 msgid "Sync Categories:"
 msgstr "Synkroniser kategorier:"
 
-#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
+#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
 msgid "Empty message"
 msgstr "Tomt brev"
 
-#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
+#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
 msgid "Reflow model"
 msgstr "Genstrømsmodel"
 
-#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
+#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
 msgid "Column width"
 msgstr "Kolonnebredde"
 
@@ -23098,8 +23195,8 @@ msgstr "_Tøm"
 msgid "Item ID"
 msgstr "Objekt-id"
 
-#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3565
-#: ../widgets/text/e-text.c:3566
+#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3566
+#: ../widgets/text/e-text.c:3567
 msgid "Text"
 msgstr "Tekst"
 
@@ -23273,19 +23370,19 @@ msgid "_When opened:"
 msgstr "_Ved åbning:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:255
+#: ../widgets/misc/e-task-widget.c:252
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:261
+#: ../widgets/misc/e-task-widget.c:258
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fuldført)"
 
-#: ../widgets/misc/e-url-entry.c:106
+#: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
 msgstr "Klik her for at gå til adresse"
 
@@ -23325,23 +23422,23 @@ msgstr "Kolonne med fokus"
 msgid "Unselected Column"
 msgstr "Umarkeret kolonne"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1807
 msgid "Strikeout Column"
 msgstr "Udstreget kolonne"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1814
 msgid "Underline Column"
 msgstr "Understreget kolonne"
 
-#: ../widgets/table/e-cell-text.c:1822
+#: ../widgets/table/e-cell-text.c:1821
 msgid "Bold Column"
 msgstr "Fed kolonne"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1828
 msgid "Color Column"
 msgstr "Farvet kolonne"
 
-#: ../widgets/table/e-cell-text.c:1843
+#: ../widgets/table/e-cell-text.c:1842
 msgid "BG Color Column"
 msgstr "Kolonnebaggrundsfarve"
 
@@ -23379,7 +23476,7 @@ msgid "A_vailable Fields:"
 msgstr "_Tilgængelige felter:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Ascending"
 msgstr "Stigende"
 
@@ -23392,7 +23489,7 @@ msgid "Clear _All"
 msgstr "Tøm _alt"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Descending"
 msgstr "Faldende"
 
@@ -23455,14 +23552,14 @@ msgstr "_Sortér..."
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
 #: ../widgets/table/e-table-field-chooser-item.c:633
 #: ../widgets/table/e-table-field-chooser.c:66
-#: ../widgets/table/e-table-header-item.c:1887
+#: ../widgets/table/e-table-header-item.c:1886
 msgid "DnD code"
 msgstr "Træk og slip-kode"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
 #: ../widgets/table/e-table-field-chooser-item.c:640
 #: ../widgets/table/e-table-field-chooser.c:73
-#: ../widgets/table/e-table-header-item.c:1901
+#: ../widgets/table/e-table-header-item.c:1900
 msgid "Full Header"
 msgstr "Komplet brevhoved"
 
@@ -23500,7 +23597,7 @@ msgstr[1] "%s (%d punkter)"
 #: ../widgets/table/e-table-group-container.c:923
 #: ../widgets/table/e-table-group-leaf.c:581
 #: ../widgets/table/e-table-group-leaf.c:582
-#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
 msgid "Alternating Row Colors"
 msgstr "Skiftende rækkefarver"
 
@@ -23508,7 +23605,7 @@ msgstr "Skiftende rækkefarver"
 #: ../widgets/table/e-table-group-container.c:930
 #: ../widgets/table/e-table-group-leaf.c:588
 #: ../widgets/table/e-table-group-leaf.c:589
-#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
 #: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
 msgid "Horizontal Draw Grid"
 msgstr "Vandret tegnegitter"
@@ -23517,7 +23614,7 @@ msgstr "Vandret tegnegitter"
 #: ../widgets/table/e-table-group-container.c:937
 #: ../widgets/table/e-table-group-leaf.c:595
 #: ../widgets/table/e-table-group-leaf.c:596
-#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
 #: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
 msgid "Vertical Draw Grid"
 msgstr "Lodret tegnegitter"
@@ -23526,7 +23623,7 @@ msgstr "Lodret tegnegitter"
 #: ../widgets/table/e-table-group-container.c:944
 #: ../widgets/table/e-table-group-leaf.c:602
 #: ../widgets/table/e-table-group-leaf.c:603
-#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
 #: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
 msgid "Draw focus"
 msgstr "Tegn fokus"
@@ -23535,7 +23632,7 @@ msgstr "Tegn fokus"
 #: ../widgets/table/e-table-group-container.c:951
 #: ../widgets/table/e-table-group-leaf.c:609
 #: ../widgets/table/e-table-group-leaf.c:610
-#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
+#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
 msgid "Cursor mode"
 msgstr "Markørtilstand"
 
@@ -23543,7 +23640,7 @@ msgstr "Markørtilstand"
 #: ../widgets/table/e-table-group-container.c:958
 #: ../widgets/table/e-table-group-leaf.c:623
 #: ../widgets/table/e-table-group-leaf.c:624
-#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
 msgid "Selection model"
 msgstr "Markeringsmodel"
 
@@ -23551,8 +23648,8 @@ msgstr "Markeringsmodel"
 #: ../widgets/table/e-table-group-container.c:965
 #: ../widgets/table/e-table-group-leaf.c:616
 #: ../widgets/table/e-table-group-leaf.c:617
-#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
-#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3337
+#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
+#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3337
 #: ../widgets/table/e-tree.c:3338
 msgid "Length Threshold"
 msgstr "Længdetærskel"
@@ -23561,8 +23658,8 @@ msgstr "Længdetærskel"
 #: ../widgets/table/e-table-group-container.c:972
 #: ../widgets/table/e-table-group-leaf.c:658
 #: ../widgets/table/e-table-group-leaf.c:659
-#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
-#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3369
+#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
+#: ../widgets/table/e-table.c:3333 ../widgets/table/e-tree.c:3369
 #: ../widgets/table/e-tree.c:3370
 msgid "Uniform row height"
 msgstr "Ens rækkehøjde"
@@ -23574,96 +23671,96 @@ msgstr "Ens rækkehøjde"
 msgid "Frozen"
 msgstr "Frosset"
 
-#: ../widgets/table/e-table-header-item.c:1453
+#: ../widgets/table/e-table-header-item.c:1452
 msgid "Customize Current View"
 msgstr "Tilpas aktuel oversigt"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1472
 msgid "Sort _Ascending"
 msgstr "Sortér _stigende"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Descending"
 msgstr "Sortér _faldende"
 
-#: ../widgets/table/e-table-header-item.c:1475
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "_Unsort"
 msgstr "_Rod rundt"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Group By This _Field"
 msgstr "Gruppér efter dette _felt"
 
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By _Box"
 msgstr "Gruppér efter _boks"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "Remove This _Column"
 msgstr "Fjern denne _kolonne"
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Add a C_olumn..."
 msgstr "Tilføj k_olonne..."
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1482
 msgid "A_lignment"
 msgstr "J_ustering"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "B_est Fit"
 msgstr "Som passer b_edst"
 
-#: ../widgets/table/e-table-header-item.c:1485
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "Format Column_s..."
 msgstr "Formatér kolonne_r..."
 
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Custo_mize Current View..."
 msgstr "Til_pas aktuel oversigt..."
 
-#: ../widgets/table/e-table-header-item.c:1543
+#: ../widgets/table/e-table-header-item.c:1542
 msgid "_Sort By"
 msgstr "_Sortér efter"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1561
+#: ../widgets/table/e-table-header-item.c:1560
 msgid "_Custom"
 msgstr "_Tilpasset"
 
-#: ../widgets/table/e-table-header-item.c:1894
+#: ../widgets/table/e-table-header-item.c:1893
 msgid "Font Description"
 msgstr "Skrifttypebeskrivelse"
 
-#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-header-item.c:1914
 #: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "Sortér info"
 
-#: ../widgets/table/e-table-header-item.c:1929
+#: ../widgets/table/e-table-header-item.c:1928
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "Træ"
 
-#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
+#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
 msgid "Table header"
 msgstr "Tabelhoved"
 
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
+#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
 msgid "Table model"
 msgstr "Tabelmodel"
 
-#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
+#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
 msgid "Cursor row"
 msgstr "Markørrække"
 
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3376
+#: ../widgets/table/e-table.c:3340 ../widgets/table/e-tree.c:3376
 #: ../widgets/table/e-tree.c:3377
 msgid "Always search"
 msgstr "Søg altid"
 
-#: ../widgets/table/e-table.c:3346
+#: ../widgets/table/e-table.c:3347
 msgid "Use click to add"
 msgstr "Tilføj ved at klikke"
 
@@ -23679,110 +23776,122 @@ msgstr "Retro-udseende"
 msgid "Draw lines and +/- expanders."
 msgstr "Tegn linjer og \"+/-\"-udviderere."
 
-#: ../widgets/text/e-text.c:2735
+#: ../widgets/text/e-text.c:2736
 msgid "Input Methods"
 msgstr "Indtastningsmetoder"
 
-#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
+#: ../widgets/text/e-text.c:3559 ../widgets/text/e-text.c:3560
 msgid "Event Processor"
 msgstr "Begivenhedsbehandler"
 
-#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
+#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3574
 msgid "Bold"
 msgstr "Fed"
 
-#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
+#: ../widgets/text/e-text.c:3580 ../widgets/text/e-text.c:3581
 msgid "Strikeout"
 msgstr "Gennemstreget"
 
-#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
+#: ../widgets/text/e-text.c:3587 ../widgets/text/e-text.c:3588
 msgid "Anchor"
 msgstr "Anker"
 
-#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
+#: ../widgets/text/e-text.c:3595 ../widgets/text/e-text.c:3596
 msgid "Justification"
 msgstr "Justering"
 
-#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
+#: ../widgets/text/e-text.c:3602 ../widgets/text/e-text.c:3603
 msgid "Clip Width"
 msgstr "Klipbredde"
 
-#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
+#: ../widgets/text/e-text.c:3609 ../widgets/text/e-text.c:3610
 msgid "Clip Height"
 msgstr "Kliphøjde"
 
-#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
+#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
 msgid "Clip"
 msgstr "Klip"
 
-#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
+#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624
 msgid "Fill clip rectangle"
 msgstr "Udfyld kliprektangel"
 
-#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
+#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
 msgid "X Offset"
 msgstr "X-forskydning"
 
-#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
+#: ../widgets/text/e-text.c:3637 ../widgets/text/e-text.c:3638
 msgid "Y Offset"
 msgstr "Y-forskydning"
 
-#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
+#: ../widgets/text/e-text.c:3673 ../widgets/text/e-text.c:3674
 msgid "Text width"
 msgstr "Tekstbredde"
 
-#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
+#: ../widgets/text/e-text.c:3680 ../widgets/text/e-text.c:3681
 msgid "Text height"
 msgstr "Teksthøjde"
 
-#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Use ellipsis"
 msgstr "Benyt tre prikker"
 
-#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Ellipsis"
 msgstr "Tre prikker"
 
-#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Line wrap"
 msgstr "Linjeombrydning"
 
-#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Break characters"
 msgstr "Ombryd tegn"
 
-#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Max lines"
 msgstr "Maks. linjer"
 
-#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3745 ../widgets/text/e-text.c:3746
 msgid "Draw borders"
 msgstr "Tegn kanter"
 
-#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3752 ../widgets/text/e-text.c:3753
 msgid "Allow newlines"
 msgstr "Tillad linjeskift"
 
-#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3759 ../widgets/text/e-text.c:3760
 msgid "Draw background"
 msgstr "Tegn baggrund"
 
-#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3767
 msgid "Draw button"
 msgstr "Tegn knap"
 
-#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
+#: ../widgets/text/e-text.c:3773 ../widgets/text/e-text.c:3774
 msgid "Cursor position"
 msgstr "Markørposition"
 
-#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
+#: ../widgets/text/e-text.c:3780 ../widgets/text/e-text.c:3781
 msgid "IM Context"
 msgstr "IM-kontekst"
 
-#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
+#: ../widgets/text/e-text.c:3787 ../widgets/text/e-text.c:3788
 msgid "Handle Popup"
 msgstr "Håndtagspopop"
 
+#~ msgid "A_dd Filter Criteria"
+#~ msgstr "T_ilføj filterregler"
+
+#~ msgid "Mark calendar offline"
+#~ msgstr "Markér kalender som afkoblet"
+
+#~ msgid "Marks the selected calendar for offline viewing."
+#~ msgstr "Markér den valgte kalender til afkoblet visning."
+
+#~ msgid "Select Importers"
+#~ msgstr "Vælg importører"
+
 #~ msgctxt "New"
 #~ msgid "_Contact"
 #~ msgstr "_Kontaktperson"
@@ -24052,9 +24161,6 @@ msgstr "Håndtagspopop"
 #~ msgid "S/MIME Sign"
 #~ msgstr "Signér med S/MIME"
 
-#~ msgid "Save As"
-#~ msgstr "Gem Som"
-
 #~ msgid "Save in folder..."
 #~ msgstr "Gem i mappe..."
 
@@ -24178,12 +24284,6 @@ msgstr "Håndtagspopop"
 #~ msgid "Se_lect..."
 #~ msgstr "V_ælg..."
 
-#~ msgid "Select Drafts Folder"
-#~ msgstr "Vælg udkastmappe"
-
-#~ msgid "Select Sent Folder"
-#~ msgstr "Vælg \"Afsendte\"-mappen"
-
 #~ msgid "_Beep when new mail arrives"
 #~ msgstr "_Bip når nye breve ankommer"
 
diff --git a/po/et.po b/po/et.po
index 14d3577055..a254d4ca9f 100644
--- a/po/et.po
+++ b/po/et.po
@@ -11,13 +11,12 @@
 # Kaarel Jõgi <kaarel@gg.ee>, 2002.
 # Priit Laes <amd@store20.com>, 2003-2007.
 #
-#: ../shell/main.c:589
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-30 08:01+0000\n"
-"PO-Revision-Date: 2008-10-12 14:06+0300\n"
+"POT-Creation-Date: 2008-10-24 09:34+0000\n"
+"PO-Revision-Date: 2008-10-25 10:37+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
 "MIME-Version: 1.0\n"
@@ -25,102 +24,75 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../a11y/addressbook/ea-addressbook-view.c:94
-#: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
 msgid "evolution address book"
 msgstr "evolutioni aadressiraamat"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "Uus kontakt"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "Uus kontaktide nimekiri"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "käesolev aadressiraamatu kaust %s sisaldab %d kaardi"
 msgstr[1] "käesolev aadressiraamatu kaust %s sisaldab %d kaarti"
 
-#: ../a11y/addressbook/ea-minicard.c:31
 msgid "Open"
 msgstr "Ava"
 
-#: ../a11y/addressbook/ea-minicard.c:141
 msgid "Contact List: "
 msgstr "Kontaktide nimekiri: "
 
-#: ../a11y/addressbook/ea-minicard.c:142
 msgid "Contact: "
 msgstr "Kontakt:"
 
-#: ../a11y/addressbook/ea-minicard.c:168
 msgid "evolution minicard"
 msgstr "evolutioni minikaart"
 
-#: ../a11y/calendar/ea-cal-view-event.c:265
 msgid "It has alarms."
 msgstr "On alarmidega."
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "It has recurrences."
 msgstr "See omab kordumisi."
 
-#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It is a meeting."
 msgstr "See on kohtumine."
 
-#: ../a11y/calendar/ea-cal-view-event.c:277
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalendrisündmus: Kokkuvõte on %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:279
 msgid "Calendar Event: It has no summary."
 msgstr "Kalendrisündmus: Kokkuvõte puudub."
 
-#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "kalendrivaate sündmus"
 
-#: ../a11y/calendar/ea-cal-view-event.c:527
 msgid "Grab Focus"
 msgstr "Haara fookus"
 
-#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
 msgstr "Uus sündmus"
 
-#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "Uus kogu päeva hõlmav sündmus"
 
-#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "Uus koosolek"
 
-#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "Mine tänasele päevale"
 
-#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "Mine kuupäevale"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:301
-#: ../a11y/calendar/ea-week-view-main-item.c:298
 msgid "a table to view and select the current time range"
 msgstr "tabel praeguse ajavahemiku kuvamiseks ja valimiseks"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:147
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -129,14 +101,12 @@ msgstr[1] "Sellel on %d sündmust."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
 msgid "It has no events."
 msgstr "Sellel pole sündmusi."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:159
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Töönädala vaade: %s. %s"
@@ -144,21 +114,16 @@ msgstr "Töönädala vaade: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:165
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Päeva vaade: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
 msgstr "kalendrivaade töönädala jaoks"
 
-#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr "kalendrivaade ühe või enama päeva jaoks"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y"
 
@@ -168,30 +133,12 @@ msgstr "%A, %d. %b %Y"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:760
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1583
-#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../a11y/calendar/ea-gnome-calendar.c:196
-#: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:762
-#: ../calendar/gui/calendar-component.c:767
-#: ../calendar/gui/calendar-component.c:769
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %b %Y"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:215
-#: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../a11y/calendar/ea-gnome-calendar.c:227
-#: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:781
-#: ../calendar/gui/calendar-component.c:788
-#: ../calendar/gui/calendar-component.c:794
-#: ../calendar/gui/calendar-component.c:796
 msgid "%d %b %Y"
 msgstr "%d. %B %Y"
 
@@ -200,149 +147,108 @@ msgstr "%d. %B %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:786
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1599
-#: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%d. %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:245
-#: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
 msgstr "Gnome kalender"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "otsinguriba"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "evolutioni kalendri otsinguriba"
 
-#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr ""
 
-#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "Täiendavate sündmuste lisamiseks klõpsa siia"
 
-#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Kuu vaade: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Nädala vaade: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
 msgstr "kalendrivaade kuu jaoks"
 
-#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
 msgstr "kalendrivaade ühe või enama nädala jaoks"
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr "hüpikaken"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
 msgid "popup a child"
 msgstr ""
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
 msgid "edit"
 msgstr "redigeerimine"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
 msgid "begin editing this cell"
 msgstr "selle välja redigeerimise alustamine"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
 msgid "toggle"
 msgstr "lüliti"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
 msgid "toggle the cell"
 msgstr ""
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
 msgid "expand"
 msgstr "ava"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
 msgid "expands the row in the ETree containing this cell"
 msgstr "ETree rea, mid seda välja sisaldab, avamine"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
 msgid "collapse"
 msgstr "ahenda"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
 msgid "collapses the row in the ETree containing this cell"
 msgstr "ETree rea, mid seda välja sisaldab, ahendamine"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "Tabeli väli"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134
-#: ../widgets/table/e-table-click-to-add.c:580
 msgid "click to add"
 msgstr "lisamiseks klõpsa"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
 msgid "click"
 msgstr "klõpsa"
 
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
 msgid "sort"
 msgstr "sordi"
 
-#: ../a11y/widgets/ea-calendar-item.c:295
-#: ../a11y/widgets/ea-calendar-item.c:301
 msgid "%d %B %Y"
 msgstr "%d. %B %Y"
 
-#: ../a11y/widgets/ea-calendar-item.c:303
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Kalender: vahemikus %s kuni %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
 msgstr "evolutioni kalendrikirje"
 
-#: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
 msgstr "Liitnupp"
 
-#: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
 msgstr "Aktiveeri vaikimisi"
 
-#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "Hüpikmenüü"
 
-#: ../a11y/widgets/ea-expander.c:40
 msgid "Toggle Attachment Bar"
 msgstr "Manuseriba sisse- ja väljalülitamine"
 
-#: ../a11y/widgets/ea-expander.c:50
 msgid "activate"
 msgstr "aktiveerimine"
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:2
 msgid ""
 "'{0}' is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
@@ -350,7 +256,6 @@ msgstr ""
 "Aadressiraamat '{0}' on kirjutuskaitsega ja seda pole võimalik muuta. Palun "
 "vali kontaktivaate külgpaanilt mõni muu aadressiraamat."
 
-#: ../addressbook/addressbook.error.xml.h:3
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
@@ -358,23 +263,18 @@ msgstr ""
 "Sellise aadressiga kontakt on juba olemas. Kas sa soovid lisada uut kaarti "
 "koos sama aadressiga?"
 
-#: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
 msgstr "Aadress '{0}' on juba olemas"
 
-#: ../addressbook/addressbook.error.xml.h:5
 msgid "Cannot add new contact"
 msgstr "Uut kontakti pole võimalik lisada"
 
-#: ../addressbook/addressbook.error.xml.h:6
 msgid "Cannot move contact."
 msgstr "Kontakti pole võimalik ümber tõsta."
 
-#: ../addressbook/addressbook.error.xml.h:7
 msgid "Category editor not available."
 msgstr "Kategooriaredaktor ei ole saadaval."
 
-#: ../addressbook/addressbook.error.xml.h:8
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
@@ -384,15 +284,12 @@ msgstr ""
 "logimismeetodit. Kuna paroolid on üldiselt tõstutundlikud, siis veendu, et "
 "caps lock ei oleks peal."
 
-#: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
 msgstr "LDAP-serveri skeemiinfot pole võimalik hankida."
 
-#: ../addressbook/addressbook.error.xml.h:10
 msgid "Could not remove address book."
 msgstr "Aadressiraamatut pole võimalik eemaldada."
 
-#: ../addressbook/addressbook.error.xml.h:11
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
@@ -404,56 +301,42 @@ msgstr ""
 "Personal Contacts) kontaktide kaustadele ligipääskuks kasuta korraks mõnda "
 "muud GroupWise postiklienti."
 
-#: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
 msgstr "Kustutada aadressiraamatu '{0}'?"
 
-#: ../addressbook/addressbook.error.xml.h:13
 msgid "Error loading address book."
 msgstr "Viga aadressiraamatu laadimisel."
 
-#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Viga {0} salvestamisel {1} alla: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
 msgstr "Tõrge LDAP-serverisse autentimisel."
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1735
 msgid "Failed to delete contact"
 msgstr "Tõrge kontakti kustutamisel"
 
-#: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
 msgstr "GroupWise'i aadressiraamatu loomine:"
 
-#: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP-server ei saatnud korrektset skeemiinfot."
 
-#: ../addressbook/addressbook.error.xml.h:19
-#: ../calendar/calendar.error.xml.h:50
 msgid "Server Version"
 msgstr "Serveri versioon"
 
-#: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr "Mõned võimalused võivad sinu praeguse serveriga ebakorrektselt töötada"
 
-#: ../addressbook/addressbook.error.xml.h:21
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "Evolutioni aadressiraamat lõpetas ootamatult."
 
-#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "Sinu valitud pilt on suur. Kas sa soovid seda vähendada ja siis salvestada?"
 
-#: ../addressbook/addressbook.error.xml.h:23
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -463,15 +346,12 @@ msgstr ""
 "funktsionaalsust. Samas võib see LDAP-server olla halvasti seadistatud. Küsi "
 "oma süsteemihaldurilt, milliseid otsingupõhjasid sa peaksid kasutama."
 
-#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book could not be opened."
 msgstr "Seda aadressisaamatud pole võimalik avada."
 
-#: ../addressbook/addressbook.error.xml.h:25
 msgid "This address book server does not have any suggested search bases."
 msgstr "See aadressiraamatuserver ei oma ühtegi soovituslikku otsingupõhja."
 
-#: ../addressbook/addressbook.error.xml.h:26
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -479,31 +359,24 @@ msgstr ""
 "See aadressiraamatu server võib olla kättesaamatu, serveri nimi võib olla "
 "valesti sisestatud või pole võrguühendus hetkel toimiv."
 
-#: ../addressbook/addressbook.error.xml.h:27
 msgid "This address book will be removed permanently."
 msgstr "See aadressisaamat eemaldatakse lõplikult."
 
-#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "See server ei toeta LDAPv3 skeemiandmeid."
 
-#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to open address book"
 msgstr "Aadressiraamatut pole võimalik avada"
 
-#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "Otsingut pole võimalik läbi viia."
 
-#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "{0} pole võimalik salvestada."
 
-#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "Kas soovid tehtud muudatusi salvestada?"
 
-#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -512,7 +385,6 @@ msgstr ""
 "lähteraamatust pole seda võimalik kustutada. Kas sa soovid ümbertõstmise "
 "asemel salvestada koopiat?"
 
-#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -522,139 +394,94 @@ msgstr ""
 "tekitada probleeme. Parima tulemuse saavutamiseks peaksid sa serveritarkvara "
 "uuendama toetatud versiooniks"
 
-#: ../addressbook/addressbook.error.xml.h:35
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "Sul pole sellest aadressiraamatust kontakti kustutamiseks õiguseid."
 
-#: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr ""
 "Sa oled seda kontakti muutnud. Kas sa soovid neid muutuseid salvestada?"
 
-#: ../addressbook/addressbook.error.xml.h:37
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Sinu {0} kontakte pole enne Evolutioni taaskäivitamist võimalik kasutada."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:513
-#: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:18
 msgid "_Add"
 msgstr "_Lisa"
 
-#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Discard"
 msgstr "_Hülga"
 
-#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Do not save"
 msgstr "Ä_ra salvesta"
 
-#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Resize"
 msgstr "_Vähenda"
 
-#: ../addressbook/addressbook.error.xml.h:42
 msgid "_Use as it is"
 msgstr "_Kasuta nii nagu on"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0}"
 msgstr "{0}"
 
 #. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:46
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "Vaikimisi sünkroniseerimisaadress:"
 
-#: ../addressbook/conduit/address-conduit.c:1320
-#: ../addressbook/conduit/address-conduit.c:1321
 msgid "Could not load address book"
 msgstr "Aadressiraamatut pole võimalik laadida"
 
-#: ../addressbook/conduit/address-conduit.c:1398
-#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot'i aadressirakenduse blokki pole võimalik lugeda"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Autocompletion"
 msgstr "Automaatlõpetus"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
 msgstr "K_ontaktid"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
 msgid "Certificates"
 msgstr "Sertifikaadid"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Configure autocomplete here"
 msgstr "Seadista automaatlõpetamist siit"
 
 #. Create the contacts group
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1325
-#: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
 msgstr "Kontaktid"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Address Book"
 msgstr "Evolutioni aadressiraamat"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Address Book address popup"
 msgstr "Evolutioni aadressiraamatu aadressi hüpikaken"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book address viewer"
 msgstr "Evolutioni aadressiraamatu aadressinäitaja"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Address Book card viewer"
 msgstr "Evolutioni aadressiraamatu kaardinäitaja"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Address Book component"
 msgstr "Evolutioni aadressiraamatu komponent"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution S/MIME Certificate Management Control"
 msgstr "Evolutioni S/MIME sertifikaatide haldamise juhtimine"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
 msgstr "Evolutioni kaustaseadistuste juhtimine"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Manage your S/MIME certificates here"
 msgstr "Siin saad hallata oma S/MIME sertifikaate"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:143
-#: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:236
-#: ../calendar/gui/memos-component.c:199 ../calendar/gui/migration.c:475
-#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
-#: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2906
-#: ../mail/mail-component.c:311 ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1521
 msgid "On This Computer"
 msgstr "Kohalikus arvutis"
 
@@ -663,139 +490,86 @@ msgstr "Kohalikus arvutis"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:151
-#: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/caltypes.xml.h:29
-#: ../calendar/gui/memos-component.c:208 ../calendar/gui/memotypes.xml.h:27
-#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:204
-#: ../calendar/gui/tasktypes.xml.h:35 ../mail/em-migrate.c:1058
 msgid "Personal"
 msgstr "Isiklik"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
-#: ../addressbook/gui/component/addressbook-migrate.c:518
 msgid "On LDAP Servers"
 msgstr "LDAP-serveris"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
 msgctxt "New"
 msgid "_Contact"
 msgstr "K_ontakt"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "Uue kontakti loomine"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Kontaktide _nimekiri"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
 msgstr "Uue kontaktide nimekirja loomine"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "Uus aadressiraamat"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Aadressiraamat"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
 msgstr "Uue aadressiraamatu loomine"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Tõrge aadressiraamatu seadistuste või kataloogide uuendamisel."
 
-#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "Baas"
 
-#: ../addressbook/gui/component/addressbook-config.c:517
-#: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "L_iik:"
 
-#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2372
-#: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Üldine"
 
-#: ../addressbook/gui/component/addressbook-config.c:983
-#: ../addressbook/gui/widgets/e-addressbook-view.c:556
-#: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Aadressiraamat"
 
-#: ../addressbook/gui/component/addressbook-config.c:987
 msgid "Server Information"
 msgstr "Serveri andmed"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
 msgid "Authentication"
 msgstr "Autentimine"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Üksikasjad"
 
-#: ../addressbook/gui/component/addressbook-config.c:993
-#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "Otsing"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
 msgid "Downloading"
 msgstr "Allalaadimine"
 
-#: ../addressbook/gui/component/addressbook-config.c:1205
-#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Aadressiraamatu omadused"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Siirdamine..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Siirdamine '%s':"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:646
 msgid "LDAP Servers"
 msgstr "LDAP-serverid"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:761
 msgid "Autocompletion Settings"
 msgstr "Automaatlõpetamise sätted"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -807,7 +581,6 @@ msgstr ""
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1151
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -817,7 +590,6 @@ msgstr ""
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1160
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -827,7 +599,6 @@ msgstr ""
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1170
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -837,92 +608,53 @@ msgstr ""
 "\n"
 "Palun oota kuni Evolution migreerib Sinu Pilot Sync andmed..."
 
-#: ../addressbook/gui/component/addressbook-view.c:424
-#: ../mail/em-folder-utils.c:448
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeta kaust \"%s\" uue nimega:"
 
-#: ../addressbook/gui/component/addressbook-view.c:427
-#: ../mail/em-folder-utils.c:450
 msgid "Rename Folder"
 msgstr "Kataloogi ümbernimetamine"
 
-#: ../addressbook/gui/component/addressbook-view.c:432
-#: ../mail/em-folder-utils.c:456
 msgid "Folder names cannot contain '/'"
 msgstr "Kausta nimes ei tohi sisalduda '/' sümbol"
 
-#: ../addressbook/gui/component/addressbook-view.c:941
 msgid "_New Address Book"
 msgstr "_Uus aadressiraamat"
 
-#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "Save As vCard..."
 msgstr "Salvesta vKaardina..."
 
-#: ../addressbook/gui/component/addressbook-view.c:945
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/calendar-component.c:619
-#: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1692 ../calendar/gui/e-memo-table.c:940
-#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2111 ../mail/em-folder-view.c:1340
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
-#: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Kustuta"
 
-#: ../addressbook/gui/component/addressbook-view.c:948
-#: ../calendar/gui/calendar-component.c:622
-#: ../calendar/gui/dialogs/comp-editor.c:2035
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:1041 ../mail/em-folder-tree.c:2120
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Omadused"
 
-#: ../addressbook/gui/component/addressbook-view.c:1336
 msgid "Contact Source Selector"
 msgstr "Kontaktide allika valimine"
 
-#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "Ühendan uuesti LDAP-serveriga anonüümselt"
 
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
 msgid "Failed to authenticate.\n"
 msgstr "Tõrge autentimisel.\n"
 
-#: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Sisesta %s parool (kasutaja %s)"
 
-#: ../addressbook/gui/component/addressbook.c:222
-#: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:444
-#: ../plugins/publish-calendar/publish-calendar.c:190
-#: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Sisesta parool"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
 msgid "Autocomplete length"
 msgstr "Automaatlõpetuse pikkus"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
 msgid "EFolderList XML for the list of completion URIs"
 msgstr "EFolderList XML automaatlõpetuste URI-de jaoks"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
 msgid "EFolderList XML for the list of completion URIs."
 msgstr "EFolderList XML automaatlõpetuste URI-de jaoks."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
 msgid ""
 "Position of the vertical pane, between the card and list views and the "
 "preview pane, in pixels."
@@ -930,15 +662,12 @@ msgstr ""
 "Püstpaani asukoht pikslites - kaartide ja loendivaadete ning eelvaatepaani "
 "vahel."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
 msgid "Show autocompleted name with an address"
 msgstr ""
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid "Show preview pane"
 msgstr "Eelvaatluspaani kuvamine"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -946,150 +675,112 @@ msgstr ""
 "Tähtede arv, mis tuleb sisestada enne kui Evolution üritab "
 "automaatlõpetamist."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Nimedevaliku dialoogis viimatikasutatud kausta URI"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
 msgid "URI for the folder last used in the select names dialog."
 msgstr "Nimedevaliku dialoogis viimatikasutatud kausta URI."
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Vertical pane position"
 msgstr "Püstpaani asukoht"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
 msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
 msgstr ""
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
 msgid "Whether to show the preview pane."
 msgstr "Millal kuvada eelvaatluspaani."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:1
 msgid "1"
 msgstr "1"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "3268"
 msgstr "3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:3
 msgid "389"
 msgstr "389"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
 msgid "5"
 msgstr "5"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "636"
 msgstr "636"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "<b>Authentication</b>"
 msgstr "<b>Autentimine</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:7
 msgid "<b>Downloading</b>"
 msgstr "<b>Allalaadimine</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
 msgstr "<b>Otsimine</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Type:</b>"
 msgstr "<b>Liik:</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "Lisa aadressiraamat"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:760
 msgid "Always"
 msgstr "Alati"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "Anonüümselt"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../addressbook/gui/component/ldap-config.glade.h:15
 msgid "B_rowse this book until limit reached"
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "Peamine"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Distinguished name"
 msgstr "Eraldusnimi"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
 msgstr "E-posti aadress:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution kasutab seda e-posti aadressi serverile sinu identuse tõendamiseks."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
 msgstr "Leia võimalikud otsingupõhjad"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
 msgstr "_Kasutajanimi:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:759
 msgid "Never"
 msgstr "Mitte kunagi"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:287
 msgid "No encryption"
 msgstr "Krüptimine puudub"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "Üks tase alla (One)"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:295
 msgid "SSL encryption"
 msgstr "SSL krüptimine"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
 msgstr "Otsingufilter"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search _base:"
 msgstr "_Otsingupõhi:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search _filter:"
 msgstr "Otsingu_filter:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Search filter"
 msgstr "Otsingufilter"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by  default search will be performed on "
@@ -1098,7 +789,6 @@ msgstr ""
 "Otsingufiltris määratakse otsitavate objektide liik. Kui seda ei ole "
 "muudetud, siis otsitakse vaikimisi objektiklassi liigiga \"person\" (isik)."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -1106,7 +796,6 @@ msgstr ""
 "See valik tähendab, et Evolution ühendub sinu LDAP-serverisse ainult juhul, "
 "kui LDAP-server toetab SSL-i."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -1114,7 +803,6 @@ msgstr ""
 "See valik tähendab, et Evolution ühendub sinu LDAP-serverisse ainult juhul, "
 "kui LDAP-server toetab TLS-i."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -1123,23 +811,18 @@ msgstr ""
 "See valik tähendab, et sinu server ei toeta SSL-i ega TLS-i. Seega pole sinu "
 "ühendus turvaline ja võib-olla ohustatud turvaaukudest."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
 msgstr "Kogu alampuu (Sub)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
 msgstr "Toetatud otsingupõhjad"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:291
 msgid "TLS encryption"
 msgstr "TLS krüptimine"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
@@ -1148,7 +831,6 @@ msgstr ""
 "Otsingupõhi on otsingu alguse eraldusnimi (DN). Kui sa selle tühjaks jätad, "
 "siis alustatakse otsingut kataloogipuu kõige ülemisest kataloogist."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -1160,13 +842,11 @@ msgstr ""
 "allapoole. \"Üks tase alla\" kaasab otsingusse kirjed, mis jäävad "
 "otsingupõhjast ühe taseme võrra allapoole."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "See on LDAP-serveri täispikk nimi. Näiteks: \"ldap.minufirma.ee\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1174,7 +854,6 @@ msgstr ""
 "See on kirjete allalaadimise suurim kogus. Selle väärtuse liiga suureks "
 "määramine aeglustab aadressiraamatu tööd."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -1184,7 +863,6 @@ msgstr ""
 "Väärtuse \"E-posti aadress\" korral peab valitud LDAP-server toetama "
 "anonüümset ligipääsu."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1192,7 +870,6 @@ msgstr ""
 "See on serveri nimi kuvamiseks Evolutioni kaustaloendis. Seda kasutatakse "
 "ainult kuvamise eesmärgil."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -1202,1412 +879,1001 @@ msgstr ""
 "standardportidest on välja toodud. Küsi oma süsteemiülemalt millise pordi sa "
 "peaksid määrama."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr "Eraldusnime (DN) kasutamine"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
 msgstr "E-posti aadressi kasutamine"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "Kui võimalik"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
 msgstr "Lisa _aadressiraamat"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "_Allalaadimise piirang:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
 msgstr "_Leia võimalikud otsingupõhjad"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Login method:"
 msgstr "_Sisselogimismeetod:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:177
-#: ../plugins/groupwise-features/properties.glade.h:11
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
 msgstr "_Otsingu ulatus"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:186
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
 msgstr "_Ajapiirang:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "_Turvalist ühendust kasutatakse:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "kaarti"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:662
-#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "minutit"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "<b>Email</b>"
 msgstr "<b>E-post</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Home</b>"
 msgstr "<b>Kodu</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Instant Messaging</b>"
 msgstr "<b>Kiirsuhtlus</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "<b>Job</b>"
 msgstr "<b>Töö</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Muu</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
 msgid "<b>Other</b>"
 msgstr "<b>Teised</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Telephone</b>"
 msgstr "<b>Telefon</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Web Addresses</b>"
 msgstr "<b>Võrguaadressid</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Work</b>"
 msgstr "<b>Töö</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Kate_gooriad..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2421
 msgid "Contact Editor"
 msgstr "Kontaktiredaktor"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "T_äisnimi..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "Pilt"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 msgid "MSN Messenger"
 msgstr "MSN Kiirsuhtlusklient"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "Postiaadress"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Nic_kname:"
 msgstr "H_üüdnimi:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Personal Information"
 msgstr "Isiklikud andmed"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Telephone"
 msgstr "Telefon"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "Töö"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "Aa_dress:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Anniversary:"
 msgstr "Aasta_päev:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Assistant:"
 msgstr "Ass_istent:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Birthday:"
 msgstr "_Sünnipäev:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../calendar/gui/dialogs/event-page.c:791
-#: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "Kalen_der:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "_Linn:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "_Firma:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_Riik:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "Osako_nd:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "_Salvesta kui:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "Vaba/_hõivatud:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "Kod_uleht:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "_Juht:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "Mä_rkused:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "_Kontor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "_Sidejaoskonna postkast:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "A_met:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "A_bikaasa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "_Maakond/Provints:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "_Tiitel:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "_Videovestlus:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "Soovib saada _HTML sõnumeid"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "Veebilo_gi:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "K_us:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "_Postiindeks:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:92
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "Aadress"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:99
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:92
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:292
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:325
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:165
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
-#: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3687
-#: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "Redigeeritav"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "Ühendriigid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "Afganistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "Albaania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "Alžeeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
 msgstr "Ameerika Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Andorra"
 msgstr "Andorra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Angola"
 msgstr "Angoola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antarctica"
 msgstr "Antarktika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Antigua And Barbuda"
 msgstr "Antigua ja Barbuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "Argentiina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "Armeenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Aruba"
 msgstr "Aruba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Australia"
 msgstr "Austraalia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "Austria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "Aserbaidžaan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "Bahama"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
 msgstr "Bahrein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Barbados"
 msgstr "Barbados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belarus"
 msgstr "Valgevene"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Belize"
 msgstr "Belize"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Benin"
 msgstr "Benin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "Boliivia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia ja Hertsegoviina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Botswana"
 msgstr "Botswana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bouvet Island"
 msgstr "Bouvet' saar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "Brasiilia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "British Indian Ocean Territory"
 msgstr "Briti India ookeani territoorium"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bulgaria"
 msgstr "Bulgaaria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Burundi"
 msgstr "Burundi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cambodia"
 msgstr "Kambodža"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cape Verde"
 msgstr "Roheneemesaared"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cayman Islands"
 msgstr "Kaimani saared"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Central African Republic"
 msgstr "Kesk-Aafrika Vabariik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "Tšaad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chile"
 msgstr "Tšiili"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "Hiina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "Jõulusaar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Cocos (Keeling) Islands"
 msgstr "Kookossaared (Keelingi saared)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "Kolumbia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "Komoorid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo"
 msgstr "Kongo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Congo, The Democratic Republic Of The"
 msgstr "Congo, Demokraatlik vabariik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "Cooki saared"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Cote d'Ivoire"
 msgstr "Elevandiluurannik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "Horvaatia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cuba"
 msgstr "Kuuba"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cyprus"
 msgstr "Küpros"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Czech Republic"
 msgstr "Tšehhi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "Taani"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "Dominica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
 msgstr "Dominikaani vabariik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "Egiptus"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "Ekvatoriaal-Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Estonia"
 msgstr "Eesti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "Etioopia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "Falklandi saared"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "Fääri saared"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "Fidži"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "Soome"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "Prantsusmaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "Prantsuse Guajaana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "Prantsuse Polüneesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "French Southern Territories"
 msgstr "Prantsuse Lõunaalad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gabon"
 msgstr "Gabon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Gambia"
 msgstr "Gambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Georgia"
 msgstr "Gruusia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "Saksamaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Ghana"
 msgstr "Ghana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greece"
 msgstr "Kreeka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "Gröönimaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guam"
 msgstr "Guam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea"
 msgstr "Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guinea-Bissau"
 msgstr "Guinea-Bissau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "Guyana"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Haiti"
 msgstr "Haiti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Heard And McDonald Islands"
 msgstr "Heardi ja McDonaldi saared"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Holy See"
 msgstr "Vatikan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hong Kong"
 msgstr "Hong-Kong"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "Ungari"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "Island"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "India"
 msgstr "India"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Indonesia"
 msgstr "Indoneesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "Iraan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "Iraak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Ireland"
 msgstr "Iirimaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Isle of Man"
 msgstr "Mani saar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Iisrael"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "Itaalia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "Jaapan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jersey"
 msgstr "Jersey"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Jordan"
 msgstr "Jordaania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "Kasahstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "Keenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "Korea Demokraatlik Rahvavabariik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Korea, Republic Of"
 msgstr "Korea Vabariik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "Kuveit"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
 msgstr "Kõrgõzstan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Laos"
 msgstr "Laos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Latvia"
 msgstr "Läti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lebanon"
 msgstr "Liibanon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Liberia"
 msgstr "Libeeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "Liibüa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "Leedu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macao"
 msgstr "Macao"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "Makedoonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malawi"
 msgstr "Malawi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Malaysia"
 msgstr "Malaisia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "Malediivid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Mali"
 msgstr "Mali"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malta"
 msgstr "Malta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Marshall Islands"
 msgstr "Marshalli saared"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
 msgstr "Martinique"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
 msgstr "Mauritaania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Mexico"
 msgstr "Mehhiko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
 msgstr "Mikroneesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Moldova, Republic Of"
 msgstr "Moldova Vabariik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Monaco"
 msgstr "Monaco"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mongolia"
 msgstr "Mongoolia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Morocco"
 msgstr "Maroko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Mozambique"
 msgstr "Mosambiik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Myanmar"
 msgstr "Birma"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Namibia"
 msgstr "Namiibia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nauru"
 msgstr "Nauru"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Nepal"
 msgstr "Nepal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "Holland"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "Hollandi Antillid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "Uus-Kaledoonia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
 msgstr "Uus-Meremaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Niger"
 msgstr "Niger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Nigeria"
 msgstr "Nigeeria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Niue"
 msgstr "Niue"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Norfolk Island"
 msgstr "Norfolk"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Northern Mariana Islands"
 msgstr "Põhja-Mariaanid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "Norra"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "Omaan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palau"
 msgstr "Palau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Palestinian Territory"
 msgstr "Palestiina territoorium"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Panama"
 msgstr "Panama"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Papua New Guinea"
 msgstr "Paapua Uus-Guinea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Peru"
 msgstr "Peruu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Philippines"
 msgstr "Filipiinid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Poland"
 msgstr "Poola"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
 msgstr "Katar"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Reunion"
 msgstr "Réunioni departemang"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Romania"
 msgstr "Rumeenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "Venemaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts ja Nevis"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Saint Vincent And The Grenadines"
 msgstr "Saint Vincent ja Grenadiinid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Samoa"
 msgstr "Samoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "San Marino"
 msgstr "San Marino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Sao Tome And Principe"
 msgstr "São Tomé ja Príncipe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saudi Arabia"
 msgstr "Saudi Araabia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Senegal"
 msgstr "Senegal"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Serbia And Montenegro"
 msgstr "Serbia ja Montenegro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "Seišellid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovakia"
 msgstr "Slovakkia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "Sloveenia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
 msgstr "Saalomoni Saared"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "Somaalia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
 msgstr "Lõuna-Aafrika Vabariik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Lõuna Georgia ja Lõuna Sandwichi saared"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "Hispaania"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Helena"
 msgstr "Saint Helena"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "St. Pierre And Miquelon"
 msgstr "Saint-Pierre ja Miquelon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "Sudaan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Suriname"
 msgstr "Suriname"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Teravmäed"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "Svaasimaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "Rootsi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "Šveits"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "Süüria"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Taiwan"
 msgstr "Taivan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tajikistan"
 msgstr "Tadžikistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tanzania, United Republic Of"
 msgstr "Tansaania, Ühendatud Vabariik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "Tai"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Timor-Leste"
 msgstr "Timor-Leste"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Togo"
 msgstr "Togo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tonga"
 msgstr "Tonga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Trinidad And Tobago"
 msgstr "Trinidad ja Tobago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "Tuneesia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "Türgi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "Türkmenistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Turks And Caicos Islands"
 msgstr "Turksi ja Caicose saared"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uganda"
 msgstr "Uganda"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Arab Emirates"
 msgstr "Araabia Ühendemiraadid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "Ühendkuningriik"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "United States Minor Outlying Islands"
 msgstr "Ühendriikide hajasaared"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Venezuela"
 msgstr "Venetsueela"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, British"
 msgstr "Neitsisaared, Briti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Virgin Islands, U.S."
 msgstr "Neitsisaared, U.S."
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis ja Futuna"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Western Sahara"
 msgstr "Lääne-Sahara"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "Jeemen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zambia"
 msgstr "Sambia"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
-#: ../mail/em-mailer-prefs.c:467
-#: ../plugins/exchange-operations/exchange-delegates.c:954
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
-#: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:351
-#: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Nimi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "AOL Instant Messenger"
 msgstr "AOL kiirsuhtlusklient"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Yahoo Messenger"
 msgstr "Yahoo Kiirsuhtlusklient"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu Kiirsuhtlusklient"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
 msgid "Service"
 msgstr "Teenus"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
-#: ../calendar/gui/caltypes.xml.h:25
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:693
-#: ../plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "Asukoht"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "Kasutajanimi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
-#: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Kodu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
-#: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Muu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Source Book"
 msgstr "Lähteraamat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Target Book"
 msgstr "Sihtraamat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
 msgid "Is New Contact"
 msgstr "Tegemist on uue kontaktiga"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Writable Fields"
 msgstr "Muudetavad väljad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Required Fields"
 msgstr "Vajalikud väljad"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Muudetud"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2416
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktiredaktor - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "Please select an image for this contact"
 msgstr "Palun vali selle kontakti jaoks pilt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
 msgid "_No image"
 msgstr "Pilti _ei ole"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3086
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2615,47 +1881,36 @@ msgstr ""
 "Kontaktandmed on vigased:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3090
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' on vigases vormingus"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' on vigases vormingus"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' on tühi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3138
 msgid "Invalid contact."
 msgstr "Vigane kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "Contact Quick-Add"
 msgstr "Kontakti kiirlisamine"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:328
 msgid "_Edit Full"
 msgstr "Täisnime r_edigeerimine"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:402
 msgid "_Full name"
 msgstr "Täis_nimi"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:413
 msgid "E_mail"
 msgstr "E-_post:"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:424
 msgid "_Select Address Book"
 msgstr "_Vali aadressiraamat"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:323
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2664,7 +1919,6 @@ msgstr ""
 "Kas sa soovid kustutada\n"
 "kontaktide loendit (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:326
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2672,7 +1926,6 @@ msgstr ""
 "Kas sa soovid kustutada\n"
 "need kontaktide loendid?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:331
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2681,7 +1934,6 @@ msgstr ""
 "Kas sa soovid kustutada\n"
 "kontakti (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:334
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2689,172 +1941,120 @@ msgstr ""
 "Kas sa soovid kustutada\n"
 "need kontaktid?"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Aadress _2:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Ci_ty:"
 msgstr "Li_nn:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Countr_y:"
 msgstr "_Riik:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Full Address"
 msgstr "Täisaadress"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "_Postiindeks:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Dr."
 msgstr "Dr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Esq."
 msgstr "Esq."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "Täisnimi"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Jr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "Preili"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Härra"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Proua"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Pr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "Sr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Eesnimi:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_Perekonnanimi:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "L_iignimi:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_Järelliide:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
 msgid "Add IM Account"
 msgstr "Lisa KS konto:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "_Account name:"
 msgstr "_Konto nimi:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:3
 msgid "_IM Service:"
 msgstr "_KS teenus:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:243
-#: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "Asuko_ht:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 msgid "<b>Members</b>"
 msgstr "<b>Liikmed</b>"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
 msgid "Contact List Editor"
 msgstr "Kontaktiloendi redaktor"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 msgid "Select..."
 msgstr "Vali..."
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Peida aadressid sõnumi saatmisel sellesse loendisse"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "_List name:"
 msgstr "_Loendi nimi:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Sisesta e-posti aadress või tiri kontakt allolevasse loendisse:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
 msgid "Contact List Members"
 msgstr "Kontaktiloendi liikmed"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
 msgid "_Members"
 msgstr "_Liikmed"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:311
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../addressbook/gui/widgets/e-addressbook-view.c:213
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
 msgstr "Raamat"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
 msgid "Is New List"
 msgstr "On uus loend"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Muudetud kontakt:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
 msgid "Conflicting Contact:"
 msgstr "Vastulous kontakt:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Avastati korduv kontakt"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
 msgid ""
 "The name or email of this contact already exists in this folder.  Would you "
 "like to add it anyway?"
@@ -2862,15 +2062,12 @@ msgstr ""
 "Selle kontakti nimi või e-posti aadress on selles kaustas juba olemas.  Kas "
 "sa soovid seda siiski lisada?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Uus kontakt:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
 msgid "Original Contact:"
 msgstr "Esialgne kontakt:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -2878,317 +2075,199 @@ msgstr ""
 "Selle kontakti nimi või e-posti aadress on selles kaustas\n"
 "juba olemas. Kas sa soovid seda siiski lisada?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:214
 msgid "_Merge"
 msgstr ""
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:199
 msgid "Merge Contact"
 msgstr ""
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:267
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
-#: ../addressbook/gui/widgets/eab-contact-display.c:879
-#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "E-post"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:162
-#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:3
-#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Suvaline väli sisaldab"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
 msgid "Email begins with"
 msgstr "E-post algab"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
 msgid "Name contains"
 msgstr "Nimi sisaldab"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
 msgid "No contacts"
 msgstr "Kontakte pole"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:166
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d kontakt"
 msgstr[1] "%d kontakti"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:318
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
-#: ../addressbook/gui/widgets/e-addressbook-view.c:227
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "Päring"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:461
 msgid "Error getting book view"
 msgstr "Viga raamatu vaate hankimisel"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
-#: ../widgets/table/e-table-click-to-add.c:509
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3353
-#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3551
-#: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "Mudel"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Viga kaardi muutmisel"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Name begins with"
 msgstr "Nimi algab"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:220
 msgid "Source"
 msgstr "Allikas"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:234
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:508
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Liik"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:813
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1954
 msgid "Save as vCard..."
 msgstr "Salvesta vKaardina..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/e-calendar-table.c:1573
-#: ../calendar/gui/e-calendar-view.c:1670 ../calendar/gui/e-memo-table.c:923
-#: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "A_va"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "_New Contact..."
 msgstr "_Uus kontakt..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "New Contact _List..."
 msgstr "Uus kontaktide _loend..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Save as vCard..."
 msgstr "_Salvesta vKaardina..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contact"
 msgstr "_Edasta kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contacts"
 msgstr "_Edasta kontaktid"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contact"
 msgstr "_Saada kontaktile sõnum"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to List"
 msgstr "_Saada sõnum postiloendisse"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Send _Message to Contacts"
 msgstr "_Saada kontaktidele sõnum"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "_Print"
 msgstr "_Prindi"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Cop_y to Address Book..."
 msgstr "_Kopeeri aadressiraamatusse..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Mo_ve to Address Book..."
 msgstr "_Tõsta aadressiraamatusse..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "Cu_t"
 msgstr "Lõ_ika"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:480
-#: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
-#: ../composer/e-msg-composer.c:2052 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2109
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopeeri"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
 msgid "P_aste"
 msgstr "_Aseta"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1525
-#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
-#: ../calendar/gui/cal-search-bar.c:691
 msgid "Any Category"
 msgstr "Iga kategooria"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
 msgstr "Assistent"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
 msgstr "Assistendi telefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Fax tööl"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Telefon tööl"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Telefon tööl 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Tagasihelistamise telefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Autotelefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:144
-#: ../calendar/gui/e-cal-list-view.etspec.h:1
-#: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-memo-table.etspec.h:1
 msgid "Categories"
 msgstr "Kategooriad"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
 msgid "Company"
 msgstr "Firma"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 msgid "Company Phone"
 msgstr "Firma telefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 3"
 msgstr "E-post 3"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Family Name"
 msgstr "Perekonnanimi"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Kataloogi kui"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Given Name"
 msgstr "Antud nimi"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
 msgstr "Kodune faks"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone"
 msgstr "Kodune telefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Home Phone 2"
 msgstr "Kodune telefon 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "ISDN Phone"
 msgstr "ISDN telefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Journal"
 msgstr "Päevik"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
 msgid "Manager"
 msgstr "Juht"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:654
 msgid "Mobile Phone"
 msgstr "Mobiiltelefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "Nickname"
 msgstr "Hüüdnimi"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:667
 msgid "Note"
 msgstr "Märkus"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Kontor"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Muu faks"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Muu telefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Piipar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Raadio"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:520
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
 msgid "Role"
 msgstr "Roll"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
 msgid "Spouse"
 msgstr "Abikaasa"
 
@@ -3198,83 +2277,45 @@ msgstr "Abikaasa"
 #. Device for Deaf". However, you probably want to leave this
 #. abbreviation unchanged unless you know that there is actually a
 #. different and established translation for this in your language.
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
 msgid "Telex"
 msgstr "Telex"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
 msgid "Title"
 msgstr "Tiitel"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Unit"
 msgstr "Ühik"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Web Site"
 msgstr "Koduleht"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:116
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
-#: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:654
-#: ../widgets/table/e-table-group-container.c:992
-#: ../widgets/table/e-table-group-container.c:993
-#: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-group-leaf.c:638
-#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
-#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "Laius"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:123
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
-#: ../widgets/table/e-table-click-to-add.c:530
-#: ../widgets/table/e-table-field-chooser-item.c:661
-#: ../widgets/table/e-table-group-container.c:985
-#: ../widgets/table/e-table-group-container.c:986
-#: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-group-leaf.c:631
-#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
-#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "Kõrgus"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:130
-#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "On fookuses"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:137
 msgid "Field"
 msgstr "Väli"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:144
 msgid "Field Name"
 msgstr "Välja nimi"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:151
 msgid "Text Model"
 msgstr "Teksti mudel"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:158
 msgid "Max field name length"
 msgstr "Suurim välja nime pikkus"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "Veeru laius"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:178
 msgid ""
 "\n"
 "\n"
@@ -3284,7 +2325,6 @@ msgstr ""
 "\n"
 "Otsi kontakte..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3298,7 +2338,6 @@ msgstr ""
 "\n"
 "Uue kontakti lisamiseks tee siin topeltklõps."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3312,7 +2351,6 @@ msgstr ""
 "\n"
 "Uue kontakti lisamiseks tee siin topeltklõps."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -3322,7 +2360,6 @@ msgstr ""
 "\n"
 "Otsi kontakti."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3332,252 +2369,170 @@ msgstr ""
 "\n"
 "Selles vaates kirjed puuduvad."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:524
 msgid "Adapter"
 msgstr "Adapter"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Töö e-post"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "Kodune e-post"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "Muu e-post"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Valitud"
 
-#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "On fookuses"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "Ava _viit veebilehitsejas"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "Kopeeri _lingi asukoht"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "_Saada uus sõnum aadressil..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
 msgstr "Kopeeri _e-posti aadress"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:370
-#: ../addressbook/gui/widgets/eab-contact-display.c:372
 msgid "(map)"
 msgstr "(kaart)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:306
-#: ../addressbook/gui/widgets/eab-contact-display.c:390
-#: ../addressbook/gui/widgets/eab-contact-display.c:402
 msgid "map"
 msgstr "kaart"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:846
 msgid "List Members"
 msgstr "Nimekirja liikmed"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
 msgid "Department"
 msgstr "Osakond"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
 msgid "Profession"
 msgstr "Eriala"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
 msgid "Position"
 msgstr "Ametikoht"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
 msgid "Video Chat"
 msgstr "Videovestlus"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/gnome-cal.c:2451
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:576
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568
-#: ../plugins/hula-account-setup/camel-hula-listener.c:377
-#: ../plugins/hula-account-setup/camel-hula-listener.c:406
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:637
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:115
 msgid "Free/Busy"
 msgstr "Vaba/hõivatud"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:638
-#: ../addressbook/gui/widgets/eab-contact-display.c:653
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:639
 msgid "Fax"
 msgstr "Faks"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Home Page"
 msgstr "Koduleht"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:651
 msgid "Web Log"
 msgstr "Veebilogi"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2342
-#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Sünnipäev"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2343
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Aastapäev"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:864
 msgid "Job Title"
 msgstr "Ametinimetus"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Home page"
 msgstr "Koduleht"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:908
 msgid "Blog"
 msgstr "Blog"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Success"
 msgstr "Õnnestus"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Backend busy"
 msgstr "Taustaprogramm on hõivatud"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Repository offline"
 msgstr "Hoidla offlain"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Address Book does not exist"
 msgstr "Aadressiraamatut ei ole olemas"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "No Self Contact defined"
 msgstr "Enda kontakti ei ole kirjeldatud"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "Juurdepääs keelatud"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact not found"
 msgstr "Kontakti ei leitud"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Contact ID already exists"
 msgstr "Kontakti ID on juba olemas"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Protocol not supported"
 msgstr "Toetamata protokoll"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-cal-model-tasks.c:364
-#: ../calendar/gui/e-cal-model-tasks.c:681
-#: ../calendar/gui/e-calendar-table.c:239
-#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/print.c:2557
 msgid "Canceled"
 msgstr "Katkestatud"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Could not cancel"
 msgstr "Katkestamine pole võimalik"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Failed"
 msgstr "Tõrge autentimisel"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "Authentication Required"
 msgstr "Autentimine on vajalik"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "TLS not Available"
 msgstr "TLS ei ole kättesaadav"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "No such source"
 msgstr "Sellist allikat ei ole olemas"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
 msgid "Not available in offline mode"
 msgstr "Autonoomses olekus pole seda saadaval"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Other error"
 msgstr "Muu viga"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
 msgid "Invalid server version"
 msgstr "Vigane serveri versioon"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:80
 msgid "Unsupported authentication method"
 msgstr "Toetamata autentimismeetod"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
 "We were unable to open this address book. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3588,7 +2543,6 @@ msgstr ""
 "veel võrguvabas olekus kasutamiseks alla laaditud. Palun laadi korraks "
 "aadressiraamat võrgurežiimis, et selle sisu oleks võimalik alla laadida."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
 #, c-format
 msgid ""
 "We were unable to open this address book.  Please check that the path %s "
@@ -3597,7 +2551,6 @@ msgstr ""
 "Aadressiraamatut pole võimalik avada.  Palun kontrolli, et rada %s oleks "
 "olemas ja et sul oleks sellele ligipääsuks vajalikud õigused."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid ""
 "We were unable to open this address book.  This either means you have "
 "entered an incorrect URI, or the LDAP server is unreachable."
@@ -3605,7 +2558,6 @@ msgstr ""
 "Aadressiraamatut pole võimalik avada.  Põhjuseks võib olla see, et "
 "sisestasid vigase URI või pole LDAP-server kättesaadav."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:134
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3615,7 +2567,6 @@ msgstr ""
 "soovid kasutada Evolutioni koos LDAP-i toega, pead paigaldama omale vastava "
 "Evolutioni paki."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:141
 msgid ""
 "We were unable to open this address book.  This either means you have "
 "entered an incorrect URI, or the server is unreachable."
@@ -3623,11 +2574,9 @@ msgstr ""
 "Aadressiraamatut pole võimalik avada.  Põhjuseks võib olla see, et "
 "sisestasid vigase URI või pole server kättesaadav."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:149
 msgid "Detailed error:"
 msgstr "Vea üksikasjad:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3639,7 +2588,6 @@ msgstr ""
 "otsingut või suurenda selle aadressiraamatu kataloogiserveri\n"
 "eelistustest tagastatavate kirjete piirangut."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:178
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this address book.  Please make your search\n"
@@ -3650,46 +2598,34 @@ msgstr ""
 "jaoks määratud piirangu. Palun täpsusta oma otsingut või suurenda selle\n"
 "aadressiraamatu kataloogiserveri eelistustest ajapiirangut."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "The backend for this address book was unable to parse this query."
 msgstr ""
 "Selle aadressiraamatu taustaprogrammil pole võimalik seda päringut parsida."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:187
 msgid "The backend for this address book refused to perform this query."
 msgstr "Selle aadressiraamatu taustaprogramm keeldus päringut parsimast."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:190
 msgid "This query did not complete successfully."
 msgstr "See päring ei lõpetanud edukalt."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error adding list"
 msgstr "Viga loendi lisamisel"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:212
-#: ../addressbook/gui/widgets/eab-gui-util.c:688
 msgid "Error adding contact"
 msgstr "Viga kontakti lisamisel"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:223
 msgid "Error modifying list"
 msgstr "Viga loendi muutmisel"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:223
 msgid "Error modifying contact"
 msgstr "Viga kontakti muutmisel"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:235
 msgid "Error removing list"
 msgstr "Viga loendi eemaldamisel"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:235
-#: ../addressbook/gui/widgets/eab-gui-util.c:638
 msgid "Error removing contact"
 msgstr "Viga kontakti eemaldamisel"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:317
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3704,16 +2640,13 @@ msgstr[1] ""
 "%d kontakti avamisega kaasneb %d uue akna avamine.\n"
 "Oled sa kindel, et soovid kuvada kõiki neid kontakte?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "_Don't Display"
 msgstr "Ä_ra kuva"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:326
 msgid "Display _All Contacts"
 msgstr "_Kuva kõiki kontakte"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:352
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3722,384 +2655,277 @@ msgstr ""
 "%s on juba olemas\n"
 "Kas soovid üle kirjutada?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:356
 msgid "Overwrite"
 msgstr "Kirjuta üle"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:397
-#: ../addressbook/gui/widgets/eab-gui-util.c:400
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "kontakt"
 msgstr[1] "kontakti"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:446
 msgid "card.vcf"
 msgstr "kaart.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:483
 msgid "Select Address Book"
 msgstr "Aadressiraamatu valimine"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:597
 msgid "list"
 msgstr "nimekiri"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:749
 msgid "Move contact to"
 msgstr "Kontakti ümbertõstmine"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Copy contact to"
 msgstr "Kontakti kopeerimine"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:754
 msgid "Move contacts to"
 msgstr "Kontaktide ümbertõstmine"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Copy contacts to"
 msgstr "Kontaktide kopeerimine"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
 msgid "Multiple vCards"
 msgstr "Mitu vKaarti"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:909
 #, c-format
 msgid "vCard for %s"
 msgstr "vKaart %s kohta"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:921
-#: ../addressbook/gui/widgets/eab-gui-util.c:947
 #, c-format
 msgid "Contact information"
 msgstr "Kontaktandmed"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:949
 #, c-format
 msgid "Contact information for %s"
 msgstr "Kontaktandmed - %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:293
 msgid "Querying Address Book..."
 msgstr "Pöördumine aadressiraamatu poole..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:141
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:226
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
 msgid "Show Full vCard"
 msgstr "Kogu vKaardi kuvamine"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:230
 msgid "Show Compact vCard"
 msgstr "Kompaktse vKaardi näitamine"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:282
 msgid "Save in address book"
 msgstr "Salvesta aadressiraamatusse"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Kaardi vaade"
 
-#: ../addressbook/importers/evolution-csv-importer.c:661
-#: ../addressbook/importers/evolution-ldif-importer.c:498
-#: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:306
-#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "Importimine..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:863
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook'i CSV või Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:864
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook'i CSV ja Tab-i importija"
 
-#: ../addressbook/importers/evolution-csv-importer.c:872
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV või Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:873
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV ja Tab-i importija"
 
-#: ../addressbook/importers/evolution-csv-importer.c:881
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolutioni CSV või Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:882
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolutioni CSV ja Tab-i importija"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:665
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP-i andmevahetusvorming (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "Evolution LDIF importer"
 msgstr "Evolutioni LDIF importija"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:547
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vKaart (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "Evolution vCard Importer"
 msgstr "Evolutioni vKaardi importija"
 
-#: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10-punktine Tahoma"
 
-#: ../addressbook/printing/e-contact-print.glade.h:2
 msgid "8 pt. Tahoma"
 msgstr "8-punktine Tahoma"
 
-#: ../addressbook/printing/e-contact-print.glade.h:3
 msgid "Blank forms at end:"
 msgstr "Tühjad väljad lõpus:"
 
-#: ../addressbook/printing/e-contact-print.glade.h:4
 msgid "Body"
 msgstr "Sisu"
 
-#: ../addressbook/printing/e-contact-print.glade.h:5
 msgid "Bottom:"
 msgstr "All:"
 
-#: ../addressbook/printing/e-contact-print.glade.h:6
 msgid "Dimensions:"
 msgstr "Mõõtmed:"
 
-#: ../addressbook/printing/e-contact-print.glade.h:7
 msgid "F_ont..."
 msgstr "_Kirjatüüp..."
 
-#: ../addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
 msgstr "Kirjatüübid"
 
-#: ../addressbook/printing/e-contact-print.glade.h:9
 msgid "Footer:"
 msgstr "Jalus:"
 
-#: ../addressbook/printing/e-contact-print.glade.h:10
 msgid "Format"
 msgstr "Vorming"
 
-#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:433 ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:647
-#: ../widgets/table/e-table-field-chooser.c:80
-#: ../widgets/table/e-table-header-item.c:1908
-#: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Päis"
 
-#: ../addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
 msgstr "Päis/jalus"
 
-#: ../addressbook/printing/e-contact-print.glade.h:13
 msgid "Headings"
 msgstr "Päised"
 
-#: ../addressbook/printing/e-contact-print.glade.h:14
 msgid "Headings for each letter"
 msgstr "Päised iga kirja jaoks"
 
-#: ../addressbook/printing/e-contact-print.glade.h:15
 msgid "Height:"
 msgstr "Kõrgus:"
 
-#: ../addressbook/printing/e-contact-print.glade.h:16
 msgid "Immediately follow each other"
 msgstr "Vahetult üksteise järgi"
 
-#: ../addressbook/printing/e-contact-print.glade.h:17
 msgid "Include:"
 msgstr "Lisa:"
 
-#: ../addressbook/printing/e-contact-print.glade.h:18
 msgid "Landscape"
 msgstr "Rõhtpaigutus"
 
-#: ../addressbook/printing/e-contact-print.glade.h:19
 msgid "Left:"
 msgstr "Vasakul:"
 
-#: ../addressbook/printing/e-contact-print.glade.h:20
 msgid "Letter tabs on side"
 msgstr "Tähenupud küljel"
 
-#: ../addressbook/printing/e-contact-print.glade.h:21
 msgid "Margins"
 msgstr "Veerised"
 
-#: ../addressbook/printing/e-contact-print.glade.h:22
 msgid "Number of columns:"
 msgstr "Tulpade arv:"
 
-#: ../addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "Valikud"
 
-#: ../addressbook/printing/e-contact-print.glade.h:24
 msgid "Orientation"
 msgstr "Suund"
 
-#: ../addressbook/printing/e-contact-print.glade.h:25
 msgid "Page"
 msgstr "Lehekülg"
 
-#: ../addressbook/printing/e-contact-print.glade.h:26
 msgid "Page Setup:"
 msgstr "Lehekülje sätted:"
 
-#: ../addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
 msgstr "Paber"
 
-#: ../addressbook/printing/e-contact-print.glade.h:28
 msgid "Paper source:"
 msgstr "Paberiallikas:"
 
-#: ../addressbook/printing/e-contact-print.glade.h:29
 msgid "Portrait"
 msgstr "Püstpaigutus"
 
-#: ../addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
 msgstr "Eelvaade:"
 
-#: ../addressbook/printing/e-contact-print.glade.h:31
 msgid "Print using gray shading"
 msgstr "Trükkimisel kasuta halli varjutamist"
 
-#: ../addressbook/printing/e-contact-print.glade.h:32
 msgid "Reverse on even pages"
 msgstr "Paarisarvulised leheküljed peeglisse"
 
-#: ../addressbook/printing/e-contact-print.glade.h:33
 msgid "Right:"
 msgstr "Paremal:"
 
-#: ../addressbook/printing/e-contact-print.glade.h:34
 msgid "Sections:"
 msgstr "Sektsioonid:"
 
-#: ../addressbook/printing/e-contact-print.glade.h:35
 msgid "Shading"
 msgstr "Varjutamine"
 
 #. FIXME: Take care of i18n
-#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1069
-#: ../plugins/exchange-operations/exchange-calendar.c:232
-#: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
 msgstr "Suurus:"
 
-#: ../addressbook/printing/e-contact-print.glade.h:37
 msgid "Start on a new page"
 msgstr "Alusta uuelt leheküljelt"
 
-#: ../addressbook/printing/e-contact-print.glade.h:38
 msgid "Style name:"
 msgstr "Stiili nimi:"
 
-#: ../addressbook/printing/e-contact-print.glade.h:39
 msgid "Top:"
 msgstr "Ülevalt:"
 
-#: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:154
 msgid "Type:"
 msgstr "Liik:"
 
-#: ../addressbook/printing/e-contact-print.glade.h:41
 msgid "Width:"
 msgstr "Laius:"
 
-#: ../addressbook/printing/e-contact-print.glade.h:42
 msgid "_Font..."
 msgstr "_Kirjatüüp..."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
 msgid "Contact Print Style Editor Test"
 msgstr "Kontakti printimislaadi redaktori test"
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:55
-#: ../addressbook/printing/test-print.c:45
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Autoriõigus (C) 2000, Ximian, Inc."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:57
 msgid "This should test the contact print style editor widget"
 msgstr "See peaks testima kontakti printimise laadiredaktori vidinat"
 
-#: ../addressbook/printing/test-print.c:44
 msgid "Contact Print Test"
 msgstr "Kontakti printimistest"
 
-#: ../addressbook/printing/test-print.c:47
 msgid "This should test the contact print code"
 msgstr "See peaks testima kontaktiprintimise koodi"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "Faili pole võimalik avada"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
 msgid "Couldn't get list of address books"
 msgstr "Aadressiraamatute nimekirja pole võimalik hankida"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
 msgid "failed to open book"
 msgstr "tõrge raamatu avamisel"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:48
 msgid "Specify the output file instead of standard output"
 msgstr "Standardväljundi asemele väljundfaili määramine"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "OUTPUTFILE"
 msgstr "VÄLJUNDFAIL"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "List local address book folders"
 msgstr "Kohalike aadressiraamatute kaustade nimekiri"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "Show cards as vcard or csv file"
 msgstr "Kaartide näitamine vcard või csv failina"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "[vcard|csv]"
 msgstr "[vkaard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Export in asynchronous mode"
 msgstr "Eksportimine asünkroonses režiimis"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
@@ -4107,33 +2933,26 @@ msgstr ""
 "Asünkroonses režiimis ühes väljundfailis olevate kaartide arv, vaikimisi "
 "suurus on 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "NUMBER"
 msgstr "NUMBER"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr "Käsureaargumentide viga, kasutusspikri saamiseks kasuta --help võtit."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr "Toetada ainult csv või vcard vorminguid."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
 msgstr "Asünkroonrežiimis peab väljundiks olema fail."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr "Tavaolekus pole suuruse võtit tarvis."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "Käsitlemata viga"
 
 #. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:2
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar from the side bar in the Calendar view."
@@ -4142,7 +2961,6 @@ msgstr ""
 "vali kalendrivaate külribalt kalender, mis võimaldab muudatusi sisse viia."
 
 #. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:4
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
@@ -4150,7 +2968,6 @@ msgstr ""
 "Kalendriallikas '{0}' on kirjutuskaitsega ja seda pole võimalik muuta. Palun "
 "vali kalender, mis võimaldab muudatusi sisse viia."
 
-#: ../calendar/calendar.error.xml.h:5
 msgid ""
 "Adding a meaningful summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
@@ -4158,7 +2975,6 @@ msgstr ""
 "Sündmusele mõtestatud kokkuvõtte lisamine annab sündmuse vastuvõtjatele aimu "
 "sündmuse sisu kohta."
 
-#: ../calendar/calendar.error.xml.h:6
 msgid ""
 "Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
@@ -4166,19 +2982,16 @@ msgstr ""
 "Ülesandele mõtestatud kokkuvõtte lisamine annab ülesande vastuvõtjatele aimu "
 "ülesande sisu kohta."
 
-#: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr ""
 "Kõik nendes märkmetes sisalduv teave kustutatakse ja seda pole võimalik enam "
 "taastada."
 
-#: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
 msgstr ""
 "Kõik selles märkmes sisalduv teave kustutatakse ja seda pole võimalik enam "
 "taastada."
 
-#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
@@ -4186,133 +2999,102 @@ msgstr ""
 "Kõik nende sündmuste kohta käiv teave kustutatakse ja seda pole võimalik "
 "enam taastada."
 
-#: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
 "Kõik nende ülesannete kohta käiv teave kustutatakse ja seda pole võimalik "
 "enam taastada."
 
-#: ../calendar/calendar.error.xml.h:11
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "Kõik selle sündmuse kohta käiv teave kustutatakse ja seda pole võimalik enam "
 "taastada."
 
-#: ../calendar/calendar.error.xml.h:12
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "Kõik selle koosoleku kohta käiv teave kustutatakse ja seda pole võimalik "
 "enam taastada."
 
-#: ../calendar/calendar.error.xml.h:13
 msgid "All information on this memo will be deleted and can not be restored."
 msgstr ""
 "Kõik selle märkme kohta käiv teave kustutatakse ja seda pole võimalik enam "
 "taastada."
 
-#: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
 "Kõik selle ülesande kohta käiv teave kustutatakse ja seda pole võimalik enam "
 "taastada."
 
-#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Kas sa soovid kustutada ülesannet '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Kas sa soovid kustutada sündmust nimega '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "Kas sa soovid kustutada märget '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Kas sa soovid kustutada {0} sündmust?"
 
-#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "Kas sa soovid kustutada {0} märget?"
 
-#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Kas sa soovid kustutada {0} ülesannet?"
 
-#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Kas sa soovid kustutada seda sündmust?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:182
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Kas sa soovid kustutada seda koosolekut?"
 
-#: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:188
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Kas sa soovid kustutada seda märget?"
 
-#: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:185
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Kas sa soovid kustutada seda ülesannet?"
 
-#: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Oled sa kindel, et soovid seda märget ilma kokkuvõtteta salvestada?"
 
-#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "Oled sa kindel, et soovid seda sündmust ilma kokkuvõtteta saata?"
 
-#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "Oled sa kindel, et soovid seda ülesannet ilma kokkuvõtteta saata?"
 
-#: ../calendar/calendar.error.xml.h:28
 msgid "Cannot create a new event"
 msgstr "Uut sündmust pole võimalik luua"
 
-#: ../calendar/calendar.error.xml.h:29
 msgid "Cannot save event"
 msgstr "Sündmust pole võimalik salvestada"
 
-#: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
 msgstr "Kas kustutada kalender '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:31
 msgid "Delete memo list '{0}'?"
 msgstr "Kas kustutata märkmeloend '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:32
 msgid "Delete task list '{0}'?"
 msgstr "Kas kustutata ülesandeloend '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:33
 msgid "Do _not Send"
 msgstr "Ä_ra saada"
 
-#: ../calendar/calendar.error.xml.h:34
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Hetkel toimub allalaadimine. Kas sa soovid sündmust kustutada?"
 
-#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Hetkel toimub allalaadimine. Kas sa soovid ülesannet salvestada?"
 
-#: ../calendar/calendar.error.xml.h:36
 msgid "Editor could not be loaded."
 msgstr "Redaktorit pole võimalik laadida."
 
-#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4320,26 +3102,21 @@ msgstr ""
 "E-posti teel edastatud kutsed saadetakse kõikidele osalejatele, see lubab "
 "neil ülesandele nõusolekut anda."
 
-#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "E-posti teel edastatud kutsed saadetakse kõikidele osalejatele, see lubab "
 "osalejatel neile vastata."
 
-#: ../calendar/calendar.error.xml.h:39
 msgid "Error loading calendar"
 msgstr "Viga kalendri laadimisel"
 
-#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading memo list"
 msgstr "Viga märkmeloendi laadimisel"
 
-#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading task list"
 msgstr "Viga ülesandeloendi laadimisel"
 
-#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -4347,7 +3124,6 @@ msgstr ""
 "Kui sa ei saada tühistamisteadet, siis ülejäänud osalised võivad kohtumise "
 "tühistamisest mitte teada saada."
 
-#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -4355,7 +3131,6 @@ msgstr ""
 "Kui sa ei saada tühistamisteadet, siis ülejäänud osalised võivad selle "
 "märkme kustutamisest mitte teada saada."
 
-#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -4363,19 +3138,15 @@ msgstr ""
 "Kui sa ei saada tühistamisteadet, siis ülejäänud osalised võivad selle "
 "ülesande kustutamisest mitte teada saada."
 
-#: ../calendar/calendar.error.xml.h:45
 msgid "Save Appointment"
 msgstr "Sündmuse salvestamine"
 
-#: ../calendar/calendar.error.xml.h:46
 msgid "Save Memo"
 msgstr "Märkme salvestamine"
 
-#: ../calendar/calendar.error.xml.h:47
 msgid "Save Task"
 msgstr "Ülesande salvestamine"
 
-#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4383,7 +3154,6 @@ msgstr ""
 "Värskendatud andmete saatmine aitab teistel osalejatel nende kalendreid "
 "ajakohasena hoida"
 
-#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4391,7 +3161,6 @@ msgstr ""
 "Värskendatud andmete saatmine aitab teistel osalejatel nende ülesannete "
 "nimekirja ajakohasena hoida"
 
-#: ../calendar/calendar.error.xml.h:51
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4399,7 +3168,6 @@ msgstr ""
 "Mõned manused on hetkel allalaadimisel. Sündmuse salvestamine võib tähendada "
 "nende manuste kaotsiminekut."
 
-#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4407,84 +3175,64 @@ msgstr ""
 "Mõned manused on hetkel allalaadimisel. Ülesande salvestamine võib tähendada "
 "nende manuste kaotsiminekut."
 
-#: ../calendar/calendar.error.xml.h:53
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Mõned võimalused võivad sinu praeguse serveriga ebakorrektselt töötada."
 
-#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolutioni kalender lõpetas ootamatult."
 
-#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolutioni märge lõpetas ootamatult."
 
-#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolutioni ülesanded lõpetasid ootamatult."
 
-#: ../calendar/calendar.error.xml.h:57
 msgid "The calendar is not marked for offline usage."
 msgstr "Kalender pole märgitud võrguvabas olekus kasutamiseks."
 
-#: ../calendar/calendar.error.xml.h:58
 msgid "The memo list is not marked for offline usage."
 msgstr "Märkmeloend pole märgitud võrguvabas olekus kasutamiseks."
 
-#: ../calendar/calendar.error.xml.h:59
 msgid "The task list is not marked for offline usage."
 msgstr "Ülesandeloend pole märgitud võrguvabas olekus kasutamiseks."
 
-#: ../calendar/calendar.error.xml.h:60
 msgid "This calendar will be removed permanently."
 msgstr "See kalender eemaldatakse jäädavalt."
 
-#: ../calendar/calendar.error.xml.h:61
 msgid "This memo list will be removed permanently."
 msgstr "See märkmeloend eemaldatakse jäädavalt."
 
-#: ../calendar/calendar.error.xml.h:62
 msgid "This task list will be removed permanently."
 msgstr "See ülesandeloend eemaldatakse jäädavalt."
 
-#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Kas soovid selle sündmuse muudatusi salvestada?"
 
-#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this memo?"
 msgstr "Kas soovid selle märkme muudatusi salvestada?"
 
-#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this task?"
 msgstr "Kas soovid selle ülesande muudatusi salvestada?"
 
-#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Kas soovid saata selle märkme kohta tühistamisteate?"
 
-#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Kas soovid teistele osalejatele saata tühistamisteate?"
 
-#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Kas soovid saata osalejatele osalemiskutsed?"
 
-#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send this task to participants?"
 msgstr "Kas soovid osalejaid teavitada sellest ülesandest?"
 
-#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Kas soovid osalejaid teavitada koosoleku muutusest?"
 
-#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send updated task information to participants?"
 msgstr "Kas soovid saata osalejatele värskemaid andmeid ülesande kohta?"
 
-#: ../calendar/calendar.error.xml.h:72
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4494,273 +3242,164 @@ msgstr ""
 "tekitada probleeme. Parima tulemuse saavutamiseks peaksid sa serveritarkvara "
 "uuendama toetatud versiooniks."
 
-#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Sa oled muutnud seda sündmust, kuid muudatused pole veel salvestatud."
 
-#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this task, but not yet saved it."
 msgstr "Sa oled muutnud seda ülesannet, kuid muudatused pole veel salvestatud."
 
-#: ../calendar/calendar.error.xml.h:75
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Sa oled muutnud seda märget, kuid muudatused pole veel salvestatud."
 
-#: ../calendar/calendar.error.xml.h:76
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Sinu kalendreid pole enne Evolutioni taaskäivitamist võimalik kasutada."
 
-#: ../calendar/calendar.error.xml.h:77
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Sinu märkmeid pole enne Evolutioni taaskäivitamist võimalik kasutada."
 
-#: ../calendar/calendar.error.xml.h:78
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Sinu ülesandeid pole enne Evolutioni taaskäivitamist võimalik kasutada."
 
-#: ../calendar/calendar.error.xml.h:79
-#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Hülga muudatused"
 
-#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "_Salvesta"
 
-#: ../calendar/calendar.error.xml.h:81
 msgid "_Save Changes"
 msgstr "_Salvesta muudatused"
 
-#: ../calendar/calendar.error.xml.h:82
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "_Saada"
 
-#: ../calendar/calendar.error.xml.h:83
 msgid "_Send Notice"
 msgstr "Saada _teavitus"
 
-#: ../calendar/calendar.error.xml.h:84
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "Mitmepäevaste sündmuste osadeks jagamine:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1521
-#: ../calendar/conduits/calendar/calendar-conduit.c:1522
-#: ../calendar/conduits/memo/memo-conduit.c:820
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/todo/todo-conduit.c:1018
-#: ../calendar/conduits/todo/todo-conduit.c:1019
 msgid "Could not start evolution-data-server"
 msgstr "Andmeserverit pole võimalik käivitada (evolution-data-server)"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1629
-#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilot'i kalendrirakenduse blokki pole võimalik lugeda"
 
-#: ../calendar/conduits/memo/memo-conduit.c:914
-#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "Pilot'i märkmerakenduse blokki pole võimalik lugeda"
 
-#: ../calendar/conduits/memo/memo-conduit.c:961
-#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "Pilot'i märkmerakenduse blokki pole võimalik kirjutada"
 
-#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "Vaikimisi tähtsus:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1102
-#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilot'i ülesanderakenduse blokki pole võimalik lugeda"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1147
-#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "Pilot'i ülesanderakenduse blokki pole võimalik kirjutada"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2363
 msgid "Calendar and Tasks"
 msgstr "Kalender ja ülesanded"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:805
-#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "Kalendrid"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "Häälesta siin oma ajavöönd, kalender ja ülesandeloend"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Evolution Calendar and Tasks"
 msgstr "Evolutioni kalender ja ülesanded"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Evolution Calendar configuration control"
 msgstr "Evolutioni kalendri seadistuste juhtimine"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar scheduling message viewer"
 msgstr "Evolutioni kalendri ajastussõnumi näitaja"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar/Task editor"
 msgstr "Evolutioni kalendri/ülesande redaktor"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution's Calendar component"
 msgstr "Evolutioni kalendrikomponent"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution's Memos component"
 msgstr "Evolutioni märkmetekomponent"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Tasks component"
 msgstr "Evolutioni ülesannetekomponent"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "Memo_s"
 msgstr "_Märkmed"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:279 ../calendar/gui/e-memos.c:1120
-#: ../calendar/gui/gnome-cal.c:1774 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:354
-#: ../calendar/gui/memos-control.c:370
 msgid "Memos"
 msgstr "Märkmed"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:703 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1642 ../calendar/gui/print.c:1984
-#: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:492
-#: ../calendar/gui/tasks-control.c:508
-#: ../calendar/importers/icalendar-importer.c:74
-#: ../calendar/importers/icalendar-importer.c:735
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:588
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Ülesanded"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
 msgid "_Calendars"
 msgstr "_Kalendrid"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Ülesanded"
 
-#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolutioni kalendri alarmteadete teenus"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minutit"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:119
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:663
-#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "tund"
 msgstr[1] "tundi"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "Algusaeg"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
 msgid "Appointments"
 msgstr "Sündmused"
 
 #. Location
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1603
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1609
-#: ../calendar/gui/e-itip-control.c:1172
-#: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Asukoht:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze _time:"
 msgstr "_Edasilükkamise aeg:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1332
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:169
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
-#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
-#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Redaktor"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
 msgid "_Snooze"
 msgstr "_Lükka edasi"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 msgid "location of appointment"
 msgstr "sündmuse asukoht"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1461
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1586
 msgid "No summary available."
 msgstr "Kokkuvõte puudub."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
 msgid "No description available."
 msgstr "Kirjeldus puudub."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1480
 msgid "No location information available."
 msgstr "Asukoha kohta andmed puuduvad."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1525
 #, c-format
 msgid "You have %d alarms"
 msgstr "Sul on %d alarmi"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1715
-#: ../mail/mail-component.c:1596
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1691
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4772,7 +3411,6 @@ msgstr ""
 "saatmist e-posti teel.  Evolution kuvab selle asemel\n"
 "hariliku meeldetuletusdialoogi."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1721
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4788,15 +3426,12 @@ msgstr ""
 "\n"
 "Oled sa kindel, et soovid seda programmi käivitada?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1735
 msgid "Do not ask me about this program again."
 msgstr "Selle programmi kohta enam mitte küsida."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:141
 msgid "Could not initialize Bonobo"
 msgstr "Bonobot pole võimalik lähtestada"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:154
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -4804,13 +3439,10 @@ msgstr ""
 "Alarmteavituse teenuse factory't pole võimalik luua, võibolla see juba "
 "töötab..."
 
-#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "vigane aeg"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
-#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4818,8 +3450,6 @@ msgstr[0] "%d tund"
 msgstr[1] "%d tundi"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
-#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4829,168 +3459,127 @@ msgstr[1] "%d minutit"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
-#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekundit"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 msgid "Alarm programs"
 msgstr "Alarmprogrammid"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
 msgstr "Nõusoleku küsimine kirjete kustutamisel"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "Täna tähtaja ületavate ülesannete värv, \"#rrggbb\" vorgmingus."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "Tähtaja ületanud ülesannete värvus, \"#rrggbb\" vorgmingus."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 msgid "Calendars to run alarms for"
 msgstr "Kalendrid, mille jaoks alarme käivitada"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "Marcus Bains'i joone värvus ajaribal (vaikimisi tühi)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Marcus Bains'i joone värvus päeva vaatel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Compress weekends in month view"
 msgstr "Kuuvaatel kuvatakse nädalalõpud kokkusurutud vormis"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Confirm expunge"
 msgstr "Kinnituse küsimine enne puhastamist"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "Päevad, millel töötundide algust ja lõppu tuleb näidata."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Default appointment reminder"
 msgstr "Kohtumise vaikimisi meeldetuletaja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Default reminder units"
 msgstr "Meeldetuletaja vaikimisi ühikud"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default reminder value"
 msgstr "Meeldetuletaja vaikimisi väärtus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Directory for saving alarm audio files"
 msgstr "Alarmi audiofailide salvestamise kataloog"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Event Gradient"
 msgstr "Sündmuse kalle"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Event Transparency"
 msgstr "Sündmuse läbipaistvus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Free/busy server URLs"
 msgstr "Vaba/hõivatud serveri URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy template URL"
 msgstr "Vaba/hõivatud malli URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Gradient of the events in calendar views."
 msgstr "Sündmuste kalle kalendrivaates."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
 msgstr "Peida lõpetatud ülesanded"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
 msgstr "Ülesandeühikute peitmine"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
 msgstr "Ülesandeväärtuste peitmine"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
 msgstr "Rõhtpaani asukoht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Tööpäeva lõpuaeg, 24-tunnises vormingus, vahemikus 0-23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Tööpäeva algusaeg, 24-tunnises vormingus, vahemikus 0-23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Päeva ja töönädala vaates näidatavad vahemikud minutites."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Last alarm time"
 msgstr "Viimase alarmi aeg"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "List of server URLs for free/busy publishing."
 msgstr "Serveri url-ide loend vaba/hõivatud andmete avaldamiseks."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains'i joon"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains'i joone värv - päeva vaade"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains'i joone värv - ajariba"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minut, millal tööpäev lõpeb, 0 kuni 59"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minut, millal tööpäev algab, 0 kuni 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "Month view horizontal pane position"
 msgstr "Kuuvaate rõhtpaani asukoht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Month view vertical pane position"
 msgstr "Kuuvaate püstpaani asukoht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Number of units for determining a default reminder."
 msgstr "Meeldetuletaja vaikimisi ühikute arv."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Number of units for determining when to hide tasks."
 msgstr "Ülesannete peitmiseks vaikimisi ühikute arv."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Overdue tasks color"
 msgstr "Tähtaja ületanud ülesannete värvus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4998,7 +3587,6 @@ msgstr ""
 "Rõhtpaani asukoht pikslites - kuupäevanavigeerimise kalendri ja ülesannete "
 "loendi vahel, kui ei olda kuuvaates."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5006,20 +3594,17 @@ msgstr ""
 "Rõhtpaani asukoht pikslites - vaate ning kuupäevanavigeerimise kalendri ja "
 "ülesannete loendi vahel, kui oldakse kuuvaates."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr "Püstpaani asukoht kalendriloendite ja kuupäevanavigaatori vahel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
 msgstr ""
 "Rõhtpaani asukoht pikslites - ülesande- ja ülesande eelvaatepaanide vahel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5027,7 +3612,6 @@ msgstr ""
 "Püstpaani asukoht pikslites - vaate ning kuupäevanavigeerimise kalendri ja "
 "ülesannete loendi vahel, kui oldakse kuuvaates."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -5035,69 +3619,51 @@ msgstr ""
 "Püstpaani asukoht pikslites - vaate ning kuupäevanavigeerimise kalendri ja "
 "ülesannete loendi vahel, kui ei olda kuuvaates."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programmid, mida on lubatud alarmide poolt käivitada."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Save directory for alarm audio"
 msgstr "Alarmide audio salvestamise kataloog"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "RSVP välja kuvamine sündmuste/ülesannete/koosolekute redaktoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Rollivälja näitamine sündmuste/ülesannete/koosolekute redaktoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Show appointment end times in week and month views"
 msgstr "Sündmuste lõpuaegade näitamine nädala ja kuu vaadetel"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Kategooriavälja näitamine sündmuste/ülesannete/koosolekute redaktoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Show display alarms in notification tray"
 msgstr "Alarmide kuvamine teavitussalves"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Olekuvälja näitamine sündmuste/ülesannete/koosolekute redaktoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "\"Eelvaatlus\" paani kuvamine"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "\"Eelvaatlus\" paani kuvamine."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Ajavööndi välja näitamine sündmuste/koosolekute redaktoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Liigivälja näitamine sündmuste/koosolekute redaktoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Show week numbers in date navigator"
 msgstr "Nädalanumbrite näitamine kuupäevavalikus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Tasks due today color"
 msgstr "Tänase tähtajaga ülesannete värvus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Tasks vertical pane position"
 msgstr "Ülesannete püstpaani asukoht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5106,7 +3672,6 @@ msgstr ""
 "Vaba/hõivatud andmete URL-i malli tagavaravariant. %u asendatakse e-posti "
 "aadressist võetud kasutajanimega ja %d asendatakse domeeniga."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5114,20 +3679,15 @@ msgstr ""
 "Vaikimisi ajavöönd kalendris märgitud päevadele ja aegadele - tõlkimata "
 "asukohastring Olseni ajavööndite andmebaasist, näiteks \"Europe/Tallinn\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Time divisions"
 msgstr "Ajajaotised:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Time the last alarm ran, in time_t."
 msgstr "Viimase alarmi töötamise aeg, time_t ühikuga."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "Ajavöönd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -5135,44 +3695,35 @@ msgstr ""
 "Sündmuste läbipaistvus kalendrivaadetes, väärtus 0 (läbipaistev) ja 1 "
 "(läbipaistmatu) vahel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Twenty four hour time format"
 msgstr "24-tunnine ajavorming"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Vaikimisi meeldetuletaja ühikud, \"minutes\" (minutid), \"hours\" (tunnid) "
 "või \"days\" (päevad)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Ühikud määramaks, millal ülesandeid peita, \"minutes\" (minutid), \"hours"
 "\" (tunnid) või \"days\" (päevad)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Week start"
 msgstr "Nädala algus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Nädalapäev, millal nädal algab, pühapäevast (0) esmaspäevani (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Kas teavitussalve kasutatakse alarmide kuvamiseks või mitte."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Kas sündmuste või ülesannete kustutamisel küsitakse nõusolekut."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Kas sündmuste või ülesannete puhastamisel küsitakse nõusolekut."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5180,145 +3731,108 @@ msgstr ""
 "Kas nädalalõpud tuleb kuuvaates kokku suruda, selle tulemusena kuvatakse "
 "nädalalõppu ühe päeva suurusena."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Kas sündmuste lõpuaegu kuvatakse nädala ja kuu vaadetel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Kas kalendris kuvatakse Marcus Bains'i joont (joon praeguse aja kohal)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Kas lõpetatud ülesanded peidetakse ülesandevaates."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Whether to set a default reminder for appointments."
 msgstr "Kas sündmustele seatakse vaikimisi meeldetuletaja."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Kas RSVP välja näidatakse sündmuste/ülesannete/koosolekute redaktoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Kas kategooriate välja näidatakse sündmuste/koosolekute redaktoris."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Kas rollivälja näidatakse sündmuste/ülesannete/koosolekute redaktoris."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Kas olekuvälja näidatakse sündmuste/ülesannete/koosolekute redaktoris."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Kas kellaaegu kuvatakse 24-tunnises või EL/PL vormingus."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Kas ajavööndi välja näidatakse sündmuste/koosolekute redaktoris."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Liigivälja näitamine sündmuste/ülesannete/koosolekute redaktoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Kas kuupäevasirvijas näidatakse nädalate numbreid."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "Kas sündmuste kuvamisel arvestatakse talve- ja suveaja nihkega."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Work days"
 msgstr "Tööpäevad"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Workday end hour"
 msgstr "Tund, millal tööpäev lõpeb"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Workday end minute"
 msgstr "Minut, millal tööpäev lõpeb"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Workday start hour"
 msgstr "Tund, millal tööpäev algab"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Workday start minute"
 msgstr "Minut, millal tööpäev algab"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "daylight savings time"
 msgstr "talve- ja suveaja nihe"
 
-#: ../calendar/gui/cal-search-bar.c:75
 msgid "Summary contains"
 msgstr "Kokkuvõte sisaldab"
 
-#: ../calendar/gui/cal-search-bar.c:76
 msgid "Description contains"
 msgstr "Kirjeldus sisaldab"
 
-#: ../calendar/gui/cal-search-bar.c:77
 msgid "Category is"
 msgstr "Kategooria on"
 
-#: ../calendar/gui/cal-search-bar.c:78
 msgid "Comment contains"
 msgstr "Kommentaar sisaldab"
 
-#: ../calendar/gui/cal-search-bar.c:79
 msgid "Location contains"
 msgstr "Asukoht sisaldab"
 
-#: ../calendar/gui/cal-search-bar.c:633 ../calendar/gui/cal-search-bar.c:676
-#: ../calendar/gui/cal-search-bar.c:695
 msgid "Unmatched"
 msgstr "Vastavus puudub"
 
-#: ../calendar/gui/cal-search-bar.c:641
 msgid "Next 7 Days' Tasks"
 msgstr "Järgneva 7 päeva ülesanded"
 
-#: ../calendar/gui/cal-search-bar.c:645
 msgid "Active Tasks"
 msgstr "Aktiivsed ülesanded"
 
-#: ../calendar/gui/cal-search-bar.c:649
 msgid "Overdue Tasks"
 msgstr "Tähtaja ületanud ülesanded"
 
-#: ../calendar/gui/cal-search-bar.c:653
 msgid "Completed Tasks"
 msgstr "Lõpetatud ülesanded"
 
-#: ../calendar/gui/cal-search-bar.c:657
 msgid "Tasks with Attachments"
 msgstr "Manustega ülesanded"
 
-#: ../calendar/gui/cal-search-bar.c:703
 msgid "Active Appointments"
 msgstr "Aktiivsed sündmused"
 
-#: ../calendar/gui/cal-search-bar.c:707
 msgid "Next 7 Days' Appointments"
 msgstr "Järgneva 7 päeva sündmused"
 
-#: ../calendar/gui/calendar-commands.c:92 ../ui/evolution-addressbook.xml.h:26
-#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
-#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Prindi"
 
-#: ../calendar/gui/calendar-commands.c:317
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5327,17 +3841,9 @@ msgstr ""
 "See tegevus eemaldab lõplikult kõik sündmused, mis on valitud päevade arvust "
 "vanemad. Eemaldatud sündmuseid pole hiljem enam võimalik taastada."
 
-#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "Puhastada sündmustest, mis on vanemad kui"
 
-#: ../calendar/gui/calendar-commands.c:328
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:664
-#: ../plugins/google-account-setup/google-contacts-source.c:330
-#: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "päeva"
 
@@ -5345,487 +3851,323 @@ msgstr "päeva"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:505
-#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
-#: ../calendar/gui/tasks-component.c:231
 msgid "On The Web"
 msgstr "Veebis"
 
-#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Sünnipäevad ja aastapäevad"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Ilm"
 
-#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "_Uus kalender"
 
-#: ../calendar/gui/calendar-component.c:616
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "_Kopeeri..."
 
-#: ../calendar/gui/calendar-component.c:949
+msgid "_Make available for offline use"
+msgstr "_Märgi kasutamiseks võrguvabas olekus"
+
+msgid "_Do not make available for offline use"
+msgstr "_Märgi võrguvabas olekus mittekasutatavaks"
+
 msgid "Failed upgrading calendars."
 msgstr "Tõrge kalendrite uuendamisel."
 
-#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Kalendrit '%s' pole võimalik sündmuste ja koosolekute loomiseks avada"
 
-#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Sündmuste ja koosolekute loomiseks pole kalendrit saadaval"
 
-#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "Kalendri allika valimine"
 
-#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "Uus sündmus"
 
-#: ../calendar/gui/calendar-component.c:1597
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Sündmus"
 
-#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "Uue sündmuse lisamine"
 
-#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Uus koosolek"
 
-#: ../calendar/gui/calendar-component.c:1605
 msgctxt "New"
 msgid "M_eeting"
 msgstr "K_oosolek"
 
-#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "Uue koosolekukutse loomine"
 
-#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Uus, kogu päeva hõlmav sündmus"
 
-#: ../calendar/gui/calendar-component.c:1613
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Kogu _päeva hõlmav sündmus"
 
-#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "Uue kogu päeva hõlmava sündmuse lisamine"
 
-#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Uus kalender"
 
-#: ../calendar/gui/calendar-component.c:1621
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_nder"
 
-#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "Uue kalendri loomine"
 
-#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "Päeva vaade"
 
-#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "Töönädala vaade"
 
-#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "Nädala vaade"
 
-#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "Kuu vaade"
 
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:4
 msgid "Any Field"
 msgstr ""
 
-#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:21
 msgid "Attachments"
 msgstr "Manused"
 
-#: ../calendar/gui/caltypes.xml.h:5
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-#: ../calendar/gui/tasktypes.xml.h:7
 msgid "Attendee"
 msgstr "Osaleja"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
-#: ../calendar/gui/tasktypes.xml.h:9
 msgid "Business"
 msgstr "Äri"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:11
 msgid "Category"
 msgstr "Kategooria"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "Liigitamine"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12
 msgid "Competition"
 msgstr ""
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:250
-#: ../calendar/gui/e-cal-model.c:348 ../calendar/gui/e-calendar-table.c:546
-#: ../calendar/gui/memotypes.xml.h:10
 msgid "Confidential"
 msgstr "Salajane"
 
-#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
-#: ../calendar/gui/tasktypes.xml.h:14
-#: ../plugins/plugin-manager/plugin-manager.c:59
-#: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "Kirjeldus"
 
-#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
-#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "Kirjeldus sisaldab"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:38
 msgid "Do Not Exist"
 msgstr "Puuduvad"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:41
 msgid "Exist"
 msgstr "On olemas"
 
-#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:18
 msgid "Favourites"
 msgstr "Lemmikud"
 
-#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:19
 msgid "Gifts"
 msgstr "Kingitused"
 
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:20
 msgid "Goals/Objectives"
 msgstr "Eesmärgid"
 
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:22
 msgid "Holiday"
 msgstr "Puhkus"
 
-#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:23
 msgid "Holiday Cards"
 msgstr "Puhkusekaardid"
 
-#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
-#: ../calendar/gui/tasktypes.xml.h:24
 msgid "Hot Contacts"
 msgstr "Kuumad kontaktid"
 
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
-#: ../calendar/gui/tasktypes.xml.h:25
 msgid "Ideas"
 msgstr "Ideed"
 
-#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
-#: ../calendar/gui/tasktypes.xml.h:27
 msgid "International"
 msgstr "Rahvusvaheline"
 
-#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
-#: ../calendar/gui/tasktypes.xml.h:28
 msgid "Key Customer"
 msgstr "Võtmeklient"
 
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
-#: ../calendar/gui/tasktypes.xml.h:30
 msgid "Miscellaneous"
 msgstr "Muu"
 
-#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
 msgid "Next 7 days"
 msgstr "Järgnevad 7 päeva"
 
-#: ../calendar/gui/caltypes.xml.h:28
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:26 ../calendar/gui/tasktypes.xml.h:34
 msgid "Organizer"
 msgstr "Korraldaja"
 
-#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
-#: ../calendar/gui/tasktypes.xml.h:36
 msgid "Phone Calls"
 msgstr "Telefonikõned"
 
-#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:346 ../calendar/gui/e-calendar-table.c:545
-#: ../calendar/gui/memotypes.xml.h:29
 msgid "Private"
 msgstr "Isiklik"
 
-#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:337 ../calendar/gui/e-cal-model.c:344
-#: ../calendar/gui/e-calendar-table.c:544 ../calendar/gui/memotypes.xml.h:30
 msgid "Public"
 msgstr "Avalik"
 
-#: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:299
 msgid "Recurrence"
 msgstr "Kordumine"
 
-#: ../calendar/gui/caltypes.xml.h:34
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:545
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
-#: ../mail/em-filter-i18n.h:86 ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Olek"
 
-#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
-#: ../calendar/gui/tasktypes.xml.h:39
 msgid "Strategies"
 msgstr "Strateegiad"
 
-#: ../calendar/gui/caltypes.xml.h:36
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:33
-#: ../calendar/gui/tasktypes.xml.h:40
-#: ../plugins/save-calendar/csv-format.c:362
 msgid "Summary"
 msgstr "Kokkuvõte"
 
-#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
-#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "Kokkuvõte sisaldab"
 
-#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
-#: ../calendar/gui/tasktypes.xml.h:42
 msgid "Suppliers"
 msgstr "Tarnijad"
 
-#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
-#: ../calendar/gui/tasktypes.xml.h:43
 msgid "Time &amp; Expenses"
 msgstr "Aeg ja kulutused"
 
-#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
-#: ../calendar/gui/tasktypes.xml.h:45
 msgid "VIP"
 msgstr "VIP"
 
-#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
-#: ../calendar/gui/tasktypes.xml.h:46
 msgid "Waiting"
 msgstr "Ootamine"
 
-#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
-#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:26
 msgid "contains"
 msgstr "sisaldab"
 
-#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
-#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:32
 msgid "does not contain"
 msgstr "ei sisalda"
 
-#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
-#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:46
 msgid "is"
 msgstr "on"
 
-#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
-#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:52
 msgid "is not"
 msgstr "ei ole"
 
-#: ../calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Viga kalendri avamisel"
 
-#: ../calendar/gui/comp-editor-factory.c:415
 msgid "Method not supported when opening the calendar"
 msgstr "Kalendri avamisel pole see meetod toetatud"
 
-#: ../calendar/gui/comp-editor-factory.c:421
 msgid "Permission denied to open the calendar"
 msgstr "Puuduvad õigused kalendri avamiseks"
 
-#: ../calendar/gui/comp-editor-factory.c:433 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "Alarmi redigeerimine"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>Alarm</b>"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
 msgid "<b>Options</b>"
 msgstr "<b>Valikud</b>"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
 msgid "<b>Repeat</b>"
 msgstr "<b>Kordumine</b>"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
 msgid "Add Alarm"
 msgstr "Alarmi lisamine"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
 msgid "Custom _message"
 msgstr "Kohandatud _sõnum"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
 msgid "Custom alarm sound"
 msgstr "Kohandatud alarmheli"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
 msgid "Mes_sage:"
 msgstr "_Sõnum:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Heli mängimine"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Hoiatuse kuvamine"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Programmi käivitamine"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Select A File"
 msgstr "Faili valimine"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "Send To:"
 msgstr "Kellele saata:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "E-kirja saatmine"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
 msgid "_Arguments:"
 msgstr "_Argumendid:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
 msgid "_Program:"
 msgstr "_Programm:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "_Repeat the alarm"
 msgstr "_Alarmi korratakse täiendavalt"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
 msgid "_Sound:"
 msgstr "_Heli:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "pärast"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "enne"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "day(s)"
 msgstr "päev(a)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "sündmuse lõppu"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
 msgid "extra times every"
 msgstr "korda, vahemikuga"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "tund(i)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minut(it)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "sündmuse algust"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "Tegevus/Päästik"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
 msgid "A_dd"
 msgstr "L_isa"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "Alarmid"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
-#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "Manust on soovitatav kuvada _automaatselt"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "Faili(de) manustamine"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:484
 msgid "Selected Calendars for Alarms"
 msgstr "Alarmidele valitud kalendrid"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid ""
 "60 minutes\n"
 "30 minutes\n"
@@ -5839,7 +4181,6 @@ msgstr ""
 "10 minutit\n"
 "05 minutit"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, no-c-format
 msgid ""
 "<i>%u and %d will be replaced by user and domain from the email address.</i>"
@@ -5847,52 +4188,36 @@ msgstr ""
 "<i>%u ja %d asendatakse kasutajanime ja domeeniga, mis võetakse e-post "
 "aadressist.</i>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Hoiatused</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">Vaikimisi vaba/hõivatud server</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:17
-#: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Üldine</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">Ülesannete loend</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">Aeg</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">Töönädal</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Adjust for daylight sa_ving time"
 msgstr "Arvestatakse s_uve- ja talveaja erinevustega"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Day _ends:"
 msgstr "Päev lõpe_b:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Display"
 msgstr "Kuvamine"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Reede"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5902,13 +4227,9 @@ msgstr ""
 "tundi\n"
 "päeva"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
-#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Esmaspäev"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5926,956 +4247,669 @@ msgstr ""
 "Laupäev\n"
 "Pühapäev"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "Värvuse valimine"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "S_un"
 msgstr "_P"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Laupäev"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Select the calendars for alarm notification"
 msgstr "Alarmmärguannetega kalendrite valimine"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Sh_ow a reminder"
 msgstr "_Meeldetuletusi näidatakse"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Show week _numbers in date navigator"
 msgstr "_Kuupäeva valimisel kuvatakse nädalate numbreid"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
-#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Pühapäev"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "T_asks due today:"
 msgstr "_Tänase tähtajaga ülesanded:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "T_hu"
 msgstr "_N"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Template:"
 msgstr "Mall:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
-#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Neljapäev"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "Aja_vöönd:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Time format:"
 msgstr "Ajavorming:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
-#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Teisipäev"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
-#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Kolmapäev"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "Wee_k starts on:"
 msgstr "Nä_dala algus:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "Work days:"
 msgstr "Tööpäevad:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_12 hour (AM/PM)"
 msgstr "_12 tunnine (EL/PL)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_24 hour"
 msgstr "_24 tunnine"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Ask for confirmation when deleting items"
 msgstr "K_irjete kustutamisel küsitakse nõusolekut"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Compress weekends in month view"
 msgstr "_Nädalalõppe kuvatakse kokkusurutud vormis"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Day begins:"
 msgstr "Päev al_gab:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Fri"
 msgstr "_R"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Hide completed tasks after"
 msgstr "Lõpetatud ülesanded _peidetakse pärast"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Mon"
 msgstr "_E"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Overdue tasks:"
 msgstr "Tä_htaja ületanud ülesanded:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Sat"
 msgstr "_L"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Show appointment end times in week and month view"
 msgstr "Nädala ja kuu vaadetel näidatakse sündmuste _lõpuaegu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Time divisions:"
 msgstr "Aja _jaotamine:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
 msgid "_Tue"
 msgstr "_T"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Wed"
 msgstr "_K"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "before every appointment"
 msgstr "enne iga sündmuse algust"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr ""
 "Kalendri sisu _kopeeritakse kohapeale, tarvitamiseks võrguvabas keskkonnas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr ""
 "Ülesandeloendi sisu _kopeerimine kohapeale tarvitamiseks võrguvabas "
 "keskkonnas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr ""
 "Märkmeloendi sisu _kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
 msgstr "Vä_rvus:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "Ülesandeloend"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "Märkmeloend"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "Kalendri omadused"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "Uus kalender"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "Ülesandeloendi omadused"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "New Task List"
 msgstr "Uus ülesandeloend"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "Memo List Properties"
 msgstr "Märkmeloendi omadused"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "Uus märkmeloend"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "See sündmus on kustutatud."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "See ülesanne on kustutatud."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
 msgid "This memo has been deleted."
 msgstr "See märge on kustutatud."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Sa oled teinud muutusi. Kas unustada need muudatused ja sulgeda aken?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Sa ei muutnud midagi. Kas sulgeda aken?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Seda sündmust on muudetud."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Seda ülesannet on muudetud."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
 msgid "This memo has been changed."
 msgstr "Seda märget on muudetud."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  On tehtud muudatusi.  Kas tühistada need muudatused ja uuendada "
 "redaktorit?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Muudatusi ei ole tehtud. Kas värskendada redaktorit?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "Valideerimisviga: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2358
 msgid " to "
 msgstr " kuni "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2362
 msgid " (Completed "
 msgstr " (Valmis "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2364
 msgid "Completed "
 msgstr "Lõpetatud "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2369
 msgid " (Due "
 msgstr " (Tähtaeg "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2371
 msgid "Due "
 msgstr "Tähtaeg "
 
-#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "Manustatud sõnum - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:237
-#: ../calendar/gui/dialogs/comp-editor.c:410 ../composer/e-msg-composer.c:1766
-#: ../composer/e-msg-composer.c:1985
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Manustatud sõnum"
 msgstr[1] "%d manustatud sõnumit"
 
-#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2053
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2110
 msgid "_Move"
 msgstr "_Tõsta ümber"
 
-#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2055
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2112
 msgid "Cancel _Drag"
 msgstr "Tühista _lohistamine"
 
-#: ../calendar/gui/dialogs/comp-editor.c:616
-#: ../calendar/gui/dialogs/comp-editor.c:3249 ../mail/em-utils.c:371
-#: ../plugins/prefer-plain/prefer-plain.c:91
-#: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "manus"
 
-#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "Objekti pole võimalik uuendada!"
 
-#: ../calendar/gui/dialogs/comp-editor.c:930
 msgid "Edit Appointment"
 msgstr "Muuda sündmust"
 
-#: ../calendar/gui/dialogs/comp-editor.c:937
 #, c-format
 msgid "Meeting - %s"
 msgstr "Koosolek - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sündmus - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Omistatud ülesanne - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Task - %s"
 msgstr "Ülesanne - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952
 #, c-format
 msgid "Memo - %s"
 msgstr "Märge - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:968
 msgid "No Summary"
 msgstr "Kokkuvõte puudub"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
 msgid "Click here to close the current window"
 msgstr "Käesoleva akna sulgemine"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1269
 msgid "Copy selected text to the clipboard"
 msgstr "Märgitud teksti kopeerimine lõikelauale"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
 msgid "Cut selected text to the clipboard"
 msgstr "Lõika valitud tekst lõikelauale"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1283
 msgid "Click here to view help available"
 msgstr "Saadaoleva abiteabe vaatamiseks klõpsa siia"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1290
 msgid "Paste text from the clipboard"
 msgstr "Teksti asetamine lõikepuhvrist"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
 msgid "Click here to save the current window"
 msgstr "Käesoleva akna sisu salvestamine"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
 msgid "Select all text"
 msgstr "Kogu teksti valimine"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
 msgid "_Classification"
 msgstr "_Liigitus"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1339
-#: ../mail/mail-signature-editor.c:208
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Fail"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1346
-#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "A_bi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1353
 msgid "_Insert"
 msgstr "L_isa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1360
 msgid "_Options"
 msgstr "_Valikud"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1367 ../mail/em-folder-tree.c:2098
-#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_Vaade"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1377
-#: ../composer/e-composer-actions.c:471
 msgid "_Attachment..."
 msgstr "_Manus..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1379
 msgid "Click here to attach a file"
 msgstr "Faili manustamine"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
 msgid "_Categories"
 msgstr "_Kategooriad"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
 msgid "Toggles whether to display categories"
 msgstr "Kategooriavälja kuvamise sisse- ja väljalülitamine"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
 msgid "Time _Zone"
 msgstr "Ajavöön_d"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1397
 msgid "Toggles whether the time zone is displayed"
 msgstr "Ajavööndivälja kuvamise sisse- ja väljalülitamine"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1406
 msgid "Pu_blic"
 msgstr "A_valik"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1408
 msgid "Classify as public"
 msgstr "Avalikuks liigitamine"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1413
 msgid "_Private"
 msgstr "_Isiklik"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1415
 msgid "Classify as private"
 msgstr "Isiklikuks liigitamine"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
 msgid "_Confidential"
 msgstr "_Salajane"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
 msgid "Classify as confidential"
 msgstr "Salajaseks liigitamine"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "R_ole Field"
 msgstr "R_olliväli"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1432
 msgid "Toggles whether the Role field is displayed"
 msgstr "Rollivälja kuvamise sisse- ja väljalülitamine"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1440
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "RSVP välja kuvamise sisse- ja väljalülitamine"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
 msgid "_Status Field"
 msgstr "_Olekuväli"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1448
 msgid "Toggles whether the Status field is displayed"
 msgstr "Olekuvälja kuvamise sisse- ja väljalülitamine"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1454
 msgid "_Type Field"
 msgstr "_Tüübiväli"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Osaleja liigi kuvamise sisse- ja väljalülitamine"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1766
-#: ../composer/e-composer-private.c:65 ../widgets/misc/e-attachment-bar.c:1381
 msgid "Recent _Documents"
 msgstr "_Hiljutised dokumendid"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1785
-#: ../composer/e-composer-actions.c:699
 msgid "Attach"
 msgstr "Manusta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> fail manusena"
 msgstr[1] "<b>%d</b> faili manusena"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "Peida manuseri_ba"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1915
-#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "Näita manuseri_ba"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/dialogs/event-page.c:1875
-#: ../calendar/gui/dialogs/task-page.c:1197 ../composer/e-msg-composer.c:1040
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "_Eemalda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2037
-#: ../composer/e-msg-composer.c:1043
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Lisa manus..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2245
-#: ../mail/em-format-html-display.c:2201
 msgid "Show Attachments"
 msgstr "Näita manuseid"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr "Vajuta tühikut manuseriba sisse-/väljalülitamiseks"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2390
-#: ../calendar/gui/dialogs/comp-editor.c:2437
-#: ../calendar/gui/dialogs/comp-editor.c:3282
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Sellele kirjele tehtud muudatused tühistatakse uuenduste saabumise korral"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "Praegust versiooni pole võimalik kasutada!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:64
 msgid "Could not open source"
 msgstr "Lähteallika avamine nurjus"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:72
 msgid "Could not open destination"
 msgstr "Sihtkoha avamine nurjus"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:81
 msgid "Destination is read only"
 msgstr "Sihtkoht on kirjutuskaitsega"
 
-#: ../calendar/gui/dialogs/delete-comp.c:205
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:56
 msgid "The event could not be deleted due to a corba error"
 msgstr "Seda sündmust pole võimalik corba vea tõttu kustutada"
 
-#: ../calendar/gui/dialogs/delete-error.c:59
 msgid "The task could not be deleted due to a corba error"
 msgstr "Seda ülesannet pole võimalik corba vea tõttu kustutada"
 
-#: ../calendar/gui/dialogs/delete-error.c:62
 msgid "The memo could not be deleted due to a corba error"
 msgstr "Seda märget pole võimalik corba vea tõttu kustutada"
 
-#: ../calendar/gui/dialogs/delete-error.c:65
 msgid "The item could not be deleted due to a corba error"
 msgstr "Seda kirjet pole võimalik corba vea tõttu kustutada"
 
-#: ../calendar/gui/dialogs/delete-error.c:72
 msgid "The event could not be deleted because permission was denied"
 msgstr "Sündmust pole võimalik ligipääsu piirangute tõttu kustutada"
 
-#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The task could not be deleted because permission was denied"
 msgstr "Ülesannet pole võimalik ligipääsu piirangute tõttu kustutada"
 
-#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Märget pole võimalik ligipääsu piirangute tõttu kustutada"
 
-#: ../calendar/gui/dialogs/delete-error.c:81
 msgid "The item could not be deleted because permission was denied"
 msgstr "Kirjet pole võimalik kustutada, kuna juurdepääs puudub"
 
-#: ../calendar/gui/dialogs/delete-error.c:88
 msgid "The event could not be deleted due to an error"
 msgstr "Sündmust pole vea tõttu võimalik kustutada"
 
-#: ../calendar/gui/dialogs/delete-error.c:91
 msgid "The task could not be deleted due to an error"
 msgstr "Ülesannet pole vea tõttu võimalik kustutada"
 
-#: ../calendar/gui/dialogs/delete-error.c:94
 msgid "The memo could not be deleted due to an error"
 msgstr "Märget pole vea tõttu võimalik kustutada"
 
-#: ../calendar/gui/dialogs/delete-error.c:97
 msgid "The item could not be deleted due to an error"
 msgstr "Kirjet pole vea tõttu võimalik kustutada"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Contacts..."
 msgstr "Kontaktid..."
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To:"
 msgstr "Delegeerida:"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
 msgid "Enter Delegate"
 msgstr "Sisesta Delegaat"
 
-#: ../calendar/gui/dialogs/event-editor.c:196
 msgid "_Alarms"
 msgstr "_Alarmid"
 
-#: ../calendar/gui/dialogs/event-editor.c:198
 msgid "Click here to set or unset alarms for this event"
 msgstr "Klõpsa siia, et seada või eemaldada selle sündmuse alarme"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
 msgid "_Recurrence"
 msgstr "_Kordumine"
 
-#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "Make this a recurring event"
 msgstr "Selle sündmuse muutmine korduvaks"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../widgets/misc/e-send-options.glade.h:19
 msgid "Send Options"
 msgstr "Saatmise valikud"
 
-#: ../calendar/gui/dialogs/event-editor.c:212
-#: ../calendar/gui/dialogs/task-editor.c:125
 msgid "Insert advanced send options"
 msgstr "Laiendatud saatmisvalikute lisamine"
 
-#: ../calendar/gui/dialogs/event-editor.c:220
 msgid "All _Day Event"
 msgstr "Kogu _päeva kestev sündmus"
 
-#: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Toggles whether to have All Day Event"
 msgstr "Kogu päeva kestva sündmuse sisse- ja väljalülitamine"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Show Time as _Busy"
 msgstr "Näita aega kui _hõivatut"
 
-#: ../calendar/gui/dialogs/event-editor.c:230
 msgid "Toggles whether to show time as busy"
 msgstr "Aja kui hõivatud aja välja kuvamise sisse- ja väljalülitamine"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "_Free/Busy"
 msgstr "_Vaba/hõivatud"
 
-#: ../calendar/gui/dialogs/event-editor.c:241
 msgid "Query free / busy information for the attendees"
 msgstr "Osalejate vaba/hõivatud andmete pärimine"
 
-#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "Sünd_mus"
 
-#: ../calendar/gui/dialogs/event-page.c:735
-#: ../calendar/gui/dialogs/event-page.c:2718
 msgid "This event has alarms"
 msgstr "See sündmus on alarmidega"
 
-#: ../calendar/gui/dialogs/event-page.c:798
-#: ../calendar/gui/dialogs/event-page.glade.h:10
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Korralda_ja:"
 
-#: ../calendar/gui/dialogs/event-page.c:844
 msgid "_Delegatees"
 msgstr "_Delegaadid"
 
-#: ../calendar/gui/dialogs/event-page.c:846
 msgid "Atte_ndees"
 msgstr "_Osalejad"
 
-#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no start date"
 msgstr "Sündmus ilma alguskuupäevata"
 
-#: ../calendar/gui/dialogs/event-page.c:1033
 msgid "Event with no end date"
 msgstr "Sündmis ilma lõppkuupäevata"
 
-#: ../calendar/gui/dialogs/event-page.c:1202
-#: ../calendar/gui/dialogs/memo-page.c:640
-#: ../calendar/gui/dialogs/task-page.c:812
 msgid "Start date is wrong"
 msgstr "Alguskuupäev on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:1212
 msgid "End date is wrong"
 msgstr "Lõppemise päev on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:1235
 msgid "Start time is wrong"
 msgstr "Algusaeg on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:1242
 msgid "End time is wrong"
 msgstr "Lõppemise aeg on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:1405
-#: ../calendar/gui/dialogs/memo-page.c:681
-#: ../calendar/gui/dialogs/task-page.c:872
 msgid "The organizer selected no longer has an account."
 msgstr "Valitud korraldajal pole enam kontot."
 
-#: ../calendar/gui/dialogs/event-page.c:1411
-#: ../calendar/gui/dialogs/memo-page.c:687
-#: ../calendar/gui/dialogs/task-page.c:878
 msgid "An organizer is required."
 msgstr "Korraldaja peab olema määrtud."
 
-#: ../calendar/gui/dialogs/event-page.c:1436
-#: ../calendar/gui/dialogs/task-page.c:902
 msgid "At least one attendee is required."
 msgstr "Vähemalt üks osaleja peab olema märgitud."
 
-#: ../calendar/gui/dialogs/event-page.c:1876
-#: ../calendar/gui/dialogs/task-page.c:1198
 msgid "_Add "
 msgstr "_Lisa "
 
-#: ../calendar/gui/dialogs/event-page.c:2594
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kalendrit '%s' pole võimalik avada."
 
-#: ../calendar/gui/dialogs/event-page.c:2638
-#: ../calendar/gui/dialogs/memo-page.c:890
-#: ../calendar/gui/dialogs/task-page.c:1797
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:2918
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d päev enne sündmust"
 msgstr[1] "%d päeva enne sündmust"
 
-#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d tund enne sündmust"
 msgstr[1] "%d tundi enne sündmust"
 
-#: ../calendar/gui/dialogs/event-page.c:2930
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minut enne sündmust"
 msgstr[1] "%d minutit enne sündmust"
 
-#: ../calendar/gui/dialogs/event-page.c:2943
 msgid "Customize"
 msgstr "Kohandatud"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2948
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
-#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:370
-#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:195
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1517
-#: ../widgets/misc/e-dateedit.c:1731
-#: ../widgets/misc/e-signature-combo-box.c:70
 msgid "None"
 msgstr "Puudub"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 day before appointment"
 msgstr "1 päev enne sündmust"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:2
 msgid "1 hour before appointment"
 msgstr "1 tund enne sündmust"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:3
 msgid "15 minutes before appointment"
 msgstr "15 minutit enne sündmust"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:5
 msgid "Attendee_s..."
 msgstr "_Osalejad..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
 msgid "Custom Alarm:"
 msgstr "Kohandatud alarm:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Event Description"
 msgstr "Sündmuse kirjeldus"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:11
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-#: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "Kokkuvõt_e:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "_Alarm"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.glade.h:8
 msgid "_Description:"
 msgstr "_Kirjeldus:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "Ae_g:"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
 msgid "for"
 msgstr "kestusega"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
 msgid "until"
 msgstr "kuni"
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:1
 msgid "<b>Att_endees</b>"
 msgstr "<b>_Osalejad</b>"
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:2
 msgid "C_hange Organizer"
 msgstr "_Muuda korraldajat"
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:3
 msgid "Co_ntacts..."
 msgstr "Ko_ntaktid..."
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "Korraldaja:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2478
 msgid "Memo"
 msgstr "Märge"
 
-#: ../calendar/gui/dialogs/memo-page.c:851
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Märkmeid pole võimalik '%s'-s avada."
 
-#: ../calendar/gui/dialogs/memo-page.c:1006 ../mail/em-format-html.c:1562
-#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "Kellele"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-#: ../calendar/gui/dialogs/task-page.glade.h:5
 msgid "Sta_rt date:"
 msgstr "_Algusaeg:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
 msgid "T_o:"
 msgstr "_Kellele:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:364
-#: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupp:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Sa muudad korduvat sündmust. Mida sa täpsemalt soovid muuta?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Sa delegeerid korduvat sündmust. Mida sa täpsemalt soovid delegeerida?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Sa muudad korduvat ülesannet. Mida sa täpsemalt soovid muuta?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Sa muudad korduvat märget. Mida sa täpsemalt soovid muuta?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This Instance Only"
 msgstr "Ainult seda kirjet"
 
-#: ../calendar/gui/dialogs/recur-comp.c:93
 msgid "This and Prior Instances"
 msgstr "Seda kirjet koos varasemate kirjetega"
 
-#: ../calendar/gui/dialogs/recur-comp.c:99
 msgid "This and Future Instances"
 msgstr "Seda kirjet koos tulevikukirjetega"
 
-#: ../calendar/gui/dialogs/recur-comp.c:104
 msgid "All Instances"
 msgstr "Kõiki kirjeid"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "See sündmus sisaldab ressursse, mida Evolutionil pole võimalik muuta."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "Kordumiskuupäev on vigane"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "järgnevatel nädalapäevadel:"
 
@@ -6883,7 +4917,6 @@ msgstr "järgnevatel nädalapäevadel:"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "esimene"
 
@@ -6892,7 +4925,6 @@ msgstr "esimene"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "teine"
 
@@ -6900,7 +4932,6 @@ msgstr "teine"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "kolmas"
 
@@ -6908,7 +4939,6 @@ msgstr "kolmas"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "neljas"
 
@@ -6916,13 +4946,11 @@ msgstr "neljas"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "viimane"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Muu kuupäev"
 
@@ -6930,7 +4958,6 @@ msgstr "Muu kuupäev"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "1-10"
 
@@ -6938,7 +4965,6 @@ msgstr "1-10"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "11-20"
 
@@ -6946,246 +4972,164 @@ msgstr "11-20"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "21-31"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "päev"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "iga"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "kord(a)"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
 msgstr "Lisa erand"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "Muutmiseks pole võimalik valikut hankida."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
 msgstr "Muuda erandit"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "Kustutamiseks pole võimalik valikut hankida."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Kuupäev/kellaaeg"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "<b>Exceptions</b>"
 msgstr "<b>Erandid</b>"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:3
 msgid "<b>Preview</b>"
 msgstr "<b>Eelvaade</b>"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
 msgid "<b>Recurrence</b>"
 msgstr "<b>Kordumine</b>"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
 msgid "Every"
 msgstr "Vahemikuga"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "This appointment rec_urs"
 msgstr "See sündmus _kordub"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "forever"
 msgstr "igavesti"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
 msgid "month(s)"
 msgstr "kuu(d)"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
 msgid "week(s)"
 msgstr "nädal(at)"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
 msgid "year(s)"
 msgstr "aasta(t)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:377
-#: ../calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
 msgstr "Lõpetamise kuupäev on vale"
 
-#: ../calendar/gui/dialogs/task-details-page.c:482
 msgid "Web Page"
 msgstr "Veebileht"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "<span weight=\"bold\">Miscellaneous</span>"
 msgstr "<span weight=\"bold\">Muu</span>"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">Olek</span>"
 
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
-#: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:253
-#: ../calendar/gui/e-cal-model-tasks.c:362
-#: ../calendar/gui/e-cal-model-tasks.c:679
-#: ../calendar/gui/e-calendar-table.c:237
-#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/e-itip-control.c:946
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/print.c:2554 ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "Lõpetatud"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:272
-#: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1066
 msgid "High"
 msgstr "Kõrge"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-cal-model-tasks.c:754
-#: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2551
 msgid "In Progress"
 msgstr "Töös"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:276
-#: ../calendar/gui/e-calendar-table.c:568 ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1064
 msgid "Low"
 msgstr "Madal"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-cal-model.c:985 ../calendar/gui/e-calendar-table.c:567
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1065
 msgid "Normal"
 msgstr "Keskmine"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:260
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:639 ../calendar/gui/print.c:2548
-#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "Pole alanud"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "P_ercent complete:"
 msgstr "Täitmis_protsent"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Stat_us:"
 msgstr "_Olek:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Määramata"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
 msgstr "_Lõpetamise kuupäev:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_Priority:"
 msgstr "Tä_htsus:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Web Page:"
 msgstr "_Koduleht:"
 
-#: ../calendar/gui/dialogs/task-editor.c:113
 msgid "_Status Details"
 msgstr "_Oleku üksikasjad"
 
-#: ../calendar/gui/dialogs/task-editor.c:115
 msgid "Click to change or view the status details of the task"
 msgstr "Klõpsa ülesande oleku üksikasjade vaatamiseks või muutmiseks"
 
-#: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:527
 msgid "_Send Options"
 msgstr "_Saatmise valikud"
 
-#: ../calendar/gui/dialogs/task-editor.c:318
 msgid "_Task"
 msgstr "_Ülesanne"
 
-#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "Task Details"
 msgstr "Ülesande üksikasjad"
 
-#: ../calendar/gui/dialogs/task-page.c:372
-#: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Ko_rraldaja:"
 
-#: ../calendar/gui/dialogs/task-page.c:785
 msgid "Due date is wrong"
 msgstr "Tähtaja kuupäev on vale"
 
-#: ../calendar/gui/dialogs/task-page.c:1754
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ülesandeid pole võimalik '%s'-s avada."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
 msgid "Atte_ndees..."
 msgstr "_Osalejad..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
 msgstr "Kate_gooriad..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "D_ue date:"
 msgstr "_Tähtaeg:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Ajavöönd:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:394
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -7193,147 +5137,105 @@ msgstr[0] "%d päev"
 msgstr[1] "%d päeva"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:400
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d nädal"
 msgstr[1] "%d nädalat"
 
-#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Teostatakse tundmatu tegevus"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:476
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s enne sündmuse algust"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:481
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s pärast sündmuse algust"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:488
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s sündmuse alguses"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s enne sündmuse lõppu"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:504
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s pärast sündmuse lõppu"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s sündmuse lõpus"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:535
 #, c-format
 msgid "%s at %s"
 msgstr "%s kell %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:543
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s tundmatule trigeri tüübile"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "Klõpsa %s avamiseks"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
 msgid "Untitled"
 msgstr "Nimetu"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:187
-#: ../calendar/gui/e-cal-component-preview.c:217
-#: ../calendar/gui/e-cal-component-preview.c:228
 msgid "Start Date:"
 msgstr "Alguskuupäev:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:291
-#: ../calendar/gui/e-itip-control.c:1218
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
-#: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Kirjeldus:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:224
-#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Web Page:"
 msgstr "Veebileht:"
 
-#: ../calendar/gui/e-cal-component-preview.c:210
-#: ../calendar/gui/e-itip-control.c:1162
-#: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Kokkuvõte:"
 
-#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "Tähtaeg:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-itip-control.c:1186
-#: ../plugins/exchange-operations/exchange-account-setup.c:267
-#: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Olek:"
 
-#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "Tähtsus:"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Lõppemise kuupäev"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
 msgid "Start Date"
 msgstr "Alguskuupäev"
 
-#: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:618
 msgid "Free"
 msgstr "Vaba"
 
-#: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:619
-#: ../calendar/gui/e-meeting-time-sel.c:396
 msgid "Busy"
 msgstr "Hõivatud"
 
-#: ../calendar/gui/e-cal-model-tasks.c:627
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7343,358 +5245,241 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/e-meeting-store.c:746
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Jah"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:991
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:165
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Ei"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-cal-popup.c:106
-#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
-#: ../calendar/gui/e-itip-control.c:1203 ../calendar/gui/e-itip-control.c:1343
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:987
-#: ../calendar/gui/print.c:1004 ../mail/em-utils.c:1340
-#: ../plugins/itip-formatter/itip-formatter.c:409
-#: ../plugins/itip-formatter/itip-formatter.c:2046
-#: ../plugins/plugin-manager/plugin-manager.c:89
-#: ../widgets/misc/e-attachment-bar.c:821
-#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: ../calendar/gui/e-cal-model.c:987
 msgid "Recurring"
 msgstr "Korduv"
 
-#: ../calendar/gui/e-cal-model.c:989
 msgid "Assigned"
 msgstr "Määratud"
 
-#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "Salvestamine teise nimega..."
 
-#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2035
 msgid "Select folder to save selected attachments..."
 msgstr "Valitud manuste salvestamiseks kataloogi valimine..."
 
-#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "nimetu_pilt.%s"
 
-#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1575
-#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:925
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "_Salvesta kui..."
 
-#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:562
-#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "Säti _taustapildiks"
 
-#: ../calendar/gui/e-cal-popup.c:288
 msgid "_Save Selected"
 msgstr "_Salvesta valik"
 
-#: ../calendar/gui/e-cal-popup.c:429 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "Ava programmiga %s..."
 
-#: ../calendar/gui/e-calendar-table.c:337
 msgid "* No Summary *"
 msgstr "* Kokkuvõte puudub *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:373
-#: ../calendar/gui/e-calendar-view.c:2214
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Korraldaja: %s <%s>"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:376
-#: ../calendar/gui/e-calendar-view.c:2218
 #, c-format
 msgid "Organizer: %s"
 msgstr "Korraldaja: %s"
 
-#: ../calendar/gui/e-calendar-table.c:407
 msgid "Start: "
 msgstr "Algus: "
 
-#: ../calendar/gui/e-calendar-table.c:419
 msgid "Due: "
 msgstr "Tähtaeg: "
 
-#: ../calendar/gui/e-calendar-table.c:588
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:589
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:590
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:591
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:592
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:593
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:594
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:595
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:596
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:597
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:598
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:878
-#: ../calendar/gui/e-calendar-view.c:664 ../calendar/gui/e-memo-table.c:438
 msgid "Deleting selected objects"
 msgstr "Valitud objektide kustutamine"
 
-#: ../calendar/gui/e-calendar-table.c:1162
-#: ../calendar/gui/e-calendar-view.c:794 ../calendar/gui/e-memo-table.c:644
 msgid "Updating objects"
 msgstr "Objektide uuendamine"
 
-#: ../calendar/gui/e-calendar-table.c:1347
-#: ../calendar/gui/e-calendar-view.c:1220 ../calendar/gui/e-memo-table.c:820
-#: ../composer/e-composer-actions.c:277
 msgid "Save as..."
 msgstr "Salvestamine teise nimega..."
 
-#: ../calendar/gui/e-calendar-table.c:1570
-#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Task"
 msgstr "Uus ü_lesanne"
 
-#: ../calendar/gui/e-calendar-table.c:1574 ../calendar/gui/e-memo-table.c:924
 msgid "Open _Web Page"
 msgstr "_Ava veebileht"
 
-#: ../calendar/gui/e-calendar-table.c:1576
-#: ../calendar/gui/e-calendar-view.c:1656 ../calendar/gui/e-memo-table.c:926
 msgid "P_rint..."
 msgstr "_Prindi..."
 
-#: ../calendar/gui/e-calendar-table.c:1580
-#: ../calendar/gui/e-calendar-view.c:1676 ../calendar/gui/e-memo-table.c:930
-#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
-#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Lõika"
 
-#: ../calendar/gui/e-calendar-table.c:1582
-#: ../calendar/gui/e-calendar-view.c:1659
-#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:932
-#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Aseta"
 
-#: ../calendar/gui/e-calendar-table.c:1586 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Määra ülesanne"
 
-#: ../calendar/gui/e-calendar-table.c:1587 ../calendar/gui/e-memo-table.c:936
-#: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Edasta iKalendrina"
 
-#: ../calendar/gui/e-calendar-table.c:1588
 msgid "_Mark as Complete"
 msgstr "_Märgi lõpetatuks"
 
-#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Märgi valitud ülesanne lõpetatuks"
 
-#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark as Incomplete"
 msgstr "_Märgi kui lõpetamata"
 
-#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Märgi valitud ülesanded kui lõpetamata"
 
-#: ../calendar/gui/e-calendar-table.c:1596
 msgid "_Delete Selected Tasks"
 msgstr "_Kustuta valitud ülesanded"
 
-#: ../calendar/gui/e-calendar-table.c:1833
-#: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Ülesande lisamiseks klõpsa siia"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "(%) valmis"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
 msgstr "Lõpetatud"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "Lõpetamise kuupäev"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Tähtaeg"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../calendar/gui/tasktypes.xml.h:37
-#: ../plugins/save-calendar/csv-format.c:373
 msgid "Priority"
 msgstr "Tähtsus"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "Alguskuupäev"
 
-#: ../calendar/gui/e-calendar-view.c:1339
 msgid "Moving items"
 msgstr "Kirjete ümbertõstmine"
 
-#: ../calendar/gui/e-calendar-view.c:1341
 msgid "Copying items"
 msgstr "Kirjete kopeerimine"
 
-#: ../calendar/gui/e-calendar-view.c:1650
 msgid "New _Appointment..."
 msgstr "Uus _sündmus..."
 
-#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New All Day _Event"
 msgstr "_Uus kogu päeva sündmus"
 
-#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New _Meeting"
 msgstr "Uus _koosolek"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1663
 msgid "_Current View"
 msgstr "_Käesolev vaade"
 
-#: ../calendar/gui/e-calendar-view.c:1665
 msgid "Select T_oday"
 msgstr "Vali _tänane kuupäev"
 
-#: ../calendar/gui/e-calendar-view.c:1666
 msgid "_Select Date..."
 msgstr "_Vali kuupäev..."
 
-#: ../calendar/gui/e-calendar-view.c:1672
 msgid "Pri_nt..."
 msgstr "_Prindi..."
 
-#: ../calendar/gui/e-calendar-view.c:1682
 msgid "Cop_y to Calendar..."
 msgstr "Kop_eeri kalendrisse..."
 
-#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Mo_ve to Calendar..."
 msgstr "_Tõsta kalendrisse..."
 
-#: ../calendar/gui/e-calendar-view.c:1684
 msgid "_Delegate Meeting..."
 msgstr "_Delegeeri koosolek..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Schedule Meeting..."
 msgstr "A_jasta koosolek..."
 
-#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Forward as iCalendar..."
 msgstr "Edasta i_Kalendrina"
 
-#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Reply"
 msgstr "_Vasta"
 
-#: ../calendar/gui/e-calendar-view.c:1688 ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
-#: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Vasta _kõigile"
 
-#: ../calendar/gui/e-calendar-view.c:1693
 msgid "Make this Occurrence _Movable"
 msgstr "Muuda seekordne sündmus _liigutatavaks"
 
-#: ../calendar/gui/e-calendar-view.c:1694 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "K_ustuta seekordne sündmus"
 
-#: ../calendar/gui/e-calendar-view.c:1695
 msgid "Delete _All Occurrences"
 msgstr "Ku_stuta kõik sündmuse kordused"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2234 ../calendar/gui/print.c:2510
 #, c-format
 msgid "Location: %s"
 msgstr "Asukoht: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2268
 #, c-format
 msgid "Time: %s %s"
 msgstr "Aeg: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:111
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:114
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:122
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7707,7 +5492,6 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:583
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i-minutiline jaotamine"
@@ -7718,42 +5502,32 @@ msgstr "%02i-minutiline jaotamine"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1566
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1674
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:806 ../calendar/gui/e-week-view.c:542
-#: ../calendar/gui/print.c:831
 msgid "am"
 msgstr "el"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:809 ../calendar/gui/e-week-view.c:545
-#: ../calendar/gui/print.c:833
 msgid "pm"
 msgstr "pl"
 
-#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Jah. (Lihtne kordumine)"
 
-#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Iga päev"
 msgstr[1] "Iga %d päeva järel"
 
-#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Iga nädal"
 msgstr[1] "Iga %d nädala järel"
 
-#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7761,35 +5535,29 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " ja "
 
-#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "%s päev"
 
-#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "%s. %s "
 
-#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "iga kuu"
 msgstr[1] "iga %d kuu"
 
-#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Iga aasta"
 msgstr[1] "Iga %d aasta"
 
-#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7797,47 +5565,31 @@ msgstr[0] "kokku %d kord"
 msgstr[1] "kokku %d korda"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", lõpeb"
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "Algab"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "Lõpeb"
 
-#: ../calendar/gui/e-itip-control.c:961
-#: ../plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "Tähtaeg"
 
-#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
 msgid "iCalendar Information"
 msgstr "iKalendri andmed"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "iKalendri viga"
 
-#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
-#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
-#: ../plugins/itip-formatter/itip-view.c:344
-#: ../plugins/itip-formatter/itip-view.c:345
-#: ../plugins/itip-formatter/itip-view.c:432
-#: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:520
-#: ../plugins/itip-formatter/itip-view.c:521
 msgid "An unknown person"
 msgstr "Tundmatu isik"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1143
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7845,424 +5597,297 @@ msgstr ""
 "<br> Palun vaata järgnev info üle ja vali allpool olevast menüüst  sobilik "
 "tegevus."
 
-#: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
-#: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2034
 msgid "Accepted"
 msgstr "Nõusolek antud"
 
-#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "Proovinõusolek antud"
 
-#: ../calendar/gui/e-itip-control.c:1199
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
-#: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2040
 msgid "Declined"
 msgstr "Tagasi lükatud"
 
-#: ../calendar/gui/e-itip-control.c:1283
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr ""
 "Koosolek on tühistatud, kuid seda pole Sinu kalendritest võimalik leida"
 
-#: ../calendar/gui/e-itip-control.c:1285
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "Ülesanne on tühistatud, kuid seda pole Sinu ülesannete hulgast võimalik leida"
 
-#: ../calendar/gui/e-itip-control.c:1363
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> avaldas koosoleku andmed."
 
-#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "Koosoleku info"
 
-#: ../calendar/gui/e-itip-control.c:1370
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> soovib, et koosolekul osaleks ka %s."
 
-#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> soovib, et sa osaleksid koosolekul."
 
-#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "Koosoleku ettepanek"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> soovib liituda olemasoleva koosolekuga."
 
-#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "Koosoleku info uuendus"
 
-#: ../calendar/gui/e-itip-control.c:1384
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> soovib saada värskeimat infot koosoleku kohta."
 
-#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "Soov muuta koosolekut"
 
-#: ../calendar/gui/e-itip-control.c:1392
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> vastas koosoleku soovile."
 
-#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "Koosoleku vastus"
 
-#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> tühistas koosoleku."
 
-#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "Koosoleku tühistamine"
 
-#: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
-#: ../calendar/gui/e-itip-control.c:1528
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> saatis arusaamatu sõnumi."
 
-#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "Vigane koosoleku sõnum"
 
-#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> avaldas ülesande andmed."
 
-#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "Ülesande info"
 
-#: ../calendar/gui/e-itip-control.c:1447
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> soovib, et %s täidaks ülesande."
 
-#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> soovib, et sa täidaksid ülesande."
 
-#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "Ettepanek ülesandeks"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> soovib liituda olemasoleva ülesandega."
 
-#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "Ülesande uuendus"
 
-#: ../calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> soovib saada värskeimat infot ülesande kohta."
 
-#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "Soov muuta ülesannet"
 
-#: ../calendar/gui/e-itip-control.c:1469
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> vastas ülesande määramisele."
 
-#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "Ülesande vastus"
 
-#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> tühistas ülesande."
 
-#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "Ülesande tühistamine"
 
-#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "Vigane ülesande sõnum"
 
-#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> avaldas vaba/hõivatud andmed."
 
-#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "Vaba/hõivatud andmed"
 
-#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> soovib saada sinu vaba/hõivatud andmeid."
 
-#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "Soov saada vaba/hõivatud teavet"
 
-#: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> vastas vaba/hõivatud päringule."
 
-#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "Vaba/hõivatud vastus"
 
-#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "Vigane vaba/hõivatud sõnum"
 
-#: ../calendar/gui/e-itip-control.c:1605
 msgid "The message does not appear to be properly formed"
 msgstr "Sõnum ei tundu olevalt õigesti vormistatud"
 
-#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "Sõnum sisaldab ainult toetamata päringuid."
 
-#: ../calendar/gui/e-itip-control.c:1697
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Manus ei sisalda arusaadavat kalendriteadet"
 
-#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "Manus ei sisalda vaadeldavaid kalendrikirjeid"
 
-#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "Uuendamine lõpetatud\n"
 
-#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt on vigane ja seda pole võimalik uuendada\n"
 
-#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "See vastus pole praeguselt osalejalt. Kas lisame ta osalejaks?"
 
-#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Osaleja olekut pole võimailk uuendada, kuna selle olek on vigane!\n"
 
-#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "Osaleja olek värskendatud\n"
 
-#: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Osaleja olekut ei olnud võimailk uuendada, kuna objekti pole enam olemas"
 
-#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "Kirje saadetud!\n"
 
-#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "Seda kirjet pole võimalik saata!\n"
 
-#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "Vali tegevus"
 
-#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "Uuenda"
 
-#: ../calendar/gui/e-itip-control.c:2355
-#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Nõustun"
 
-#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "Nõustun, kuid pole hetkel kindel"
 
-#: ../calendar/gui/e-itip-control.c:2357
-#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Lükkan tagasi"
 
-#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "Vaba/hõivatud teabe saatmine"
 
-#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "Värskenda vastaja olekut"
 
-#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "Värskeimate andmete saatmine"
 
-#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
-#: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Tühista"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
 msgid "--to--"
 msgstr "--kellele--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
 msgid "Calendar Message"
 msgstr "Kalendri sõnum"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "Date:"
 msgstr "Kuupäev:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Loading Calendar"
 msgstr "Kalendri laadimine"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
 msgid "Loading calendar..."
 msgstr "Kalendri laadimine..."
 
-#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
 msgstr "Serveri teade:"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "Juhid"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "Vajalikud osalejad"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "Võimalikud osalejad"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "Ressursid"
 
-#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "Osalejad"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:983
 msgid "Individual"
 msgstr "Isik"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:984 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Grupp"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:985
 msgid "Resource"
 msgstr "Ressurss"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:92 ../calendar/gui/e-meeting-store.c:109
-#: ../calendar/gui/print.c:986
 msgid "Room"
 msgstr "Ruum"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:1000
 msgid "Chair"
 msgstr "Juht"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:1001
 msgid "Required Participant"
 msgstr "Nõutav osaleja"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:1002
 msgid "Optional Participant"
 msgstr "Võimalik osavõtja"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/print.c:1003
 msgid "Non-Participant"
 msgstr "Mitteosaleja"
 
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
-#: ../calendar/gui/e-meeting-store.c:753
 msgid "Needs Action"
 msgstr "Vajab tegevust"
 
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
-#: ../calendar/gui/e-meeting-time-sel.c:395
 msgid "Tentative"
 msgstr "Katseline"
 
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
-#: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2043
 msgid "Delegated"
 msgstr "Delegeeritud"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:491
 msgid "Attendee                          "
 msgstr "Osaleja                           "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:533
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
 msgid "In Process"
 msgstr "Töös"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:467
-#: ../calendar/gui/e-meeting-time-sel.c:2120
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d. %B %Y"
 
@@ -8270,115 +5895,86 @@ msgstr "%A, %d. %B %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:471
-#: ../calendar/gui/e-meeting-time-sel.c:2151
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:475
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Out of Office"
 msgstr "Kontorist väljas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "No Information"
 msgstr "Andmed puuduvad"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "A_ttendees..."
 msgstr "_Osalejad..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:434
 msgid "O_ptions"
 msgstr "_Valikud"
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
 msgid "Show _only working hours"
 msgstr "Näita tunde _tööaja piires"
 
-#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _zoomed out"
 msgstr "Näita _väikeses plaanis"
 
-#: ../calendar/gui/e-meeting-time-sel.c:476
 msgid "_Update free/busy"
 msgstr "_Värskenda vaba/hõivatud"
 
-#: ../calendar/gui/e-meeting-time-sel.c:491
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:509
 msgid "_Autopick"
 msgstr "_Automaatne valik"
 
-#: ../calendar/gui/e-meeting-time-sel.c:524
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
 msgid "_All people and resources"
 msgstr "_Kõik inimesed ja ressursid"
 
-#: ../calendar/gui/e-meeting-time-sel.c:550
 msgid "All _people and one resource"
 msgstr "Kõik _inimesed ja üks ressurss"
 
-#: ../calendar/gui/e-meeting-time-sel.c:559
 msgid "_Required people"
 msgstr "_Vajalikud inimesed"
 
-#: ../calendar/gui/e-meeting-time-sel.c:568
 msgid "Required people and _one resource"
 msgstr "Vajalikud inimesed ja _üks ressurss"
 
-#: ../calendar/gui/e-meeting-time-sel.c:604
 msgid "_Start time:"
 msgstr "_Algus:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:631
 msgid "_End time:"
 msgstr "_Lõpp:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "Osaleja lisamiseks klõpsa siia"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr "Üldine nimi"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated From"
 msgstr "Kust delegeeritud"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Delegated To"
 msgstr "Kuhu delegeeritud"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Language"
 msgstr "Keel"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "Member"
 msgstr "Liige"
 
-#: ../calendar/gui/e-memo-table.c:941
 msgid "_Delete Selected Memos"
 msgstr "_Kustuta valitud märkmed"
 
-#: ../calendar/gui/e-memo-table.c:1092 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Märkme lisamiseks klõpsa siia"
 
-#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2961
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8387,277 +5983,213 @@ msgstr ""
 "Viga tegevusel %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "Märkmete laadimine"
 
-#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Märkmete avamine asukohast %s"
 
-#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "Valitud objektide kustutamine..."
 
-#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "Ülesannete laadimine"
 
-#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ülesannete avamine asukohast %s"
 
-#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "Ülesannete lõpetamine..."
 
-#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "Puhastamine"
 
-#: ../calendar/gui/e-timezone-entry.c:128
 msgid "Select Timezone"
 msgstr "Ajavööndi valimine"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1655
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "_Kohandatud vaade"
 
-#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "_Salvesta kohandatud vaade"
 
-#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
 msgstr "_Kirjelda vaateid..."
 
-#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Sündmuste laadimine asukohast %s"
 
-#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Ülesannete laadimine asukohast %s"
 
-#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Märkmete laadimine asukohast %s"
 
-#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "%s avamine"
 
-#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "Puhastamine"
 
-#: ../calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprill"
 
-#: ../calendar/gui/goto-dialog.glade.h:2
 msgid "August"
 msgstr "August"
 
-#: ../calendar/gui/goto-dialog.glade.h:3
 msgid "December"
 msgstr "Detsember"
 
-#: ../calendar/gui/goto-dialog.glade.h:4
 msgid "February"
 msgstr "Veebruar"
 
-#: ../calendar/gui/goto-dialog.glade.h:5
 msgid "January"
 msgstr "Jaanuar"
 
-#: ../calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "Juuli"
 
-#: ../calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "Juuni"
 
-#: ../calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "Märts"
 
-#: ../calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "Mai"
 
-#: ../calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "November"
 
-#: ../calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "Oktoober"
 
-#: ../calendar/gui/goto-dialog.glade.h:12
 msgid "Select Date"
 msgstr "Kuupäeva valimine"
 
-#: ../calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "September"
 
-#: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
 msgstr "_Vali tänane kuupäev"
 
-#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
-#: ../calendar/gui/itip-utils.c:544
 msgid "An organizer must be set."
 msgstr "Korraldaja peab olema määrtud."
 
-#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "Vaja on vähemalt ühte osalejat"
 
-#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "Andmed sündmuse kohta"
 
-#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "Andmed ülesande kohta"
 
-#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "Märkme andmed"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "Vaba/Hõivatud andmed"
 
-#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "Kalendri andmed"
 
-#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "Uuendatud"
 
-#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "Värskenda"
 
-#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "Loenduri esitus"
 
-#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vaba/hõivatud andmed (%s -> %s)"
 
-#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "iKalendri info"
 
-#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "Sa pead ise olema sündmusest osavõtja."
 
-#: ../calendar/gui/memos-component.c:464
 msgid "_New Memo List"
 msgstr "_Uus märkmeloend"
 
-#: ../calendar/gui/memos-component.c:544
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d märge"
 msgstr[1] "%d märget"
 
-#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d valitud"
 msgstr[1] ", %d valitud"
 
-#: ../calendar/gui/memos-component.c:593
 msgid "Failed upgrading memos."
 msgstr "Tõrge märkmete uuendamisel."
 
-#: ../calendar/gui/memos-component.c:953
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
 "Märkmeloendit '%s' pole võimalik sündmuste ja koosolekute loomiseks avada"
 
-#: ../calendar/gui/memos-component.c:966
 msgid "There is no calendar available for creating memos"
 msgstr "Märkmete loomiseks pole ühtegi kalendrit saadaval"
 
-#: ../calendar/gui/memos-component.c:1076
 msgid "Memo Source Selector"
 msgstr "Märkmete allika valija"
 
-#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "Uus märge"
 
-#: ../calendar/gui/memos-component.c:1261
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Mär_ge"
 
-#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "Uue märkme loomine"
 
-#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "Uus jagatud märge"
 
-#: ../calendar/gui/memos-component.c:1269
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "_Jagatud märge"
 
-#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "Uue jagatud märkme loomine"
 
-#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "Uus märkmeloend"
 
-#: ../calendar/gui/memos-component.c:1277
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "_Märkmeloend"
 
-#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "Uue märkmeloendi loomine"
 
-#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
 msgstr "Märkmete printimine"
 
-#: ../calendar/gui/memotypes.xml.h:25
 msgid "Next 7 Days"
 msgstr "Järgnevad 7 päeva"
 
-#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8669,7 +6201,6 @@ msgstr ""
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: ../calendar/gui/migration.c:161
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8682,300 +6213,229 @@ msgstr ""
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 "Vanade sätete migreerimine failist evolution/config.xmldb pole võimalik"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Kalendrit `%s' pole võimalik siirdada"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Ülesandeid `%s' pole võimalik siirdada"
 
-#: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
 msgid "Notes"
 msgstr "Märge"
 
-#: ../calendar/gui/print.c:517
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:517
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:517
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:517
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:517
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:518
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:518
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:518
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:518
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:518
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:519
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:519
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:519
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:519
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:519
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:520
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:520
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:520
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:520
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:520
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:521
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:521
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:521
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:521
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:521
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:522
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:522
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:522
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:522
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:522
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:523
 msgid "31st"
 msgstr "31."
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:598
 msgid "Su"
 msgstr "P"
 
-#: ../calendar/gui/print.c:598
 msgid "Mo"
 msgstr "E"
 
-#: ../calendar/gui/print.c:598
 msgid "Tu"
 msgstr "T"
 
-#: ../calendar/gui/print.c:598
 msgid "We"
 msgstr "K"
 
-#: ../calendar/gui/print.c:599
 msgid "Th"
 msgstr "N"
 
-#: ../calendar/gui/print.c:599
 msgid "Fr"
 msgstr "R"
 
-#: ../calendar/gui/print.c:599
 msgid "Sa"
 msgstr "L"
 
-#: ../calendar/gui/print.c:2474
 msgid "Appointment"
 msgstr "Sündmus"
 
-#: ../calendar/gui/print.c:2476
 msgid "Task"
 msgstr "Ülesanne"
 
-#: ../calendar/gui/print.c:2501
 #, c-format
 msgid "Summary: %s"
 msgstr "Kokkuvõte: %s"
 
-#: ../calendar/gui/print.c:2524
 msgid "Attendees: "
 msgstr "Osalejad: "
 
-#: ../calendar/gui/print.c:2564
 #, c-format
 msgid "Status: %s"
 msgstr "Olek: %s"
 
-#: ../calendar/gui/print.c:2581
 #, c-format
 msgid "Priority: %s"
 msgstr "Tähtsus: %s"
 
-#: ../calendar/gui/print.c:2593
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Valmis (%%): %i"
 
-#: ../calendar/gui/print.c:2605
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2618
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategooriad: %s"
 
-#: ../calendar/gui/print.c:2629
 msgid "Contacts: "
 msgstr "Kontaktid:"
 
-#: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "Uus ü_lesandeloend"
 
-#: ../calendar/gui/tasks-component.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d ülesanne"
 msgstr[1] "%d ülesannet"
 
-#: ../calendar/gui/tasks-component.c:584
 msgid "Failed upgrading tasks."
 msgstr "Tõrge ülesannete uuendamisel."
 
-#: ../calendar/gui/tasks-component.c:941
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Ülesannete loendit '%s' pole võimalik sündmuste ja koosolekute loomiseks "
 "avada"
 
-#: ../calendar/gui/tasks-component.c:954
 msgid "There is no calendar available for creating tasks"
 msgstr "Ülesannete loomiseks pole ühtegi kalendrit saadaval"
 
-#: ../calendar/gui/tasks-component.c:1065
 msgid "Task Source Selector"
 msgstr "Ülesannete allika valija"
 
-#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Uus ülesanne"
 
-#: ../calendar/gui/tasks-component.c:1326
 msgctxt "New"
 msgid "_Task"
 msgstr "_Ülesanne"
 
-#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Uue ülesande loomine"
 
-#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "Uus omistatud ülesanne"
 
-#: ../calendar/gui/tasks-component.c:1334
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "_Omistatud ülesanne"
 
-#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "Uue omistatud ülesande loomine"
 
-#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Uus ülesandeloend"
 
-#: ../calendar/gui/tasks-component.c:1342
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "Ü_lesandeloend"
 
-#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "Uue ülesandeloendi loomine"
 
-#: ../calendar/gui/tasks-control.c:452
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8986,70 +6446,52 @@ msgstr ""
 "lõpetatud. Kui sa jätkad, siis neid ülesandeid ei ole võimalik taastada.\n"
 "Kas tõesti kustutada need ülesanded?"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "Seda küsimust rohkem mitte esitada."
 
-#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "Prindi ülesanded"
 
-#: ../calendar/gui/tasktypes.xml.h:2
 #, no-c-format
 msgid "% Completed"
 msgstr "% valmis"
 
-#: ../calendar/gui/tasktypes.xml.h:10
 msgid "Cancelled"
 msgstr "Katkestatud"
 
-#: ../calendar/gui/tasktypes.xml.h:26
 msgid "In progress"
 msgstr "Töös"
 
-#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:50
 msgid "is greater than"
 msgstr "on suurem kui"
 
-#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:51
 msgid "is less than"
 msgstr "on väiksem kui"
 
-#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "Sündmused ja koosolekud"
 
-#: ../calendar/importers/icalendar-importer.c:331
-#: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "Kalendri avamine"
 
-#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "iKalendri failid (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "Evolutioni iKalendri imoportija"
 
-#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "Meeldetuletus!"
 
-#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "vKalendri failid (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "Evolutioni vKalendri importija"
 
-#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "Kalendrisündmused"
 
-#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolutioni intelligentne kalendriimportija"
 
@@ -9077,1738 +6519,1299 @@ msgstr "Evolutioni intelligentne kalendriimportija"
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: ../calendar/zones.h:26
 msgid "Africa/Abidjan"
 msgstr "Aafrika/Abidjan"
 
-#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "Aafrika/Accra"
 
-#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "Aafrika/Addis_Ababa"
 
-#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "Aafrika/Alžeeria"
 
-#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "Aafrika/Asmara"
 
-#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "Aafrika/Bamako"
 
-#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "Aafrika/Bangui"
 
-#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
 msgstr "Aafrika/Banjul"
 
-#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "Aafrika/Bissau"
 
-#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "Aafrika/Blantyre"
 
-#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "Aafrika/Brazzaville"
 
-#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "Aafrika/Bugumbura"
 
-#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "Aafrika/Kairo"
 
-#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "Aafrika/Casablanca"
 
-#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "Aafrika/Ceuta"
 
-#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "Aafrika/Conakry"
 
-#: ../calendar/zones.h:42
 msgid "Africa/Dakar"
 msgstr "Aafrika/Dakar"
 
-#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr "Aafrika/Dar_es_Salaam"
 
-#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "Aafrika/Djibouti"
 
-#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "Aafrika/Douala"
 
-#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "Aafrika/El_Aauin"
 
-#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "Aafrika/Freetown"
 
-#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "Aafrika/Gaborone"
 
-#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "Aafrika/Harare"
 
-#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "Aafrika/Johannesburg"
 
-#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "Aafrika/Kampala"
 
-#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
 msgstr "Aafrika/Khartum"
 
-#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "Aafrika/Kigali"
 
-#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "Aafrika/Kinshasa"
 
-#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "Aafrika/Lagos"
 
-#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "Aafrika/Libreville"
 
-#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "Aafrika/Lome"
 
-#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "Aafrika/Luanda"
 
-#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "Aafrika/Lubumbashi"
 
-#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "Aafrika/Lusaka"
 
-#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "Aafrika/Malabo"
 
-#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "Aafrika/Maputo"
 
-#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "Aafrika/Maseru"
 
-#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "Aafrika/Mbabane"
 
-#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
 msgstr "Aafrika/Mogadishu"
 
-#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "Aafrika/Monrovia"
 
-#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "Aafrika/Nairobi"
 
-#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "Aafrika/Ndjamena"
 
-#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "Aafrika/Niamey"
 
-#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "Aafrika/Nouakchott"
 
-#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "Aafrika/Ouagadougou"
 
-#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "Aafrika/Porto-Novo"
 
-#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr "Aafrika/Sao_Tome"
 
-#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "Aafrika/Timbuktu"
 
-#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "Aafrika/Tripoli"
 
-#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "Aafrika/Tunis"
 
-#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "Aafrika/Windhoek"
 
-#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr "Ameerika/Adak"
 
-#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr "Ameerika/Anchorage"
 
-#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "Ameerika/Anguilla"
 
-#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "Ameerika/Antigua"
 
-#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr "Ameerika/Araguaina"
 
-#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "Ameerika/Aruba"
 
-#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "Ameerika/Asuncion"
 
-#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "Ameerika/Barbados"
 
-#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "Ameerika/Belem"
 
-#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "Ameerika/Belize"
 
-#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "Ameerika/Boa_Vista"
 
-#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "Ameerika/Bogota"
 
-#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "Ameerika/Boise"
 
-#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "Ameerika/Buenos_Aires"
 
-#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr "Ameerika/Cambridge_Bay"
 
-#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "Ameerika/Cancun"
 
-#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "Ameerika/Caracas"
 
-#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr "Ameerika/Catamarca"
 
-#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr "Ameerika/Cayenne"
 
-#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr "Ameerika/Cayman"
 
-#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "Ameerika/Chicago"
 
-#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "Ameerika/Chihuahua"
 
-#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "Ameerika/Cordoba"
 
-#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "Ameerika/Costa_Rica"
 
-#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "Ameerika/Cuiaba"
 
-#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr "Ameerika/Curacao"
 
-#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr "Ameerika/Damnarkshavn"
 
-#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "Ameerika/Dawson"
 
-#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "Ameerika/Dawson_Creek"
 
-#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "Ameerika/Denver"
 
-#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "Ameerika/Detroit"
 
-#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "Ameeria/Dominica"
 
-#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "Ameerika/Edmonton"
 
-#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr "Ameerika/Eirunepe"
 
-#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "Ameerika/El_Salvador"
 
-#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "Ameerika/Fortaleza"
 
-#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "Ameerika/Glace_Bay"
 
-#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr "Ameerika/Godthab"
 
-#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "Ameerika/Goose_Bay"
 
-#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr "Ameerika/Grand_Turk"
 
-#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "Ameeria/Grenada"
 
-#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr "Ameerika/Guadeloupe"
 
-#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "Ameerika/Guatemala"
 
-#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "Ameerika/Guayaquil"
 
-#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "Ameerika/Guyana"
 
-#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr "Ameerika/Halifax"
 
-#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "Ameerika/Havana"
 
-#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr "Ameerika/Hermosillo"
 
-#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "Ameerika/Indiana/Indianapolis"
 
-#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "Ameerika/Indiana/Knox"
 
-#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "Ameerika/Indiana/Marengo"
 
-#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "Ameerika/Indiana/Vevay"
 
-#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "Ameerika/Indianapolis"
 
-#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "Ameerika/Inuvik"
 
-#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr "Ameerika/Iqaluit"
 
-#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "Ameerika/Jamaika"
 
-#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr "Ameerika/Jujuy"
 
-#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr "Ameerika/Juneau"
 
-#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "Ameerika/Kentucky/Louisville"
 
-#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "Ameerika/Kentucky/Monticello"
 
-#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "Ameerika/La_Paz"
 
-#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "Ameerika/Lima"
 
-#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
 msgstr "Ameerika/Los_Angeles"
 
-#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "Ameerika/Louisville"
 
-#: ../calendar/zones.h:142
 msgid "America/Maceio"
 msgstr "Ameerika/Maceio"
 
-#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "Ameerika/Managua"
 
-#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "Ameerika/Manaus"
 
-#: ../calendar/zones.h:145
 msgid "America/Martinique"
 msgstr "Ameerika/Martinique"
 
-#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr "Ameerika/Mazatlan"
 
-#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "Ameerika/Mendoza"
 
-#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "Ameerika/Menominee"
 
-#: ../calendar/zones.h:149
 msgid "America/Merida"
 msgstr "Ameerika/Merida"
 
-#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "Ameerika/Mexico_City"
 
-#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "Ameerika/Miquelon"
 
-#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "Ameerika/Monterrey"
 
-#: ../calendar/zones.h:153
 msgid "America/Montevideo"
 msgstr "Ameerika/Montevideo"
 
-#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "Ameerika/Montreal"
 
-#: ../calendar/zones.h:155
 msgid "America/Montserrat"
 msgstr "Ameerika/Montserrat"
 
-#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr "Ameerika/Nassau"
 
-#: ../calendar/zones.h:157
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "Ameerika/New_York"
 
-#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "Ameerika/Nipigon"
 
-#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "Ameerika/Nome"
 
-#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr "Ameerika/Noronha"
 
-#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "Ameerika/Põhja_Dakota/Center"
 
-#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "Ameerika/Panama"
 
-#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr "Ameerika/Pangnirtung"
 
-#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
 msgstr "Ameerika/Paramaribo"
 
-#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "Ameerika/Phoenix"
 
-#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr "Ameerika/Port-au-Prince"
 
-#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
 msgstr "Ameerika/Port_of_Spain"
 
-#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
 msgstr "Ameerika/Porto_Velho"
 
-#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
 msgstr "Ameerika/Puerto_Rico"
 
-#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr "Ameerika/Rainy_River"
 
-#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
 msgstr "Ameerika/Rankin_Inlet"
 
-#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "Ameerika/Recife"
 
-#: ../calendar/zones.h:173
 msgid "America/Regina"
 msgstr "Ameerika/Regina"
 
-#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "Ameerika/Rio_Branco"
 
-#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr "Ameerika/Rosario"
 
-#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "Ameerika/Santiago"
 
-#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "Ameerika/Santo_Domingo"
 
-#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
 msgstr "Ameerika/Sao_Paulo"
 
-#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr "Ameerika/Scoresbysund"
 
-#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr "Ameerika/Shiprocks"
 
-#: ../calendar/zones.h:181
 msgid "America/St_Johns"
 msgstr "Ameerika/St_Johns"
 
-#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
 msgstr "Ameerika/St_Kitts"
 
-#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "Ameerika/St_Lucia"
 
-#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr "Ameerika/St_Thomas"
 
-#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr "Ameerika/St_Vincent"
 
-#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr "Ameerika/Swift_Current"
 
-#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
 msgstr "Ameerika/Tegucigalpa"
 
-#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr "Ameerika/Thule"
 
-#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "Ameerika/Thunder_Bay"
 
-#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "Ameerika/Tijuana"
 
-#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr "Ameerika/Tortola"
 
-#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "Ameerika/Vancouver"
 
-#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr "Ameerika/Whitehorse"
 
-#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr "Ameerika/Winnipeg"
 
-#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr "Ameerika/Yakutat"
 
-#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr "Ameerika/Yelloknife"
 
-#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr "Antarktika/Casey"
 
-#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "Antarktika/Davis"
 
-#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarktika/DumontDurville"
 
-#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "Antarktika/Mawson"
 
-#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "Antarktika/McMurdo"
 
-#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "Antarktika/Palmer"
 
-#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "Antarktika/South_Pole"
 
-#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "Antarktika/Syowa"
 
-#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "Antarktika/Vostok"
 
-#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "Arktika/Longyearbyen"
 
-#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "Aasia/Aden"
 
-#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "Aasia/Almaty"
 
-#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "Aasia/Amman"
 
-#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "Aasia/Anadyr"
 
-#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "Aasia/Aqtau"
 
-#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "Aasia/Aqtobe"
 
-#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "Aasia/Ashgabat"
 
-#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "Aasia/Bagdad"
 
-#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "Aasia/Bahrein"
 
-#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "Aasia/Bakuu"
 
-#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "Aasia/Bangkok"
 
-#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "Aasia/Beirut"
 
-#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "Aasia/Bishkek"
 
-#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "Aasia/Brunei"
 
-#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "Aasia/Calcutta"
 
-#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "Aasia/Choibalsan"
 
-#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "Aasia/Chongqing"
 
-#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "Aasia/Colombo"
 
-#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "Aasia/Damascus"
 
-#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "Aasia/Dhaka"
 
-#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "Aasia/Dili"
 
-#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "Aasia/Dubai"
 
-#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "Aasia/Dushanbe"
 
-#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "Aasia/Gaza"
 
-#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "Aasia/Harbin"
 
-#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "Aasia/Hong_Kong"
 
-#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "Aasia/Hovd"
 
-#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "Aasia/Irkuts"
 
-#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "Aasia/Istanbu"
 
-#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "Aasia/Jakarta"
 
-#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "Aasia/Jayapura"
 
-#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "Aasia/Jeruusalem"
 
-#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "Aasia/Kabul"
 
-#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "Aasia/Kamchatka"
 
-#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "Aasia/Karachi"
 
-#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "Aasia/Kashgar"
 
-#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "Aasia/Katmandu"
 
-#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "Aasia/Krasnojarsk"
 
-#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "Aasia/Kuala_Lumpur"
 
-#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "Aasia/Kuching"
 
-#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "Aasia/Kuveit"
 
-#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "Aasia/Macao"
 
-#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "Aasia/Macau"
 
-#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "Aasia/Magadan"
 
-#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "Aasia/Makassar"
 
-#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "Aasia/Manila"
 
-#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "Aasia/Muscat"
 
-#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "Aasia/Nicosia"
 
-#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "Aasia/Novosibirsk"
 
-#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "Aasia/Omsk"
 
-#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "Aasia/Oral"
 
-#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "Aasia/Phnom_Penh"
 
-#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "Aasia/Pontianak"
 
-#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "Aasia/Pyongyang"
 
-#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "Aasia/Katar"
 
-#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "Aasia/Qyzylorda"
 
-#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "Aasia/Rangoon"
 
-#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "Aasia/Riyadh"
 
-#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "Aasia/Saigon"
 
-#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "Aasia/Sakhalin"
 
-#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "Aasia/Samarkand"
 
-#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "Aasia/Seoul"
 
-#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "Aasia/Shanghai"
 
-#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "Aasia/Singapur"
 
-#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "Aasia/Taipei"
 
-#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "Aasia/Taškent"
 
-#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "Aasia/Tbilisi"
 
-#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "Aasia/Tehran"
 
-#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "Aasia/Thimphu"
 
-#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "Aasia/Tokio"
 
-#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "Aasia/Ujung_Pandang"
 
-#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "Aasia/Ulaanbaator"
 
-#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "Aasia/Urumqi"
 
-#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "Aasia/Vientiane"
 
-#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "Aasia/Vladivostok"
 
-#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "Aasia/Jakuts"
 
-#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "Aasia/Jekaterinburg"
 
-#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "Aasia/Jerevan"
 
-#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "Atlantic/Azores"
 
-#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "Atlandi_ookean/Bermuda"
 
-#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "Atlandi_ookean/Canary"
 
-#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlandi_ookean/Cape_Verde"
 
-#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "Atlandi_ookean/Fääri_saared"
 
-#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlandi_ookean/Jan_Mayen"
 
-#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "Atlandi_ookean/Madeira"
 
-#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "Atlandi_ookean/Reykjavik"
 
-#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "Atlandi_ookean/South_Georgia"
 
-#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "Atlandi_ookean/St_Helena"
 
-#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "Atlandi_ookean/Stanley"
 
-#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "Austraalia/Adelaide"
 
-#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "Austraalia/Brisbane"
 
-#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "Austraalia/Broken_Hill"
 
-#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "Austraalia/Darwin"
 
-#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "Austraalia/Hobart"
 
-#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "Austraalia/Lindeman"
 
-#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "Austraalia/Lord_Howe"
 
-#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "Austraalia/Melbourne"
 
-#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "Austraalia/Perth"
 
-#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "Austraalia/Sydney"
 
-#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "Euroopa/Amsterdam"
 
-#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "Euroopa/Andorra"
 
-#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "Euroopa/Ateena"
 
-#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "Euroopa/Belfast"
 
-#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "Euroopa/Belgrad"
 
-#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "Euroopa/Berliin"
 
-#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "Euroopa/Bratislava"
 
-#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "Euroopa/Brüssel"
 
-#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "Euroopa/Bukarest"
 
-#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "Euroopa/Budapest"
 
-#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "Euroopa/Chisinau"
 
-#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "Euroopa/Kopenhaagen"
 
-#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "Euroopa/Dublin"
 
-#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "Euroopa/Gibraltar"
 
-#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "Euroopa/Helsingi"
 
-#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "Euroopa/Istanbul"
 
-#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "Euroopa/Kaliningrad"
 
-#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "Euroopa/Kiiev"
 
-#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "Euroopa/Lisbon"
 
-#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "Euroopa/Ljubljana"
 
-#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "Euroopa/London"
 
-#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "Euroopa/Luksemburg"
 
-#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "Euroopa/Madriid"
 
-#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "Euroopa/Malta"
 
-#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "Euroopa/Minsk"
 
-#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "Euroopa/Monaco"
 
-#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "Euroopa/Moskva"
 
-#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "Euroopa/Nicosia"
 
-#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "Euroopa/Oslo"
 
-#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "Euroopa/Pariis"
 
-#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "Euroopa/Praha"
 
-#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "Euroopa/Riia"
 
-#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "Euroopa/Rooma"
 
-#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "Euroopa/Samaara"
 
-#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "Euroopa/San_Marino"
 
-#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "Euroopa/Sarajevo"
 
-#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "Euroopa/Simferoopol"
 
-#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "Euroopa/Skopje"
 
-#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "Euroopa/Sofia"
 
-#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "Euroopa/Stockholm"
 
-#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "Euroopa/Tallinn"
 
-#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "Euroopa/Tirana"
 
-#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "Euroopa/Uzhgorod"
 
-#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "Euroopa/Vaduz"
 
-#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "Euroopa/Vatikan"
 
-#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "Euroopa/Viin"
 
-#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "Euroopa/Vilnius"
 
-#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "Euroopa/Varssavi"
 
-#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "Euroopa/Zagreb"
 
-#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "Europe/Zaporozie"
 
-#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "Euroopa/Zürich"
 
-#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "India_ookean/Antananarivo"
 
-#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "India_ookean/Chagos"
 
-#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "India_ookean/Christmas"
 
-#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "India_ookean/Cocos"
 
-#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "India_ookean/Comoro"
 
-#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "India_ookean/Kerguelen"
 
-#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "India_ookean/Mahe"
 
-#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "India_ookean/Maldives"
 
-#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "India_ookean/Mauritius"
 
-#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "India_ookean/Mayotte"
 
-#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "India_ookean/Reunion"
 
-#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "Vaikne_ookean/Apia"
 
-#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "Vaikne_ookean/Auckland"
 
-#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "Vaikne_ookean/Chatham"
 
-#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "Vaikne_ookean/Easter"
 
-#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "Vaikne_ookean/Efate"
 
-#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "Vaikne_ookean/Enderbury"
 
-#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "Vaikne_ookean/Fakaofo"
 
-#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "Vaikne_ookean/Fiji"
 
-#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "Vaikne_ookean/Funafuti"
 
-#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "Vaikne_ookean/Galapagos"
 
-#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "Vaikne_ookean/Gambier"
 
-#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "Vaikne_ookean/Guadalcanal"
 
-#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "Vaikne_ookean/Guam"
 
-#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "Vaikne_ookean/Honolulu"
 
-#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "Vaikne_ookean/Johnston"
 
-#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "Vaikne_ookean/Kiritimati"
 
-#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "Vaikne_ookean/Kosrae"
 
-#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "Vaikne_ookean/Kwajalein"
 
-#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "Vaikne_ookean/Majuro"
 
-#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "Vaikne_ookean/Marquesas"
 
-#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "Vaikne_ookean/Midway"
 
-#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "Vaikne_ookean/Nauru"
 
-#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "Vaikne_ookean/Niue"
 
-#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "Vaikne_ookean/Norfolk"
 
-#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "Vaikne_ookean/Noumea"
 
-#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "Vaikne_ookean/Pago_Pago"
 
-#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "Vaikne_ookean/Palau"
 
-#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "Vaikne_ookean/Pitcairn"
 
-#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "Vaikne_ookean/Ponape"
 
-#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "Vaikne_ookean/Port_Moresby"
 
-#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "Vaikne_ookean/Rarotonga"
 
-#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "Vaikne_ookean/Saipan"
 
-#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "Vaikne_ookean/Tahiti"
 
-#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "Vaikne_ookean/Tarawa"
 
-#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "Vaikne_ookean/Tongatapu"
 
-#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "Vaikne_ookean/Truk"
 
-#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "Vaikne_ookean/Wake"
 
-#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "Vaikne_ookean/Wallis"
 
-#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "Vaikne_ookean/Yap"
 
-#: ../composer/e-composer-autosave.c:275
 msgid "Could not open autosave file"
 msgstr "Automaatsalvestuse faili pole võimalik avada"
 
-#: ../composer/e-composer-autosave.c:282
 msgid "Unable to retrieve message from editor"
 msgstr "Sõnumit pole võimalik redaktorist kätte saada"
 
-#: ../composer/e-composer-actions.c:47
 msgid "Insert Attachment"
 msgstr "Manuse lisamine"
 
-#: ../composer/e-composer-actions.c:51
 msgid "A_ttach"
 msgstr "_Manusta"
 
-#: ../composer/e-composer-actions.c:142
 msgid "Untitled Message"
 msgstr "Pealkirjata sõnum"
 
-#: ../composer/e-composer-actions.c:473
 msgid "Attach a file"
 msgstr "Sõnumile faili lisamine"
 
-#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "Sul_ge"
 
-#: ../composer/e-composer-actions.c:480
 msgid "Close the current file"
 msgstr "Sulge fail"
 
-#: ../composer/e-composer-actions.c:485 ../mail/em-folder-view.c:1337
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "_Prindi..."
 
-#: ../composer/e-composer-actions.c:492 ../ui/evolution-addressbook.xml.h:27
-#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
-#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Printimise eel_vaade"
 
-#: ../composer/e-composer-actions.c:501
 msgid "Save the current file"
 msgstr "Käesoleva faili salvestamine"
 
-#: ../composer/e-composer-actions.c:506
 msgid "Save _As..."
 msgstr "_Salvesta kui..."
 
-#: ../composer/e-composer-actions.c:508
 msgid "Save the current file with a different name"
 msgstr "Käesoleva faili salvestamine teise nime alla"
 
-#: ../composer/e-composer-actions.c:513
 msgid "Save _Draft"
 msgstr "Salvesta _mustand"
 
-#: ../composer/e-composer-actions.c:515
 msgid "Save as draft"
 msgstr "Salvestamine mustandina"
 
-#: ../composer/e-composer-actions.c:520
 msgid "S_end"
 msgstr "_Saada"
 
-#: ../composer/e-composer-actions.c:522
 msgid "Send this message"
 msgstr "Selle sõnumi saatmine"
 
-#: ../composer/e-composer-actions.c:529
 msgid "Insert Send options"
 msgstr "Saatmisvalikute lisamine"
 
-#: ../composer/e-composer-actions.c:534
 msgid "New _Message"
 msgstr "Uus _sõnum"
 
-#: ../composer/e-composer-actions.c:536
 msgid "Open New Message window"
 msgstr "Uue sõnumi akna avamine"
 
-#: ../composer/e-composer-actions.c:543
 msgid "Character _Encoding"
 msgstr "_Kooditabel"
 
-#: ../composer/e-composer-actions.c:550
 msgid "_Security"
 msgstr "_Turvalisus"
 
-#: ../composer/e-composer-actions.c:560
 msgid "PGP _Encrypt"
 msgstr "PGP k_rüptimine"
 
-#: ../composer/e-composer-actions.c:562
 msgid "Encrypt this message with PGP"
 msgstr "Krüpti sõnum PGPga"
 
-#: ../composer/e-composer-actions.c:568
 msgid "PGP _Sign"
 msgstr "PGP a_llkiri"
 
-#: ../composer/e-composer-actions.c:570
 msgid "Sign this message with your PGP key"
 msgstr "Allkirjastab sõnumi sinu PGP võtme abil"
 
-#: ../composer/e-composer-actions.c:576
 msgid "_Prioritize Message"
 msgstr "Määra sõnum _oluliseks"
 
-#: ../composer/e-composer-actions.c:578
 msgid "Set the message priority to high"
 msgstr "Sõnumi tähtsuse seadmine kõrgeks"
 
-#: ../composer/e-composer-actions.c:584
 msgid "Re_quest Read Receipt"
 msgstr "Küsi _lugemiskinnitust"
 
-#: ../composer/e-composer-actions.c:586
 msgid "Get delivery notification when your message is read"
 msgstr "Kohaletoimetamise märguande saamine sinu sõnumi lugemise korral"
 
-#: ../composer/e-composer-actions.c:592
 msgid "S/MIME En_crypt"
 msgstr "S/MIME _krüptimine"
 
-#: ../composer/e-composer-actions.c:594
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Sõnumi krüptimine sinu S/MIME krüptimissertifikaadi abil"
 
-#: ../composer/e-composer-actions.c:600
 msgid "S/MIME Sig_n"
 msgstr "S/MIME _allkiri"
 
-#: ../composer/e-composer-actions.c:602
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Allkirjastab sõnumi sinu S/MIME allkirjasertifikaadi abil"
 
-#: ../composer/e-composer-actions.c:608
 msgid "_Bcc Field"
 msgstr "_Pimekoopia (Bcc) väli"
 
-#: ../composer/e-composer-actions.c:610
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Pimekoopia välja kuvamise sisse- või väljalülitamine"
 
-#: ../composer/e-composer-actions.c:616
 msgid "_Cc Field"
 msgstr "K_oopia (Cc) väli"
 
-#: ../composer/e-composer-actions.c:618
 msgid "Toggles whether the CC field is displayed"
 msgstr "Koopiavälja kuvamise sisse- või väljalülitamine"
 
-#: ../composer/e-composer-actions.c:624
 msgid "_From Field"
 msgstr "_Saatja väli"
 
-#: ../composer/e-composer-actions.c:626
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Saatja valija kuvamise sisse- või väljalülitamine"
 
-#: ../composer/e-composer-actions.c:632
 msgid "_Post-To Field"
 msgstr "Postita-ku_hu väli"
 
-#: ../composer/e-composer-actions.c:634
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Postita-kuhu välja kuvamise sisse- või väljalülitamine"
 
-#: ../composer/e-composer-actions.c:640
 msgid "_Reply-To Field"
 msgstr "Kellele-_vastata väli"
 
-#: ../composer/e-composer-actions.c:642
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Kellele-vastata välja kuvamise sisse- või väljalülitamine"
 
-#: ../composer/e-composer-actions.c:648
 msgid "_Subject Field"
 msgstr "_Teemaväli"
 
-#: ../composer/e-composer-actions.c:650
 msgid "Toggles whether the Subject field is displayed"
 msgstr "Teemavälja kuvamise sisse- ja väljalülitamine"
 
-#: ../composer/e-composer-actions.c:656
 msgid "_To Field"
 msgstr "_Kellele väli"
 
-#: ../composer/e-composer-actions.c:658
 msgid "Toggles whether the To field is displayed"
 msgstr "Saaja välja kuvamise sisse- või väljalülitamine"
 
-#: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
 msgstr "Sisesta sõnumi adressaadid"
 
-#: ../composer/e-composer-header-table.c:68
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Sisesta aadressid, milledele saadetakse sõnumi koopiad"
 
-#: ../composer/e-composer-header-table.c:71
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -10816,66 +7819,51 @@ msgstr ""
 "Sisesta aadressid, millele saadetakse sõnumi koopiad nii, et aadresse sõnumi "
 "saajate hulgas ei paista"
 
-#: ../composer/e-composer-header-table.c:645
 msgid "Fr_om:"
 msgstr "_Saatja:"
 
-#: ../composer/e-composer-header-table.c:654
 msgid "_Reply-To:"
 msgstr "Kellele-v_astata:"
 
-#: ../composer/e-composer-header-table.c:658
 msgid "_To:"
 msgstr "_Kellele:"
 
-#: ../composer/e-composer-header-table.c:663
 msgid "_Cc:"
 msgstr "K_oopia:"
 
-#: ../composer/e-composer-header-table.c:668
 msgid "_Bcc:"
 msgstr "_Pimekoopia:"
 
-#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
 msgstr "Ku_hu postitada:"
 
-#: ../composer/e-composer-header-table.c:677
 msgid "S_ubject:"
 msgstr "T_eema:"
 
-#: ../composer/e-composer-header-table.c:686
 msgid "Si_gnature:"
 msgstr "Si_gnatuur:"
 
-#: ../composer/e-composer-name-header.c:115
 msgid "Click here for the address book"
 msgstr "Aadressiraamatu kasutamiseks klõpsa siia"
 
-#: ../composer/e-composer-post-header.c:137
 msgid "Posting destination"
 msgstr "Postituse sihtkoht"
 
-#: ../composer/e-composer-post-header.c:138
 msgid "Choose folders to post the message to."
 msgstr "Vali kaust, kuhu sõnum postitada."
 
-#: ../composer/e-composer-post-header.c:172
 msgid "Click here to select folders to post to"
 msgstr "Klõpsa siia, et valida kaustad kuhu postitada"
 
-#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1553
 msgid "Show _Attachment Bar"
 msgstr "Näita _manuseriba"
 
-#: ../composer/e-msg-composer.c:867
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Väljuvat sõnumit pole võimalik signeerida: selle konto jaoks ei ole "
 "signeerimissertifikaati määratud."
 
-#: ../composer/e-msg-composer.c:874
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10883,23 +7871,17 @@ msgstr ""
 "Väljuvat sõnumit pole võimalik krüptida: selle konto jaoks ei ole "
 "krüptimissertifikaati määratud."
 
-#: ../composer/e-msg-composer.c:1495 ../mail/em-format-html-display.c:1919
-#: ../mail/em-format-html-display.c:2411 ../mail/mail-config.glade.h:45
-#: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Manus"
 msgstr[1] "Manused"
 
-#: ../composer/e-msg-composer.c:1551
 msgid "Hide _Attachment Bar"
 msgstr "Peida _manuseriba"
 
-#: ../composer/e-msg-composer.c:1568 ../composer/e-msg-composer.c:2775
 msgid "Compose Message"
 msgstr "Sõnumi koostamine"
 
-#: ../composer/e-msg-composer.c:4050
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10907,7 +7889,6 @@ msgstr ""
 "<b>(Redaktor sisaldab mittetekstilist sõnumit mida pole võimalik "
 "redigeerida.)</b>"
 
-#: ../composer/mail-composer.error.xml.h:1
 msgid ""
 " There are few attachments getting downloaded. Sending the mail will cause "
 "the mail to be sent without those pending attachments "
@@ -10915,25 +7896,20 @@ msgstr ""
 " Mõned manused pole alla laaditud. Sõnumi saatmine tähendab, et sõnum "
 "saadetakse välja ilma nende manusteta "
 
-#: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
 msgstr "Kõik kontod on kustutatud."
 
-#: ../composer/mail-composer.error.xml.h:3
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr "Kas sa soovid hüljata pooleliolevat sõnumit '{0}'?"
 
-#: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "Sa pead sõnumile valima teised sätted, põhjus: &quot;{0}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
 msgstr "Põhjus: &quot;{1}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:6
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -10942,43 +7918,33 @@ msgstr ""
 "Selle redaktoriakna sulgemine hülgab sõnumi lõplikult. Kui sa tahad sõnumi "
 "koostamist hiljem jätkata, siis salvesta see sõnum Mustandite kausta."
 
-#: ../composer/mail-composer.error.xml.h:7
 msgid "Could not create composer window."
 msgstr "Redaktoriakent pole võimalik luua."
 
-#: ../composer/mail-composer.error.xml.h:8
 msgid "Could not create message."
 msgstr "Sõnumit pole võimalik luua."
 
-#: ../composer/mail-composer.error.xml.h:9
 msgid "Could not read signature file &quot;{0}&quot;."
 msgstr "Signatuurifaili &quot;{0}&quot; pole võimalik lugeda."
 
-#: ../composer/mail-composer.error.xml.h:10
 msgid "Could not retrieve messages to attach from {0}."
 msgstr "Manustamiseks pole võimalik {0} allikast sõnumeid alla laadida."
 
-#: ../composer/mail-composer.error.xml.h:11
 msgid "Could not save to autosave file &quot;{0}&quot;."
 msgstr "Faili &quot;{0}&quot; pole võimalik automaatselt salvestada."
 
-#: ../composer/mail-composer.error.xml.h:12
 msgid "Directories can not be attached to Messages."
 msgstr "Katalooge pole võimalik sõnumitele manustada."
 
-#: ../composer/mail-composer.error.xml.h:13
 msgid "Do you want to recover unfinished messages?"
 msgstr "Kas sa soovid lõpetamata sõnumid taastada?"
 
-#: ../composer/mail-composer.error.xml.h:14
 msgid "Download in progress. Do you want to send the mail?"
 msgstr "Hetkel toimub allalaadimine. Kas sa soovid sõnumit saata?"
 
-#: ../composer/mail-composer.error.xml.h:15
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "Viga faili automaatsel salvestamisel, põhjus: &quot;{1}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:16
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -10986,7 +7952,6 @@ msgstr ""
 "Evolution lõpetas ootamatult ajal, mil Sa koostasid uut sõnumit. Sõnumi "
 "taastamine võimaldab sul jätkata sealt, kus sa pooleli jäid."
 
-#: ../composer/mail-composer.error.xml.h:17
 msgid ""
 "Send options available only for Novell GroupWise and Microsoft Exchange "
 "accounts."
@@ -10994,15 +7959,12 @@ msgstr ""
 "Saatmisvalikud on saadaval ainult Novell GroupWise ja Microsoft Exchange "
 "kontodele."
 
-#: ../composer/mail-composer.error.xml.h:18
 msgid "Send options not available."
 msgstr "Saatmise valikuid pole saadaval."
 
-#: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "Fail `{0}' ei ole tavaline fail ja seda pole võimalik sõnumiga saata."
 
-#: ../composer/mail-composer.error.xml.h:20
 msgid ""
 "To attach the contents of this directory, either attach the files in this "
 "directory individually, or create an archive of the directory and attach it."
@@ -11010,7 +7972,6 @@ msgstr ""
 "Selle kataloogi manustamiseks tuleb failid ükshaaval manustada või luua "
 "kataloogist arhiiv ja siis see manustada."
 
-#: ../composer/mail-composer.error.xml.h:21
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -11022,438 +7983,338 @@ msgstr ""
 "Palun veendu, et sul on paigaldatud korreksed gtkhtml'i ja libgtkhtml'i "
 "versioonid."
 
-#: ../composer/mail-composer.error.xml.h:24
 msgid "Unable to activate the address selector control."
 msgstr "Aadressi valimise juhtimist pole võimalik aktiveerida."
 
-#: ../composer/mail-composer.error.xml.h:25
 msgid "Unfinished messages found"
 msgstr "Leidsin lõpetamata sõnumi"
 
-#: ../composer/mail-composer.error.xml.h:26
 msgid "Warning: Modified Message"
 msgstr "Hoiatus: salvestamata sõnum"
 
-#: ../composer/mail-composer.error.xml.h:27
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Sul pole võimalik sellele sõnumile faili `{0}' manustada."
 
-#: ../composer/mail-composer.error.xml.h:28
 msgid "You need to configure an account before you can compose mail."
 msgstr "Enne sõnumite koostamist tuleb sul seadistada postikonto."
 
-#: ../composer/mail-composer.error.xml.h:29
 msgid "_Continue Editing"
 msgstr "_Jätka redigeerimist"
 
-#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "Ära _taasta"
 
-#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "_Taasta"
 
-#: ../composer/mail-composer.error.xml.h:33
 msgid "_Save Draft"
 msgstr "_Salvesta mustand"
 
-#: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "Evolutioni E-post ja kalender"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
 msgid "Groupware Suite"
 msgstr "Grupitöövahend"
 
-#: ../data/evolution.desktop.in.in.h:3
 msgid "Manage your email, contacts and schedule"
 msgstr "Oma e-posti, kontaktide ja kalendri haldamine"
 
-#: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "aadressikaart"
 
-#: ../data/evolution.keys.in.in.h:2
 msgid "calendar information"
 msgstr "kalendri andmed"
 
-#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "Evolutioni viga"
 
-#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
 msgid "Evolution Warning"
 msgstr "Evolutioni hoiatus"
 
-#: ../e-util/e-error.c:118
 msgid "Evolution Information"
 msgstr "Evolutioni info"
 
-#: ../e-util/e-error.c:120
 msgid "Evolution Query"
 msgstr "Evolutioni küsimus"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:450
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Sisemine viga, küsiti tundmatut viga '%s'"
 
-#: ../e-util/e-logger.c:161
 msgid "Component"
 msgstr "Komponent"
 
-#: ../e-util/e-logger.c:162
 msgid "Name of the component being logged"
 msgstr "Logitava komponendi nimi"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
-#: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:689
 msgid "Enabled"
 msgstr "Lubatud"
 
-#: ../e-util/e-plugin.c:309
 msgid "Whether the plugin is enabled"
 msgstr "Kas plugin on lubatud või mitte"
 
-#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "Printimise ajal tekkis viga"
 
-#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "Printimissüsteem edastas vea kohta järgnevad üksikasjad:"
 
-#: ../e-util/e-print.c:173
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "Printimissüsteem ei täpsustanud vea üksikasju."
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
 msgid "Because \"{1}\"."
 msgstr "Põhjus: \"{1}\"."
 
-#: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file \"{0}\"."
 msgstr "Faili \"{0}\" pole võimalik avada."
 
-#: ../e-util/e-system.error.xml.h:3
 msgid "Cannot save file \"{0}\"."
 msgstr "Faili \"{0}\" pole võimalik salvestada."
 
-#: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
 msgstr "Kas sa soovid seda üle kirjutada?"
 
-#: ../e-util/e-system.error.xml.h:5
 msgid "File exists \"{0}\"."
 msgstr "Fail \"{0}\" on juba olemas."
 
-#: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Fail üle kirjutada?"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
 msgstr "_Kirjuta üle"
 
-#: ../e-util/e-util.c:96
 msgid "Could not display help for Evolution."
 msgstr "Evolutioni abiteavet pole võimalik kuvada."
 
-#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "_Tähtis"
 
 #. red
-#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "_Töö"
 
 #. orange
-#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "_Isiklik"
 
 #. green
-#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "Ü_lesanne"
 
 #. blue
-#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "_Hiljem"
 
-#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
 msgstr "Sildi _nimi:"
 
-#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "Sildi muutmine"
 
-#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "Sildi lisamine"
 
-#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "Silt ei tohi olla tühi."
 
-#: ../e-util/e-util-labels.c:356
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
 msgstr "Sama sisuga silt on serveris juba olemas. Palun muuda oma sildi nime."
 
-#: ../e-util/gconf-bridge.c:1218
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf'i viga: %s"
 
-#: ../e-util/gconf-bridge.c:1228
 msgid "All further errors shown only on terminal."
 msgstr "Kõiki ülejäänud vigu näidatakse ainult terminalil."
 
-#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 sekund tagasi"
 msgstr[1] "%d sekundit tagasi"
 
-#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 sekundi pärast"
 msgstr[1] "%d sekundi pärast"
 
-#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minut tagasi"
 msgstr[1] "%d minutit tagasi"
 
-#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 minuti pärast"
 msgstr[1] "%d minuti pärast"
 
-#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 tund tagasi"
 msgstr[1] "%d tundi tagasi"
 
-#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 tunni pärast"
 msgstr[1] "%d tunni pärast"
 
-#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 päev tagasi"
 msgstr[1] "%d päeva tagasi"
 
-#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "1 päeva pärast"
 msgstr[1] "%d päeva pärast"
 
-#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 nädal tagasi"
 msgstr[1] "%d päeva tagasi"
 
-#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 nädala pärast"
 msgstr[1] "%d nädala pärast"
 
-#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 kuu tagasi"
 msgstr[1] "%d kuud tagasi"
 
-#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 kuu pärast"
 msgstr[1] "%d kuu pärast"
 
-#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 aasta tagasi"
 msgstr[1] "%d aastat tagasi"
 
-#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 aasta pärast"
 msgstr[1] "%d aasta pärast"
 
-#: ../filter/filter-datespec.c:288
 msgid "<click here to select a date>"
 msgstr "<kuupäeva valimiseks klõpsa siia>"
 
-#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
-#: ../filter/filter-datespec.c:313
 msgid "now"
 msgstr "praegu"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:298
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:452
 msgid "Select a time to compare against"
 msgstr "Võrdlusaja valimine"
 
-#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "Vali faili"
 
-#: ../filter/filter-part.c:532
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
 
-#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "_Reegli nimi:"
 
-#: ../filter/filter-rule.c:880
-msgid "Find items that meet the following criteria"
-msgstr "Järgnevale kriteeriumile vastavate kirjete leidmine"
+msgid "Find items that meet the following conditions"
+msgstr "Järgnevatele tingimustele vastavate kirjete leidmine"
 
-#: ../filter/filter-rule.c:914
-msgid "A_dd Filter Criteria"
-msgstr "L_isa filtreerimisreegel"
+msgid "A_dd Condition"
+msgstr "Lisa _tingimus"
 
-#: ../filter/filter-rule.c:920
-msgid "If all criteria are met"
+msgid "If all conditions are met"
 msgstr "Kui kõik tingimused on täidetud"
 
-#: ../filter/filter-rule.c:920
-msgid "If any criteria are met"
-msgstr "Kui üks tingimustest on täidetud"
+msgid "If any conditions are met"
+msgstr "Kui vähemalt üks tingimustest on täidetud"
 
-#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "_Kirjeid otsitakse:"
 
-#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "Kõik seonduvad"
 
-#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "Vastused"
 
-#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "Vastused ja eelnenud"
 
-#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "Ilma vastuse või eelnevata"
 
-#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "Kaa_satavad lõimed"
 
-#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Sissetulev"
 
-#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Väljaminev"
 
-#: ../filter/filter.error.xml.h:1
 msgid "Bad regular expression &quot;{0}&quot;."
 msgstr "Vigane regulaaravaldis &quot;{0}&quot;."
 
-#: ../filter/filter.error.xml.h:2
 msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr "Regulaaravaldist &quot;{1}&quot; pole võimalik kompileerida."
 
-#: ../filter/filter.error.xml.h:3
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
 msgstr "Faili &quot;{0}&quot; pole olemas või pole see tavaline fail."
 
-#: ../filter/filter.error.xml.h:4
 msgid "Missing date."
 msgstr "Kuupäev on puudu."
 
-#: ../filter/filter.error.xml.h:5
 msgid "Missing file name."
 msgstr "Failinimi on puudu."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Nimi on puudu."
 
-#: ../filter/filter.error.xml.h:7
 msgid "Name &quot;{0}&quot; already used."
 msgstr "Nimi &quot;{0}&quot; on juba kasutusel."
 
-#: ../filter/filter.error.xml.h:8
 msgid "Please choose another name."
 msgstr "Palun vali mõni teine nimi."
 
-#: ../filter/filter.error.xml.h:9
 msgid "You must choose a date."
 msgstr "Kuupäeva valimine on kohustuslik."
 
-#: ../filter/filter.error.xml.h:10
 msgid "You must name this filter."
 msgstr "Sa pead sellele filtrile nime määrama."
 
-#: ../filter/filter.error.xml.h:11
 msgid "You must specify a file name."
 msgstr "Failinime andmine on kohustuslik"
 
-#: ../filter/filter.glade.h:1
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>_Filtri reeglid</b>"
 
-#: ../filter/filter.glade.h:2
 msgid "Compare against"
 msgstr "Võrreldakse väärtusega"
 
-#: ../filter/filter.glade.h:4
 msgid "Show filters for mail:"
 msgstr "Näita filtreid sõnumitele:"
 
-#: ../filter/filter.glade.h:5
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -11461,7 +8322,6 @@ msgstr ""
 "Sõnumi kuupäeva võrreldakse allpool\n"
 "määratud kuupäeva kella 12:00'ga."
 
-#: ../filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -11469,7 +8329,6 @@ msgstr ""
 "Sõnumi kuupäeva võrreldakse ajahetkega,\n"
 "mis on suhteline filtri käivitamise hetkega."
 
-#: ../filter/filter.glade.h:9
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -11477,139 +8336,99 @@ msgstr ""
 "Sõnumi kuupäeva võrreldakse ajahetkega,\n"
 "mis on võrdne filtri käivitamise hetkega."
 
-#: ../filter/filter.glade.h:12
 msgid "a time relative to the current time"
 msgstr "ajaga, mis on suhteline käesoleva hetkega"
 
-#: ../filter/filter.glade.h:13
 msgid "ago"
 msgstr "tagasi"
 
-#: ../filter/filter.glade.h:16
 msgid "in the future"
 msgstr "tulevikus"
 
-#: ../filter/filter.glade.h:18
 msgid "months"
 msgstr "kuud"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:197
 msgid "seconds"
 msgstr "sekundit"
 
-#: ../filter/filter.glade.h:20
 msgid "the current time"
 msgstr "praegune aeg"
 
-#: ../filter/filter.glade.h:21
 msgid "the time you specify"
 msgstr "sinu poolt määratud aeg"
 
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:282
-#: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:665
-#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "nädalat"
 
-#: ../filter/filter.glade.h:23
 msgid "years"
 msgstr "aastat"
 
-#: ../filter/rule-editor.c:380
 msgid "Add Rule"
 msgstr "Reegli lisamine"
 
-#: ../filter/rule-editor.c:459
 msgid "Edit Rule"
 msgstr "Muuda reeglit"
 
-#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "Reegli nimi"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "Composer Preferences"
 msgstr "Sõnumikoostaja eelistused"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Sõnumieelistuste seadistamine - kaasa arvatud turvalisus ka sõnumite kuvamine"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr "Õigekirjakontrolli, signatuuride ja sõnumikoostaja seadistamine"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
 msgstr "Säti oma e-posti kontosid siin"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Configure your network connection settings here"
 msgstr "Säti oma võrguühendusi siin"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "Evolutioni e-posti klient"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail accounts configuration control"
 msgstr "Evolutioni e-posti kontode seadistuste juhtimine"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "Evolutioni e-posti komponent"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "Evolutioni sõnumikoostaja"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail composer configuration control"
 msgstr "Evolutioni e-posti redaktori seadistuste juhtimine"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "Evolutioni e-posti eelistuste juhtimine"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
 msgid "Evolution Network configuration control"
 msgstr "Evolutioni võrguseadistuste juhtimine"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:605
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:592 ../mail/mail-component.c:593
-#: ../mail/mail-component.c:762
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "E-post"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "Postikontod"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:103
 msgid "Mail Preferences"
 msgstr "E-posti eelistused"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
 msgid "Network Preferences"
 msgstr "Võrgueelistused"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "_Post"
 
-#: ../mail/em-account-editor.c:386
 #, c-format
 msgid "%s License Agreement"
 msgstr "Litsents %s"
 
-#: ../mail/em-account-editor.c:393
 #, c-format
 msgid ""
 "\n"
@@ -11622,109 +8441,81 @@ msgstr ""
 "mida kuvatakse allpool ja nendega nõustumise korral\n"
 "märgi märkeruut\n"
 
-#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:239
-#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Kausta valimine"
 
-#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
-#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:98
 msgid "Autogenerated"
 msgstr "Automaatselt koostatud"
 
-#: ../mail/em-account-editor.c:761
 msgid "Ask for each message"
 msgstr "Küsitakse iga sõnumi kohta"
 
-#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "Identiteet"
 
-#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "E-posti vastuvõtmine"
 
-#: ../mail/em-account-editor.c:2130
 msgid "Check for _new messages every"
 msgstr "Uusi sõnumeid _kontrollitakse iga"
 
-#: ../mail/em-account-editor.c:2138
 msgid "minu_tes"
 msgstr "minu_ti järel"
 
-#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "Kirjade saatmine"
 
-#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Vaikimisi"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:131
-#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Turvalisus"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
 msgid "Receiving Options"
 msgstr "Vastuvõtmise valikud"
 
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Checking for New Messages"
 msgstr "Uute sõnumite kontrollimine"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Kontoredaktor"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Evolutioni kontoabiline"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[Vaikimisi]"
 
-#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "Konto nimi"
 
-#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1158 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "Nimetu"
 
-#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "Keel(ed)"
 
-#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "Allkirjaskripti lisamine"
 
-#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "Allkiri(jad)"
 
-#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Edastatud sõnum --------"
 
-#: ../mail/em-composer-utils.c:1962
 msgid "an unknown sender"
 msgstr "tundmatu saatja"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2009
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11732,11 +8523,9 @@ msgstr ""
 "Ühel kenal päeval, ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} kell "
 "${24Hour}:${Minute}, kirjutas ${Sender}:"
 
-#: ../mail/em-composer-utils.c:2152
 msgid "-----Original Message-----"
 msgstr "-----Algupärane sõnum-----"
 
-#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "_Filtreerimisreeglid"
 
@@ -11757,320 +8546,235 @@ msgstr "_Filtreerimisreeglid"
 #. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
 #.
 #. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:18
 msgid "Adjust Score"
 msgstr "Muuda punkte"
 
-#: ../mail/em-filter-i18n.h:19
 msgid "Assign Color"
 msgstr "Omista värvus"
 
-#: ../mail/em-filter-i18n.h:20
 msgid "Assign Score"
 msgstr "Määra punktid"
 
-#: ../mail/em-filter-i18n.h:22
 msgid "BCC"
 msgstr "Pimekoopia"
 
-#: ../mail/em-filter-i18n.h:23
 msgid "Beep"
 msgstr "Piiksu"
 
-#: ../mail/em-filter-i18n.h:24
 msgid "CC"
 msgstr "Koopia"
 
-#: ../mail/em-filter-i18n.h:25
 msgid "Completed On"
 msgstr "Lõpetatud"
 
-#: ../mail/em-filter-i18n.h:27
 msgid "Copy to Folder"
 msgstr "Kopeeri kausta"
 
-#: ../mail/em-filter-i18n.h:28
 msgid "Date received"
 msgstr "Vastuvõtmise kuupäev"
 
-#: ../mail/em-filter-i18n.h:29
 msgid "Date sent"
 msgstr "Saatmise kuupäev"
 
-#: ../mail/em-filter-i18n.h:30
-#: ../plugins/groupwise-features/share-folder.c:768
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
-#: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Kustuta"
 
-#: ../mail/em-filter-i18n.h:31
 msgid "Deleted"
 msgstr "Kustutatud"
 
-#: ../mail/em-filter-i18n.h:33
 msgid "does not end with"
 msgstr "ei lõpe stringiga"
 
-#: ../mail/em-filter-i18n.h:34
 msgid "does not exist"
 msgstr "pole olemas"
 
-#: ../mail/em-filter-i18n.h:35
 msgid "does not return"
 msgstr "ei tagasta"
 
-#: ../mail/em-filter-i18n.h:36
 msgid "does not sound like"
 msgstr "ei kõla nagu"
 
-#: ../mail/em-filter-i18n.h:37
 msgid "does not start with"
 msgstr "ei alga stringiga"
 
-#: ../mail/em-filter-i18n.h:39
 msgid "Draft"
 msgstr "Mustand"
 
-#: ../mail/em-filter-i18n.h:40
 msgid "ends with"
 msgstr "lõpeb stringiga"
 
-#: ../mail/em-filter-i18n.h:42
 msgid "exists"
 msgstr "on olemas"
 
-#: ../mail/em-filter-i18n.h:43
 msgid "Expression"
 msgstr "Avaldis"
 
-#: ../mail/em-filter-i18n.h:44
 msgid "Follow Up"
 msgstr "Jälgimislipp"
 
-#: ../mail/em-filter-i18n.h:45 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "Tähtis"
 
-#: ../mail/em-filter-i18n.h:47
 msgid "is after"
 msgstr "on pärast"
 
-#: ../mail/em-filter-i18n.h:48
 msgid "is before"
 msgstr "on enne"
 
-#: ../mail/em-filter-i18n.h:49
 msgid "is Flagged"
 msgstr "on märgistatud"
 
-#: ../mail/em-filter-i18n.h:53
 msgid "is not Flagged"
 msgstr "on märgistamata"
 
-#: ../mail/em-filter-i18n.h:54
 msgid "is not set"
 msgstr "on määramata"
 
-#: ../mail/em-filter-i18n.h:55
 msgid "is set"
 msgstr "on määratud"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/mail-config.glade.h:97
-#: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Rämps"
 
-#: ../mail/em-filter-i18n.h:57
 msgid "Junk Test"
 msgstr "Rämpsukontroll"
 
-#: ../mail/em-filter-i18n.h:58 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "Silt"
 
-#: ../mail/em-filter-i18n.h:59
 msgid "Mailing list"
 msgstr "Postiloend"
 
-#: ../mail/em-filter-i18n.h:60
 msgid "Match All"
 msgstr "Kõik sobivused"
 
-#: ../mail/em-filter-i18n.h:61
 msgid "Message Body"
 msgstr "Sõnumi keha"
 
-#: ../mail/em-filter-i18n.h:62
 msgid "Message Header"
 msgstr "Sõnumi päis"
 
-#: ../mail/em-filter-i18n.h:63
 msgid "Message is Junk"
 msgstr "Sõnum on rämps"
 
-#: ../mail/em-filter-i18n.h:64
 msgid "Message is not Junk"
 msgstr "Sõnum ei ole rämpspost"
 
-#: ../mail/em-filter-i18n.h:65
 msgid "Move to Folder"
 msgstr "Tõsta kausta"
 
-#: ../mail/em-filter-i18n.h:66
 msgid "Pipe to Program"
 msgstr "Suuna programmi"
 
-#: ../mail/em-filter-i18n.h:67
 msgid "Play Sound"
 msgstr "Mängi heli"
 
 #. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:69 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "Loetud"
 
-#: ../mail/em-filter-i18n.h:70 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Saajad"
 
-#: ../mail/em-filter-i18n.h:71
 msgid "Regex Match"
 msgstr "Regex sobivus"
 
-#: ../mail/em-filter-i18n.h:72
 msgid "Replied to"
 msgstr "Vastatud"
 
-#: ../mail/em-filter-i18n.h:73
 msgid "returns"
 msgstr "tagastab"
 
-#: ../mail/em-filter-i18n.h:74
 msgid "returns greater than"
 msgstr "tagastab suurema kui"
 
-#: ../mail/em-filter-i18n.h:75
 msgid "returns less than"
 msgstr "tagastab väiksema kui"
 
-#: ../mail/em-filter-i18n.h:76
 msgid "Run Program"
 msgstr "Käivita programm"
 
-#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Hinne"
 
-#: ../mail/em-filter-i18n.h:78 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Saatja"
 
-#: ../mail/em-filter-i18n.h:79
 msgid "Set Label"
 msgstr "Määra silt"
 
-#: ../mail/em-filter-i18n.h:80
 msgid "Set Status"
 msgstr "Määra olek"
 
-#: ../mail/em-filter-i18n.h:81
 msgid "Size (kB)"
 msgstr "Suurus (kB)"
 
-#: ../mail/em-filter-i18n.h:82
 msgid "sounds like"
 msgstr "kõlab kui"
 
-#: ../mail/em-filter-i18n.h:83
 msgid "Source Account"
 msgstr "Lähtekonto"
 
-#: ../mail/em-filter-i18n.h:84
 msgid "Specific header"
 msgstr "Spetsiifiline päis"
 
-#: ../mail/em-filter-i18n.h:85
 msgid "starts with"
 msgstr "algab stringiga"
 
-#: ../mail/em-filter-i18n.h:87
 msgid "Stop Processing"
 msgstr "Seiska töötlus"
 
-#: ../mail/em-filter-i18n.h:88 ../mail/em-format-quote.c:342
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:312
-#: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1132
 msgid "Subject"
 msgstr "Teema"
 
-#: ../mail/em-filter-i18n.h:89
 msgid "Unset Status"
 msgstr "Määramata olek"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:522
 msgid "Then"
 msgstr "Siis"
 
-#: ../mail/em-filter-rule.c:550
 msgid "Add Ac_tion"
 msgstr "Lisa _tegevus"
 
-#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
 msgstr "Loo o_tsingu põhjal otsingukaust..."
 
-#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "Kõik sõnumid"
 
-#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "Lugemata sõnumid"
 
-#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "Silt puudub"
 
-#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "Loetud sõnumid"
 
-#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "Värsked sõnumid"
 
-#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "Viimase 5 päeva sõnumid"
 
-#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "Manustega sõnumid"
 
-#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "Tähtsad sõnumid"
 
-#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "Mitte rämpspost"
 
-#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "Kontootsing"
 
-#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "Otsing kõigi kontode hulgast"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Lugemata sõnumeid:"
@@ -12078,72 +8782,52 @@ msgstr[1] "Lugemata sõnumeid:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Sõnumeid kokku:"
 msgstr[1] "Sõnumeid kokku:"
 
-#: ../mail/em-folder-properties.c:196
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Kvoodikasutus (%s):"
 
-#: ../mail/em-folder-properties.c:198
 #, c-format
 msgid "Quota usage"
 msgstr "Kvoodikasutus"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:358 ../mail/em-folder-tree-model.c:507
-#: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:159
-#: ../mail/mail-component.c:580
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:594
 msgid "Inbox"
 msgstr "Sisendkast"
 
-#: ../mail/em-folder-properties.c:389
-#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Kausta omadused"
 
-#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<kausta valimiseks klõpsa siia>"
 
-#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "L_oo"
 
-#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "_Kausta nimi:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "Otsingukaustad"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
 msgid "UNMATCHED"
 msgstr "MITTEVASTAV"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:160
 msgid "Drafts"
 msgstr "Mustandid"
 
-#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:161
 msgid "Outbox"
 msgstr "Väljundkast"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:162
 msgid "Sent"
 msgstr "Saadetud"
 
-#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "Laadimine..."
 
@@ -12162,324 +8846,242 @@ msgstr "Laadimine..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:380
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "Kirjakaustade puu"
 
-#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "Kausta %s ümbertõstmine"
 
-#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kausta %s kopeerimine"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2018
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Sõnumite ümbertõstmine %s kausta"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2020
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Sõnumeid pole võimalik ülemise taseme hoidlasse panna"
 
-#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
 msgstr "_Kopeeri kausta"
 
-#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
 msgid "_Move to Folder"
 msgstr "_Tõsta kausta"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" kaustade läbivaatamine"
 
-#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "Uues _aknas avamine"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "_Uus kaust..."
 
-#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "_Tõsta ümber..."
 
-#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "Muuda _nime..."
 
-#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "_Värskenda"
 
-#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Tühjenda prügikast"
 
-#: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Kopeerimine `%s' -> `%s'"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1186
-#: ../mail/em-folder-view.c:1201
-#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder"
 msgstr "Kausta valimine"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "K_opeeri"
 
-#: ../mail/em-folder-utils.c:532
-#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Kataloogi `%s' loomine"
 
-#: ../mail/em-folder-utils.c:690
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Kausta loomine"
 
-#: ../mail/em-folder-utils.c:690
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Kirjelda, kuhu tuleb kaust luua:"
 
-#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Tõrge sõnumi kustutamisel"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Sul pole selle sõnumi kustutamiseks piisavalt õiguseid."
 
-#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Vasta saatjale"
 
-#: ../mail/em-folder-view.c:1331 ../mail/em-popup.c:568 ../mail/em-popup.c:579
-#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
 msgstr "_Edasta"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "_Redigeeri kui uut kirja..."
 
-#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "T_aasta"
 
-#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "_Tõsta kausta..."
 
-#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "_Kopeeri kausta..."
 
-#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "_Märgi loetuks"
 
-#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "Märgi kui l_ugemata"
 
-#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "Märgi _tähtsaks"
 
-#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "Märgi m_ittetähtsaks"
 
-#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "Märgi _rämpsuks"
 
-#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "Märgista _mitterämpsuks"
 
-#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "Märgi _järeltoiminguks..."
 
-#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "Si_lt"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "_Puudub"
 
-#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "_Uus silt"
 
-#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "Märgista kui _lõpetatud"
 
-#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "_Eemalda märgistus"
 
-#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "_Loo sõnumi põhjal reegel"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "Otsingukaust _teema järgi"
 
-#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "Otsingukaust _saatja järgi"
 
-#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "Otsingukaust _adressaatide järgi"
 
-#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "Otsingukaust _postiloendi järgi"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "Filter t_eema järgi"
 
-#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "Filter saat_ja järgi"
 
-#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "Filter a_dressaatide järgi"
 
-#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "Filter p_ostiloendi järgi"
 
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2255 ../mail/em-folder-view.c:2298
-#: ../plugins/google-account-setup/google-source.c:251
-#: ../plugins/google-account-setup/google-source.c:532
-#: ../plugins/google-account-setup/google-source.c:718
 msgid "Default"
 msgstr "UTF-8"
 
-#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "Sõnumit pole võimalik vastu võtta"
 
-#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr "Sõnumi vastuvõtmine..."
 
-#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr "_Helista..."
 
-#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "Loo uus _otsingukaust"
 
-#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "_Sellelt aadressilt"
 
-#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "S_ellele aadressile"
 
-#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klõpsa, et saata sõnumit aadressile %s"
 
-#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "Klõpsa, et helistada numbrile %s"
 
-#: ../mail/em-folder-view.c:3313
 msgid "Click to hide/unhide addresses"
 msgstr "Klõpsa aadresside peitmiseks/nähtavale toomiseks"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:471
 #, c-format
 msgid "Matches: %d"
 msgstr "Sobivaid: %d"
 
-#: ../mail/em-format-html-display.c:615
 msgid "Fin_d:"
 msgstr "_Otsing:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:639
 msgid "_Previous"
 msgstr "_Eelmine"
 
-#: ../mail/em-format-html-display.c:644
 msgid "_Next"
 msgstr "_Järgmine"
 
-#: ../mail/em-format-html-display.c:649
 msgid "M_atch case"
 msgstr "_Tõstutundlik"
 
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Allkirjastamata"
 
-#: ../mail/em-format-html-display.c:948
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 "See sõnum ei ole allkirjastatud. Selle sõnumi tõesust pole võimalik tagada."
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Kehtiv allkiri"
 
-#: ../mail/em-format-html-display.c:949
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12487,11 +9089,9 @@ msgstr ""
 "See sõnum on allkirjastatud ja kehtiv, seega on väga tõenäoline, et tegemist "
 "on tõese sõnumiga."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Vigane allkiri"
 
-#: ../mail/em-format-html-display.c:950
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12499,11 +9099,9 @@ msgstr ""
 "Selle sõnumi signatuuri pole võimalik verifitseerida. See võib olla sõnumi "
 "kohaletoimetamise käigus asendatud."
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Signatuur kehtib, kuid saatjat pole võimalik tuvastada"
 
-#: ../mail/em-format-html-display.c:951
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12511,11 +9109,9 @@ msgstr ""
 "See sõnum on signeeritud korrektse allkirjaga, kuid selle saatjat pole "
 "võimalik verifitseerida."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "Allkiri on olemas, kui vaja on ka avalikku võtit"
 
-#: ../mail/em-format-html-display.c:952
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12523,11 +9119,9 @@ msgstr ""
 "See sõnum on signeeritud allkirjaga, kuid sellele vastav avalik võti on "
 "puudu."
 
-#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Krüptimata"
 
-#: ../mail/em-format-html-display.c:959
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12535,11 +9129,9 @@ msgstr ""
 "See sõnum ei ole krüptitud ja seetõttu võib see interneti kaudu liikudes "
 "olla kolmandatele osapooltele nähtav."
 
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Krüptitud, nõrgalt"
 
-#: ../mail/em-format-html-display.c:960
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12549,22 +9141,18 @@ msgstr ""
 "olema väga raske aga sugugi mitte võimatu mõistliku aja jooksul sõnumi sisu "
 "näha."
 
-#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Krüptitud"
 
-#: ../mail/em-format-html-display.c:961
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 "See sõnum on krüptitud.  Sõnumi sisu ei tohiks olla teistele iskutele loetav."
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Krüptitud, tugevalt"
 
-#: ../mail/em-format-html-display.c:962
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12573,87 +9161,67 @@ msgstr ""
 "See sõnum on krüptitud tugeva krüptoalgoritmiga. Võimalikul ründajal peaks "
 "olema väga raske mõistliku aja jooksul sõnumi krüpteeringut lahti murda."
 
-#: ../mail/em-format-html-display.c:1063 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Vaata sertifikaati"
 
-#: ../mail/em-format-html-display.c:1078
 msgid "This certificate is not viewable"
 msgstr "See sertifikaat ei ole vaadatav"
 
-#: ../mail/em-format-html-display.c:1377
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Lõpetatud %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1385
 msgid "Overdue:"
 msgstr "Tähtaja ületanud:"
 
-#: ../mail/em-format-html-display.c:1388
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "sellel ajal: %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1466
 msgid "_View Inline"
 msgstr "_Sisekuva"
 
-#: ../mail/em-format-html-display.c:1467
 msgid "_Hide"
 msgstr "_Peida"
 
-#: ../mail/em-format-html-display.c:1468
 msgid "_Fit to Width"
 msgstr "_Sobita laiusega"
 
-#: ../mail/em-format-html-display.c:1469
 msgid "Show _Original Size"
 msgstr "Näita _algset suurust"
 
-#: ../mail/em-format-html-display.c:1989
 msgid "Save attachment as"
 msgstr "Manuse salvestamine kui"
 
-#: ../mail/em-format-html-display.c:1993
 msgid "Select folder to save all attachments"
 msgstr "Kõikide manuste salvestamiseks kataloogi valimine"
 
-#: ../mail/em-format-html-display.c:2044
 msgid "_Save Selected..."
 msgstr "_Salvesta valitud..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2111
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d ma_nus"
 msgstr[1] "%d ma_nust"
 
-#: ../mail/em-format-html-display.c:2118 ../mail/em-format-html-display.c:2207
 msgid "S_ave"
 msgstr "Salves_ta"
 
-#: ../mail/em-format-html-display.c:2129
 msgid "S_ave All"
 msgstr "_Salvesta kõik"
 
-#: ../mail/em-format-html-display.c:2203
 msgid "No Attachment"
 msgstr "Manus puudub"
 
-#: ../mail/em-format-html-display.c:2344 ../mail/em-format-html-display.c:2383
 msgid "View _Unformatted"
 msgstr "Vaata _vormindamata"
 
-#: ../mail/em-format-html-display.c:2346
 msgid "Hide _Unformatted"
 msgstr "Peida _vormindamata"
 
-#: ../mail/em-format-html-display.c:2403
 msgid "O_pen With"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:2479
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12662,247 +9230,184 @@ msgstr ""
 "töötlemiseks liiga suur. Sa võid vaadata seda vormindamata kujul või välise "
 "tekstiredaktori abil."
 
-#: ../mail/em-format-html-print.c:156
 #, c-format
 msgid "Page %d of %d"
 msgstr "Lehekülg %d %d-st"
 
-#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "`%s' tõmbamine"
 
-#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr ""
 
-#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr ""
 
-#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Viide FTP saidile (%s)"
 
-#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Viide kohalikult failile (%s) on saidis \"%s\" korrektne"
 
-#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Viide kohalikule failile (%s)"
 
-#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Viide kaugandmetele (%s)"
 
-#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Viide tundmatutele välistele andmetele (tüüp \"%s\")"
 
-#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "Sõnumi vormindamine"
 
-#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "Sõnumi vormindamine..."
 
-#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
-#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "Koopia"
 
-#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
-#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "Pimekoopia"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1451
 msgid "Mailer"
 msgstr "Postiprogramm"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1771
 msgid " (%a, %R %Z)"
 msgstr " (%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Selle sõnumi on <b>%2$s</b> nimel saatnud <b>%1$s</b>"
 
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:884
-#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:308
 msgid "From"
 msgstr "Saatja"
 
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
-#: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "Vastus-Kuhu"
 
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:331
-#: ../widgets/misc/e-dateedit.c:353
 msgid "Date"
 msgstr "Kuupäev"
 
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
 msgid "Newsgroups"
 msgstr "Uudisegrupid"
 
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:83
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Näopilt"
 
-#: ../mail/em-format.c:1158
 #, c-format
 msgid "%s attachment"
 msgstr "\"%s\" tüüpi manus"
 
-#: ../mail/em-format.c:1200
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME sõnumit pole võimalik analüüsida: Tundmatu viga"
 
-#: ../mail/em-format.c:1337 ../mail/em-format.c:1493
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME sõnumit pole võimalik analüüsida. Kuvatakse lähtekoodina."
 
-#: ../mail/em-format.c:1345
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Toetamata krüptimistüüp multipart/encrypted sõnumile"
 
-#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message"
 msgstr "PGP/MIME sõnumit pole võimalik analüüsida"
 
-#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "PGP/MIME sõnumit pole võimalik analüüsida: Tundmatu viga"
 
-#: ../mail/em-format.c:1512
 msgid "Unsupported signature format"
 msgstr "Toetamata allkirjavorming"
 
-#: ../mail/em-format.c:1520 ../mail/em-format.c:1591
 msgid "Error verifying signature"
 msgstr "Viga allkirja tõestamisel"
 
-#: ../mail/em-format.c:1520 ../mail/em-format.c:1582 ../mail/em-format.c:1591
 msgid "Unknown error verifying signature"
 msgstr "Tundmatu viga allkirja tõestamisel"
 
-#: ../mail/em-format.c:1663
 msgid "Could not parse PGP message"
 msgstr "PGP-sõnumit pole võimalik analüüsida"
 
-#: ../mail/em-format.c:1663
 msgid "Could not parse PGP message: Unknown error"
 msgstr "PGP-sõnumit pole võimalik analüüsida: Tundmatu viga"
 
-#: ../mail/em-mailer-prefs.c:94
 msgid "Every time"
 msgstr "iga kord"
 
-#: ../mail/em-mailer-prefs.c:95
 msgid "Once per day"
 msgstr "kord päevas"
 
-#: ../mail/em-mailer-prefs.c:96
 msgid "Once per week"
 msgstr "kord nädalas"
 
-#: ../mail/em-mailer-prefs.c:97
 msgid "Once per month"
 msgstr "kord kuus"
 
-#: ../mail/em-mailer-prefs.c:327
 msgid "Add Custom Junk Header"
 msgstr "Rämpspostile kohandatud päise lisamine"
 
-#: ../mail/em-mailer-prefs.c:331
 msgid "Header Name:"
 msgstr "Päise nimi:"
 
-#: ../mail/em-mailer-prefs.c:332
 msgid "Header Value Contains:"
 msgstr "Päise väärtus sisaldab:"
 
-#: ../mail/em-mailer-prefs.c:437
 msgid "Contains Value"
 msgstr "Sisaldab väärtust"
 
-#: ../mail/em-mailer-prefs.c:459
 msgid "Color"
 msgstr "Värvus"
 
-#: ../mail/em-mailer-prefs.c:462
 msgid "Tag"
 msgstr "Silt"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s plugin on saadaval ja binaarfail on paigaldatud."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s plugin pole saadaval. Palun kontrolli, kas see pakk on paigaldatud."
 
-#: ../mail/em-mailer-prefs.c:1108
 msgid "No Junk plugin available"
 msgstr "Räpsposti plugin pole saadaval"
 
 #. green
-#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "Ülesanne"
 
 #. blue
-#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "Hiljem"
 
-#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Uut kataloogi `%s' pole võimalik luua: %s"
 
-#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Kausta `%s' pole võimalik kopeerida `%s': %s"
 
-#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Olemasolevaid postkaste asukohas '%s' pole võimalik läbi vaadata: %s"
 
-#: ../mail/em-migrate.c:1868
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12914,27 +9419,22 @@ msgstr ""
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Vana POP `%s' hoia-serveris andmeid pole võimalik avada: %s"
 
-#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "POP3 hoia-serveris andmekataloogi `%s' pole võimalik luua: %s"
 
-#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP3 hoia-serveris `%s' andmeid pole võimalik kopeerida: %s"
 
-#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Tõrge kohaliku postisalvesti `%s' loomisel: %s"
 
-#: ../mail/em-migrate.c:2898
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -12946,12 +9446,10 @@ msgstr ""
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Kohalikku postikausta pole võimalik asukohas `%s' luua: %s"
 
-#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12959,138 +9457,104 @@ msgstr ""
 "Eelmisest Evolutioni paigaldusest pole võimalik sätteid lugeda, `evolution/"
 "configxmldb' pole olemas või on see rikutud."
 
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "Saatjale _vastamine"
 
-#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
-#: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Vasta _postiloendisse"
 
 #. make it first item
-#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "_Lisa aadressiraamatusse"
 
-#: ../mail/em-subscribe-editor.c:582
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "See hoidla ei toeta tellimusi või pole tellimused lubatud."
 
-#: ../mail/em-subscribe-editor.c:615
 msgid "Subscribed"
 msgstr "Tellitud"
 
-#: ../mail/em-subscribe-editor.c:619
 msgid "Folder"
 msgstr "Kaust"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:821
 msgid "Please select a server."
 msgstr "Palun vali server."
 
-#: ../mail/em-subscribe-editor.c:842
 msgid "No server has been selected"
 msgstr "Serverit ei ole valitud"
 
 #. Check buttons
-#: ../mail/em-utils.c:120
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "Seda teadet enam _uuesti mitte näidata."
 
-#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "Sõnumifiltrid"
 
-#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "sõnum"
 
-#: ../mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "Sõnumi salvestamine..."
 
-#: ../mail/em-utils.c:703
 msgid "Add address"
 msgstr "Aadressi lisamine"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1224
 #, c-format
 msgid "Messages from %s"
 msgstr "Andmed %s-st"
 
-#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "_Otsingukaustad"
 
-#: ../mail/em-vfolder-rule.c:593
 msgid "Search Folder source"
 msgstr "Otsingukausta allikas"
 
-#: ../mail/evolution-mail.schemas.in.h:1
 msgid "\"Send and Receive Mail\" window height"
 msgstr "\"Posti saatmise ja vastuvõtmise\" akna kõrgus"
 
-#: ../mail/evolution-mail.schemas.in.h:2
 msgid "\"Send and Receive Mail\" window maximize state"
 msgstr "\"Posti saatmise ja vastuvõtmise\" maksimeerimise olek"
 
-#: ../mail/evolution-mail.schemas.in.h:3
 msgid "\"Send and Receive Mail\" window width"
 msgstr "\"Posti saatmise ja vastuvõtmise\" akna laius"
 
-#: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows Evolution to display text part of limited size"
 msgstr "Piiratud suurusega tekstiosa kuvamise lubamine"
 
-#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "Lugemiskinnitust küsimine alati"
 
-#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Mitme sekundi vältel tuleb olekuribal veateadet kuvada."
 
-#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr "Automaatne tujunäotuvastus"
 
-#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
 msgstr "Automaatne viidatuvastus"
 
-#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr "Otsi sissetuleva posti seest rämpsu"
 
-#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr "Tsitaatide esiletoomise värvus"
 
-#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr "Tsitaatide esiletoomise värvus."
 
-#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "Redaktoriakna vaikimisi kõrgus"
 
-#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "Redaktoriakna vaikimisi laius"
 
-#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
 msgstr "Sõnumikoostaja laadimiste/manuste kataloog"
 
-#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Saaja/Koopia/Pimekoopia väljadel olevate aadresside kokkusurumine"
 
-#: ../mail/evolution-mail.schemas.in.h:16
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -13098,7 +9562,6 @@ msgstr ""
 "Saaja/Koopia/Pimekoopia väljadel olevate aadresside kokkusurumine "
 "address_count võtmes määratud arvuni."
 
-#: ../mail/evolution-mail.schemas.in.h:17
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -13107,11 +9570,9 @@ msgstr ""
 "postiserveritega. Sünkroniseerimiste vahe peab olema vähemalt 30-sekundi "
 "pikkune."
 
-#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Custom headers to use while checking for junk."
 msgstr "Rämpsukontrollis kasutatavad kohandatud päiseid."
 
-#: ../mail/evolution-mail.schemas.in.h:19
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -13119,69 +9580,53 @@ msgstr ""
 "Rämpsukontrolli jaoks kasutatavad kohandatud päiseid. Nimekirja kirjed on "
 "\"päis=väärtus\" vormingus."
 
-#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "Vaikimisi kooditabel, milles sõnumeid koostada"
 
-#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "Vaikimisi kooditabel, milles sõnumeid koostada."
 
-#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "Vaikimisi kooditabel, millega sõnumeid kuvada"
 
-#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "Vaikimisi kooditabel, millega sõnumeid kuvada."
 
-#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "Vaikimisi edastamisstiil"
 
-#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "Redaktoriakna vaikimisi kõrgus."
 
-#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "Sõnumiakna vaikimisi kõrgus."
 
-#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "Tellimisdialoogi vaikimisi kõrgus."
 
-#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "Vastamise vaikimisi laad"
 
-#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr "Vaikimisi väärtus lõimede laiendamise olekule"
 
-#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "Redaktoriakna vaikimisi laius."
 
-#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "Sõnumiakna vaikimisi laius."
 
-#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "Tellimisdialoogi vaikimisi laius."
 
-#: ../mail/evolution-mail.schemas.in.h:33
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -13189,78 +9634,61 @@ msgid ""
 "autocompletion."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:37
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
 "checking speed."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:38
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "Koostajasse failide laadimise/manustamise kataloog."
 
-#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "Mailikomponentide failide salvestamise kataloog."
 
-#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Disable or enable ellipsizing of folder names in folder tree"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 "Õigekirjakontrolli poolt tuvastatud vigade esiletõstmine tippimise ajal."
 
-#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "Rämpspostikaustade tühjendamine programmi sulgemisel"
 
-#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "Prügikaustade tühjendamine programmi sulgemisel"
 
-#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Evolutionist väljumisel kõigi rämpspostikaustade tühjendamine."
 
-#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Evolutionist väljumisel kõigi prügikaustade tühjendamine."
 
-#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Kursorirežiimi lubamine - siis on sõnumi lugemisel kursori asukoht näha."
 
-#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "Võlutühiku lubamine või keelamine"
 
-#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "Ettevaatava otsinguvõimaluse lubamine"
 
-#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "Otsingukaustade lubamine"
 
-#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "Käivitamisel otsingukaustade lubamine."
 
-#: ../mail/evolution-mail.schemas.in.h:52
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -13272,7 +9700,6 @@ msgstr ""
 "näiteks kausta, sisestades kausta nime ja see kaust aktiveeritakse "
 "automaatselt."
 
-#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -13280,27 +9707,21 @@ msgstr ""
 "Selle märkimisega lubatakse sõnumi eelvaates, sõnumite nimekirjas ja "
 "kataloogides kasutada tühikuklahvi kuva edasikerimiseks."
 
-#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr "Piiratud suurusega tekstiosa kuvamise lubamine."
 
-#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "Kursorirežiimi lubamine/keelamine"
 
-#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "Sõnumiloendi paani kõrgus"
 
-#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "Sõnumiloendi paani kõrgus."
 
-#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Kaustapõhise eelvaate peitmine ja valiku eemaldamine"
 
-#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -13308,7 +9729,6 @@ msgstr ""
 "Korraga kümne või enama sõnumi avamise korral kasutaja käest kinnituse "
 "küsimine"
 
-#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -13316,7 +9736,6 @@ msgstr ""
 "Kui \"Eelvaate\" paan on sisse lülitatud, siis näidatakse seda vertikaalse "
 "vaate asemel külg-külje kõrval."
 
-#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -13327,7 +9746,6 @@ msgstr ""
 "andmebaasis kirjeldatud bonobo-komponendinäitajaga ja seda näitajat "
 "kasutatakse sisu kuvamiseks."
 
-#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -13335,7 +9753,6 @@ msgstr ""
 "\"Posti saatmise ja vastuvõtmise\" akna lähtekõrgus. Väärtust uuendatakse, "
 "kui kasutaja akna kõrgust muudab."
 
-#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13349,7 +9766,6 @@ msgstr ""
 "saatmise ja vastuvõtmise\" akent pole võimalik maksimeerida. Praegu on see "
 "väärtus siin arendajate huvides."
 
-#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -13357,13 +9773,11 @@ msgstr ""
 "\"Posti saatmise ja vastuvõtmise\" akna lähtelaius. Väärtust uuendatakse, "
 "kui kasutaja akna laiust muudab."
 
-#: ../mail/evolution-mail.schemas.in.h:65
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr ""
 "Sellega lubatakse ja keelatakse mitme sõnumi märkimise korral kinnituse "
 "küsimine."
 
-#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -13372,42 +9786,33 @@ msgstr ""
 "sünkroniseerimise kohta käiva kinnituse küsimised, mis esitatakse "
 "ennevõrguvabasse režiimi siirdumist."
 
-#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "Viimane kord kui rämpsukausta tühjendati"
 
-#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "Viimane kord kui prügikasti tühjendati"
 
-#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "Tase, millest alates tuleb sõnumeid logida."
 
-#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "Siltide ja nende värvuste loend"
 
-#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "MIME-tüüpide loetelu bonobo komponendivaaturi kontrolliks"
 
-#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accepted licenses"
 msgstr "Aktsepteeritud litsentside loend"
 
-#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of accounts"
 msgstr "Kontode nimekiri"
 
-#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13415,16 +9820,13 @@ msgstr ""
 "Evolutioni sõnumikomponendile teadaolevate kontode loend. Sisaldab "
 "alamkataloogide nimesid kataloogi /apps/evolution/mail/accounts suhtes."
 
-#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of custom headers and whether they are enabled."
 msgstr "Kohandatud päiste ja nende lubamise tingimuste loend."
 
-#: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 "Õigekirjakontrolli jaoks kasutatavate sõnaraamatukeelte koodide loetelu"
 
-#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -13433,15 +9835,12 @@ msgstr ""
 "värvus vorminus sõnumeid, kus värvus on kirjeldatud HTML-ile sarnaselt "
 "kuueteistkümnendsüsteemis."
 
-#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "Aktsepteeritava litsentsiga protokollide nimede loend."
 
-#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over HTTP"
 msgstr "HTML-sõnumite piltide laadimine üle HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -13452,110 +9851,85 @@ msgstr ""
 "laaditakse ainult kontaktide hulgast tulnud sõnumite puhul, \"2\" - Pildid "
 "laaditakse alati võrgust alla."
 
-#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "Filtrite tegevuste logimine"
 
-#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "Filtri tegevuste logimine määratud logifaili."
 
-#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "Filtrite tegevuse logimise logifail"
 
-#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "Filtrite tegevuse logimise logifail."
 
-#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "Sõnumi nähtuks märkimine pärast määratud ajapiirangu ületamist"
 
-#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Sõnumi nähtuks märkimine pärast määratud ajapiirangu ületamist."
 
-#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "Tsitaatide märkimine sõnumi eelvaates"
 
-#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Tsitaatide märkimine sõnumi eelvaates."
 
-#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "Sõnumiakna vaikimisi kõrgus"
 
-#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "Sõnumiakna vaikimisi laius"
 
-#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Sõnumi kuvamise laad (\"tavaline\", \"kõik päised\", \"lähtekood\")"
 
-#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Vähim arv päevi rämpsukausta tühjendamiste vahel töö lõpetamisel"
 
-#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Vähim arv päevi prügikasti tühjendamiste vahel töö lõpetamisel"
 
-#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Vähim arv päevi rämpsukausta tühjendamiste vahel programmi töö lõpetamisel."
 
-#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 "Vähim arv päevi prügikasti tühjendamiste vahel programmi töö lõpetamisel."
 
-#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Aadresside arv, mis kuvatakse Saaja/Koopia/Pimekoopia väljadel"
 
-#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "Kinnituse küsimine tühja teema korral"
 
-#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Kausta puhastamisel kasutaja käest kinnituse küsimine."
 
-#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Teemata sõnumi saatmisel kasutaja käest kinnituse küsimine."
 
-#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr ""
 "Kinnituse küsimine, kui kasutaja soovib viivitamatult võrguvabat režiimi "
 "aktiveerida"
 
-#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "Otsingukaustast sõnumi kustutamisel küsitakse kinnitust"
 
-#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "Kinnituse küsimine puhastamise korral"
 
-#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "Ainult pimekoopiaga saatmisel kasutaja käest kinnituse küsimine"
 
-#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Korraga kümne või enama sõnumi saatmise korral kasutaja käest kinnituse "
 "küsimine"
 
-#: ../mail/evolution-mail.schemas.in.h:106
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -13563,141 +9937,108 @@ msgstr ""
 "Kinnituse küsimine, kui püütakse saata HTML-sõnumit isikule, kes ei soovi "
 "HTML-sisuga sõnumeid vastu võtta."
 
-#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Kinnituse küsimine, kui püütakse saata sõnumit, millel pole tavalist saajat "
 "ega pimekoopa saajat määratud."
 
-#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Kinnituse küsimine soovimatu HTML saatmise korral"
 
-#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "Kinnituse küsimine mitme sõnumi märkimise korral"
 
-#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Tekstis olevate emotikonide äratundmine ja nende asendamine piltidega."
 
-#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "Tekstis olevate viitade äratundmine ja asendamine."
 
-#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "Rämpspostikontrollitestide rakendamine sissetulevatele sõnumitele."
 
-#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "Salvestamise kataloog"
 
-#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Search for the sender photo in local address books"
 msgstr "Saatja foto otsimine kohalikest aadressiraamatutest"
 
-#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "Sõnumite vaikimisi HTML-vormingus saatmine"
 
-#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "Sõnumite vaikimisi HTML-vormingus saatmine."
 
-#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "Saatja e-post aadressi näitamine sõnumite loendi sõnumiveerus"
 
-#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Server synchronization interval"
 msgstr "Serveriga sünkroniseerimise intervall"
 
-#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "Animatsioonide kuvamine"
 
-#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "Animeeritud piltide kuvamine animatsioonidena."
 
-#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Kustutatud sõnumite kuvamine (läbikriipsutatult) sõnumiloendis."
 
-#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "Kustutatud sõnumite näitamine sõnumiteloendis"
 
-#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "Saatja foto näitamine"
 
-#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "Saatja aadressi näitamine sõnumite loendi sõnumiveerus."
 
-#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Saatja foto näitamine sõnumi lugemispaanil."
 
-#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "Õigekirjakontrolli teostatakse jooksvalt"
 
-#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Spell checking color"
 msgstr "Õigekirjakontrolli värvus"
 
-#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell checking languages"
 msgstr "Õigekirjakontrolli keeled"
 
-#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "Tellimisdialoogi vaikimisi kõrgus"
 
-#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "Tellimisdialoogi vaikimisi laius"
 
-#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "Terminali kirjatüüp"
 
-#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "Sõnumi tekstiosa piirang"
 
-#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "Vaikimisi plugin rämpsposti käsitlemiseks"
 
-#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "Viimane rämpsukausta tühjendamise aeg päevades alates epohhi algusest."
 
-#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Viimane prügikasti tühjendamise aeg päevades alates epohhi algusest."
 
-#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "Terminali kirjatüüp sõnumikuvas."
 
-#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "Muutuva laiusega kirjatüüp sõnumikuvas."
 
-#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
@@ -13706,20 +10047,17 @@ msgstr ""
 "suurim suurus. Väärtus määratakse kilobaitides ja vaikimisi on selleks 4MB / "
 "4096 KB."
 
-#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
 "to the other available plugins."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:143
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:144
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13731,18 +10069,15 @@ msgstr ""
 "&lt;header enabled&gt; - kui seda päiserida tuleks kuvada, siis on \"enabled"
 "\" määratud."
 
-#: ../mail/evolution-mail.schemas.in.h:145
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:146
 msgid "This option would help in improving the speed of fetching."
 msgstr "See võti võib aidata tõhustada vastuvõtmise kiirust."
 
-#: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -13750,7 +10085,6 @@ msgstr ""
 "Selle võtmega määratakse sõnumite nimekirja vaikimisi vaates näidatavate "
 "aadresside arv enne '...' näitamist."
 
-#: ../mail/evolution-mail.schemas.in.h:148
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -13758,7 +10092,6 @@ msgstr ""
 "Selle sättega määratakse, kas lõimed peavad vaikimisi olema avatud või "
 "ahendatud olekus. Sätte rakendamiseks tuleb Evolution uuesti käivitada."
 
-#: ../mail/evolution-mail.schemas.in.h:149
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -13768,117 +10101,89 @@ msgstr ""
 "värskeimale sõnumile või sorditakse lõimed sõnumite kuupäevade alusel. Sätte "
 "muutmise korral vajab Evolution taaskäivitamist."
 
-#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "Sõnumiloendi paigutamine lõimedesse."
 
-#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "Sõnumiloendi paigutamine lõimedesse"
 
-#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "Sõnumiloendi paigutamine lõimedesse Teema alusel"
 
-#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Aeg, mille jooksul sõnum nähtuks märgitakse"
 
-#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
 msgstr "Aeg, mille jooksul sõnum nähtuks märgitakse."
 
-#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "Vaikimisi määratud konto UID string."
 
-#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Use SpamAssassin daemon and client"
 msgstr "SpamAssassin'i deemoni ja kliendi kasutamine"
 
-#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "SpamAssassin'i deemoni ja kliendi (spamc/spamd) kasutamine."
 
-#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "Kohandatud kirjatüüpide kasutamine"
 
-#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
 msgstr "Kohandatud kirjatüüpide kasutamine sõnumite näitamisel."
 
-#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "Ainult kohalike rämpspostitestide kasutamine."
 
-#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Ainult kohalike (mitte-DNS) rämpspostitestide kasutamine."
 
-#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr "Külg-külje kõrval paigutuse või laia paigutuse kasutamine"
 
-#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "Muutuva laiusega kirjatüüp"
 
-#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "Vaade/Pimekoopia menüükirje on märgitud"
 
-#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "Vaade/Pimekoopia menüükirje on märgitud."
 
-#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "Vaade/Koopia menüükirje on märgitud"
 
-#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "Vaade/Koopia menüükirje on märgitud."
 
-#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "Vaade/Kellelt menüükirje on märgitud"
 
-#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "Vaade/Kellelt menüükirje on märgitud."
 
-#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "Vaade/Postita-kuhu menüükirje on märgitud"
 
-#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "Vaade/Postita-kuhu menüükirje on märgitud."
 
-#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "Vaade/Kellele-vastata menüükirje on märgitud"
 
-#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "Vaade/Kellele-vastata menüükirje on märgitud."
 
-#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Kas lugemiskinnituse päring pannakse vaikimisi iga saadetava sõnumi külge "
 "või mitte."
 
-#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Whether disable ellipsizing feature of folder names in folder tree."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13887,459 +10192,350 @@ msgstr ""
 "järgi paigutamist - seda juhul, kui sõnumite päised ei sisalda In-Reply-To "
 "või References ridu."
 
-#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Whether sort threads based on latest message in that thread"
 msgstr ""
 "Kas lõimede sortimine toimub viimase lõimesoleva sõnumi alusel või mitte"
 
-#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "Sõnumiloendi paani laius"
 
-#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "Sõnumiloendi paani laius."
 
-#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "Elm'i andmete importimine"
 
-#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Evolutioni Elm'i importija"
 
-#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "Postkasti importimine programmist Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:79
 msgid "Destination folder:"
 msgstr "Sihtkataloog:"
 
-#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder to import into"
 msgstr "Vali kaust, kuhu importida"
 
-#: ../mail/importers/evolution-mbox-importer.c:219
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley postkast (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Berkeley postkasti vormingus kaustade importija"
 
-#: ../mail/importers/mail-importer.c:147
 msgid "Importing mailbox"
 msgstr "Postkasti importimine"
 
-#: ../mail/importers/mail-importer.c:231 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "'%s' importimine"
 
-#: ../mail/importers/mail-importer.c:371
 #, c-format
 msgid "Scanning %s"
 msgstr "%s läbivaatamine"
 
-#: ../mail/importers/pine-importer.c:225
 msgid "Importing Pine data"
 msgstr "Pine'i andmete importimine"
 
-#: ../mail/importers/pine-importer.c:424
 msgid "Evolution Pine importer"
 msgstr "Evolutioni Pine'i importija"
 
-#: ../mail/importers/pine-importer.c:425
 msgid "Import mail from Pine."
 msgstr "Postkasti importimine programmist Pine."
 
-#: ../mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
 msgstr "Sõnumi saaja: %s"
 
-#: ../mail/mail-autofilter.c:239 ../mail/mail-autofilter.c:278
 #, c-format
 msgid "Mail from %s"
 msgstr "Sõnumi saatja: %s"
 
-#: ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Subject is %s"
 msgstr "Teema on %s"
 
-#: ../mail/mail-autofilter.c:297
 #, c-format
 msgid "%s mailing list"
 msgstr "%s postiloend"
 
-#: ../mail/mail-autofilter.c:368
 msgid "Add Filter Rule"
 msgstr "Lisa filtreerimisreegel"
 
-#: ../mail/mail-component.c:163 ../plugins/templates/templates.c:519
-#: ../plugins/templates/templates.c:689 ../plugins/templates/templates.c:724
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "Mallid"
 
-#: ../mail/mail-component.c:545
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d valitud, "
 msgstr[1] "%d valitud, "
 
-#: ../mail/mail-component.c:549
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d kustutatut"
 msgstr[1] "%d kustutatut"
 
-#: ../mail/mail-component.c:556
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d rämpssõnum"
 msgstr[1] "%d rämpssõnumit"
 
-#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d mustand"
 msgstr[1] "%d mustandit"
 
-#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d saadetud"
 msgstr[1] "%d saadetud"
 
-#: ../mail/mail-component.c:563
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d saatmata"
 msgstr[1] "%d saatmata"
 
-#: ../mail/mail-component.c:569
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d lugemata, "
 msgstr[1] "%d lugemata, "
 
-#: ../mail/mail-component.c:570
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d kokku"
 msgstr[1] "%d kokku"
 
-#: ../mail/mail-component.c:922
 msgid "New Mail Message"
 msgstr "Uus e-posti sõnum"
 
-#: ../mail/mail-component.c:923
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_E-posti sõnum"
 
-#: ../mail/mail-component.c:924
 msgid "Compose a new mail message"
 msgstr "Uue e-posti sõnumi loomine"
 
-#: ../mail/mail-component.c:930
 msgid "New Mail Folder"
 msgstr "Uus kirjakaust"
 
-#: ../mail/mail-component.c:931
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Postikaust"
 
-#: ../mail/mail-component.c:932
 msgid "Create a new mail folder"
 msgstr "Uue postikausta loomine"
 
-#: ../mail/mail-component.c:1079
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Tõrge e-posti seadistuste või kaustade uuendamisel"
 
-#: ../mail/mail-component.c:1595
 msgid "Error"
 msgstr "Viga"
 
-#: ../mail/mail-component.c:1595
 msgid "Errors"
 msgstr "Vead"
 
-#: ../mail/mail-component.c:1596
 msgid "Warnings and Errors"
 msgstr "Hoiatused ja vead"
 
-#: ../mail/mail-component.c:1597
 msgid "Debug"
 msgstr "Silumine"
 
-#: ../mail/mail-component.c:1597
 msgid "Error, Warnings and Debug messages"
 msgstr "Vea-, hoiatus- ja silumisteated"
 
-#: ../mail/mail-component.c:1724
 msgid "Debug Logs"
 msgstr "Silumislogid"
 
-#: ../mail/mail-component.c:1738
 msgid "Show _errors in the status bar for"
 msgstr "Ol_ekuribal näidatakse vigu"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1754
 msgid "second(s)."
 msgstr "sekund(it)."
 
-#: ../mail/mail-component.c:1760
 msgid "Log Messages:"
 msgstr "Logiteated:"
 
-#: ../mail/mail-component.c:1801
 msgid "Log Level"
 msgstr "Logimise tase"
 
-#: ../mail/mail-component.c:1810 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Aeg"
 
-#: ../mail/mail-component.c:1820 ../mail/message-list.c:2519
-#: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Sõnumid"
 
-#: ../mail/mail-component.c:1829 ../ui/evolution-mail-messagedisplay.xml.h:2
-#: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Akna sulgemine"
 
-#: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr "T_uvasta toetatavad liigid"
 
-#: ../mail/mail-config.glade.h:2
 msgid "(Note: Requires restart of the application)"
 msgstr "(Märkus: Selle rakendamiseks on tarvilik rakenduse taaskäivitamine)"
 
-#: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>Käesolev Evolition ehitatud ilma SSL'i toeta</b>"
 
-#: ../mail/mail-config.glade.h:5
 msgid "<b>Sender Photograph</b>"
 msgstr "<b>Saatja foto</b>"
 
-#: ../mail/mail-config.glade.h:6
 msgid "<b>Sig_natures</b>"
 msgstr "<b>All_kirjad</b>"
 
-#: ../mail/mail-config.glade.h:7
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>Ülapostitamise valik</b> (pole soovitatav)"
 
-#: ../mail/mail-config.glade.h:8
 msgid "<b>_Languages</b>"
 msgstr "<b>_Keeled</b>"
 
-#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Konto andmed</span>"
 
-#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Autentimine</span>"
 
-#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Sõnumite koostamine</span>"
 
-#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Sätted</span>"
 
-#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Vaikimisi käitumine</span>"
 
-#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Sõnumite kustutamine</span>"
 
-#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
 msgstr "<span weight=\"bold\">Kuvatavad _kirjapäised</span>"
 
-#: ../mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Labels</span>"
 msgstr "<span weight=\"bold\">Sildid</span>"
 
-#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Piltide laadimine</span>"
 
-#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Sõnumikuva</span>"
 
-#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Sõnumi kirjatüübid</span>"
 
-#: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Sõnumi saajad</span>"
 
-#: ../mail/mail-config.glade.h:23
-#: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Mittekohustuslikud andmed</span>"
 
-#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Valikud</span>"
 
-#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Prinditud kirjatüübid</span>"
 
-#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Proxy Settings</span>"
 msgstr "<span weight=\"bold\">Proksi sätted</span>"
 
-#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Kohustuslikud andmed</span>"
 
-#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Turvaline MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Turvalisus</span>"
 
-#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Saadetud sõnumid ja mustandid</span>"
 
-#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Serveri sätted</span>"
 
-#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">_Authentication Type</span>"
 msgstr "<span weight=\"bold\">_Autentimise liik</span>"
 
-#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Kontohaldus"
 
-#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "Lisa _uus allkiri..."
 
-#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Lisa _skript"
 
-#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Väljuvad sõnumid _allkirjastatakse alati selle konto abil"
 
-#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "Krüptitud sõnumi saatmisel krüptitakse see ka _endale"
 
-#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "_Alati saadetakse koopia (cc):"
 
-#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Alati saadetakse _pimekoopia (bcc):"
 
-#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Minu võtmerõngas olevad võtmed _usaldatakse alati"
 
-#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Krüptitud sõnumi saatmisel krüptitakse alati ka _enda jaoks"
 
-#: ../mail/mail-config.glade.h:44
 msgid "Always request rea_d receipt"
 msgstr "_Lugemiskinnitust küsitakse alati"
 
-#: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _emoticon images"
 msgstr "Tuju_nägude pildid lisatakse automaatselt"
 
-#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balti (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balti (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:49
 msgid "C_haracter set:"
 msgstr "_Märgistik:"
 
-#: ../mail/mail-config.glade.h:50
 msgid "Ch_eck for Supported Types "
 msgstr "_Toetatavate tüüpide tuvastus"
 
-#: ../mail/mail-config.glade.h:51
 msgid "Check cu_stom headers for junk"
 msgstr "Rämpsukontrollis vaadatakse kohandatud _päiseid"
 
-#: ../mail/mail-config.glade.h:52
 msgid "Check incoming _messages for junk"
 msgstr "Sissetulevale postile rakendatakse _rämpsukontrolli"
 
-#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "Sisestamise käigus kon_trollitakse õigekirja"
 
-#: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Sissetulevate sõnumite seest rämpsu kontrollimine"
 
-#: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
 msgstr "_Puhasta"
 
-#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "_Puhasta"
 
-#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "_Värvus õigekirjakontrolli probleemsetele sõnade jaoks:"
 
-#: ../mail/mail-config.glade.h:58
 msgid "Confirm _when expunging a folder"
 msgstr "_Enne kataloogi puhastamist küsitakse kinnitust"
 
-#: ../mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14355,176 +10551,134 @@ msgstr ""
 "\n"
 "Seadistuste salvestamiseks vajuta \"Rakenda\"."
 
-#: ../mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "_Vaikimisi"
 
-#: ../mail/mail-config.glade.h:66
 msgid "Default character e_ncoding:"
 msgstr "_Vaikimisi kooditabel:"
 
-#: ../mail/mail-config.glade.h:68
 msgid "Delete junk messages on e_xit"
 msgstr "Lõpetamisel _kustutatakse rämpspost"
 
-#: ../mail/mail-config.glade.h:70
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Väljuvate sõnumite _digitaalne allkirjastamine (vaikimisi)"
 
-#: ../mail/mail-config.glade.h:71
 msgid "Do not format messages when text si_ze exceeds"
 msgstr "Sõnumite tekstiosa ei vo_rmindata, kui selle suurus ületab"
 
-#: ../mail/mail-config.glade.h:72
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Minu _aadressiraamatus olevate saatjate sõnumeid ei märgita rämpsuks"
 
-#: ../mail/mail-config.glade.h:73
 msgid "Do not quote"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:74
 msgid "Done"
 msgstr "Valmis"
 
-#: ../mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
 msgstr "Mustan_dite kaust:"
 
-#: ../mail/mail-config.glade.h:76
 msgid "Email Accounts"
 msgstr "E-posti kontod"
 
-#: ../mail/mail-config.glade.h:77
 msgid "Email _Address:"
 msgstr "E-posti _aadress:"
 
-#: ../mail/mail-config.glade.h:78
 msgid "Empty trash folders on e_xit"
 msgstr "Väljumisel tühjendatakse _prügikaustad"
 
-#: ../mail/mail-config.glade.h:79
 msgid "Enable Magic S_pacebar "
 msgstr "Võ_lutühik on lubatud"
 
-#: ../mail/mail-config.glade.h:80
 msgid "Enable Sea_rch Folders"
 msgstr "_Otsingukaustad on lubatud"
 
-#: ../mail/mail-config.glade.h:81
 msgid "Encry_ption certificate:"
 msgstr "_Krüptimissertifikaat:"
 
-#: ../mail/mail-config.glade.h:82
 msgid "Encrypt out_going messages (by default)"
 msgstr "Väljuvate sõnumite _krüptimine (vaikimisi)"
 
-#: ../mail/mail-config.glade.h:84
 msgid "Fi_xed-width:"
 msgstr "Fi_kseeritud-laiusega:"
 
-#: ../mail/mail-config.glade.h:85
 msgid "Fix_ed width Font:"
 msgstr "Fi_kseeritud laiusega kirjatüüp:"
 
-#: ../mail/mail-config.glade.h:86
 msgid "Font Properties"
 msgstr "Kirjatüübi omadused"
 
-#: ../mail/mail-config.glade.h:87
 msgid "Format messages in _HTML"
 msgstr "Sõnumid vormindatakse _HTML-is"
 
-#: ../mail/mail-config.glade.h:88
 msgid "Full Nam_e:"
 msgstr "Täis_nimi:"
 
-#: ../mail/mail-config.glade.h:90
 msgid "HTML Messages"
 msgstr "HTML-Sõnumid"
 
-#: ../mail/mail-config.glade.h:91
 msgid "H_TTP Proxy:"
 msgstr "H_TTP proksi:"
 
-#: ../mail/mail-config.glade.h:92
 msgid "Headers"
 msgstr "Päised"
 
-#: ../mail/mail-config.glade.h:93
 msgid "Highlight _quotations with"
 msgstr "_Tsitaate rõhutatakse"
 
-#: ../mail/mail-config.glade.h:95
 msgid "Inline"
 msgstr "Samal joonel"
 
-#: ../mail/mail-config.glade.h:96
 msgid "Inline (Outlook style)"
 msgstr "Algse sõnumiga samal joonel (Outlook'i moodi)"
 
-#: ../mail/mail-config.glade.h:98
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Sildid"
 
-#: ../mail/mail-config.glade.h:100
 msgid "Languages Table"
 msgstr "Keeltetabel"
 
-#: ../mail/mail-config.glade.h:101
 msgid "Mail Configuration"
 msgstr "E-posti seadistused"
 
-#: ../mail/mail-config.glade.h:102
 msgid "Mail Headers Table"
 msgstr "Sõnumipäiste tabel"
 
-#: ../mail/mail-config.glade.h:104
 msgid "Mailbox location"
 msgstr "Postkasti asukoht"
 
-#: ../mail/mail-config.glade.h:105
 msgid "Message Composer"
 msgstr "Sõnumiredaktor"
 
-#: ../mail/mail-config.glade.h:106
 msgid "No _Proxy for:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:107
 msgid ""
 "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr ""
 "Märkus: Sildi nimes olevat alakriipsu kasutatakse menüüdes mnemoonilise "
 "identifikaatorina."
 
-#: ../mail/mail-config.glade.h:108
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Märkus: parooli ei küsita enne kui esimesel ühendumisel"
 
-#: ../mail/mail-config.glade.h:109
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "Seda valikut eiratakse kohandatud rämpspostipäiste vastavuse korral."
 
-#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "_Organisatsioon:"
 
-#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _võtme ID:"
 
-#: ../mail/mail-config.glade.h:112
 msgid "Pass_word:"
 msgstr "Pa_rool:"
 
-#: ../mail/mail-config.glade.h:114
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -14532,7 +10686,6 @@ msgstr ""
 "Palun siselda seda kontot kirjeldav nimi allolevasse kasti.\n"
 "Seda nime kasutatakse ainult kuvamiseks."
 
-#: ../mail/mail-config.glade.h:116
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14541,7 +10694,6 @@ msgstr ""
 "siia sisestada, küsi oma lisateavet oma süsteemiülemalt või interneti "
 "teenusepakkujalt."
 
-#: ../mail/mail-config.glade.h:117
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -14551,125 +10703,95 @@ msgstr ""
 "Mittekohustuslikud väljad võib täita siis, kui sa soovid nendes väljades "
 "olevaid andmeid lisada enda saadetud sõnumitesse."
 
-#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Palun vali järgnevate valikute vahel"
 
-#: ../mail/mail-config.glade.h:119
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Ainult _pimekoopias olevate adressaatidega varustatud sõnumi saatmise puhul "
 "küsitakse kinnitust"
 
-#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Tsitaadina"
 
-#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "_Parool jäetakse meelde"
 
-#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "Kellele-_vastata:"
 
-#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "Parool jäetakse _meelde"
 
-#: ../mail/mail-config.glade.h:126
 msgid "S_OCKS Host:"
 msgstr "S_OCKS-i host:"
 
-#: ../mail/mail-config.glade.h:127
 msgid "S_earch for sender photograph only in local address books"
 msgstr "Saatja f_otot otsitakse ainult kohalikust aadressiraamatust"
 
-#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "_Vali..."
 
-#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "_Lugemiskinnitus saadetakse:"
 
-#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "Tavaline ki_rjatüüp:"
 
-#: ../mail/mail-config.glade.h:132
 msgid "Select Drafts Folder"
 msgstr "Mustandite kausta valimine"
 
-#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font"
 msgstr "Vali HTML fikseeritud laiusega kirjatüüp"
 
-#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font for printing"
 msgstr "Vali printimise jaoks HTML fikseeritud laiusega kirjatüüp"
 
-#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font"
 msgstr "Vali HTML muutuva laiusega kirjatüüp"
 
-#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font for printing"
 msgstr "Vali printimise jaoks HTML muutuva laiusega kirjatüüp"
 
-#: ../mail/mail-config.glade.h:137
 msgid "Select Sent Folder"
 msgstr "Saadetud sõnumite kausta valimine"
 
-#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr "E-posti saatmine"
 
-#: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
 msgstr "Saadetud _sõnumite kaust:"
 
-#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr "Server vajab _autentimist"
 
-#: ../mail/mail-config.glade.h:142
 msgid "Server _Type: "
 msgstr "Serveri l_iik:"
 
-#: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
 msgstr "All_kirjastamissertifikaat:"
 
-#: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
 msgstr "All_kiri:"
 
-#: ../mail/mail-config.glade.h:145
 msgid "Signatures"
 msgstr "Allkirjad"
 
-#: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
 msgstr "Allkirjatabel"
 
-#: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
 msgstr "Õigekirja kontrollimine"
 
-#: ../mail/mail-config.glade.h:148
 msgid "Start _typing at the bottom on replying"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:149
 msgid "T_ype: "
 msgstr "Lii_k:"
 
-#: ../mail/mail-config.glade.h:150
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14677,7 +10799,6 @@ msgstr ""
 "Siinolev keelteloend kajastab ainult keeli, millede jaoks on sõnastik "
 "paigaldatud."
 
-#: ../mail/mail-config.glade.h:151
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14686,7 +10807,6 @@ msgstr ""
 "Selle skripti väljundit kasutatakse sinu signatuurina.\n"
 "Nimevälja kasutatakse ainult kuvamiseks."
 
-#: ../mail/mail-config.glade.h:154
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14694,26 +10814,18 @@ msgstr ""
 "Sisesta nimi, millega sa soovid sellele kontole viidata.\n"
 "Näiteks: \"Isiklik\" või \"Tööasjad\""
 
-#: ../mail/mail-config.glade.h:156
 msgid "Us_ername:"
 msgstr "_Kasutajanimi:"
 
-#: ../mail/mail-config.glade.h:157
 msgid "Use Authe_ntication"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:158 ../plugins/caldav/caldav-source.c:284
-#: ../plugins/google-account-setup/google-source.c:625
-#: ../plugins/google-account-setup/google-contacts-source.c:278
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
 msgid "User_name:"
 msgstr "_Kasutajanimi:"
 
-#: ../mail/mail-config.glade.h:159
 msgid "V_ariable-width:"
 msgstr "_Muutuva laiusega:"
 
-#: ../mail/mail-config.glade.h:160
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14723,201 +10835,152 @@ msgstr ""
 "\n"
 "Jätkamiseks vajuta \"Edasi\"."
 
-#: ../mail/mail-config.glade.h:163
 msgid "_Add Signature"
 msgstr "Allkirja _lisamine"
 
-#: ../mail/mail-config.glade.h:164
 msgid "_Always load images from the Internet"
 msgstr "_Internetis asuvad pildid laaditakse alati"
 
-#: ../mail/mail-config.glade.h:165
 msgid "_Automatic proxy configuration URL:"
 msgstr "Proksi _automaatseadistuse URL:"
 
-#: ../mail/mail-config.glade.h:166
 msgid "_Default junk plugin:"
 msgstr "Vaikimisi _rämpsuplugin:"
 
-#: ../mail/mail-config.glade.h:167
 msgid "_Direct connection to the Internet"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:168
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Koosolekupäringuid ei _signeerita (Outlookiga ühilduvuse tarbeks)"
 
-#: ../mail/mail-config.glade.h:170
 msgid "_Forward style:"
 msgstr "_Edastamise laad:"
 
-#: ../mail/mail-config.glade.h:171
 msgid "_Keep Signature above the original message on replying"
 msgstr "Vastamisel paigutatakse a_llkiri algsest sõnumist ettepoole"
 
-#: ../mail/mail-config.glade.h:172
 msgid "_Load images in messages from contacts"
 msgstr "Pildid _laaditakse kontaktide poolt saadetud sõnumites"
 
-#: ../mail/mail-config.glade.h:173
 msgid "_Lookup in local address book only"
 msgstr "_Otsitakse ainult kohalikest aadressiraamatutest"
 
-#: ../mail/mail-config.glade.h:174
 msgid "_Make this my default account"
 msgstr "See konto on _määratud minu vaikimisi kontoks"
 
-#: ../mail/mail-config.glade.h:175
 msgid "_Manual proxy configuration:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:176
 msgid "_Mark messages as read after"
 msgstr "Sõnum _märgitakse loetuks pärast"
 
-#: ../mail/mail-config.glade.h:178
 msgid "_Never load images from the Internet"
 msgstr "Internetist ei laadita kunagi ü_htegi pilti"
 
-#: ../mail/mail-config.glade.h:179
 msgid "_Path:"
 msgstr "_Rada:"
 
-#: ../mail/mail-config.glade.h:180
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 "HTML-sõnumi saatmisel seda mittesoovivatele kontaktidele _küsitakse kinnitust"
 
-#: ../mail/mail-config.glade.h:181
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Tühja _teemareaga sõnumi saatmisel küsitakse kinnitust"
 
-#: ../mail/mail-config.glade.h:182
 msgid "_Reply style:"
 msgstr "_Vastamise stiil:"
 
-#: ../mail/mail-config.glade.h:183
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.glade.h:184
 msgid "_Secure HTTP Proxy:"
 msgstr "_Turvalise HTTP proksi:"
 
-#: ../mail/mail-config.glade.h:185
 msgid "_Select..."
 msgstr "_Vali..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:188
 msgid "_Show image animations"
 msgstr "_Pildianimatsioone näitatakse"
 
-#: ../mail/mail-config.glade.h:189
 msgid "_Show the photograph of sender in the message preview"
 msgstr "E-sõnumi eelvaates näidatakse saatja _fotot"
 
-#: ../mail/mail-config.glade.h:190
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "Kellele / Koopia / Pimekoopia välju vä_hendatakse"
 
-#: ../mail/mail-config.glade.h:191
 msgid "_Use Secure Connection:"
 msgstr "Tu_rvalise ühenduse kasutamine:"
 
-#: ../mail/mail-config.glade.h:192
 msgid "_Use system defaults"
 msgstr "Kasuta süsteemi _vaikeväärtuseid"
 
-#: ../mail/mail-config.glade.h:193
 msgid "_Use the same fonts as other applications"
 msgstr "_Kirjatüüp on sama, mis teistes rakendustes"
 
-#: ../mail/mail-config.glade.h:194
 msgid "addresses"
 msgstr "aadressini"
 
-#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr "värvusega"
 
-#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "kirjeldus"
 
-#: ../mail/mail-dialogs.glade.h:1
 msgid "    "
 msgstr "    "
 
-#: ../mail/mail-dialogs.glade.h:2
 msgid "<b>Search Folder Sources</b>"
 msgstr "<b>Otsingukausta allikad</b>"
 
-#: ../mail/mail-dialogs.glade.h:3
 msgid "<span weight=\"bold\">Digital Signature</span>"
 msgstr "<span weight=\"bold\">Digitaalallkiri</span>"
 
-#: ../mail/mail-dialogs.glade.h:4
 msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Krüptimine</span>"
 
-#: ../mail/mail-dialogs.glade.h:5
 msgid "All active remote folders"
 msgstr "Kõik aktiivsed võrgukaustad"
 
-#: ../mail/mail-dialogs.glade.h:6
 msgid "All local and active remote folders"
 msgstr "Kõik kohalikud kaustad ja aktiivsed võrgukaustad"
 
-#: ../mail/mail-dialogs.glade.h:7
 msgid "All local folders"
 msgstr "Kõik kohalikud kaustad"
 
-#: ../mail/mail-dialogs.glade.h:8
 msgid "Case _sensitive"
 msgstr "_Tõstutundlik"
 
-#: ../mail/mail-dialogs.glade.h:9
 msgid "Co_mpleted"
 msgstr "_Valmis"
 
-#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "Ot_sing:"
 
-#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "Otsing sõnumist"
 
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr "Märgistamine järeltoiminguks"
 
-#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Kaustade tellimused"
 
-#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "Kasutustingimused"
 
-#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "Ühtegi pole valitud"
 
-#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "_Server:"
 
-#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "Turvalisuse andmed"
 
-#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "Spetsiifilised kaustad"
 
-#: ../mail/mail-dialogs.glade.h:19
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14925,42 +10988,33 @@ msgstr ""
 "Allpool kuvatakse sõnumid, mida sa oled märkinud järeltoiminguteks.\n"
 "Palun vali järeltoiming menüüst \"Märgistus\"."
 
-#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "_Nõustu kasutustingimustega"
 
-#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "_Tähtaeg:"
 
-#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "_Märgistus:"
 
-#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "Litsentsitingimustega _nõustumisel märgi see ruut"
 
-#: ../mail/mail-folder-cache.c:833
 #, c-format
 msgid "Pinging %s"
 msgstr "%s pingimine"
 
-#: ../mail/mail-ops.c:105
 msgid "Filtering Selected Messages"
 msgstr "Valitud sõnumite filtreerimine"
 
-#: ../mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "E-posti võtmine"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:560
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Tõrge väljundfiltrite rakendamisel: %s"
 
-#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14969,123 +11023,98 @@ msgstr ""
 "Tõrge kausta %s lisamisel: %s\n"
 "Selle asemel lisatakse kausta `Saadetud'."
 
-#: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Tõrge lisamisel kohalikku `Saadetud' kausta: %s"
 
-#: ../mail/mail-ops.c:724
 msgid "Sending message"
 msgstr "Sõnumi saatmine"
 
-#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sõnumi %d/%d saatmine"
 
-#: ../mail/mail-ops.c:761
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Tõrge sõnumi %d saatmisel (kokku %d)"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "Tühistatud."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "Valmis."
 
-#: ../mail/mail-ops.c:871
 msgid "Saving message to folder"
 msgstr "Sõnumi salvestamine kausta"
 
-#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Sõnumite ümbertõstmine kausta %s"
 
-#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: ../mail/mail-ops.c:1166
 msgid "Forwarded messages"
 msgstr "Edastatud sõnum"
 
-#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "Kausta %s avamine"
 
-#: ../mail/mail-ops.c:1272
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Kausta %s kohta kvoodiandmete vastuvõtmine"
 
-#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Opening store %s"
 msgstr "Hoidla %s avamine"
 
-#: ../mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Kausta %s eemaldamine"
 
-#: ../mail/mail-ops.c:1530
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Kausta %s salvestamine"
 
-#: ../mail/mail-ops.c:1593
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Konto '%s' sõnumite puhastamine ja salvestamine"
 
-#: ../mail/mail-ops.c:1594
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Konto %s salvestamine"
 
-#: ../mail/mail-ops.c:1648
 msgid "Refreshing folder"
 msgstr "Kausta värskendamine"
 
-#: ../mail/mail-ops.c:1688 ../mail/mail-ops.c:1738
 msgid "Expunging folder"
 msgstr "Kataloogi puhastamine"
 
-#: ../mail/mail-ops.c:1735
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Prügikasti '%s' tühjendamine"
 
-#: ../mail/mail-ops.c:1736
 msgid "Local Folders"
 msgstr "Kohalikud kaustad"
 
-#: ../mail/mail-ops.c:1817
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Sõnumi %s vastuvõtmine"
 
-#: ../mail/mail-ops.c:1924
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d sõnumi vastuvõtmine"
 msgstr[1] "%d sõnumi vastuvõtmine"
 
-#: ../mail/mail-ops.c:2009
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "%d sõnumi salvestamine"
 msgstr[1] "%d sõnumi salvestamine"
 
-#: ../mail/mail-ops.c:2087
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15094,11 +11123,9 @@ msgstr ""
 "Viga sõnumite salvestamisel %s kausta\n"
 " %s"
 
-#: ../mail/mail-ops.c:2159
 msgid "Saving attachment"
 msgstr "Manuse salvestamine"
 
-#: ../mail/mail-ops.c:2177 ../mail/mail-ops.c:2185
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15107,146 +11134,113 @@ msgstr ""
 "Väljundfaili pole võimalik luua: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2200
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Andmeid pole võimalik kirjutada: %s"
 
-#: ../mail/mail-ops.c:2346
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Ühendun lahti: %s"
 
-#: ../mail/mail-ops.c:2346
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Taasühendamine %s"
 
-#: ../mail/mail-ops.c:2442
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Konto '%s' ettevalmistamine võrguvabaks režiimiks"
 
-#: ../mail/mail-ops.c:2528
 msgid "Checking Service"
 msgstr "Teenuse kontrollimine"
 
-#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "Tühistamine..."
 
-#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "Posti saatmine ja vastuvõtmine"
 
-#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "Tühista _kõik"
 
-#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "Uuendamine..."
 
-#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "Ootamine..."
 
-#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "Uute sõnumite kontroll"
 
-#: ../mail/mail-session.c:207
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Parooli sisestamine %s jaoks"
 
-#: ../mail/mail-session.c:209
 msgid "Enter Passphrase"
 msgstr "Parooli sisestamine"
 
-#: ../mail/mail-session.c:212
-#: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Parooli sisestamine %s jaoks"
 
-#: ../mail/mail-session.c:214
 msgid "Enter Password"
 msgstr "Parooli sisestamine"
 
-#: ../mail/mail-session.c:256
 msgid "User canceled operation."
 msgstr "Kasutaja katkestas toimingu."
 
-#: ../mail/mail-signature-editor.c:201
 msgid "_Save and Close"
 msgstr "_Salvesta ja sulge"
 
-#: ../mail/mail-signature-editor.c:355
 msgid "Edit Signature"
 msgstr "Allkirja redigeerimine"
 
-#: ../mail/mail-signature-editor.c:370
 msgid "_Signature Name:"
 msgstr "_Allkirja nimi:"
 
-#: ../mail/mail-tools.c:120
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Puhverkataloogi `%s' pole võimalik luua: %s"
 
-#: ../mail/mail-tools.c:150
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "Movemail'i proovimine mitte-mbox allikaga `%s'"
 
-#: ../mail/mail-tools.c:256
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Edastatud sõnum - %s"
 
-#: ../mail/mail-tools.c:258
 msgid "Forwarded message"
 msgstr "Edastatud sõnum"
 
-#: ../mail/mail-tools.c:298
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Vigane kaust: `%s'"
 
-#: ../mail/mail-vfolder.c:89
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Otsingukausta ülesseadmine: %s"
 
-#: ../mail/mail-vfolder.c:233
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "'%s:%s' otsingukaustade uuendamine"
 
-#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s' otsingukaustade uuendamine"
 
-#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "Otsingukausta redigeerimine"
 
-#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "Uus otsingukaust"
 
-#: ../mail/mail.error.xml.h:1
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "Kaust nimega \"{0}\" on juba olemas. Palun kasuta teistsugust nime."
 
-#: ../mail/mail.error.xml.h:2
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Kaust nimega \"{1}\" on juba olemas. Palun kasuta teistsugust nime."
 
-#: ../mail/mail.error.xml.h:3
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15258,7 +11252,6 @@ msgstr ""
 "Sa võid seda kausta eirata, üle kirjutada, selle sisule lisada või toimingu "
 "lõpetada."
 
-#: ../mail/mail.error.xml.h:6
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
@@ -15266,14 +11259,12 @@ msgstr ""
 "\"{1}\" kohta küsitakse lugemiskinnitust. Kas saata lugemiskinnitus "
 "aadressile {0}?"
 
-#: ../mail/mail.error.xml.h:7
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
 msgstr ""
 "Signatuur nimega \"{0}\" on juba olemas. Palun kasuta teistsugust nime."
 
-#: ../mail/mail.error.xml.h:8
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -15281,24 +11272,19 @@ msgstr ""
 "Sõnumile mõtestatud teemarea lisamine annab sõnumi vastuvõtjatele aimu "
 "sõnumi sisu kohta."
 
-#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Kas sa soovid kustutada seda kontot ja kõiki selle proksisid?"
 
-#: ../mail/mail.error.xml.h:10
 msgid "Are you sure you want to delete this account?"
 msgstr "Kas sa soovid kustutada seda kontot?"
 
-#: ../mail/mail.error.xml.h:11
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Kas sa soovid keelata seda kontot ja kustutada kõik selle proksid?"
 
-#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Oled sa kindel, et soovid korraga avada {0} sõnumit?"
 
-#: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -15306,7 +11292,6 @@ msgstr ""
 "Kas sa soovid jäädavalt eemaldada kõik kustutatud sõnumid kõikidest "
 "kaustadest?"
 
-#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
@@ -15314,81 +11299,62 @@ msgstr ""
 "Kas sa soovid jäädavalt eemaldada kõik kaustas \"{0}\" olevad kustutatud "
 "sõnumid?"
 
-#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Oled sa kindel, et soovid seda sõnumit saata HTML-vormingus?"
 
-#: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 "Oled sa kindel, et soovid saata seda sõnumit pimekoopia adressaatidele?"
 
-#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Oled sa kindel, et soovid seda sõnumit saata ilma pealkirjata?"
 
-#: ../mail/mail.error.xml.h:18
 msgid "Because \"{0}\"."
 msgstr "Põhjus: \"{0}\"."
 
-#: ../mail/mail.error.xml.h:20
 msgid "Because \"{2}\"."
 msgstr "Põhjus: \"{2}\"."
 
-#: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "Tühi allkiri"
 
-#: ../mail/mail.error.xml.h:22
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Otsingukausta \"{0}\" pole võimalik lisada."
 
-#: ../mail/mail.error.xml.h:23
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Kausta \"{0}\" pole võimalik kausta \"{1}\" kopeerida."
 
-#: ../mail/mail.error.xml.h:24
 msgid "Cannot create folder \"{0}\"."
 msgstr "Kausta \"{0}\" pole võimalik luua."
 
-#: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "Ajutist salvestuskataloogi pole võimalik luua."
 
-#: ../mail/mail.error.xml.h:26
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Salvestuskataloogi pole võimalik luua. Põhjus: \"{1}\""
 
-#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Kausta \"{0}\" pole võimalik kustutada."
 
-#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Süsteemset kausta \"{0}\" pole võimalik kustutada."
 
-#: ../mail/mail.error.xml.h:29
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr ""
 "Otsingukausta \"{0}\" pole võimalik redigeerida, kuna seda pole olemas."
 
-#: ../mail/mail.error.xml.h:30
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kausta \"{0}\" pole võimalik kausta \"{1}\" ümber tõsta."
 
-#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source \"{1}\""
 msgstr "Allikat \"{1}\" pole võimalik avada"
 
-#: ../mail/mail.error.xml.h:32
 msgid "Cannot open source \"{2}\"."
 msgstr "Allikat \"{2}\" pole võimalik avada."
 
-#: ../mail/mail.error.xml.h:33
 msgid "Cannot open target \"{2}\"."
 msgstr "Sihtkohta \"{2}\" pole võimalik avada."
 
-#: ../mail/mail.error.xml.h:34
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -15396,35 +11362,27 @@ msgstr ""
 "Litsentsifaili \"{0}\" pole paigaldusprobleemide tõttu võimalik lugeda. Sul "
 "pole seda tagajat võimalik enne litsentsitingimustega nõustumist pruukida."
 
-#: ../mail/mail.error.xml.h:35
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "\"{0}\" pole võimalik \"{1}\"-ks ümber nimetada."
 
-#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Süsteemset kausta \"{0}\" pole võimalik ümber nimetada ega tõsta."
 
-#: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "Konto muudatusi pole võimalik salvestada."
 
-#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Kataloogi \"{0}\" alla pole võimalik salvestada."
 
-#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to file \"{0}\"."
 msgstr "Faili \"{0}\" pole võimalik salvestada."
 
-#: ../mail/mail.error.xml.h:40
 msgid "Cannot set signature script \"{0}\"."
 msgstr "Signatuuriskripti \"{0}\" pole võimalik määrata."
 
-#: ../mail/mail.error.xml.h:41
 msgid "Check Junk Failed"
 msgstr "Tõrge rämpsposti kontrollimisel"
 
-#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -15433,43 +11391,33 @@ msgstr ""
 "tõstutundlikud, siis veendu, et klaviatuuri \"Caps Lock\" klahv ei oleks "
 "sisse lülitatud."
 
-#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "Signatuurifaili pole võimalik salvestada."
 
-#: ../mail/mail.error.xml.h:44
 msgid "Delete \"{0}\"?"
 msgstr "Kas kustutada \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:45
 msgid "Delete account?"
 msgstr "Kustutada konto?"
 
-#: ../mail/mail.error.xml.h:46
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Kas kustutada otsingukaustas \"{0}\" olevad sõnumid?"
 
-#: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
 msgstr "Kas kustutada otsingukaustas olevad sõnumid?"
 
-#: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
 msgstr "Kas hüljata muudatused?"
 
-#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "Ära k_ustuta"
 
-#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "Ära kustuta"
 
-#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "Ära keela"
 
-#: ../mail/mail.error.xml.h:52
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -15477,43 +11425,33 @@ msgstr ""
 "Kas soovid võrguvabas keskkonnas kasutamiseks märgitud kaustad "
 "sünkroniseerida kohapeale?"
 
-#: ../mail/mail.error.xml.h:53
 msgid "Do you want to mark all messages as read?"
 msgstr "Kas soovid märkida kõiki sõnumeid loetuks?"
 
-#: ../mail/mail.error.xml.h:54
 msgid "Do you wish to save your changes?"
 msgstr "Kas soovid tehtud muudatused salvestada?"
 
-#: ../mail/mail.error.xml.h:55
 msgid "Enter password."
 msgstr "Sisesta parool."
 
-#: ../mail/mail.error.xml.h:56
 msgid "Error loading filter definitions."
 msgstr "Viga filtridefinitsioonide laadimisel."
 
-#: ../mail/mail.error.xml.h:57
 msgid "Error while performing operation."
 msgstr "Viga käsu täitmisel."
 
-#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "Viga toimingul: {0}."
 
-#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
 msgstr "Fail on juba olemas, kuid seda pole võimalik üle kirjutada."
 
-#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
 msgstr "Fail on juba olemas, aga see ei ole tavaline fail."
 
-#: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Kui sa jätkad, siis neid sõnumeid ei ole võimalik enam taastada."
 
-#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -15521,11 +11459,9 @@ msgstr ""
 "Kui sa selle kausta kustutad, siis kustuvad jäädavalt ka kõik selles olevad "
 "sõnumid ja alamkaustad."
 
-#: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Kui sa seda teed, siis kõik proksi kontod kustutatakse jäädavalt."
 
-#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -15533,11 +11469,9 @@ msgstr ""
 "Kui sa seda teed, siis konto ja kõik proksi\n"
 "andmed kustutatakse jäädavalt."
 
-#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Kui sa seda teed, siis konto andmed kustutatakse jäädavalt."
 
-#: ../mail/mail.error.xml.h:67
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -15545,19 +11479,15 @@ msgstr ""
 "Kui sa praegu lõpetad, siis ei saadeta saatmata sõnumeid enne, kui sa "
 "Evolutioni uuesti käivitad."
 
-#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr "Eira"
 
-#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "Vigane autentimine"
 
-#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "Postifiltrid automaatselt uuendatud."
 
-#: ../mail/mail.error.xml.h:72
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -15565,31 +11495,24 @@ msgid ""
 "recipient."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
 msgstr "Kõigi sõnumite loetuksmärkimine"
 
-#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "Puuduv kaust."
 
-#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "Ühtegi allikat pole valitud."
 
-#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr "Ühekorraga paljude sõnumite avamisele võib kuluda kaua aega."
 
-#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "Palun kontrolli oma kontosätteid ja proovi uuesti."
 
-#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "Palun luba konto või saada mõne muu konto kaudu."
 
-#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -15597,7 +11520,6 @@ msgstr ""
 "Palun määra sõnumi saaja. Saajat saab kontaktide hulgast valida, kui sa "
 "klõpsad \"Kellele:\" nupul."
 
-#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -15607,64 +11529,49 @@ msgstr ""
 "vastu võtta:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "Palun sisesta selle signatuuri identifitseerimiseks unikaalne nimi."
 
-#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "Palun oota."
 
-#: ../mail/mail.error.xml.h:85
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Probleem vana postikausta \"{0}\" migreerimisel."
 
-#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "Serverist pärimine"
 
-#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Serverilt küsitakse toetatud autentimismehhanismide nimekirja."
 
-#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "Küsitakse lugemiskinnitust."
 
-#: ../mail/mail.error.xml.h:89
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Kas tõesti kustutada kaust \"{0}\" ja selle kõik alamkaustad?"
 
-#: ../mail/mail.error.xml.h:90
 msgid "Report Junk Failed"
 msgstr "Tõrge rämpspostist raporteerimisel"
 
-#: ../mail/mail.error.xml.h:91
 msgid "Report Not Junk Failed"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
 msgstr "Otsingukaustad automaatselt uuendatud."
 
-#: ../mail/mail.error.xml.h:93
 msgid "Send Receipt"
 msgstr "Saada kinnitus"
 
-#: ../mail/mail.error.xml.h:94
 msgid "Signature Already Exists"
 msgstr "Allkiri on juba olemas"
 
-#: ../mail/mail.error.xml.h:95
 msgid "Synchronize"
 msgstr "Sünkroniseeri"
 
-#: ../mail/mail.error.xml.h:96
 msgid "Synchronize folders locally for offline usage?"
 msgstr ""
 "Kas sünkroniseerida kaustad kohapeale, võrguvabas keskkonnas kasutamiseks?"
 
-#: ../mail/mail.error.xml.h:97
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -15672,7 +11579,6 @@ msgstr ""
 "Süsteemsed kaustad on tarvilikud Evolutioni korrektseks toimimiseks ja neid "
 "pole võimalik ümber nimetada, ümber tõsta või kustutada."
 
-#: ../mail/mail.error.xml.h:98
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -15682,7 +11588,6 @@ msgid ""
 "recipient. "
 msgstr ""
 
-#: ../mail/mail.error.xml.h:101
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -15696,7 +11601,6 @@ msgstr ""
 "    \"{1}\"\n"
 "Otsingukaustad on nüüd uuendatud."
 
-#: ../mail/mail.error.xml.h:106
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -15710,11 +11614,9 @@ msgstr ""
 "    \"{1}\"\n"
 "Reeglid on nüüd uuendatud."
 
-#: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
 msgstr "Skriptifail peab olemas olema ja peab olema käivitatav."
 
-#: ../mail/mail.error.xml.h:112
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -15722,19 +11624,16 @@ msgstr ""
 "See kaust on lisatud muu tegevuse tulemusel,\n"
 "kui vaja, saad selle lisamist Otsingukaustade redaktoris kinnitada."
 
-#: ../mail/mail.error.xml.h:114
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "Seda sõnumit pole võimalik saata kuna adressaadi konto pole lubatud"
 
-#: ../mail/mail.error.xml.h:115
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Seda sõnumit pole võimalik saata kuna sa pole määranud ühtegi adressaati"
 
-#: ../mail/mail.error.xml.h:116
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -15742,11 +11641,9 @@ msgstr ""
 "See server ei toeta seda tüüpi autentimist ja arvatavasti ei toeta see "
 "autentimist üleüldse."
 
-#: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
 msgstr "See allkiri on muudetud, kuid seda ei ole salvestatud."
 
-#: ../mail/mail.error.xml.h:118
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -15754,11 +11651,9 @@ msgstr ""
 "Kõigi valitud kataloogis ja selle alamkataloogides olevate sõnumite "
 "loetuksmärkimine"
 
-#: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
 msgstr "GroupWise serveriga pole võimalik ühenduda."
 
-#: ../mail/mail.error.xml.h:120
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -15766,19 +11661,15 @@ msgstr ""
 "Selle konto mustandite kausta pole võimalik avada. Kas kasutada selle asemel "
 "süsteemset mustandite kasuta?"
 
-#: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
 msgstr "Litsentsifaili pole võimalik lugeda"
 
-#: ../mail/mail.error.xml.h:122
 msgid "Use _Default"
 msgstr "Kasuta _vaikimisi valikut"
 
-#: ../mail/mail.error.xml.h:123
 msgid "Use default drafts folder?"
 msgstr "Vaikekausta kasutamine mustandite jaoks?"
 
-#: ../mail/mail.error.xml.h:124
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -15788,27 +11679,21 @@ msgstr ""
 "kaugkaustadest.\n"
 "Kas sa soovid seda teha?"
 
-#: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
 msgstr "Sa pole kõiki vajalikke andmeid sisestanud."
 
-#: ../mail/mail.error.xml.h:128
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Sul on saatmata sõnumeid, kas soovid igal juhul lõpetada?"
 
-#: ../mail/mail.error.xml.h:129
 msgid "You may not create two accounts with the same name."
 msgstr "Sul pole võimalik kahte sama nimega kontot luua."
 
-#: ../mail/mail.error.xml.h:130
 msgid "You must name this Search Folder."
 msgstr "Sa pead sellele otsikaustale nime andma."
 
-#: ../mail/mail.error.xml.h:131
 msgid "You must specify a folder."
 msgstr "Kausta valimine on kohustuslik."
 
-#: ../mail/mail.error.xml.h:132
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -15818,218 +11703,164 @@ msgstr ""
 "Kaustu on võimalik valida üksikult või ka kõik kohalikud kaustad, kõik "
 "võrgukaustad või kõik kohalikud ja võrgukaustad korraga."
 
-#: ../mail/mail.error.xml.h:134
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Tõrge serverisse \"{0}\" sisselogimisel kasutajana \"{0}\"."
 
-#: ../mail/mail.error.xml.h:135
 msgid "_Append"
 msgstr "_Lisa"
 
-#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "_Hülga muudatused"
 
-#: ../mail/mail.error.xml.h:137
 msgid "_Do not Synchronize"
 msgstr "Ä_ra sünkroniseeri"
 
-#: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
 msgstr "_Puhasta"
 
-#: ../mail/mail.error.xml.h:140
 msgid "_Open Messages"
 msgstr "_Ava sõnumid"
 
-#: ../mail/message-list.c:1053
 msgid "Unseen"
 msgstr "Nägemata"
 
-#: ../mail/message-list.c:1054
 msgid "Seen"
 msgstr "Nähtud"
 
-#: ../mail/message-list.c:1055
 msgid "Answered"
 msgstr "Vastatud"
 
-#: ../mail/message-list.c:1056
 msgid "Forwarded"
 msgstr "Edastatud"
 
-#: ../mail/message-list.c:1057
 msgid "Multiple Unseen Messages"
 msgstr "Mitu nägemata sõnumit"
 
-#: ../mail/message-list.c:1058
 msgid "Multiple Messages"
 msgstr "Mitu sõnumit"
 
-#: ../mail/message-list.c:1062
 msgid "Lowest"
 msgstr "Madalaim"
 
-#: ../mail/message-list.c:1063
 msgid "Lower"
 msgstr "Alumine"
 
-#: ../mail/message-list.c:1067
 msgid "Higher"
 msgstr "Kõrge"
 
-#: ../mail/message-list.c:1068
 msgid "Highest"
 msgstr "Kõrgeim"
 
-#: ../mail/message-list.c:1660 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1667 ../plugins/itip-formatter/itip-view.c:203
-#: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Täna %l:%M %p"
 
-#: ../mail/message-list.c:1676 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Eile %l:%M %p"
 
-#: ../mail/message-list.c:1688 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a, %d. %b %Y"
 
-#: ../mail/message-list.c:1696 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: ../mail/message-list.c:1698 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3981 ../mail/message-list.c:4441
 msgid "Generating message list"
 msgstr "Sõnumiloendi genereerimine"
 
-#: ../mail/message-list.c:4289
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
 
-#: ../mail/message-list.c:4291
 msgid "There are no messages in this folder."
 msgstr "Selles kaustas pole sõnumeid."
 
-#: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Tähtaeg"
 
-#: ../mail/message-list.etspec.h:4
 msgid "Flag Status"
 msgstr "Märgistuse olek"
 
-#: ../mail/message-list.etspec.h:5
 msgid "Flagged"
 msgstr "Märgistatud"
 
-#: ../mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
 msgstr "Märgistatud järeltoiminguks"
 
-#: ../mail/message-list.etspec.h:11
 msgid "Received"
 msgstr "Vastuvõetud"
 
-#: ../mail/message-list.etspec.h:15
 msgid "Sent Messages"
 msgstr "Saadetud sõnumid"
 
-#: ../mail/message-list.etspec.h:16
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Suurus"
 
-#: ../mail/message-list.etspec.h:19
 msgid "Subject - Trimmed"
 msgstr ""
 
-#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Helista"
 
-#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "Ära edasta"
 
-#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "Jälgi"
 
-#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "Võta teadmiseks"
 
-#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Edasta"
 
-#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "Tagasiside pole tarvilik"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "Vasta"
 
-#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "Vasta kõigile"
 
-#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "Vaata üle"
 
-#: ../mail/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Sisu sisaldab"
 
-#: ../mail/searchtypes.xml.h:2
 msgid "Message contains"
 msgstr "Sõnum sisaldab"
 
-#: ../mail/searchtypes.xml.h:3
 msgid "Recipients contain"
 msgstr "Saaja sisaldab"
 
-#: ../mail/searchtypes.xml.h:4
 msgid "Sender contains"
 msgstr "Saatja sisaldab"
 
-#: ../mail/searchtypes.xml.h:5
 msgid "Subject contains"
 msgstr "Teema sisaldab"
 
-#: ../mail/searchtypes.xml.h:6
 msgid "Subject or Recipients contains"
 msgstr "Teema või vastuvõtja sisaldab"
 
-#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "Teema või saatja sisaldab"
 
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Local Address Books"
 msgstr "Kohalikud aadressiraamatud"
 
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
 msgid "Provides core functionality for local address books."
 msgstr "Kohalike aadressiraamatute põhitalitluse tagamine."
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
@@ -16037,7 +11868,6 @@ msgstr ""
 "Fraaside kirjeldamine, mille esinemise korral näidatakse manuse puudumise "
 "kohta meeldetuletust"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body."
@@ -16045,17 +11875,12 @@ msgstr ""
 "Fraaside kirjeldamine, mille esinemise korral näidatakse manuse puudumise "
 "kohta meeldetuletust."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
-#: ../plugins/templates/templates.c:392
 msgid "Keywords"
 msgstr "Võtmesõnad"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
 msgid "Attachment Reminder"
 msgstr "Manuste meeldetuletaja"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
 msgid ""
 "Looks for clues in a message for mention of attachments and warns if the "
 "attachment is missing"
@@ -16063,7 +11888,6 @@ msgstr ""
 "Manuse olemasolule viitavate võtmesõnade otsimine sõnumist, et kahtluse "
 "korral hoiatada kasutajat manuseta sõnumi väljasaatmise eest"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
@@ -16072,15 +11896,12 @@ msgstr ""
 "see sõnum peaks sisaldama manust, kuid ühtegi manust selle sõnumi küljest ei "
 "leitud."
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "Message has no attachments"
 msgstr "Sõnumil puuduvad manused"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Edit Message"
 msgstr "_Redigeeri sõnumit"
 
-#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
 "play them directly from Evolution."
@@ -16088,31 +11909,24 @@ msgstr ""
 "Vormindusplugin audiomanuste kuvamiseks sõnum osana ja nende esitamiseks "
 "ilma välist esitajat avamata."
 
-#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Audio inline plugin"
 msgstr "Audioesitamise plugin"
 
-#: ../plugins/backup-restore/backup-restore.c:127
 msgid "Select name of the Evolution backup file"
 msgstr "Evolutioni varukoopiale faili nime valimine"
 
-#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
 msgstr "_Pärast varundamist taaskäivitatakse Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:179
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Taastamiseks Evolutioni varukoopiafaili nime valimine"
 
-#: ../plugins/backup-restore/backup-restore.c:203
 msgid "_Restart Evolution after restore"
 msgstr "_Pärast taastamist taaskäivitatakse Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:276
 msgid "Restore from backup"
 msgstr "Taastamine varukoopiast"
 
-#: ../plugins/backup-restore/backup-restore.c:278
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. \n"
@@ -16122,141 +11936,107 @@ msgstr ""
 "posti, kalenderid, ülesandeid, märkmeid ja aadressiraamatut.\n"
 "Samuti saab taastada ka isiklikud sätted, postifiltrid jne."
 
-#: ../plugins/backup-restore/backup-restore.c:284
 msgid "_Restore Evolution from the backup file"
 msgstr "_Taasta Evolution varukoopiafailist"
 
-#: ../plugins/backup-restore/backup-restore.c:291
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Palun vali taastamiseks Evolutioni arhiiv:"
 
-#: ../plugins/backup-restore/backup-restore.c:294
 msgid "Choose a file to restore"
 msgstr "Taastatava faili valimine"
 
-#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
 msgstr "Evolutioni kataloogi varundamine"
 
-#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
 msgstr "Evolutioni kataloogi taastamine"
 
-#: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
 msgstr "Evolutioni varukoopia kontrollimine"
 
-#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "Evolutioni taaskäivitamine"
 
-#: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
 msgstr "Koos graafilise kasutajaliidesega"
 
-#: ../plugins/backup-restore/backup.c:125
-#: ../plugins/backup-restore/backup.c:258
 msgid "Shutting down Evolution"
 msgstr "Evolutioni seiskamine"
 
-#: ../plugins/backup-restore/backup.c:132
 msgid "Backing Evolution accounts and settings"
 msgstr "Evolutioni kontode ja seadistuste varundamine"
 
-#: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Evolutioni andmete (e-post, kontaktid, kalender, ülesanded, märkmed) "
 "varundamine"
 
-#: ../plugins/backup-restore/backup.c:147
 msgid "Backup complete"
 msgstr "Varundamine on valmis"
 
-#: ../plugins/backup-restore/backup.c:152
-#: ../plugins/backup-restore/backup.c:339
 msgid "Restarting Evolution"
 msgstr "Evolutioni taaskäivitamine"
 
-#: ../plugins/backup-restore/backup.c:262
 msgid "Backup current Evolution data"
 msgstr "Praeguse Evolutioni kataloogi varundamine"
 
-#: ../plugins/backup-restore/backup.c:267
 msgid "Extracting files from backup"
 msgstr "Varukoopiast failide väljavõtmine"
 
-#: ../plugins/backup-restore/backup.c:274
 msgid "Loading Evolution settings"
 msgstr "Evolutioni sätete laadimine"
 
-#: ../plugins/backup-restore/backup.c:278
 msgid "Removing temporary backup files"
 msgstr "Ajutiste varufailide eemaldamine"
 
-#: ../plugins/backup-restore/backup.c:285
 msgid "Ensuring local sources"
 msgstr "Kohalike allikate kindlakstegemine"
 
-#: ../plugins/backup-restore/backup.c:455
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Varundamine kataloogi %s"
 
-#: ../plugins/backup-restore/backup.c:460
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Taastamine kataloogist %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Backup"
 msgstr "Evolutioni varundamine"
 
-#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Restore"
 msgstr "Evolutioni taastamine"
 
-#: ../plugins/backup-restore/backup.c:514
 msgid "Backing up Evolution Data"
 msgstr "Evolutioni andmete varundamine"
 
-#: ../plugins/backup-restore/backup.c:515
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Palun oota kuni Evolution Sinu andmeid varundab."
 
-#: ../plugins/backup-restore/backup.c:517
 msgid "Restoring Evolution Data"
 msgstr "Evolutioni andmete taastamine"
 
-#: ../plugins/backup-restore/backup.c:518
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Palun oota kuni Evolution Sinu andmeid taastab."
 
-#: ../plugins/backup-restore/backup.c:536
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Sõltuvalt andmete hulgast, võib see veidi aega võtta."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr ""
 "Plugin Evolutioni andmete ja seadistuste varundamiseks ja taastamiseks."
 
 #. the path to the shared library
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
 msgid "Backup and restore plugin"
 msgstr "Varundamise ja taastamise plugin"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
 msgstr "Kas sa soovid Evolutioni sulgeda?"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
 msgid ""
 "Are you sure you want to restore Evolution from the selected backup file?"
 msgstr "Kas sa soovid Evolutioni valitud varukoopiafailist taastada?"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid ""
 "Evolution backup can start only when Evolution is not running. Please make "
 "sure that you save and close all your unsaved windows before proceeding.  If "
@@ -16268,23 +12048,18 @@ msgstr ""
 "sulgesid kõik Evolutioni aknad. Varundamise järel Evolutioni automaatseks "
 "taaskäivitamiseks märgi allpool olev märkeruut."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
 msgid "Insufficient Permissions"
 msgstr "Puuduvad õigused"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
 msgstr "Vigane Evolutioni varukoopia fail"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Please select a valid backup file to restore."
 msgstr "Taastamiseks vali palun töökorras varukoopiafail."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
 msgid "The selected folder is not writable."
 msgstr "Valitud kaust pole kirjutatav"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
 "This will delete all your current Evolution data and settings and restore "
 "them from your backup. Evolution restore can start only when Evolution is "
@@ -16298,51 +12073,39 @@ msgstr ""
 "Evolutioni aknad. Taastamise järel Evolutioni automaatseks taaskäivitamiseks "
 "märgi allpool olev märkeruut."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
 msgstr "Evolutioni andmete ja seadistuste varundamine"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
 msgid "R_estore Settings..."
 msgstr "_Taasta sätted..."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
 msgid "_Backup Settings..."
 msgstr "_Varunda sätted..."
 
-#: ../plugins/bbdb/bbdb.c:530 ../plugins/bbdb/bbdb.c:539
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automaatsed kontaktid"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:554
 msgid "_Auto-create address book entries when replying to messages"
 msgstr "Sõnumile vastamisel luuakse automaatselt aa_dressiraamatu kirje"
 
-#: ../plugins/bbdb/bbdb.c:560
 msgid "Select Address book for Automatic Contacts"
 msgstr "Vali automaatsetele kontaktidele aadressiraamat"
 
-#: ../plugins/bbdb/bbdb.c:575
 msgid "Instant Messaging Contacts"
 msgstr "Kiirsuhtluse kontaktid"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:590
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "Kontaktandmete ja piltide sünkroniseerimine Pidgin'i sõbranimekirjaga"
 
-#: ../plugins/bbdb/bbdb.c:596
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Vali Pidgin'i sõbranimekirja jaoks aadressiraamat"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:607
 msgid "Synchronize with _buddy list now"
 msgstr "Sünkroniseeri sõ_branimekiri kohe"
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid ""
 "Automatically fills your address book with names and email addresses as you "
 "reply to messages. Also fills in IM contact information from your buddy "
@@ -16352,40 +12115,32 @@ msgstr ""
 "sõnumite adressaatide nime ja e-posti aadressiga. Samuti täiendatakse "
 "aadressiraamatut välksõnumirakenduse sõbranimekirja kontaktide andmetega."
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
 msgstr "BBDB"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:114
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr ""
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Bogofilteri lapsprotsess ei vasta ja seetõttu kõrvaldatakse..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr ""
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Tõrge Bogofilteri torus, veakood: %d"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
 msgid "Convert message text to _Unicode"
 msgstr "Teisenda sõnumi tekst _Unicode kooditabelisse"
 
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
 msgid "Convert mail messages to Unicode"
 msgstr "Sõnumite teisendamine Unicode kooditabelisse"
 
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
 msgid ""
 "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
 "different character sets."
@@ -16394,126 +12149,90 @@ msgstr ""
 "(rämps)postifiltrid saaksid universaalselt käitleda erinevates "
 "kooditabelites olevaid sõnumeid."
 
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
 msgid "Bogofilter Options"
 msgstr "Bogofiltri valikud"
 
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
 msgid "Bogofilter junk plugin"
 msgstr "Bogofilter - rämpspostiplugin"
 
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
 msgstr "Rämpsposti filtreerimine Bogofiltri abil."
 
-#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:249
-#: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:271
-#: ../plugins/google-account-setup/google-source.c:618
-#: ../plugins/google-account-setup/google-contacts-source.c:301
 msgid "Use _SSL"
 msgstr "Kasutatakse _SSL-i"
 
-#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "CalDAV Calendar sources"
 msgstr "CalDAV-i kalendriallikad"
 
-#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
 msgid "CalDAV sources"
 msgstr "CalDAV-i allikad"
 
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 msgid "Local Calendars"
 msgstr "Kohalikud kalendrid"
 
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
 msgid "Provides core functionality for local calendars."
 msgstr "Kohalike kalendrite põhitalitluse tagamine."
 
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:642
-#: ../plugins/google-account-setup/google-contacts-source.c:320
 msgid "Re_fresh:"
 msgstr "_Värskenda:"
 
-#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "_Turvaline ühendus"
 
-#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "Kasutajani_mi:"
 
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 msgid "HTTP Calendars"
 msgstr "HTTP-kalendrid"
 
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
 msgid "Provides core functionality for webcal and http calendars."
 msgstr "Webcal- ja http-kalendrite põhitalitluse tagamine."
 
-#: ../plugins/calendar-weather/calendar-weather.c:54
-#: ../plugins/calendar-weather/calendar-weather.c:60
 msgid "Weather: Cloudy"
 msgstr "Ilm: Pilves"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
 msgstr "Ilm: Udu"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Partly Cloudy"
 msgstr "Ilm: Pilves selgimistega"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Rain"
 msgstr "Ilm: Vihmane"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Snow"
 msgstr "Ilm: Lumesadu"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Sunny"
 msgstr "Ilm: Selge"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Thunderstorms"
 msgstr "Ilm: Äike"
 
-#: ../plugins/calendar-weather/calendar-weather.c:267
 msgid "Select a location"
 msgstr "Vali asukoht"
 
-#: ../plugins/calendar-weather/calendar-weather.c:652
 msgid "_Units:"
 msgstr "Ü_hikud:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:659
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Meetermõõdustik (Celsius, cm, jms.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:660
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperial (Fahrenheit, tollid, jms)"
 
-#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
 msgid "Provides core functionality for weather calendars."
 msgstr "Ilmakalendrite põhitalitluse tagamine."
 
-#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "Ilmakalendrid"
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
 msgid ""
 "A test plugin which demonstrates a popup menu plugin which lets you copy "
 "things to the clipboard."
@@ -16521,60 +12240,46 @@ msgstr ""
 "Testplugin asjade lõikelauale kopeerimise hüpikmenüü plugina "
 "demonstreeriseks."
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
 msgstr "Kopeerimisvahend"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "Kontroll, kas Evolution on vaikimisi postiprogramm"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
 "Evolutioni iga käivitamise ajal kontrollitakse, kas Evolution on vaikimisi "
 "postiprogramm või mitte."
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
 msgid "Checks whether Evolution is the default mail client on startup."
 msgstr ""
 "Käivitumisel kontrollimiseks, kas Evolution on vaikimisi e-postiklient."
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
 msgid "Default Mail Client "
 msgstr "Vaikimisi postiklient"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Kas sa soovid Evolutioni määrata vaikimisi e-posti kliendiks?"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:585
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../plugins/default-source/default-source.c:82
 msgid "Mark as _default address book"
 msgstr "Märgitud _vaikimisi aadressiraamatuks"
 
-#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default calendar"
 msgstr "Märgitud _vaikimisi kalendriks"
 
-#: ../plugins/default-source/default-source.c:104
 msgid "Mark as _default task list"
 msgstr "Märgitud _vaikimisi ülesannete loendiks"
 
-#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default memo list"
 msgstr "Märgitud _vaikimisi märkmeloendiks"
 
-#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
 msgstr "Vaikimisi allikad"
 
-#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
 msgid ""
 "Provides functionality for marking a calendar or an address book as the "
 "default one."
@@ -16582,73 +12287,57 @@ msgstr ""
 "Kalendri või aadressiraamatu vaikimisi kalendriks või aadressiraamatuks "
 "märkimise funktsionaalsuse tagamine."
 
-#: ../plugins/email-custom-header/email-custom-header.c:560
 msgid "_Custom Header"
 msgstr "Kohandatud _päised"
 
-#: ../plugins/email-custom-header/email-custom-header.c:881
 msgid "Key"
 msgstr "Võti"
 
-#: ../plugins/email-custom-header/email-custom-header.c:892
-#: ../plugins/templates/templates.c:398
 msgid "Values"
 msgstr "Väärtused"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.glade.h:2
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
 msgstr ""
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
 msgid "Email Custom Header"
 msgstr "E-posti kohandatud päised"
 
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
 msgid "Adds custom header to outgoing messages."
 msgstr "Kohandatud päise lisamine väljaminevatele sõnumitele."
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
 msgid "Custom Header"
 msgstr "Kohandatud päis"
 
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
 msgid "List of Custom Headers"
 msgstr "Kohandatud päiste nimekiri"
 
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
 msgid ""
 "The key specifies the list of custom headers that you can add to an outgoing "
 "message. The format for specifying a Header and Header value is: Name of the "
 "custom header followed by \"=\" and the values separated by \";\""
 msgstr ""
 
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "Teiste kasutajate kaustade avamine"
 
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
 msgid "_Folder Name:"
 msgstr "_Kausta nimi:"
 
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
 msgid "_User:"
 msgstr "_Kasutaja:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "Turvaline parool"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -16656,11 +12345,9 @@ msgstr ""
 "See valik loob ühenduse Exchange serveriga kasutades turvalist parooliga "
 "(NTLM) autentimist."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "Avatekstiline parool"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -16668,11 +12355,9 @@ msgstr ""
 "See valik loob ühenduse Exchange serveriga kasutades avatekstilise parooliga "
 "autentimist."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "Kontorist väljas"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:262
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16680,88 +12365,63 @@ msgstr ""
 "Allpool näidatav sõnum saadetakse automaatselt igale isikule,\n"
 "kes saadab sulle sinu puhkusel olemise ajal sõnumi."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "Olen praegu puhkusel"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "Olen praegu tööl"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "Exchange konto parooli muutmine"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Parooli muutmine"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Exchange konto delegaatide sätete haldamine"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "Delegeerimisabiline"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "Muu"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "Kõikide Exchange kaustade suuruse vaatamine"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "Kausta suurus"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:366
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchange sätted"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "A_utentimine"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:735
 msgid "_Mailbox:"
 msgstr "_Postkast:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "_Autentimise liik"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "_Tuvasta toetatud tüübid"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1062
-#: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1064
-#: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:165
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -16773,7 +12433,6 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:114
 msgid ""
 "The current password does not match the existing password for your account. "
 "Please enter the correct password"
@@ -16781,58 +12440,40 @@ msgstr ""
 "Käesolev parool ei vasta sinu konto olemasolevale paroolile. Palun sisesta "
 "õige parool"
 
-#: ../plugins/exchange-operations/exchange-change-password.c:121
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "Kaks parooli ei ole vastavuses. Palin sisesta paroolid uuesti."
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Confirm Password:"
 msgstr "Paroolikontroll:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
 msgid "Current Password:"
 msgstr "Käesolev parool:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
 msgid "New Password:"
 msgstr "Uus parool:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
 msgid "Your current password has expired. Please change your password now."
 msgstr "Sinu käesolev parool on aegunud. Palun vaheta nüüd oma parool ära."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:660
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Sinu parool aegub järgneva %d päeva jooksul"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:154
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "Kohandatud"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:184
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "Toimetaja (lugemine, loomine, muutmine)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:188
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "Autor (lugemine, loomine)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:192
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "Ülevaataja (ainult lugemiseks)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:242
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "Delegeeritud õigused"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:253
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
 msgstr "%s pääsuõigused"
@@ -16840,7 +12481,6 @@ msgstr "%s pääsuõigused"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:343
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -16850,88 +12490,70 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:348
 msgid "You have been given the following permissions on my folders:"
 msgstr "Samuti on Sulle antud õigus näha järgnevaid minu katalooge:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:366
 msgid "You are also permitted to see my private items."
 msgstr "Samuti on Sul lubatud näha minu isiklikke kirjeid."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:373
 msgid "However you are not permitted to see my private items."
 msgstr "Siiski pole Sul lubatud näha minu isiklikke kirjeid."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:405
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "Sind on määratud kasutaja %s delegaadiks"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To"
 msgstr "Delegeerida kellele"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Eemaldada delegaat %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:700
 msgid "Could not access Active Directory"
 msgstr "Active Directory't pole võimalik kasutada"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:712
 msgid "Could not find self in Active Directory"
 msgstr "Active Directory'st pole võimalik ennast leida"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:725
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Delegaati %s pole võimalik Active Directory'st leida"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:737
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Delegaati %s pole võimalik eemaldada"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
 msgid "Could not update list of delegates."
 msgstr "Delegaatide loendit pole võimalik uuendada."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:815
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Delegaati %s pole võimalik lisada"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:983
 msgid "Error reading delegates list."
 msgstr "Viga delegaatide loendi lugemisel."
 
 #. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
 msgid "C_alendar:"
 msgstr "K_alender:"
 
 #. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 msgid "Co_ntacts:"
 msgstr "Ko_ntaktid:"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
 msgid "Delegates"
 msgstr "Delegaadid"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
 msgid "Permissions for"
 msgstr "Õigused"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
 msgid ""
 "These users will be able to send mail on your behalf\n"
 "and access your folders with the permissions you give them."
@@ -16939,85 +12561,62 @@ msgstr ""
 "Järgnevad kasutajad saavat saata sinu nime all sõnumeid\n"
 "ja pääsevad ligi sinu kaustadele vastavalt sinu poolt antud õigustele."
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
 msgid "_Delegate can see private items"
 msgstr "_Delegaadid võivad näha isiklikke kirjeid"
 
 #. Translators: This is used for permissions for <user> for the folder Inbox.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
 msgid "_Inbox:"
 msgstr "_Sisendkast:"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
 msgid "_Summarize permissions"
 msgstr ""
 
 #. Translators: This is used for permissions for <user> for the folder Tasks.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
 msgid "_Tasks:"
 msgstr "_Ülesanded:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:62
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Pääsuõigused..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "Kausta nimi"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
 msgstr "Kausta suurus"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
 msgid "User"
 msgstr "Kasutaja"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:321
-#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Teise kasutaja kausta tellimine"
 
-#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 msgid "Exchange Folder Tree"
 msgstr "Exchange kirjakaustade puu"
 
-#: ../plugins/exchange-operations/exchange-folder.c:67
-#: ../plugins/exchange-operations/exchange-folder.c:236
-#: ../plugins/exchange-operations/exchange-folder.c:246
 msgid "Unsubscribe Folder..."
 msgstr "Lõpeta kausta tellimus..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:466
-#: ../plugins/exchange-operations/exchange-folder.c:521
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Kas tõesti loobuda kausta \"%s\" tellimusest?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:478
-#: ../plugins/exchange-operations/exchange-folder.c:533
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\" tellimusest loobumine"
 
-#: ../plugins/exchange-operations/exchange-oof.glade.h:1
 msgid ""
 "<b>Currently, your status is \"Out of the Office\". </b>\n"
 "\n"
 "Would you like to change your status to \"In the Office\"? "
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
 msgid "<b>Out of Office Message:</b>"
 msgstr "<b>Puhkuseteade:</b>"
 
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
 msgid "<b>Status:</b>"
 msgstr "<b>Olek:</b>"
 
-#: ../plugins/exchange-operations/exchange-oof.glade.h:6
 msgid ""
 "<small>The message specified below will be automatically sent to each person "
 "who sends\n"
@@ -17026,126 +12625,93 @@ msgstr ""
 "<small>See allpool näidatud sõnum saadetakse automaatselt igale isikule,\n"
 "kes saadab sulle kirja ajal kui sa puhkusel oled.</small>"
 
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
 msgid "I am currently in the office"
 msgstr "Olen praegu tööl"
 
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
 msgid "I am currently out of the office"
 msgstr "Olen praegu puhkusel"
 
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
 msgid "No, Don't Change Status"
 msgstr "Ei, ära muuda olekut"
 
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
 msgid "Out of Office Assistant"
 msgstr "Puhkuseteadete assistent"
 
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
 msgid "Yes, Change Status"
 msgstr "Jah, muuda olekut"
 
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
 msgid "Password Expiry Warning..."
 msgstr "Parooliaegumise hoiatus..."
 
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
 msgid "Your password will expire in 7 days..."
 msgstr "Su parool aegub 7 päeva jooksul..."
 
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
 msgid "_Change Password"
 msgstr "_Muuda parooli"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 msgid "(Permission denied.)"
 msgstr "(Ligipääs keelatud.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 msgid "Add User:"
 msgstr "Lisa kasutaja:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
-#: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:934
-#: ../plugins/groupwise-features/share-folder.c:716
 msgid "Add User"
 msgstr "Kasutaja lisamine"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
 msgid "<b>Permissions</b>"
 msgstr "<b>Õigused</b>"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
 msgid "Cannot Delete"
 msgstr "Ei tohi kustutada"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
 msgid "Cannot Edit"
 msgstr "Ei tohi muuta"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
 msgid "Create items"
 msgstr "Tohib luua kirjeid"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
 msgid "Create subfolders"
 msgstr "Tohib luua alamkaustu"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Delete Any Items"
 msgstr "Tohib kustutada ükskõik mis kirjet"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Own Items"
 msgstr "Tohib kustutada enda kirjeid"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 msgid "Edit Any Items"
 msgstr "Tohib muuta ükskõik mis kirjet"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 msgid "Edit Own Items"
 msgstr "Tohib muuta enda kirjeid"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 msgid "Folder contact"
 msgstr "Kausta kontakt"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 msgid "Folder owner"
 msgstr "Kausta omanik"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
 msgid "Folder visible"
 msgstr "Kaust on nähtaval"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 msgid "Read items"
 msgstr "Tohib lugeda kirjeid"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 msgid "Role: "
 msgstr "Roll: "
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:1
 msgid "<b>Message Settings</b>"
 msgstr "<b>Sõnumi sätted</b>"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:2
 msgid "<b>Tracking Options</b>"
 msgstr "<b>Jälgimise valikud</b>"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:3
 msgid "Exchange - Send Options"
 msgstr "Exchange - Saatmise valikud"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:4
 msgid "I_mportance: "
 msgstr "_Tähtsus: "
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:5
 msgid ""
 "Normal\n"
 "High\n"
@@ -17155,7 +12721,6 @@ msgstr ""
 "Kõrge\n"
 "Madal"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:8
 msgid ""
 "Normal\n"
 "Personal\n"
@@ -17167,43 +12732,33 @@ msgstr ""
 "Isiklik\n"
 "Salajane"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:12
 msgid "Request a _delivery receipt for this message"
 msgstr "Selle sõnumi kohta _kohaletoimetamise kinnituse küsimine"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:13
 msgid "Request a _read receipt for this message"
 msgstr "Selle sõnumi kohta _lugemiskinnituse küsimine"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:14
 msgid "Send as Delegate"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
 msgid "_Sensitivity: "
 msgstr "_Tundlikkus:"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
 msgid "_User"
 msgstr "_Kasutaja"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:136
 msgid "Select User"
 msgstr "Kasutaja valimine"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:174
 msgid "Address Book..."
 msgstr "Aadressiraamat..."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
 msgid "Subscribe to Other User's Contacts"
 msgstr "Teiste kasutajate kontaktide tellimine"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
 msgid "Subscribe to Other User's Calendar"
 msgstr "Teiste kasutajate kalendrite tellimine"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
 msgid ""
 "A plugin that manages a collection of Exchange account specific operations "
 "and features."
@@ -17211,23 +12766,18 @@ msgstr ""
 "Exchange'i kontole spetsiifiliste toimingute ja võimaluste käsitlemise "
 "plugin."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
 msgstr "Exchange'i toimingud"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
 msgid "Cannot change password due to configuration problems."
 msgstr "Seadistusprobleemide tõttu pole võimalik parooli muuta."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
 msgid "Cannot display folders."
 msgstr "Kaustu pole võimalik kuvada."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 msgid "Cannot perform the operation."
 msgstr "Toimingut pole võimalik teostada."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid ""
 "Changes to options for Exchange account \"{0}\" will only take effect after "
 "restarting Evolution."
@@ -17235,15 +12785,12 @@ msgstr ""
 "Exchange'i konto \"{0}\" sätete muudatused rakenduvad pärast Evolutioni "
 "taaskäivitamist."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not authenticate to server."
 msgstr "Serverisse pole võimalik autentida."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 msgid "Could not change password."
 msgstr "Parooli pole võimalik muuta."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
@@ -17252,59 +12799,45 @@ msgstr ""
 "Tundmatu vea tõttu pole Exchange'i kontot võimalik seadistada. Kontrolli URL-"
 "i, kasutajanime ning parooli ja proovi uuesti."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to Exchange server."
 msgstr "Exchange'i serveriga pole võimalik ühenduda."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not connect to server {0}."
 msgstr "Serveriga {0} pole võimalik ühenduda."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not determine folder permissions for delegates."
 msgstr "Kataloogi pääsuõiguseid delegaatidele pole võimalik tuvastada."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not find Exchange Web Storage System."
 msgstr "Exchange Web Storage System'it pole võimalik leida."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not locate server {0}."
 msgstr "Serveri {0} asukohta pole võimalik tuvastada."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not make {0} a delegate"
 msgstr "{0} pole võimalik delegaadiks määrata"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions"
 msgstr "Kausta pääsuõiguseid pole võimalik lugeda"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read folder permissions."
 msgstr "Kausta pääsuõiguseid pole võimalik lugeda."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not read out-of-office state"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not update folder permissions."
 msgstr "Kausta pääsuõiguseid pole võimalik uuendada."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Could not update out-of-office state"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid "Evolution requires a restart to load the subscribed user's mailbox"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
 msgstr "Exchange'i konto on võrguvabas olekus."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -17332,32 +12865,24 @@ msgstr ""
 "{0}\n"
 "  "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "Tõrge delegaatide uuendamisel:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "Kaust on juba olemas"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "Kataloogi pole olema"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "Kataloog pole võgus"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "Üldine viga"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Global Catalog Server is not reachable"
 msgstr "Globaalne kataloogiserver pole kättesaadav"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
@@ -17365,71 +12890,54 @@ msgstr ""
 "Kui OWA töötab teise raja peal, siis pead sa selle määrama kontosätete "
 "dialoogis."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Mailbox for {0} is not on this server."
 msgstr "{0} postkast pole selles serveris."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the URL is correct and try again."
 msgstr "Veendu, et URL on õige ja proovi uuesti."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "Kontrolli, et serveri nimi on õigesti kirjutatud ja proovi uuesti."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the username and password are correct and try again."
 msgstr "Veendu, et kasutajanimi ja parool on õiged ning proovi uuesti."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
 msgstr "Selle konto jaoks pole globaalset kataloogiserverit seadistatud."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No mailbox for user {0} on {1}."
 msgstr "Kasutajal {0} serveris {1} postkasti ei ole."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "Kasutajat {0} pole olemas"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Password successfully changed."
 msgstr "Parool on edukalt muudetud."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "Palun veendu, et Globaalse kataloogiteenuse serveri nimi on korrektne."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "Muudatuste rakendamiseks palun taaskäivita Evolution"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "Palun vali kasutaja."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Server rejected password because it is too weak."
 msgstr "Server lükkas parooli tagasi kuna see on liiga nõrk."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Exchange'i konto keelatakse, kui sa sulged Evolutioni"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Exchange'i konto eemaldatakse, kui sa sulged Evolutioni"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Exchange'i server pole Exchange Connector'iga ühilduv."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -17437,7 +12945,6 @@ msgstr ""
 "Serveris töötab Exchange 5.5. Exchange Connector \n"
 "toetab ainult Microsoft Exchange versioone 2000 ja 2003."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -17451,62 +12958,48 @@ msgstr ""
 "\n"
 "On ka võimalus, et sisestatud parool on lihtalt vale."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Try again with a different password."
 msgstr "Proovi uuesti teistsuguse parooliga."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "Kasutajat pole võimalik pääsuõiguste loendisse lisada:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "Delegaate pole võimalik redigeerida."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "Tundmatu viga {0} lahendamisel"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-#: ../plugins/google-account-setup/google-source.c:543
 msgid "Unknown error."
 msgstr "Tundmatu viga."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "Tundmatu tüüp"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "Toetamata toiming"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 "Sa oled lähedal mahupiirangu ületamisele, mis sulle selles serveris e-posti "
 "hoidmiseks ette on nähtud."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "You are permitted to send a message on behalf of only one delegator at a "
 "time."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You cannot make yourself your own delegate"
 msgstr "Ennast pole enda delegaadiks võimalik teha"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr ""
 "Sa oled ületanud mahupiirangu, mis sulle selles serveris e-posti hoidmiseks "
 "ette on nähtud."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You may only configure a single Exchange account."
 msgstr "Sul on võimalik seadistada üksikut Exchange'i kontot."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
@@ -17514,7 +13007,6 @@ msgstr ""
 "Sinu praegune kasutatav maht on {0} KB. Proovi mõnede sõnumite kustutamise "
 "abil vaba ruumi juurde teha."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
@@ -17522,7 +13014,6 @@ msgstr ""
 "Sinu praegune kasutatav maht on {0} KB. Hetkel pole sul võimalik sõnumeid "
 "saata ega vastu võtta."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -17531,39 +13022,30 @@ msgstr ""
 "vastu võtta enne, kui sa pole mõne sõnumi kustutamise abil omale vaba ruumi "
 "juurde loonud."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
 msgstr "Su parool on aegunud."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
 msgstr "Kasutajat {0} pole võimalik pääsuõiguste loendisse lisada"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} on juba delegaat"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} on juba loendis"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
 msgid "Subscribe to Other User's Tasks"
 msgstr "Teiste kasutajate ülesannete tellimine"
 
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
 msgid "Check folder permissions"
 msgstr "Kausta pääsuõiguste kontrollimine"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
 msgid "Default External Editor"
 msgstr "Vaikimisi väline redaktor"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
 msgid "The default command that must be used as the editor."
 msgstr ""
 
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid ""
 "A plugin for using an external editor as the composer. You can send only "
 "plain-text messages."
@@ -17572,19 +13054,15 @@ msgstr ""
 "võimalik saata ainult lihttekstilisi sõnumeid."
 
 #. the path to the shared library
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
 msgid "External Editor"
 msgstr "Väline redaktor"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
 msgid "Cannot create Temporary File"
 msgstr "Ajutist faili pole võimalik luua"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
 msgid "Editor not launchable"
 msgstr "Redaktor pole käivitatav"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
@@ -17592,7 +13070,6 @@ msgstr ""
 "Evolutionil pole võimalik sõnumi salvestamiseks ajutist faili luua. Proovi "
 "hiljem uuesti."
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
 msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
@@ -17600,19 +13077,15 @@ msgstr ""
 "Sinu pluginaeelistustes määratud redaktorit pole võimalik käivitada. Proovi "
 "mõnda muud redaktorit."
 
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
 msgid "Compose in _External Editor"
 msgstr "Koostamine _välise redaktor abil"
 
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
 msgstr "Sõnumite koostamine välise redaktor abil"
 
-#: ../plugins/external-editor/external-editor.c:112
 msgid "Command to be executed to launch the editor: "
 msgstr "Redaktori käivitamiseks kasutatav käsk: "
 
-#: ../plugins/external-editor/external-editor.c:113
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
@@ -17620,19 +13093,15 @@ msgstr ""
 "Emacs'i jaoks kasuta \"xemacs\"\n"
 "VI jaoks kasuta \"gvim\""
 
-#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Vali PNG-pilt mõõtmetega 48x48 ja suurusega mitte rohkem kui 700 baiti"
 
-#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "PNG-failid"
 
-#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "_Näopilt"
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid ""
 "Attach Face header to outgoing messages. First time the user needs to "
 "configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
@@ -17643,42 +13112,30 @@ msgstr ""
 "salvestatakse kataloogi ~/.evolution/faces. Seda pilti hakatakse tulevikus "
 "kasutama väljuvatele sõnumitele päisesse lisamiseks."
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Kausta \"%s\" tellimusest loobumine"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
 msgid "Allows unsubscribing of mail folders in the folder tree context menu."
 msgstr "Sõnumikaustade tellimise lubamine kaustapuu kontekstimenüüst."
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
 msgstr "Kausta tellimuse lõpetamine"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "_Lõpeta tellimus"
 
-#: ../plugins/google-account-setup/google-source.c:83
-#: ../plugins/google-account-setup/google-source.c:90
-#: ../plugins/google-account-setup/google-contacts-source.c:52
-#: ../plugins/google-account-setup/google-contacts-source.c:57
-#: ../plugins/google-account-setup/google-contacts-source.c:83
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:439
 msgid "Please enter user name first."
 msgstr "Palun sisesta esmalt kasutajanimi."
 
-#: ../plugins/google-account-setup/google-source.c:443
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 "Sisesta kasutajale %s parool, millega ta tellitud kalendritele ligi pääseb."
 
-#: ../plugins/google-account-setup/google-source.c:543
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17687,40 +13144,30 @@ msgstr ""
 "Google serverist pole võimalik andmeid lugeda.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:693
 msgid "Cal_endar:"
 msgstr "Kalen_der:"
 
-#: ../plugins/google-account-setup/google-source.c:728
 msgid "Retrieve _list"
 msgstr ""
 
-#: ../plugins/google-account-setup/google-contacts-source.c:268
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
 msgid "<b>Server</b>"
 msgstr "<b>Server</b>"
 
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 msgid "A plugin to setup Google Calendar and Contacts."
 msgstr "Plugin Google kalendri ja kontaktide seadistamiseks."
 
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "Google allikad"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 msgid "Checklist"
 msgstr "Kontroll-loend"
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
 msgid "A plugin to setup GroupWise calendar and contacts sources."
 msgstr "Plugin GroupWise kalendri- ja kontaktiallikate seadistamiseks."
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "GroupWise Account Setup"
 msgstr "GroupWise'i konto sätted"
 
-#: ../plugins/groupwise-features/install-shared.c:220
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17745,118 +13192,89 @@ msgstr ""
 "Jagatud kausta paigaldamiseks klõpsa \"Edasi\"\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:225
 msgid "Install the shared folder"
 msgstr "Jagatud kausta paigaldamine"
 
-#: ../plugins/groupwise-features/install-shared.c:227
 msgid "Shared Folder Installation"
 msgstr "Jagatud kataloogi paigaldamine"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
 msgstr "Rämpsposti sätted"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:93
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
 msgid "Junk Mail Settings"
 msgstr "Rämpsposti sätted"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
 msgstr "Rämpsposti sätted..."
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:1
 msgid "<b>Junk List:</b>"
 msgstr "<b>Rämpsposti loend:</b>"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:2
 msgid "Email:"
 msgstr "E-post:"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "_Disable"
 msgstr "_Keela"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:6
 msgid "_Enable"
 msgstr "_Lubamine"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:7
 msgid "_Junk List"
 msgstr "_Rämpsposti loend"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
 msgid "Message Retract"
 msgstr ""
 
-#: ../plugins/groupwise-features/mail-retract.c:58
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this ?"
 msgstr ""
 
-#: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
 msgstr "Sõnum on edukalt tagasi võetud"
 
-#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr "E-posti tagasivõtmine"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to GroupWise messages"
 msgstr "Saatmisvalikute lisamine GroupWise'i sõnumitele"
 
-#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in GroupWise accounts."
 msgstr "Plugin GroupWise kontode võimaluste jaoks."
 
-#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "GroupWise Features"
 msgstr "GroupWise'i võimalused"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
 msgid "Message retract failed"
 msgstr ""
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
 msgid "The server did not allow the selected message to be retracted."
 msgstr ""
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
 msgid "Invalid user"
 msgstr "Vigane kasutaja"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "Kasutajale &quot;{0}&quot; pole võimalik proksi ligipääsu anda"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
 msgid "Specify User"
 msgstr "Kasutaja määramine"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 msgid "You have already given proxy permissions to this user."
 msgstr "Sa oled sellele kasutajale juba proksile ligipääsu andnud."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr ""
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
 msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
 msgstr "Konto &quot;{0}&quot; on juba olemas. Palun kontrolli oma kaustapuud."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
 msgid "Account Already Exists"
 msgstr "Konto on juba olemas"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
 msgid ""
 "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
 "address and try again."
@@ -17864,131 +13282,97 @@ msgstr ""
 "Proksisse kasutajana &quot;{0}&quot; sisselogimine nurjus. Palun kontrolli "
 "oma e-posti aadressi ja proovi uuesti."
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
 msgid "This is a recurring meeting"
 msgstr "See on korduv kohtumine"
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
 msgid "Would you like to accept it?"
 msgstr "Kas nõustud sellega?"
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
 msgid "Would you like to decline it?"
 msgstr "Kas lükkad selle tagasi?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
 msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
 msgstr "Sul pole võimalik kausta määratud kasutajale &quot;{0}&quot; jagada"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
 msgid "You have to specify a user name which you want to add to the list"
 msgstr "Sa pead määrama nimekirja lisatava kasutaja nime"
 
-#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "Nõustu katseliselt"
 
-#: ../plugins/groupwise-features/properties.glade.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>Kasutajad:</b>"
 
-#: ../plugins/groupwise-features/properties.glade.h:2
 msgid "C_ustomize notification message"
 msgstr "Ko_handa teavitussõnumit"
 
-#: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Con_tacts..."
 msgstr "Kon_taktid..."
 
-#: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:516
 msgid "Message"
 msgstr "Sõnum"
 
-#: ../plugins/groupwise-features/properties.glade.h:6
 msgid "Shared Folder Notification"
 msgstr "Jagatud kataloogi teavitus"
 
-#: ../plugins/groupwise-features/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "Osalejad saavad järgneva teate.\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Not Shared"
 msgstr "_Väljajagamata"
 
-#: ../plugins/groupwise-features/properties.glade.h:14
 msgid "_Shared With..."
 msgstr ""
 
-#: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Sharing"
 msgstr "_Jagamine"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
 msgid "<b>Name</b>"
 msgstr "<b>Nimi</b>"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
 msgid "Access Rights"
 msgstr "Ligipääsuõigused"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
 msgid "Add/Edit"
 msgstr "Lisa/Redigeeri"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
 msgid "Con_tacts"
 msgstr "Kon_taktid"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
 msgid "Modify _folders/options/rules/"
 msgstr "Luba muuta _kaustu/valikuid/reegleid"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
 msgid "Read items marked _private"
 msgstr "Loetud kirjed märgitakse _privaatseks"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
 msgid "Reminder Notes"
 msgstr "Meeldetuletaja märkmed"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
 msgid "Subscribe to my _alarms"
 msgstr "Minu _häirete saamine"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
 msgid "Subscribe to my _notifications"
 msgstr "Minu _märguannete saamine"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
 msgid "_Write"
 msgstr "_Kirjutamine"
 
 #. To Translators: strip the part in front of the | and the | itself
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
 msgid "permission to read|_Read"
 msgstr "Lu_gemine"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:1
 msgid "Proxy"
 msgstr "Volinik"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
 msgid "<b>Account Name</b>"
 msgstr "<b>Konto nimi</b>"
 
 # Proxy tähendab siin kedagi, kes on volitatud
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
 msgid "Proxy Login"
 msgstr "Volitatatu kasutajanimi"
 
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:250
-#: ../plugins/groupwise-features/proxy.c:491
-#: ../plugins/groupwise-features/send-options.c:85
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sPalun sisesta %s parool (kasutaja %s)"
@@ -17997,135 +13381,107 @@ msgstr "%sPalun sisesta %s parool (kasutaja %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:509
 msgid "_Proxy Login..."
 msgstr "_Volitatu kasutajanimi..."
 
 # Proxy tähendab siin kedagi, kes on volitatud
-#: ../plugins/groupwise-features/proxy.c:691
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Voliniku sakk on saadaval ainult juhul, kui konto on võrku ühendatud."
 
 # Proxy tähendab siin kedagi, kes on volitatud
-#: ../plugins/groupwise-features/proxy.c:696
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Voliniku sakk on saadaval ainult juhul, kui konto on lubatud."
 
-#: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:751
+msgid "Advanced send options"
+msgstr "Laiendatud saatmisvalikud"
+
 msgid "Users"
 msgstr "Kasutajad"
 
-#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr "Sisesta kasutajad ja määra õigused"
 
-#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
 msgstr "Uus _jagatud kataloog..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "Jagamine"
 
-#: ../plugins/groupwise-features/share-folder.c:534
 msgid "Custom Notification"
 msgstr "Kohandatud teavitus"
 
-#: ../plugins/groupwise-features/share-folder.c:756
 msgid "Add   "
 msgstr ""
 
-#: ../plugins/groupwise-features/share-folder.c:762
 msgid "Modify"
 msgstr ""
 
-#: ../plugins/groupwise-features/status-track.c:107
 msgid "Message Status"
 msgstr "Sõnumi olek"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:121
 msgid "Subject:"
 msgstr "Teema:"
 
-#: ../plugins/groupwise-features/status-track.c:135
 msgid "From:"
 msgstr "Saatja:"
 
-#: ../plugins/groupwise-features/status-track.c:150
 msgid "Creation date:"
 msgstr "Loomise kuupäev:"
 
-#: ../plugins/groupwise-features/status-track.c:189
 msgid "Recipient: "
 msgstr "Saajad: "
 
-#: ../plugins/groupwise-features/status-track.c:196
 msgid "Delivered: "
 msgstr "Kohale toimetatud: "
 
-#: ../plugins/groupwise-features/status-track.c:202
 msgid "Opened: "
 msgstr "Avatud: "
 
-#: ../plugins/groupwise-features/status-track.c:207
 msgid "Accepted: "
 msgstr "Nõustutud: "
 
-#: ../plugins/groupwise-features/status-track.c:212
 msgid "Deleted: "
 msgstr "Kustutatud: "
 
-#: ../plugins/groupwise-features/status-track.c:217
 msgid "Declined: "
 msgstr "Tagasi lükatud: "
 
-#: ../plugins/groupwise-features/status-track.c:222
 msgid "Completed: "
 msgstr "Lõpetatud: "
 
-#: ../plugins/groupwise-features/status-track.c:227
 msgid "Undelivered: "
 msgstr "Kohale toimetamata: "
 
-#: ../plugins/groupwise-features/status-track.c:251
 msgid "Track Message Status..."
 msgstr "Jälgi sõnumi olekut..."
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
 msgid "A plugin to setup hula calendar sources."
 msgstr "Plugin Hula kalendriallikate seadistamiseks."
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
 msgid "Hula Account Setup"
 msgstr "Hula konto sätted"
 
-#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "Kohandatud päised"
 
-#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "IMAP-i päised"
 
-#: ../plugins/imap-features/imap-headers.glade.h:1
 msgid "<b>Custom Headers</b>"
 msgstr "<b>Kohandatud päised</b>"
 
-#: ../plugins/imap-features/imap-headers.glade.h:2
 msgid "<b>IMAP Headers</b>"
 msgstr "<b>IMAP-i päised</b>"
 
-#: ../plugins/imap-features/imap-headers.glade.h:3
 msgid "Basic and _Mailing List Headers (Default)"
 msgstr "_Põhilised päised ja postiloendite päised (vaikimisi)"
 
-#: ../plugins/imap-features/imap-headers.glade.h:4
 msgid "Fetch A_ll Headers"
 msgstr "_Kõik päised laaditakse alla"
 
-#: ../plugins/imap-features/imap-headers.glade.h:5
 msgid ""
 "Give the extra headers that you need to fetch in addition to the above "
 "standard headers. \n"
@@ -18135,7 +13491,6 @@ msgstr ""
 "laaditakse.\n"
 "Kohandatud päiseid saab eirata valides kõigi päisete allalaadimise."
 
-#: ../plugins/imap-features/imap-headers.glade.h:7
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -18143,7 +13498,6 @@ msgstr ""
 "Määra oma eelistused IMAP-i päiste jaoks.\n"
 "Mida rohkem päiseid on määratud, seda kauem võtab nende allalaadimine aega."
 
-#: ../plugins/imap-features/imap-headers.glade.h:9
 msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -18151,53 +13505,40 @@ msgstr ""
 "_Põhilised päised (kiireim variant)\n"
 "Kasuta seda juhul, kui sul pole postiloenditel põhinevaid filtreid"
 
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
 msgid "A plugin for the features in the IMAP accounts."
 msgstr "Plugin IMAP kontode võimaluste jaoks."
 
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
 msgid "IMAP Features"
 msgstr "IMAP-i võimalused"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:78
 msgid "_Import to Calendar"
 msgstr "_Impordi kalendrisse"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Tasks"
 msgstr "_Impordi ülesannetesse"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:201
 msgid "Import ICS"
 msgstr "Impordi ICS-i"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:224
 msgid "Select Task List"
 msgstr "Ülesandeloendi valimine"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Calendar"
 msgstr "Kalendri valimine"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:260
-#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "_Impordi"
 
 #. the path to the shared library
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
 msgid "Import to Calendar"
 msgstr "Kalendrisse importimine"
 
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
 msgid "Imports ICS attachments to calendar."
 msgstr "ICS-manuste importimine kalendrisse."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "Hardware Abstraction Layer pole laaditud"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
@@ -18205,11 +13546,9 @@ msgstr ""
 "Vajalik \"hald\" teenus ei tööta hetkel. Palun luba see teenus ja käivita "
 "programm uuesti või võta ühendust oma süsteemiülemaga."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
 msgid "Search for an iPod failed"
 msgstr "Tõrge iPod'i leidmisel"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
 msgid ""
 "Evolution could not find an iPod to synchronize with. Either the iPod is not "
 "connected to the system or it is not powered on."
@@ -18217,149 +13556,113 @@ msgstr ""
 "Evolution ei leia sünkroniseerimiseks iPod'i. iPod pole kas ühendatud või "
 "pole see sisse lülitatud."
 
-#: ../plugins/ipod-sync/ical-format.c:119
-#: ../plugins/save-calendar/ical-format.c:164
 msgid "iCalendar format (.ics)"
 msgstr "iKalendri vorming (.ics)"
 
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
 msgid ""
 "Synchronize the selected task/memo/calendar/address book with Apple iPod"
 msgstr ""
 "Valitud ülesande/märkme/kalendri/aadressiraamatu sünkroniseerimine Apple "
 "iPod'iga"
 
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
 msgstr "Sünkroniseeri iPod'iga"
 
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
 msgid "iPod Synchronization"
 msgstr "iPod'iga sünkroniseerimine"
 
-#: ../plugins/itip-formatter/itip-formatter.c:443
-#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Tõrge kalendri '%s' laadimisel"
 
-#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Kalendris '%s' olev sündmus on selle kohtumisega vastuolus"
 
-#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Sündmus leiti kalendrist '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "Ühtegi kalendrit pole võimalik leida"
 
-#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "Seda kohtumist pole võimalik ühestki kalendrist leida"
 
-#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "Seda ülesannet pole võimalik ühestki ülesannete loendist leida"
 
-#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "Seda märget pole võimalik ühestki märkmete loendist leida"
 
-#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "Selle sündumuse olemasoleva versiooni otsimine"
 
-#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "Kirjet pole võimalik analüüsida"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Kirjet pole võimalik kalendrisse '%s' saata. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Saadetud kalendrisse '%s' kui aktsepteeritud"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Saadetud kalendrisse '%s' kui katseline"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Saadetud kalendrisse '%s' kui keeldutud"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Saadetud kalendrisse '%s' kui tühistatud"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Korraldaja eemaldas delegaadi %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Delegaadile saadeti tühistusteade"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Delegaadile pole võimalik tühistusteadet saata"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Osaleja olekut pole võimalik uuendada, kuna selle olek on vigane"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Osalejat pole võimalik uuendada. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "Osaleja olek uuendatud"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "Koosoleku andmed on saadetud"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "Ülesande andmed on saadetud"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "Märkme andmed on saadetud"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 "Koosoleku kohta pole võimalik andmeid saata kuna koosolekut pole olemas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr "Ülesande kohta pole võimalik andmeid saata kuna ülesannet pole olemas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Märkme kohta pole võimalik andmeid saata kuna märget pole olemas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1365
-#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "Manuses olev kalender on vigane"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18367,15 +13670,9 @@ msgstr ""
 "Sõnum sisaldab kalendrit, kuid kalender see kalender pole korrektses "
 "iCalendar vormingus."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
-#: ../plugins/itip-formatter/itip-formatter.c:1435
-#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "The item in the calendar is not valid"
 msgstr "Kalendris olev kirje on vigane"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1418
-#: ../plugins/itip-formatter/itip-formatter.c:1436
-#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18383,11 +13680,9 @@ msgstr ""
 "Sõnum sisaldab kalendrit, kuid kalender ei sisalda sündmusi, ülesandeid ega "
 "vaba/hõivatud andmeid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "Manuseks olev kalender sisaldab mitut kirjet"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18395,503 +13690,391 @@ msgstr ""
 "Kõikide nende kirjete töötlemiseks peab fail olema salvestatud ja kalender "
 "imporditud"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
 msgstr "See koosolek kordub"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This task recurs"
 msgstr "See ülesanne kordub"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2154
 msgid "This memo recurs"
 msgstr "See märge kordub"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2388
 msgid "_Delete message after acting"
 msgstr "Pärast tegevuse läbiviimist sõnum _kustutatakse"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2398
-#: ../plugins/itip-formatter/itip-formatter.c:2430
 msgid "Conflict Search"
 msgstr "Vastuolude otsimine"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2413
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Vali kalendrid, millest tuleb koosolekute vastuolusid otsida"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:298
 msgid "Today"
 msgstr "Täna"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "Täna %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "Täna %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "Täna %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "Homme"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "Homme kell %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "Homme kell %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "Homme kell %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Homme kell %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:254
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:259
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:263
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:268
 msgid "%A %l:%M %p"
 msgstr "%A, %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:272
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%A, %e. %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e. %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e. %B %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e. %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e. %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e. %B %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e. %B %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%a, %e. %B %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e. %B %Y, %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:324
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e. %B %Y, %l:%M%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:349
-#: ../plugins/itip-formatter/itip-view.c:437
-#: ../plugins/itip-formatter/itip-view.c:525
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> avaldas %s kaudu teabe järgneva koosoleku kohta:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> avaldas järgneva koosoleku teabe:"
 
-#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> delegeeris järgneva koosoleku sulle:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> taotleb %s kaudu, et sa osaleksid järgneval koosolekul:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> taotleb, et sa osaleksid järgneval koosolekul:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> soovib %s kaudu lisada olemasolevale koosolekule:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> soovib lisada olemasolevale koosolekule:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> soovib saada värskeimat teavet järgneva koosoleku kohta:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> saatis järgneva koosoleku tagasi:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> tühistas %s kaudu järgneva koosoleku:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> tühistas järgneva koosoleku."
 
-#: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> esitas järgnevad koosoleku muudatused."
 
-#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> tühistas %s kaudu järgnevad koosolekumuutused:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> keeldus järgnevatest koosoleku muudatusest."
 
-#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> avaldas %s kaudu järgneva ülesande:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> avaldas järgmise ülesande:"
 
-#: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> taotleb %s määramist järgneva ülesande täitjaks:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> määras %s kaudu sulle ülesande:"
 
-#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> määras sulle ülesande:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> soovib %s kaudu lisada olemasolevale ülesandele:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> soovib lisada olemasolevale ülesandele:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "<b>%s</b> soovib saada värskeimat infot järgneva ülesande kohta:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> saatis järgneva määratud ülesande vastuse tagasi:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> tühistas %s kaudu järgneva määratud ülesande:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> tühistas järgneva määratud ülesande:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> esitas järgnevad muudatused määratud ülesandele:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> keeldus %s kaudu järgneva määratud ülesande:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> keeldus järgnevast määratud ülesandest:"
 
-#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> avaldas %s kaudu järgneva märkme:"
 
-#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> avaldas järgmise märkme:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> soovib %s kaudu lisada olemasolevale märkmele:"
 
-#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> soovib lisada olemasolevale märkmele:"
 
-#: ../plugins/itip-formatter/itip-view.c:545
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> tühistas %s kaudu järgneva märkme:"
 
-#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> tühistas järgneva määratud märkme:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "_Ava kalender"
 
-#: ../plugins/itip-formatter/itip-view.c:824
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:851
-#: ../plugins/itip-formatter/itip-view.c:856
 msgid "_Decline"
 msgstr "_Lükka tagasi"
 
-#: ../plugins/itip-formatter/itip-view.c:825
-#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:853
-#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Accept"
 msgstr "_Nõustu"
 
-#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "_Lükka kõik tagasi"
 
-#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "_Määra kõik katseliseks"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:852
-#: ../plugins/itip-formatter/itip-view.c:857
 msgid "_Tentative"
 msgstr "_Määra katseliseks"
 
-#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "_Nõustu kõigiga"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "_Saada andmed"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "_Värskenda osaleja olekut"
 
-#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "_Uuenda"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1012
 msgid "Start time:"
 msgstr "Algus:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1021
 msgid "End time:"
 msgstr "Lõpp:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1037
-#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Comment:"
 msgstr "Kommentaar:"
 
-#: ../plugins/itip-formatter/itip-view.c:1073
 msgid "Send _reply to sender"
 msgstr "Saatjale _vastamine"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Send _updates to attendees"
 msgstr "_Uuenduste saatmine osalejatele"
 
-#: ../plugins/itip-formatter/itip-view.c:1110
 msgid "_Apply to all instances"
 msgstr "_Rakenda kõigile instantsidele"
 
-#: ../plugins/itip-formatter/itip-view.c:1119
 msgid "Show time as _free"
 msgstr "Näita aega kui _vaba"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
 msgid "_Tasks :"
 msgstr "_Ülesanded :"
 
-#: ../plugins/itip-formatter/itip-view.c:1854
 msgid "Memos :"
 msgstr "Märkmed :"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Displays text/calendar parts in messages."
 msgstr "Teksti- ja kalendriosade kuvamine sõnumis."
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
 msgstr "Itip vormindaja"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
 "&quot;{1}&quot;?"
@@ -18899,48 +14082,37 @@ msgstr ""
 "&quot;{0}&quot; delegeeris koosoleku. Kas sa soovid lisada delegaati &quot;"
 "{1}&quot;?"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
 msgstr "See kohtumine on kustutatud"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
 msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "See vastus pole praeguselt osalejalt. Kas lisame ta osalejaks?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:47
 msgid "Proxy _Logout"
 msgstr "Proksi välja_logimine"
 
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
 msgid "Allows disabling of accounts."
 msgstr "Kontode keelamise võimaldamine."
 
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
 msgid "Disable Account"
 msgstr "Konto keelamine"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "Helifaili esitamine või piiksumine."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
 msgid "Blink icon in notification area."
 msgstr "Teavitusalal ikooni vilgutamine."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable D-Bus messages."
 msgstr "D-Bus'i teadete lubamine."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Enable icon in notification area."
 msgstr "Teavitusalal ikooni lubamine."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "D-Bus'i teate genereerimine uue sõnumi saabumisel."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 msgid ""
 "If \"true\", then beep, otherwise will play sound file when new messages "
 "arrive."
@@ -18948,65 +14120,51 @@ msgstr ""
 "Kui märgitud, siis tehakse uue sõnumi saabumisel piiksu, vastasel juhul "
 "esitatakse helifaili."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
 msgstr "Uute sõnumite saabumisest teatamine ainult Sisendkausta kohta."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Play sound when new messages arrive."
 msgstr "Heli esitamine uute sõnumite saabumisel."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Popup message together with the icon."
 msgstr "Hüpiksõnumi kuvamine koos ikooniga."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "Uute sõnumite saabumisel teavitusalas uue sõnumi ikooni kuvamine."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Sound file name to be played."
 msgstr "Esitatava helifaili nimi."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr ""
 "Uute sõnumite saabumisel esitatava helifaili nimi (kui pole määratud, et "
 "helifaili esitamise asemel tuleb piiksuda)."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "Kas uute sõnumite saabumisel tuleb esitada helifaili või piiksuda."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Whether show message over the icon when new messages arrive."
 msgstr ""
 "Kas uute sõnumite saabumisel tuleb ikooni juures näidata ka sõnumit või "
 "mitte."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether the icon should blink or not."
 msgstr "Kas ikoon peab vilkuma või mitte."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr ""
 "Kas teavitusi tuleb näidata ainult Sisendkausta või ka teiste kaustade kohta."
 
-#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "_D-Bus'i teate genereerimine"
 
-#: ../plugins/mail-notification/mail-notification.c:378
 msgid "Evolution's Mail Notification"
 msgstr "Evolutioni sõnumiteavutus"
 
-#: ../plugins/mail-notification/mail-notification.c:399
 msgid "Mail Notification Properties"
 msgstr "Sõnumiteavituse omadused"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:458
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19021,59 +14179,45 @@ msgstr[1] ""
 "Sulle on %d uut sõnumit\n"
 "kaustas %s."
 
-#: ../plugins/mail-notification/mail-notification.c:463
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Sulle on %d uus sõnum."
 msgstr[1] "Sulle on %d uut sõnumit."
 
-#: ../plugins/mail-notification/mail-notification.c:480
-#: ../plugins/mail-notification/mail-notification.c:485
 msgid "New email"
 msgstr "Uus e-sõnum"
 
-#: ../plugins/mail-notification/mail-notification.c:544
 msgid "Show icon in _notification area"
 msgstr "Teavitusalas kuvatakse _ikooni"
 
-#: ../plugins/mail-notification/mail-notification.c:547
 msgid "B_link icon in notification area"
 msgstr "Teavitusala ikooni _vilgutatakse"
 
-#: ../plugins/mail-notification/mail-notification.c:549
 msgid "Popup _message together with the icon"
 msgstr "Ikoo_niga koos kuvatakse ka sõnumit"
 
-#: ../plugins/mail-notification/mail-notification.c:730
 msgid "_Play sound when new messages arrive"
 msgstr "Uue sõnumi saabumisel esitatakse _heli"
 
-#: ../plugins/mail-notification/mail-notification.c:736
 msgid "_Beep"
 msgstr "_Piiksutakse"
 
-#: ../plugins/mail-notification/mail-notification.c:737
 msgid "Play _sound file"
 msgstr "Esitatakse heli_faili"
 
-#: ../plugins/mail-notification/mail-notification.c:748
 msgid "Specify _filename:"
 msgstr "_Faili nimi:"
 
-#: ../plugins/mail-notification/mail-notification.c:749
 msgid "Select sound file"
 msgstr "Helifaili valimine"
 
-#: ../plugins/mail-notification/mail-notification.c:750
 msgid "Pl_ay"
 msgstr "_Esita"
 
-#: ../plugins/mail-notification/mail-notification.c:807
 msgid "Notify new messages for _Inbox only"
 msgstr "Uutest sõnumitest teatatakse ainult _Sisendkausta kohta"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid ""
 "Generates a D-Bus message or notifies the user with an icon in notification "
 "area and a notification message whenever a new message has arrived."
@@ -19081,11 +14225,9 @@ msgstr ""
 "Uue sõnumi saabumisel D-Bus sõnumi genereerimine või kasutaja teavitamine "
 "teavitusala ja -sõnumi abil."
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Mail Notification"
 msgstr "Sõnumiteavitus"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
 msgid ""
 "A plugin which allows the creation of meetings from the contents of a mail "
 "message."
@@ -19093,20 +14235,16 @@ msgstr ""
 "Plugin, mille abil on võimalik e-posti sõnumite sisu põhjal luua uusi "
 "koosolekuid."
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
 msgid "Con_vert to Meeting"
 msgstr "_Teisenda koosolekuks"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
 msgid "Mail to meeting"
 msgstr "Sõnumi teisendamine koosolekuks"
 
-#: ../plugins/mail-to-task/mail-to-task.c:287
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kalendrit pole võimalik avada. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:292
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19114,7 +14252,6 @@ msgstr ""
 "Valitud allikas on kirjutuskaitsega, selle alla pole võimalik ülesandeid "
 "luua. Palun vali mõni teine allikas."
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
 msgid ""
 "A plugin which allows the creation of tasks from the contents of a mail "
 "message."
@@ -19122,63 +14259,47 @@ msgstr ""
 "Plugin, mille abil on võimalik e-posti sõnumite sisu põhjal luua uusi "
 "ülesandeid."
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
 msgid "Con_vert to Task"
 msgstr "_Teisenda ülesandeks"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
 msgid "Mail to task"
 msgstr "Sõnumi teisendamine ülesandeks"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
 msgid "Convert the selected message to a new task"
 msgstr "Valitud sõnumi teisendamine uueks ülesandeks"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 msgid "Contact list _owner"
 msgstr "Võta postiloendi _omanikuga ühendust"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
 msgid "Get list _archive"
 msgstr "Hangi postiloendi _arhiiv"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
 msgid "Get list _usage information"
 msgstr "_Hangi postiloendi kasutusteave"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
 msgid "Mailing List Actions"
 msgstr "Postiloendi toimingud"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
 msgid "Mailing _List"
 msgstr "_Postiloend"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
 msgid ""
 "Provide actions for common mailing list commands (subscribe, unsubscribe...)."
 msgstr ""
 "Üldiste postiloendikäskude (tellimine, tellimusest loobumine, ...) tagamine."
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
 msgstr "_Sõnumi saatmine loendisse"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
 msgid "_Subscribe to list"
 msgstr "_Telli postiloend"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
 msgid "_Un-subscribe to list"
 msgstr "_Lõpeta postiloendi tellimus"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
 msgstr "Tegevus pole saadaval"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
 "An e-mail message will be sent to the URL \"{0}\". You can either send the "
 "message automatically, or see and change it first.\n"
@@ -19187,19 +14308,15 @@ msgid ""
 "has been sent."
 msgstr ""
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
 msgid "Malformed header"
 msgstr "Vigane päis"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
 msgid "No e-mail action"
 msgstr "Puudub e-posti toiming"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
 msgid "Posting not allowed"
 msgstr "Postitamine ei ole lubatud"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
 msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
@@ -19207,11 +14324,9 @@ msgstr ""
 "Sellesse postiloendisse pole postitamine lubatud. Võimalik, et see loend on "
 "ainult lugemiseks. Üksikasjade teadasaamiseks võta ühendust loendi omanikuga."
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
 msgstr "Kas saadan sõnumi postiloendisse?"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
 "The action could not be performed. This means the header for this action did "
 "not contain any action we could process.\n"
@@ -19219,7 +14334,6 @@ msgid ""
 "Header: {0}"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
 msgid ""
 "The {0} header of this message is malformed and could not be processed.\n"
 "\n"
@@ -19229,73 +14343,56 @@ msgstr ""
 "töödelda.\n"
 "Päis: {1}"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
 msgid ""
 "This message does not contain the header information required for this "
 "action."
 msgstr "Sõnumi päises pole selle toimingu läbiviimiseks vajalikke andmeid."
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 msgid "_Edit message"
 msgstr "_Redigeeri sõnumit"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
 msgid "_Send message"
 msgstr "_Saada sõnum"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact List _Owner"
 msgstr "Kontaktide nimekirja _omanik"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Ühenduse võtmine postiloendi omanikuga"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
 msgid "Get List _Archive"
 msgstr "Hangi postiloendi _arhiiv"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get List _Usage Information"
 msgstr "_Hangi postiloendi kasutusteave"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get an archive of the list this message belongs to"
 msgstr "Postiloendi, kuhu see sõnum kuulub, arhiivi hankimine"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Postiloendi, kuhu see sõnum kuulub, kasutusjuhendi hankimine"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Sõnumi postitamine postiloendi omanikule"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Postiloendi, kust see sõnum pärit on, tellimine"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "Postiloendi, kust see sõnum pärit on, tellimusest loobumine"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post Message to List"
 msgstr "_Saada loendisse sõnum"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to List"
 msgstr "_Telli postiloend"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Unsubscribe from List"
 msgstr "_Loobu postiloendi tellimusest"
 
-#: ../plugins/mark-all-read/mark-all-read.c:39
 msgid "Also mark messages in subfolders?"
 msgstr "Kas märkida ka alamkaustade sõnumid?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:41
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -19303,90 +14400,55 @@ msgstr ""
 "Kas soovid ainult valitud kataloogis olevaid sõnumeid loetuks märkida või "
 "tuleb sama teha ka kõigis alamkataloogides?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:164
 msgid "Current Folder and _Subfolders"
 msgstr "_Käesolevas kaustas ja alamkaustades"
 
-#: ../plugins/mark-all-read/mark-all-read.c:176
 msgid "Current _Folder Only"
 msgstr "Ainult _käesolevas kaustas"
 
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Kõigi loetuksmärkimine"
 
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
 msgid "Mark Me_ssages as Read"
 msgstr "Märgi sõnumid _loetuks"
 
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
 msgid "Used for marking all the messages under a folder as read"
 msgstr "Kasutatakse kõigi kaustas olevate sõnumite loetuks määramiseks"
 
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
-msgid "Mark calendar offline"
-msgstr "Kalendri märkimine võrguvaba režiimi jaoks"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
-msgid "Marks the selected calendar for offline viewing."
-msgstr "Kalendri märkimine võrguvabas olekus vaatamiseks."
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make available for offline use"
-msgstr "_Märgi võrguvabas olekus mittekasutatavaks"
-
-#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Make available for offline use"
-msgstr "_Märgi kasutamiseks võrguvabas olekus"
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
 msgstr "Plugin, mille abil teostatakse mono pluginaid."
 
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
 msgid "Mono Loader"
 msgstr "Mono laadur"
 
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
 msgstr "Plugin määramaks millised pluginad on lubatud ja millised mitte."
 
 #. Setup the ui
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:252
 msgid "Plugin Manager"
 msgstr "Pluginahaldur"
 
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
 msgid "Enable and disable plugins"
 msgstr "Pluginate lubamine ja keelamine"
 
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
 msgid "_Plugins"
 msgstr "_Pluginad"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "Autor(id)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "Seadistused"
 
-#: ../plugins/plugin-manager/plugin-manager.c:265
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Märkus: mõned muudatused rakenduvad alles pärast taaskäivitamist"
 
-#: ../plugins/plugin-manager/plugin-manager.c:291
 msgid "Overview"
 msgstr "Ülevaade"
 
-#: ../plugins/plugin-manager/plugin-manager.c:362
-#: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
 msgstr "Plugin"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
 msgid ""
 "A test plugin which demonstrates a formatter plugin which lets you choose to "
 "disable HTML messages.\n"
@@ -19399,67 +14461,51 @@ msgstr ""
 "See plugin on mõeldud koodinäiteks ja pole seetõttu toetatud.\n"
 
 #. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
 msgid "Plain Text Mode"
 msgstr "Lihtteksti režiim"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
 msgid "Prefer plain-text"
 msgstr "Lihtteksti eelistamine"
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Show HTML if present"
 msgstr "Kui sõnum sisaldab HTML-i, siis näidatakse HTML-ina"
 
-#: ../plugins/prefer-plain/prefer-plain.c:192
 msgid "Prefer PLAIN"
 msgstr "Eelistatakse lihtteksti"
 
-#: ../plugins/prefer-plain/prefer-plain.c:193
 msgid "Only ever show PLAIN"
 msgstr "Näidatakse alati lihttekstina"
 
-#: ../plugins/prefer-plain/prefer-plain.c:236
 msgid "HTML _Mode"
 msgstr "_HTML-režiim"
 
-#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
 msgstr "Evolutioni profileerija"
 
-#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
 msgid "Writes a log of profiling data events."
 msgstr "Profileerimisandmete kirjutamine logisse."
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
 msgstr "Plugin kalendrite avalikustamiseks veebis"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Calendar Publishing"
 msgstr "Kalendri avalikustamine"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
 msgid "Locations"
 msgstr "Asukohad"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
 msgid "_Publish Calendar Information"
 msgstr "_Publitseeri kalendri andmed"
 
-#: ../plugins/publish-calendar/publish-calendar.c:595
 msgid "Are you sure you want to remove this location?"
 msgstr "Oled sa kindel, et soovid seda asukohta eemaldada?"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
 msgstr "<span weight=\"bold\">Asukoht</span>"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:4
 msgid "<span weight=\"bold\">Sources</span>"
 msgstr "<span weight=\"bold\">Allikad</span>"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:6
 msgid ""
 "Daily\n"
 "Weekly\n"
@@ -19469,23 +14515,18 @@ msgstr ""
 "Igal nädalal\n"
 "Kohandatud (toimingute menüüst)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
 msgstr "_Lubamine"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:10
 msgid "P_ort:"
 msgstr "_Port:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:11
 msgid "Publishing Location"
 msgstr "Avalikustamise asukoht"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:12
 msgid "Publishing _Frequency:"
 msgstr "Avalikustamise sa_gedus"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:13
 msgid ""
 "Secure FTP (SSH)\n"
 "Public FTP\n"
@@ -19503,31 +14544,24 @@ msgstr ""
 "Turvaline WebDAV (HTTPS)\n"
 "Kohandatud asukoht"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:20
 msgid "Service _type:"
 msgstr "_Teenuse liik:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
 msgid "_File:"
 msgstr "_Fail:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_Password:"
 msgstr "Pa_rool:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Publish as:"
 msgstr "_Avalikustamise vorming:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Remember password"
 msgstr "Parool jäetakse _meelde"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Username:"
 msgstr "_Kasutajanimi:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid ""
 "iCal\n"
 "Free/Busy"
@@ -19535,79 +14569,61 @@ msgstr ""
 "iCal\n"
 "Vaba/hõivatud"
 
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Tere Python"
 
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
 msgid "Python Plugin Loader tests"
 msgstr "Pythoni plugina laaduri testid"
 
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
 msgid "Python Test Plugin"
 msgstr "Pythoni testplugin"
 
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
 msgid "Test Plugin for Python EPlugin loader."
 msgstr "Pythoni EPlugini laaduri testplugin."
 
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
 msgid "A plugin which loads other plugins written using Python."
 msgstr "Plugin, mis laadib teisi Pythonis kirjutatud pluginaid."
 
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
 msgid "Python Loader"
 msgstr "Pythoni laadur"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (sisseehitatud)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin'it ei leitud, kood: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Tõrge toru loomisel: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Viga pärast fork'i: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "SpamAssassin'i lapsprotsess ei vasta ja seetõttu kõrvaldatakse..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "SpamAssassini lapsprotsessi lõpetamise ootamine, katkestatakse..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Tõrge SpamAssassini torus, veakood: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "SpamAssassin pole saadaval."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "See teeb filtri usaldusväärsemaks, kuid samas ka aeglasemaks"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
 msgid "I_nclude remote tests"
 msgstr "_Kaasatakse ka välised testid"
 
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
 msgid ""
 "Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
 "to be installed."
@@ -19615,41 +14631,31 @@ msgstr ""
 "Rämpsposti filtreerimine SpamAssassin'i abil. Selle plugina jaoks on "
 "oluline, et SpamAssassin oleks paigaldatud."
 
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
 msgid "SpamAssassin Options"
 msgstr "SpamAssassin'i valikud"
 
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
 msgid "SpamAssassin junk plugin"
 msgstr "SpamAssassin rämpspostiplugin"
 
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
 msgstr "Plugin kõigi sõnumi manuste või osade ühekorraga salvestamiseks."
 
 #. the path to the shared library
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:315
 msgid "Save attachments"
 msgstr "Manuste salvestamine"
 
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
 msgid "Save Attachments..."
 msgstr "Salvesta manused..."
 
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
 msgid "Save all attachments"
 msgstr "Kõikide manuste salvestamine"
 
-#: ../plugins/save-attachments/save-attachments.c:321
 msgid "Select save base name"
 msgstr "Salvestamise alusnime valimine"
 
-#: ../plugins/save-attachments/save-attachments.c:340
 msgid "MIME Type"
 msgstr "MIME tüüp"
 
-#: ../plugins/save-attachments/save-attachments.c:348
 msgid "Save"
 msgstr "Salvesta"
 
@@ -19657,91 +14663,69 @@ msgstr "Salvesta"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:163
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:361
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:363
 msgid "Description List"
 msgstr "Kirjelduste loend"
 
-#: ../plugins/save-calendar/csv-format.c:364
 msgid "Categories List"
 msgstr "Kategooriate loend"
 
-#: ../plugins/save-calendar/csv-format.c:365
 msgid "Comment List"
 msgstr "Kommentaaride loend"
 
-#: ../plugins/save-calendar/csv-format.c:367
 msgid "Created"
 msgstr "Loodud"
 
-#: ../plugins/save-calendar/csv-format.c:368
 msgid "Contact List"
 msgstr "Kontaktide loend"
 
-#: ../plugins/save-calendar/csv-format.c:369
 msgid "Start"
 msgstr "Algus"
 
-#: ../plugins/save-calendar/csv-format.c:370
 msgid "End"
 msgstr "Lõpp"
 
-#: ../plugins/save-calendar/csv-format.c:372
 msgid "percent Done"
 msgstr "Täitmisprotsent"
 
-#: ../plugins/save-calendar/csv-format.c:374
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:375
 msgid "Attendees List"
 msgstr "Osalejajate loend"
 
-#: ../plugins/save-calendar/csv-format.c:377
 msgid "Modified"
 msgstr "Muudetud"
 
-#: ../plugins/save-calendar/csv-format.c:532
 msgid "Advanced options for the CSV format"
 msgstr "Laiendatud valikus CSV vormingule"
 
-#: ../plugins/save-calendar/csv-format.c:539
 msgid "Prepend a header"
 msgstr "Päise lisamine"
 
-#: ../plugins/save-calendar/csv-format.c:548
 msgid "Value delimiter:"
 msgstr "Väljaeraldaja:"
 
-#: ../plugins/save-calendar/csv-format.c:554
 msgid "Record delimiter:"
 msgstr "Kirjete eraldaja:"
 
-#: ../plugins/save-calendar/csv-format.c:560
 msgid "Encapsulate values with:"
 msgstr "Väärtuste kapseldamine:"
 
-#: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "Komaga eraldatud väärtuste vorming (.csv)"
 
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "Valitu salvestamine"
 
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
 msgid "Saves selected calendar or tasks list to disk."
 msgstr "Valitud kalendri või ülesannete salvestamine kettale."
 
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
 msgid "_Save to Disk"
 msgstr "_Salvesta kettale"
 
@@ -19750,55 +14734,42 @@ msgstr "_Salvesta kettale"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:150
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:377
 msgid "RDF format (.rdf)"
 msgstr "RDF vorming (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:161
 msgid "Select destination file"
 msgstr "Sihtfaili valimine"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
 msgid "Select one source"
 msgstr "Ühe allika valimine"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
 msgid "Selects a single calendar or task source for viewing."
 msgstr "Ühe kalendri või ülesandeallika vaatamiseks valimine."
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 msgid "Show _only this Calendar"
 msgstr "_Näita ainult seda kalendrit"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
 msgid "Show _only this Memo List"
 msgstr "_Näita ainult seda märkmeloendit"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
 msgid "Show _only this Task List"
 msgstr "_Näita ainult seda ülesandeloendit"
 
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Guides you through your initial account setup."
 msgstr ""
 
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
 msgid "Setup Assistant"
 msgstr "Seadistusabiline"
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
 msgstr "Evolutioni seadistusabiline"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid "Welcome"
 msgstr "Tere tulemast"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -19810,173 +14781,128 @@ msgstr ""
 "\n"
 "Jätkamiseks klõpsa palun \"Edasi\" nuppu. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
 msgid "Importing files"
 msgstr "Failide importimine"
 
-#: ../plugins/startup-wizard/startup-wizard.c:137
-#: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "Palun valige andmed, mida soovid importida:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:152
-#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "Programmist %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
-#: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "Andmete importimine."
 
-#: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "Palun oota"
 
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
 msgstr ""
 "Lõimede koostamine teema järgi juhuks, kui sõnumeid pole võimalik muul "
 "viisil lõimedesse jaotada."
 
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
 msgstr "Jutulõng teema järgi"
 
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
 msgid "Thread messages by subject"
 msgstr "Jutulõngade koostamine teema järgi"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:56
 msgid "F_all back to threading messages by subject"
 msgstr "Varuvaria_ndina koostatakse jutulõng teema alusel"
 
-#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
 "message body."
 msgstr ""
 
-#: ../plugins/templates/templates.c:613
 msgid "No title"
 msgstr "Pealkirja pole"
 
-#: ../plugins/templates/templates.c:741
 msgid "Save as _Template"
 msgstr "Salvesta _mallina"
 
-#: ../plugins/templates/templates.c:743
 msgid "Save as Template"
 msgstr "Salvestamine mallina"
 
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Drafts based template plugin"
 msgstr "Mallipluginal põhinevad mustandid"
 
-#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
 msgstr "Lihtne yTNEF'i kasutav plugin, TNEF-manuste lahtikodeerimiseks."
 
-#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
 msgid "TNEF Attachment decoder"
 msgstr "TNEF-manuse lahtikodeerija"
 
-#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
 msgid "A plugin to setup WebDAV contacts."
 msgstr "Plugin WebDAV'i kontaktide seadistamiseks."
 
-#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
 msgstr "WebDAV'i kontaktid"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:69
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:74
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr ""
 
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Evolutioni kest"
 
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
 msgid "Evolution Shell Config factory"
 msgstr "Evolutioni kesta seadistamise factory"
 
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
 msgstr "Evolutioni test"
 
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
 msgid "Evolution Test component"
 msgstr "Evolutioni testkomponent"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
 msgstr "Proksi-serveri ühenduste autentimine"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Automatic proxy configuration URL"
 msgstr "Proksi automaatseadistuste URL"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "Seadistuste versioon"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
 msgstr "Külgpaani vaikimisi laius"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "Akna vaikimisi kõrgus"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "Akna vaikimisi olek"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "Akna vaikimisi laius"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
 msgstr "HTTP-proksi hostinimi"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy password"
 msgstr "HTTP-proksi parool"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy port"
 msgstr "HTTP-proksi port"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy username"
 msgstr "HTTP-proksi kasutajanimi"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "Käivitamisel vaikimisi näidatava komponendi ID või alias."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
 "username is retrieved from the \"/apps/evolution/shell/network_config/"
@@ -19984,44 +14910,34 @@ msgid ""
 "gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "Viimati uuendatud seadistuste versioon"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "Autonoomses olekus kettale sünkroniseeritavate kaustade radade loend"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Non-proxy hosts"
 msgstr "Mitte-proksi hostid"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "HTTP-proksimise kasutamiseks kasutatav autentimisparool."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Proxy configuration mode"
 msgstr "Proksi seadistamise režiim"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "SOCKS proxy host name"
 msgstr "SOCKS-proksi hostinimi"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy port"
 msgstr "SOCKS-proksi port"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Secure HTTP proxy host name"
 msgstr "Turvalise HTTP proksi hostinimi"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy port"
 msgstr "Turvalise HTTP proksi hosti port"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -20029,23 +14945,18 @@ msgid ""
 "\" respectively."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "Külgpaan on nähtav"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "Arendushoiatuse dialoogi jäetakse vahele"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "Alustamine võrguvabas olekus"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "Olekuriba on nähtav"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -20053,19 +14964,15 @@ msgstr ""
 "Evolutioni viimati uuendatud seadistuste versioon kujul major/minor/"
 "configuration (näiteks \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "Peaakna vaikimisi kõrgus pikslites."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "Peaakna vaikimisi laius pikslites."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "Külgpaani vaikimisi laius pikslites."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -20074,37 +14981,30 @@ msgstr ""
 "configuration, kus major on peamine versioon, minor alamversioon ja "
 "configuration seadistuste versioon (näiteks \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The machine name to proxy secure HTTP through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy socks through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -20114,7 +15014,6 @@ msgstr ""
 "ikoonide, \"both\" nii tekstinuppude kui ikoonide jaoks ja \"toolbar\" "
 "juhuks, kui nuppude laad tuletatakse GNOME tööriistariba sätetest."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -20122,80 +15021,62 @@ msgid ""
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "Tööriistariba on nähtav"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "URL that provides proxy configuration values."
 msgstr "Proksi seadistustele viitav URL."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Use HTTP proxy"
 msgstr "HTTP-proksi kasutamine"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "HTTP-proksi autentimisel kasutatav kasutajanimi."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Millal Evolution alustab võrgurežiimi asemel võrguvabas režiimis."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "Millal aken peaks maksimeeritud olema ja millal mitte."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "Millal külgpaan peaks nähtav olema."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "Millal olekuriba peaks nähtav olema."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "Millal tööriistariba peaks nähtav olema."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Kas Evolutioni arendusversioonis tuleb hoiatusdialoogist üle hüpata või "
 "mitte."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "Millal aknanupud peaksid nähtavad olema."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "Aknanupu stiil"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "Aknanupud on nähtavad"
 
-#: ../shell/e-active-connection-dialog.glade.h:1
 msgid "<b>Active Connections</b>"
 msgstr "<b>Aktiivsed ühendused</b>"
 
-#: ../shell/e-active-connection-dialog.glade.h:2
 msgid "Active Connections"
 msgstr "Aktiivsed ühendused"
 
-#: ../shell/e-active-connection-dialog.glade.h:3
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 "Kui soovid neid ühendusi sulgeda ja võrguvabasse\n"
 "olekusse siirduda, vajuta \"Olgu\""
 
-#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "Vali, millist tüüpi importerit sa soovid kasutada:"
 
-#: ../shell/e-shell-importer.c:134
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -20203,11 +15084,9 @@ msgstr ""
 "Vali fail, mida Sa soovid Evolutioni importida, ning vali ka allpool olevast "
 "valikukastist, mis liiki failiga on tegemist."
 
-#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr "Vali selle importimise sihtkoht"
 
-#: ../shell/e-shell-importer.c:144
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -20219,58 +15098,46 @@ msgstr ""
 "ühtegi imporditavat seadistusfaili. Kui sa soovid veel proovida,\n"
 "siis vajuta \"Tagasi\" nuppu.\n"
 
-#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "_Failinimi:"
 
-#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "Faili valimine"
 
-#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "Faili _tüüp:"
 
-#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "Andmete ja seadistuste importimine _vanematest programmidest"
 
-#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "Üksiku _faili importimine"
 
-#: ../shell/e-shell-settings-dialog.c:313
 msgid "Evolution Preferences"
 msgstr "Evolutioni eelistused"
 
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window-commands.c:75
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot vahendid ei paista sellesse süsteemi paigaldatud olevat."
 
-#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "Viga %s käivitamisel."
 
-#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "Veateatamisprogramm ei ole paigaldatud."
 
-#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy veateatamisprogrammi pole võimalik käivitada."
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:942
 msgid "translator-credits"
 msgstr ""
 "Ilmar Kerm <ikerm@hot.ee>, 2001.\n"
@@ -20279,27 +15146,21 @@ msgstr ""
 "Kaarel Jõgi <kaarel@gg.ee>, 2002.\n"
 "Priit Laes <amd@store20.com>, 2003-2007."
 
-#: ../shell/e-shell-window-commands.c:953
 msgid "Evolution Website"
 msgstr "Evolutioni veebisait"
 
-#: ../shell/e-shell-window-commands.c:971
 msgid "Error opening the FAQ webpage."
 msgstr "Viga KKK veebilehe avamisel."
 
-#: ../shell/e-shell-window-commands.c:1168
 msgid "_Work Online"
 msgstr "Ühendu v_õrku"
 
-#: ../shell/e-shell-window-commands.c:1181 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Siirdu aut_onoomsesse olekusse"
 
-#: ../shell/e-shell-window-commands.c:1194
 msgid "Work Offline"
 msgstr "Siirdumine võrguvabasse olekusse"
 
-#: ../shell/e-shell-window.c:381
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -20307,11 +15168,9 @@ msgstr ""
 "Evolution on hetkel võrku ühendatud.\n"
 "Võrguvabasse olekusse siirdumiseks klõpsa seda nuppu."
 
-#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution siirdub võrguvabasse olekusse."
 
-#: ../shell/e-shell-window.c:395
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -20319,84 +15178,63 @@ msgstr ""
 "Evolution on hetkel võrguvabas olekus.\n"
 "Võrku ühendumiseks klõpsa seda nuppu."
 
-#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Ümberlülitumine vaatele \"%s\""
 
-#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "Tundmatu süsteemne viga."
 
-#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "Olgu"
 
-#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "Vigased argumendid"
 
-#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "OAF'i pole võimalik registreerida"
 
-#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "Ei leia seadistuste andmebaasi"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
 msgid "New"
 msgstr "Uus"
 
-#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "Uus test"
 
-#: ../shell/test/evolution-test-component.c:106
 msgctxt "New"
 msgid "_Test"
 msgstr "_Test"
 
-#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "Uue testikirje loomine"
 
-#: ../shell/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Faili importimiseks Evolutioni vajuta \"Impordi\"."
 
-#: ../shell/import.glade.h:2
 msgid "Evolution Import Assistant"
 msgstr "Evolutioni impordiabiline"
 
-#: ../shell/import.glade.h:3
 msgid "Import File"
 msgstr "Impordi failist"
 
-#: ../shell/import.glade.h:4
 msgid "Import Location"
 msgstr "Impordi asukohast"
 
-#: ../shell/import.glade.h:5
 msgid "Importer Type"
 msgstr "Importija tüüp"
 
-#: ../shell/import.glade.h:6
-msgid "Select Importers"
-msgstr "Vali importijad"
+msgid "Select Information to Import"
+msgstr "Vali importitavad andmed"
 
-#: ../shell/import.glade.h:7
 msgid "Select a File"
 msgstr "Vali fail"
 
-#: ../shell/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -20407,7 +15245,6 @@ msgstr ""
 "importid aväliseid faile Evolutioni keskkonda."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20444,7 +15281,6 @@ msgstr ""
 "Me loodame, et võid meie töö ja vaevaga valminud programmist\n"
 "rõõmu tunda ja me ootame programmi kohta tagasisidet!\n"
 
-#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20452,43 +15288,33 @@ msgstr ""
 "Täname,\n"
 "Evolutioni meeskond\n"
 
-#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "Enam uuesti mitte näidata"
 
-#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "Evolutioni käivitamine koos määratud komponendi aktiveerimisega"
 
-#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "Alustamine võrgurežiimis"
 
-#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "Kõigi Evolutioni komponentide töö lõpetamisele sundimine"
 
-#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Uuesti Evolutioni versioonist 1.4 migreerumisele sundimine"
 
-#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "Kõikide komponentide silumisinfo saatmine faili"
 
-#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "Kõigi pluginate laadimise keelamine."
 
-#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Sõnumite, kontaktide ja ülesannete eelvaatepaani keelamine"
 
-#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolutioni e-posti ja isikliku teabehalduse klient"
 
-#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20497,27 +15323,21 @@ msgstr ""
 "%s: --online ja --offline võtmeid pole võimalik koos kasutada.\n"
 "  Täiendava teabe saamiseks käivita %s --help.\n"
 
-#: ../shell/shell.error.xml.h:1
 msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Kas sa soovid unustada kõik meeldejäetud paroolid?"
 
-#: ../shell/shell.error.xml.h:2
 msgid "Cannot start Evolution"
 msgstr "Evolutioni pole võimalik käivitada"
 
-#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "Jätka"
 
-#: ../shell/shell.error.xml.h:4
 msgid "Delete old data from version {0}?"
 msgstr "Kas kustutada vanad andmed versioonist {0}?"
 
-#: ../shell/shell.error.xml.h:5
 msgid "Evolution can not start."
 msgstr "Evolution ei ole võimeline käivituma."
 
-#: ../shell/shell.error.xml.h:6
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
@@ -20525,15 +15345,12 @@ msgstr ""
 "Meeldejäetud paroolide unustamine nullib ära kõik meeldejäetud paroolid. "
 "Paroolid küsitakse uuesti järgmisel korral, mil neid vaja läheb."
 
-#: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
 msgstr "Uuendamiseks napib kettaruumi."
 
-#: ../shell/shell.error.xml.h:9
 msgid "Really delete old data?"
 msgstr "Kas tõesti kustutada vanad andmed?"
 
-#: ../shell/shell.error.xml.h:10
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -20554,7 +15371,6 @@ msgstr ""
 "Pärast kustutamist pole sul võimalik ilma käsitsi sekkumiseta enam "
 "Evolutioni vanemat versiooni kasutada.\n"
 
-#: ../shell/shell.error.xml.h:16
 msgid ""
 "The previous version of Evolution stored its data in a different location.\n"
 "\n"
@@ -20570,11 +15386,9 @@ msgstr ""
 "võid hiljem omal vabal valikul kataloogi &quot;evolution&quot; käsitsi "
 "eemaldada.\n"
 
-#: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
 msgstr "Tõrge eelmisest versioonist uuendamisel: {0}"
 
-#: ../shell/shell.error.xml.h:21
 msgid ""
 "Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
@@ -20587,7 +15401,6 @@ msgstr ""
 "\n"
 "Enne jätkamise pead Sa oma kodukataloogi looma rohkem vaba ruumi."
 
-#: ../shell/shell.error.xml.h:24
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
@@ -20597,7 +15410,6 @@ msgstr ""
 "\n"
 "Üksikasjade jaoks klõpsa nupule \"Abi\"."
 
-#: ../shell/shell.error.xml.h:27
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -20611,19 +15423,15 @@ msgstr ""
 "\n"
 "Üksikasjade jaoks klõpsa nupule \"Abi\"."
 
-#: ../shell/shell.error.xml.h:32
 msgid "_Forget"
 msgstr "_Unusta"
 
-#: ../shell/shell.error.xml.h:33
 msgid "_Keep Data"
 msgstr "_Säilita andmed"
 
-#: ../shell/shell.error.xml.h:34
 msgid "_Remind Me Later"
 msgstr "_Tuleta mulle hiljem meelde"
 
-#: ../shell/shell.error.xml.h:35
 msgid ""
 "{1}\n"
 "\n"
@@ -20635,7 +15443,6 @@ msgstr ""
 "Kui sa valid jätkamise, siis võid sa kaotada ligipääsu mõnedele vanadele "
 "andmetele.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20646,7 +15453,6 @@ msgstr ""
 "\n"
 "Muuda usaldussätteid:"
 
-#: ../smime/gui/cert-trust-dialog.c:151
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -20656,7 +15462,6 @@ msgstr ""
 "siis sa usaldad ka selle sertifikaadi autentsust kuni siin pole vastupidi "
 "määratud"
 
-#: ../smime/gui/cert-trust-dialog.c:155
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -20666,75 +15471,52 @@ msgstr ""
 "siis sa ei usalda ka selle sertifikaadi autentsust kuni siin pole vastupidi "
 "määratud"
 
-#: ../smime/gui/certificate-manager.c:137
-#: ../smime/gui/certificate-manager.c:380
-#: ../smime/gui/certificate-manager.c:604
 msgid "Select a certificate to import..."
 msgstr "Imporditava sertifikaadi valimine..."
 
-#: ../smime/gui/certificate-manager.c:146
 msgid "All PKCS12 files"
 msgstr "Kõik PKCS12-failid"
 
-#: ../smime/gui/certificate-manager.c:151
-#: ../smime/gui/certificate-manager.c:394
-#: ../smime/gui/certificate-manager.c:618
 msgid "All files"
 msgstr "Kõik failid"
 
-#: ../smime/gui/certificate-manager.c:271
-#: ../smime/gui/certificate-manager.c:480
-#: ../smime/gui/certificate-manager.c:702
 msgid "Certificate Name"
 msgstr "Sertifikaadi nimi"
 
-#: ../smime/gui/certificate-manager.c:280
-#: ../smime/gui/certificate-manager.c:498
 msgid "Purposes"
 msgstr "Kasutusalad"
 
-#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:570
 msgid "Serial Number"
 msgstr "Seerianumber"
 
-#: ../smime/gui/certificate-manager.c:297
 msgid "Expires"
 msgstr "Aegub"
 
-#: ../smime/gui/certificate-manager.c:389
 msgid "All email certificate files"
 msgstr "Kõik e-posti sertifikaadifailid"
 
-#: ../smime/gui/certificate-manager.c:489
 msgid "E-Mail Address"
 msgstr "E-posti aadress"
 
-#: ../smime/gui/certificate-manager.c:613
 msgid "All CA certificate files"
 msgstr "Kõik sertifitseerimiskeskuse failid"
 
-#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Sertifikaadivaatur: %s"
 
-#: ../smime/gui/component.c:46
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Sisesta sisesta parool '%s' jaoks"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:69
 msgid "Enter new password for certificate database"
 msgstr "Palun sisesta uus parool sertifikaatide andmebaasi jaoks"
 
-#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "Sisesta uus parool"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -20743,7 +15525,6 @@ msgstr ""
 "Kellele väljastatud:\n"
 "             Omanik: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20752,60 +15533,46 @@ msgstr ""
 "Väljastaja:\n"
 "    Omanik: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "Sertifikaadi valimine"
 
-#: ../smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<Ei ole sertifikaadi osa>"
 
-#: ../smime/gui/smime-ui.glade.h:2
 msgid "<b>Certificate Fields</b>"
 msgstr "<b>Sertifikaadi väljad</b>"
 
-#: ../smime/gui/smime-ui.glade.h:3
 msgid "<b>Certificate Hierarchy</b>"
 msgstr "<b>Sertifikaatide hierarhia</b>"
 
-#: ../smime/gui/smime-ui.glade.h:4
 msgid "<b>Field Value</b>"
 msgstr "<b>Välja väärtus</b>"
 
-#: ../smime/gui/smime-ui.glade.h:5
 msgid "<b>Fingerprints</b>"
 msgstr "<b>Sõrmejäljed</b>"
 
-#: ../smime/gui/smime-ui.glade.h:6
 msgid "<b>Issued By</b>"
 msgstr "<b>Väljastaja</b>"
 
-#: ../smime/gui/smime-ui.glade.h:7
 msgid "<b>Issued To</b>"
 msgstr "<b>Omanik</b>"
 
-#: ../smime/gui/smime-ui.glade.h:8
 msgid "<b>This certificate has been verified for the following uses:</b>"
 msgstr ""
 "<b>See sertifikaat on verifitseeritud järgnevate toimingute tarbeks:</b>"
 
-#: ../smime/gui/smime-ui.glade.h:9
 msgid "<b>Validity</b>"
 msgstr "<b>Kehtivus</b>"
 
-#: ../smime/gui/smime-ui.glade.h:10
 msgid "Authorities"
 msgstr "Sertifitseerimiskeskused"
 
-#: ../smime/gui/smime-ui.glade.h:11
 msgid "Backup"
 msgstr "Varunda"
 
-#: ../smime/gui/smime-ui.glade.h:12
 msgid "Backup All"
 msgstr "Varunda kõik"
 
-#: ../smime/gui/smime-ui.glade.h:13
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -20814,1741 +15581,1305 @@ msgstr ""
 "peaksid sa tutvuma selle SK kasutamisreeglitega ja protseduuridega (kui need "
 "on saadaval)."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
 msgstr "Sertifikaat"
 
-#: ../smime/gui/smime-ui.glade.h:15
 msgid "Certificate Authority Trust"
 msgstr "Usaldatav sertifitseerimiskeskus"
 
-#: ../smime/gui/smime-ui.glade.h:16
 msgid "Certificate details"
 msgstr "Sertifikaadi üksikasjad"
 
-#: ../smime/gui/smime-ui.glade.h:17
 msgid "Certificates Table"
 msgstr "Sertifikaatide tabel"
 
-#: ../smime/gui/smime-ui.glade.h:18
 msgid "Common Name (CN)"
 msgstr "Üldine nimi (CN)"
 
-#: ../smime/gui/smime-ui.glade.h:19
 msgid "Contact Certificates"
 msgstr "Kontaktide sertifikaadid"
 
-#: ../smime/gui/smime-ui.glade.h:21
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Ära selle sertifikaadi autentsust usalda"
 
-#: ../smime/gui/smime-ui.glade.h:22
 msgid "Dummy window only"
 msgstr ""
 
-#: ../smime/gui/smime-ui.glade.h:23
 msgid "Edit"
 msgstr "Redigeermine"
 
-#: ../smime/gui/smime-ui.glade.h:24
 msgid "Email Certificate Trust Settings"
 msgstr "E-post sertifikaadi usaldussätted"
 
-#: ../smime/gui/smime-ui.glade.h:25
 msgid "Email Recipient Certificate"
 msgstr "E-post vastuvõtja sertifikaat"
 
-#: ../smime/gui/smime-ui.glade.h:26
 msgid "Email Signer Certificate"
 msgstr "E-posti signeerija sertifikaat"
 
-#: ../smime/gui/smime-ui.glade.h:27
 msgid "Expires On"
 msgstr "Aegub"
 
-#: ../smime/gui/smime-ui.glade.h:29
 msgid "Import"
 msgstr "Impordi"
 
-#: ../smime/gui/smime-ui.glade.h:30
 msgid "Issued On"
 msgstr "Väljastatud"
 
-#: ../smime/gui/smime-ui.glade.h:31
 msgid "MD5 Fingerprint"
 msgstr "MD5 sõrmejälg"
 
-#: ../smime/gui/smime-ui.glade.h:32
 msgid "Organization (O)"
 msgstr "Organisatsioon (O)"
 
-#: ../smime/gui/smime-ui.glade.h:33
 msgid "Organizational Unit (OU)"
 msgstr "Allüksus (OU):"
 
-#: ../smime/gui/smime-ui.glade.h:34
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 sõrmejälg"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
 msgid "SSL Client Certificate"
 msgstr "SSL-kliendi sertifikaat"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
 msgid "SSL Server Certificate"
 msgstr "SSL-serveri sertifikaat"
 
-#: ../smime/gui/smime-ui.glade.h:38
 msgid "Trust the authenticity of this certificate"
 msgstr "Usalda selle sertifikaadi autentsust"
 
-#: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify email users."
 msgstr ""
 "Seda sertifitseerimiskeskust usaldatakse e-posti kasutajate tuvastamisel"
 
-#: ../smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify software developers."
 msgstr ""
 "Seda sertifitseerimiskeskust usaldatakse tarkvaraarendajate tuvastamisel"
 
-#: ../smime/gui/smime-ui.glade.h:41
 msgid "Trust this CA to identify web sites."
 msgstr "Seda sertifitseerimiskeskust usaldatakse veebisaitide tuvastamisel"
 
-#: ../smime/gui/smime-ui.glade.h:42
 msgid "View"
 msgstr "Vaata"
 
-#: ../smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Sinu sertifikaadid organisatsioonidelt, mis aitavad sind tuvastada:"
 
-#: ../smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "Sinu sertifikaadid, mis aitavad sul sertifitseerimiskeskusi tuvastada:"
 
-#: ../smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr "Sinu sertifikaadid, mis sul aitavad teisi inimesi tuvastada:"
 
-#: ../smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
 msgstr "Sinu sertifikaadid"
 
-#: ../smime/gui/smime-ui.glade.h:47
 msgid "_Edit CA Trust"
 msgstr "_Redigeeri SK usaldust"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "Sertifikaat on juba olemas."
 
-#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:425
 msgid "Sign"
 msgstr "Allkirjasta"
 
-#: ../smime/lib/e-cert.c:426
 msgid "Encrypt"
 msgstr "Krüpti"
 
-#: ../smime/lib/e-cert.c:531
 msgid "Version"
 msgstr "Versioon"
 
-#: ../smime/lib/e-cert.c:546
 msgid "Version 1"
 msgstr "Versioon 1"
 
-#: ../smime/lib/e-cert.c:549
 msgid "Version 2"
 msgstr "Versioon 2"
 
-#: ../smime/lib/e-cert.c:552
 msgid "Version 3"
 msgstr "Versioon 3"
 
-#: ../smime/lib/e-cert.c:634
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 koos RSA krüpteeringuga"
 
-#: ../smime/lib/e-cert.c:637
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 koos RSA krüpteeringuga"
 
-#: ../smime/lib/e-cert.c:640
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 koos RSA krüpteeringuga"
 
-#: ../smime/lib/e-cert.c:667
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA krüptimine"
 
-#: ../smime/lib/e-cert.c:670
 msgid "Certificate Key Usage"
 msgstr "Sertifikaadi võtmekasutus"
 
-#: ../smime/lib/e-cert.c:673
 msgid "Netscape Certificate Type"
 msgstr "Netscape'i sertifikaadi tüüp"
 
-#: ../smime/lib/e-cert.c:676
 msgid "Certificate Authority Key Identifier"
 msgstr "Sertifitseerimiskeskuse võtme identifikaator"
 
-#: ../smime/lib/e-cert.c:688
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Objekti identifikaator (%s)"
 
-#: ../smime/lib/e-cert.c:739
 msgid "Algorithm Identifier"
 msgstr "Algoritmi identifikaator"
 
-#: ../smime/lib/e-cert.c:747
 msgid "Algorithm Parameters"
 msgstr "Algoritmi parameetrid"
 
-#: ../smime/lib/e-cert.c:769
 msgid "Subject Public Key Info"
 msgstr "Omaniku avaliku võtme andmed"
 
-#: ../smime/lib/e-cert.c:774
 msgid "Subject Public Key Algorithm"
 msgstr "Omaniku avaliku võtme algoritm"
 
-#: ../smime/lib/e-cert.c:789
 msgid "Subject's Public Key"
 msgstr "Omaniku avalik võti"
 
-#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
 msgid "Error: Unable to process extension"
 msgstr "Viga: laiendit pole võimalik töödelda"
 
-#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
 msgid "Object Signer"
 msgstr "Objekti allkirjastaja"
 
-#: ../smime/lib/e-cert.c:835
 msgid "SSL Certificate Authority"
 msgstr "SSL sertifikaadi atesteerimisorgan"
 
-#: ../smime/lib/e-cert.c:839
 msgid "Email Certificate Authority"
 msgstr "E-posti sertifikaadi atesteerimisorgan"
 
-#: ../smime/lib/e-cert.c:867
 msgid "Signing"
 msgstr "Allkirjastamine"
 
-#: ../smime/lib/e-cert.c:871
 msgid "Non-repudiation"
 msgstr "Ebausaldusväärne"
 
-#: ../smime/lib/e-cert.c:875
 msgid "Key Encipherment"
 msgstr "Võtme šiffer"
 
-#: ../smime/lib/e-cert.c:879
 msgid "Data Encipherment"
 msgstr "Andmete šiffer"
 
-#: ../smime/lib/e-cert.c:883
 msgid "Key Agreement"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:887
 msgid "Certificate Signer"
 msgstr "Sertifikaadi allkirjastaja"
 
-#: ../smime/lib/e-cert.c:891
 msgid "CRL Signer"
 msgstr "CRL allkirjastaja"
 
-#: ../smime/lib/e-cert.c:939
 msgid "Critical"
 msgstr "Kriitiline"
 
-#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
 msgid "Not Critical"
 msgstr "Mittekriitiline"
 
-#: ../smime/lib/e-cert.c:965
 msgid "Extensions"
 msgstr "Laiendused"
 
-#: ../smime/lib/e-cert.c:1036
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
 msgid "Certificate Signature Algorithm"
 msgstr "Sertifikaadi allkirja algoritm"
 
-#: ../smime/lib/e-cert.c:1101
 msgid "Issuer"
 msgstr "Väljaandja"
 
-#: ../smime/lib/e-cert.c:1155
 msgid "Issuer Unique ID"
 msgstr "Väljastaja unikaalne ID"
 
-#: ../smime/lib/e-cert.c:1174
 msgid "Subject Unique ID"
 msgstr "Omaniku unikaalne ID"
 
-#: ../smime/lib/e-cert.c:1217
 msgid "Certificate Signature Value"
 msgstr "Sertifikaadi signatuuri väärtus"
 
-#: ../smime/lib/e-pkcs12.c:244
 msgid "PKCS12 File Password"
 msgstr "PKCS12-faili parool"
 
-#: ../smime/lib/e-pkcs12.c:244
 msgid "Enter password for PKCS12 file:"
 msgstr "Sisesta PKCS12-faili jaoks parool:"
 
-#: ../smime/lib/e-pkcs12.c:343
 msgid "Imported Certificate"
 msgstr "Imporditud sertifikaat"
 
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: ../tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "'%s' käivitamine pole võimalik: %s\n"
 
-#: ../tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Süsteemi %s sulgemine (%s)\n"
 
-#: ../ui/evolution-addressbook.xml.h:1
 msgid "Address _Book Properties"
 msgstr "Aadressi_raamatu omadused"
 
-#: ../ui/evolution-addressbook.xml.h:3
 msgid "Change the properties of the selected folder"
 msgstr "Valitud kausta omaduste muutmine"
 
-#: ../ui/evolution-addressbook.xml.h:4
 msgid "Co_py All Contacts To..."
 msgstr "Ko_peeri kõik kontaktid asukohta..."
 
-#: ../ui/evolution-addressbook.xml.h:5
 msgid "Contact _Preview"
 msgstr "Kontakti _eelvaade"
 
-#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopeeri"
 
-#: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "Kopeeri valitud kontaktid teise kausta..."
 
-#: ../ui/evolution-addressbook.xml.h:8
 msgid "Copy the contacts of the selected folder into another folder"
 msgstr "Valitud kaustas olevate kontaktide kopeerimine teise kausta"
 
-#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Valiku kopeerimine"
 
-#: ../ui/evolution-addressbook.xml.h:10
 msgid "Copy to Folder..."
 msgstr "Kopeeri kausta..."
 
-#: ../ui/evolution-addressbook.xml.h:11
 msgid "Create a new address book folder"
 msgstr "Uue aadressiraamatute kausta loomine"
 
-#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
-#: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Lõika"
 
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Valiku lõikamine"
 
-#: ../ui/evolution-addressbook.xml.h:14
 msgid "Del_ete Address Book"
 msgstr "Kustuta aa_dressiraamat"
 
-#: ../ui/evolution-addressbook.xml.h:16
 msgid "Delete selected contacts"
 msgstr "Valitud kontaktide kustutamine"
 
-#: ../ui/evolution-addressbook.xml.h:17
 msgid "Delete the selected folder"
 msgstr "Valitud kausta kustutamine"
 
-#: ../ui/evolution-addressbook.xml.h:18
 msgid "Forward Contact"
 msgstr "Edasta kontakt"
 
-#: ../ui/evolution-addressbook.xml.h:19
 msgid "Mo_ve All Contacts To..."
 msgstr "_Tõsta kõik kontaktid asukohta..."
 
-#: ../ui/evolution-addressbook.xml.h:20
 msgid "Move Selected Contacts to Another Folder..."
 msgstr "Valitud kontaktide ümbertõstmine teise kausta..."
 
-#: ../ui/evolution-addressbook.xml.h:21
 msgid "Move the contacts of the selected folder into another folder"
 msgstr "Valitud kaustas olevate kontaktide ümbertõstmine teise kausta"
 
-#: ../ui/evolution-addressbook.xml.h:22
 msgid "Move to Folder..."
 msgstr "Tõsta kausta..."
 
-#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
-#: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Aseta"
 
-#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Lõikepuhvri asetamine"
 
-#: ../ui/evolution-addressbook.xml.h:25
 msgid "Previews the contacts to be printed"
 msgstr "Prinditavate kontaktide eelvaatlemine"
 
-#: ../ui/evolution-addressbook.xml.h:28
 msgid "Print selected contacts"
 msgstr "Valitud kontaktide printimine"
 
-#: ../ui/evolution-addressbook.xml.h:29
 msgid "Rename the selected folder"
 msgstr "Valitud kausta ümbernimetamine"
 
-#: ../ui/evolution-addressbook.xml.h:30
 msgid "S_ave Address Book As VCard"
 msgstr "_Aadressiraamatu salvestamine VKaardina"
 
-#: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Salvesta vKaardina..."
 
-#: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
 msgstr "Valitud kontaktide salvestamine VKaardina."
 
-#: ../ui/evolution-addressbook.xml.h:33
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Valitud kaustas olevate kontaktide salvestamine VKaardina"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "Vali kõik"
 
-#: ../ui/evolution-addressbook.xml.h:35
 msgid "Select _All"
 msgstr "Vali _kõik"
 
-#: ../ui/evolution-addressbook.xml.h:36
 msgid "Select all contacts"
 msgstr "Vali kõik kontaktid"
 
-#: ../ui/evolution-addressbook.xml.h:37
 msgid "Send a message to the selected contacts."
 msgstr "Sõnumi saatmine valitud kontaktidele."
 
-#: ../ui/evolution-addressbook.xml.h:38
 msgid "Send message to contact"
 msgstr "Kontaktile sõnumi saatmine"
 
-#: ../ui/evolution-addressbook.xml.h:39
 msgid "Send selected contacts to another person."
 msgstr "Valitud kontaktide saatmine teisele isikule."
 
-#: ../ui/evolution-addressbook.xml.h:40
 msgid "Show contact preview window"
 msgstr "Kontakti kuvamine eelvaateaknas"
 
-#: ../ui/evolution-addressbook.xml.h:41
 msgid "St_op"
 msgstr "_Peata"
 
-#: ../ui/evolution-addressbook.xml.h:42
 msgid "Stop"
 msgstr "Peata"
 
-#: ../ui/evolution-addressbook.xml.h:43
 msgid "Stop Loading"
 msgstr "Laadimise peatamine"
 
-#: ../ui/evolution-addressbook.xml.h:44
 msgid "View the current contact"
 msgstr "Käesolev kontakti vaatamine"
 
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "_Tegevused"
 
-#: ../ui/evolution-addressbook.xml.h:47
 msgid "_Copy Contact to..."
 msgstr "_Kopeeri kontakt asukohta"
 
-#: ../ui/evolution-addressbook.xml.h:48
 msgid "_Copy Folder Contacts To"
 msgstr "_Kopeeri kausta kontaktid asukohta"
 
-#: ../ui/evolution-addressbook.xml.h:50
 msgid "_Delete Contact"
 msgstr "Kustuta ko_ntakt"
 
-#: ../ui/evolution-addressbook.xml.h:52
 msgid "_Forward Contact..."
 msgstr "_Edasta kontakt..."
 
-#: ../ui/evolution-addressbook.xml.h:53
 msgid "_Move Contact to..."
 msgstr "_Tõsta kontaktid asukohta..."
 
-#: ../ui/evolution-addressbook.xml.h:54
 msgid "_Move Folder Contacts To"
 msgstr "_Tõsta kausta kontaktid asukohta"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Uus"
 
-#: ../ui/evolution-addressbook.xml.h:60
 msgid "_Rename"
 msgstr "Muuda _nime"
 
-#: ../ui/evolution-addressbook.xml.h:61
 msgid "_Save Contact as VCard..."
 msgstr "_Salvesta kontakt VKaardina..."
 
-#: ../ui/evolution-addressbook.xml.h:62
 msgid "_Save Folder Contacts As VCard"
 msgstr "_Salvesta kausta kontaktid VKaardina"
 
-#: ../ui/evolution-addressbook.xml.h:63
 msgid "_Send Message to Contact..."
 msgstr "_Saada kontaktile sõnum..."
 
-#: ../ui/evolution-calendar.xml.h:4
 msgid "Day"
 msgstr "Päev"
 
-#: ../ui/evolution-calendar.xml.h:6
 msgid "Delete _all Occurrences"
 msgstr "Ku_stuta kõik kordused"
 
-#: ../ui/evolution-calendar.xml.h:7
 msgid "Delete all occurrences"
 msgstr "Kõikide korduste kustutamine"
 
-#: ../ui/evolution-calendar.xml.h:8
 msgid "Delete the appointment"
 msgstr "Sündmuse kustutamine"
 
-#: ../ui/evolution-calendar.xml.h:10
 msgid "Delete this occurrence"
 msgstr "Kustuta seekordne sündmus"
 
-#: ../ui/evolution-calendar.xml.h:11
 msgid "Go To"
 msgstr "Liigu"
 
-#: ../ui/evolution-calendar.xml.h:12
 msgid "Go back"
 msgstr "Tagasiliikumine"
 
-#: ../ui/evolution-calendar.xml.h:13
 msgid "Go forward"
 msgstr "Edasiliikumine"
 
-#: ../ui/evolution-calendar.xml.h:14
 msgid "List"
 msgstr "Loend"
 
-#: ../ui/evolution-calendar.xml.h:15
 msgid "Month"
 msgstr "Kuu"
 
-#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:195
 msgid "Next"
 msgstr "Järgmine"
 
-#: ../ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Prinditava kalendri eelvaatlemine"
 
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:171
 msgid "Previous"
 msgstr "Eelmine"
 
-#: ../ui/evolution-calendar.xml.h:22
 msgid "Print this calendar"
 msgstr "Kalendri printimine"
 
-#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "Pu_hasta"
 
-#: ../ui/evolution-calendar.xml.h:24
 msgid "Purge old appointments and meetings"
 msgstr "Vanadest sündmustest ja koosolekutest puhastamine"
 
-#: ../ui/evolution-calendar.xml.h:25
 msgid "Select _Date"
 msgstr "Vali _kuupäev"
 
-#: ../ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Vali _tänane kuupäev"
 
-#: ../ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
 msgstr "Määratud kuupäeva valimine"
 
-#: ../ui/evolution-calendar.xml.h:28
 msgid "Select today"
 msgstr "Tänase kuupäeva valimine"
 
-#: ../ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "Näitamine loendina"
 
-#: ../ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Ühe päeva näitamine"
 
-#: ../ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Ühe kuu näitamine"
 
-#: ../ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Ühe nädala näitamine"
 
-#: ../ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Ühe töönädala näitamine"
 
-#: ../ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "Käesoleva sündmuse kuvamine"
 
-#: ../ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Nädal"
 
-#: ../ui/evolution-calendar.xml.h:37
 msgid "Work Week"
 msgstr "Töönädal"
 
-#: ../ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Ava sündmus"
 
-#: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "Käimasoleva sõnumioperatsiooni katkestamine"
 
-#: ../ui/evolution-mail-global.xml.h:3
 msgid "Copy the selected folder into another folder"
 msgstr "Valitud kausta kopeerimine teise kausta alla"
 
-#: ../ui/evolution-mail-global.xml.h:4
 msgid "Create a new folder for storing mail"
 msgstr "Uue kausta loomine e-posti hoidmiseks"
 
-#: ../ui/evolution-mail-global.xml.h:5
 msgid "Create or edit Search Folder definitions"
 msgstr "Otsikausta kirjelduste loomine või muutmine"
 
-#: ../ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
 msgstr "Uute sõnumite filtreerimisreeglite loomine või muutmine"
 
-#: ../ui/evolution-mail-global.xml.h:7
 msgid "Download messages of accounts/folders marked for offline"
 msgstr ""
 "Sõnumite allalaadimine võrguvaba režiimi jaoks märgitud kontodele ja "
 "kaustadele"
 
-#: ../ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
 msgstr "Tühjenda _prügist"
 
-#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
 msgid "F_older"
 msgstr "Ka_ust"
 
-#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "Valitud kausta ümbertõstmine teise kausta alla"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "Eemaldab lõplikult kõikidest kaustadest kõik kustutatud sõnumid"
 
-#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "_Otsingukaustad"
 
-#: ../ui/evolution-mail-global.xml.h:14
 msgid "Show Message _Preview"
 msgstr "Näita sõnumi _eelvaadet"
 
-#: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview below the message list"
 msgstr "Sõnumi eelvaate näitamine sõnumiloendi all"
 
-#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview side-by-side with the message list"
 msgstr "Sõnumi eelvaate näitamine sõnumiloendi kõrval"
 
-#: ../ui/evolution-mail-global.xml.h:17
 msgid "Show message preview window"
 msgstr "Sõnumi eelvaateakna näitamine"
 
-#: ../ui/evolution-mail-global.xml.h:18
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Kaugserveris olevate kaustade tellimine või tellimusest loobumine"
 
-#: ../ui/evolution-mail-global.xml.h:19
 msgid "View the debug console for log messages"
 msgstr "Silumiskonsoolilt logiteadete vaatamine"
 
-#: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
 msgstr "_Klassikaline vaade"
 
-#: ../ui/evolution-mail-global.xml.h:21
 msgid "_Copy Folder To..."
 msgstr "_Kopeeri kaustad asukohta..."
 
-#: ../ui/evolution-mail-global.xml.h:22
 msgid "_Debug Logs"
 msgstr "Silumislo_gid"
 
-#: ../ui/evolution-mail-global.xml.h:23
 msgid "_Download Messages for Offline Usage"
 msgstr ""
 
-#: ../ui/evolution-mail-global.xml.h:25
 msgid "_Message Filters"
 msgstr "Sõnumif_iltrid"
 
-#: ../ui/evolution-mail-global.xml.h:26
 msgid "_Move Folder To..."
 msgstr "_Tõsta kaustad asukohta..."
 
-#: ../ui/evolution-mail-global.xml.h:27
 msgid "_New..."
 msgstr "_Uus..."
 
-#: ../ui/evolution-mail-global.xml.h:28
 msgid "_Preview"
 msgstr "_Eelvaade"
 
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:32
 msgid "_Subscriptions"
 msgstr "_Tellimused"
 
-#: ../ui/evolution-mail-global.xml.h:33
 msgid "_Vertical View"
 msgstr "_Vertikaalne vaade"
 
-#: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
 msgstr "Kausta nime muutmine"
 
-#: ../ui/evolution-mail-list.xml.h:2
 msgid "Change the properties of this folder"
 msgstr "Kausta omaduste muutmine"
 
-#: ../ui/evolution-mail-list.xml.h:3
 msgid "Collapse All _Threads"
 msgstr "A_henda kõik lõimed"
 
-#: ../ui/evolution-mail-list.xml.h:4
 msgid "Collapse all message threads"
 msgstr "Kõigi sõnumilõimede ahendamine"
 
-#: ../ui/evolution-mail-list.xml.h:5
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Valitud sõnumi(te) kopeerimine lõikelauale"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:7
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Valitud sõnumi(te) ümbertõstmine lõikelauale"
 
-#: ../ui/evolution-mail-list.xml.h:8
 msgid "E_xpand All Threads"
 msgstr "A_va kõik lõimed"
 
-#: ../ui/evolution-mail-list.xml.h:9
 msgid "E_xpunge"
 msgstr "_Tühjenda"
 
-#: ../ui/evolution-mail-list.xml.h:10
 msgid "Expand all message threads"
 msgstr "Kõigi sõnumilõimede avamine"
 
-#: ../ui/evolution-mail-list.xml.h:12
 msgid "Hide S_elected Messages"
 msgstr "Peida _valitud sõnumid"
 
-#: ../ui/evolution-mail-list.xml.h:13
 msgid "Hide _Deleted Messages"
 msgstr "Peida _kustutatud sõnumid"
 
-#: ../ui/evolution-mail-list.xml.h:14
 msgid "Hide _Read Messages"
 msgstr "Peida _loetud sõnumid"
 
-#: ../ui/evolution-mail-list.xml.h:15
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 "Kustutatud sõnumite peitmine selle asemel, et neid läbikriipsutatuna kuvada"
 
-#: ../ui/evolution-mail-list.xml.h:16
 msgid "Mar_k All Messages as Read"
 msgstr "Märgi sõnumid _loetuks"
 
-#: ../ui/evolution-mail-list.xml.h:17
 msgid "Mark all messages in the folder as read"
 msgstr "Kõigi selles kaustas olevate sõnumite märkimine loetuks"
 
-#: ../ui/evolution-mail-list.xml.h:18
 msgid "Paste message(s) from the clipboard"
 msgstr "Asetab sõnumid lõikepuhvrist"
 
-#: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Kõigi selles kaustas olevate sõnumite lõplik eemaldamine"
 
-#: ../ui/evolution-mail-list.xml.h:20
 msgid "Permanently remove this folder"
 msgstr "Kausta lõplik eemaldamine"
 
-#: ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh..."
 msgstr "_Värskenda..."
 
-#: ../ui/evolution-mail-list.xml.h:22
 msgid "Refresh the folder"
 msgstr "Kausta värskendamine"
 
-#: ../ui/evolution-mail-list.xml.h:23
 msgid "Select Message S_ubthread"
 msgstr "Vali sõnumi ala_mlõim"
 
-#: ../ui/evolution-mail-list.xml.h:24
 msgid "Select Message _Thread"
 msgstr "Vali sõnumi _lõim"
 
-#: ../ui/evolution-mail-list.xml.h:25
 msgid "Select _All Messages"
 msgstr "Vali _kõik sõnumid"
 
-#: ../ui/evolution-mail-list.xml.h:26
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Kõibi hetkel valimata sõnumite valimine"
 
-#: ../ui/evolution-mail-list.xml.h:27
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Valitud sõnumiga samas lõimes olevate sõnumite valimine"
 
-#: ../ui/evolution-mail-list.xml.h:28
 msgid "Select all replies to the currently selected message"
 msgstr "Valitud sõnumi vastuste valimine"
 
-#: ../ui/evolution-mail-list.xml.h:29
 msgid "Select all visible messages"
 msgstr "Kõigi peitmata sõnumite valimine"
 
-#: ../ui/evolution-mail-list.xml.h:30
 msgid "Show Hidde_n Messages"
 msgstr "_Näita peidetud sõnumeid"
 
-#: ../ui/evolution-mail-list.xml.h:31
 msgid "Show messages that have been temporarily hidden"
 msgstr "Ajutiselt peidetud sõnumite peidust väljatoomine"
 
-#: ../ui/evolution-mail-list.xml.h:32
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Kõigi loetud sõnumite ajutine peitmine"
 
-#: ../ui/evolution-mail-list.xml.h:33
 msgid "Temporarily hide the selected messages"
 msgstr "Valitud sõnumite ajutine peitmine"
 
-#: ../ui/evolution-mail-list.xml.h:34
 msgid "Threaded Message list"
 msgstr "Sõnumite esitamine jutulõngadena"
 
-#: ../ui/evolution-mail-list.xml.h:36
 msgid "_Group By Threads"
 msgstr "_Grupeeri lõimedena"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
-#: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Sõnum"
 
-#: ../ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "Lisa saatja _aadressiraamatusse"
 
-#: ../ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
 msgstr "_Rakenda filtreid"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-message.xml.h:4
 msgid "Add Sender to Address Book"
 msgstr "Saatja lisamine aadressiraamatusse"
 
-#: ../ui/evolution-mail-message.xml.h:5
 msgid "All Message _Headers"
 msgstr "Kõik sõnumi _päised"
 
-#: ../ui/evolution-mail-message.xml.h:6
 msgid "Apply filter rules to the selected messages"
 msgstr "Valitud sõnumitele filtreerimisreeglite rakendamine"
 
-#: ../ui/evolution-mail-message.xml.h:7
 msgid "Check for _Junk"
 msgstr "Kontrolli _rämpsu"
 
-#: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose _New Message"
 msgstr "Koosta _uus sõnum"
 
-#: ../ui/evolution-mail-message.xml.h:9
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Vastuse koostamine kõigile valitud sõnumi adressaatidele"
 
-#: ../ui/evolution-mail-message.xml.h:10
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Vastuse koostamine valitud sõnumi postiloendisse"
 
-#: ../ui/evolution-mail-message.xml.h:11
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Vastuse koostamine valitud sõnumi saatjale"
 
-#: ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected messages to another folder"
 msgstr "Valitud sõnumi kopeerimine teise kausta"
 
-#: ../ui/evolution-mail-message.xml.h:13
 msgid "Copy selected messages to the clipboard"
 msgstr "Valitud sõnumite kopeerimine lõikelauale"
 
-#: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
 msgstr "Loo _reegel"
 
-#: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a Search Folder for these recipients"
 msgstr "Otsingukausta loomine nende adressaatide jaoks"
 
-#: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a Search Folder for this mailing list"
 msgstr "Otsingukausta loomine selle postiloendi jaoks"
 
-#: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a Search Folder for this sender"
 msgstr "Otsingukausta loomine selle saatja jaoks"
 
-#: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a Search Folder for this subject"
 msgstr "Otsingukausta loomine selle teema jaoks"
 
-#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a rule to filter messages from this sender"
 msgstr "Reegli loomine selle saatja poolt saadetud sõnumite filtreerimiseks"
 
-#: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 "Reegli loomine nendele adressaatidele saadetud sõnumite filtreerimiseks"
 
-#: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 "Reegli loomine sellese postiloendisse saadetud sõnumite filtreerimiseks"
 
-#: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a rule to filter messages with this subject"
 msgstr "Reegli loomine selle teemaga sõnumite filtreerimiseks"
 
-#: ../ui/evolution-mail-message.xml.h:23
 msgid "Cut selected messages to the clipboard"
 msgstr "Valitud sõnumite ümbertõstmine lõikelauale"
 
-#: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
 msgstr "Teksti suuruse vähendamine"
 
-#: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next important message"
 msgstr "Järgmise tähtsa sõnumi kuvamine"
 
-#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next message"
 msgstr "Järgmise sõnumi kuvamine"
 
-#: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next thread"
 msgstr "Järgmise jutulõnga kuvamine"
 
-#: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread message"
 msgstr "Järgmise lugemata sõnumi kuvamine"
 
-#: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous important message"
 msgstr "Eelmise tähtsa sõnumi kuvamine"
 
-#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous message"
 msgstr "Eelmise sõnumi kuvamine"
 
-#: ../ui/evolution-mail-message.xml.h:32
 msgid "Display the previous unread message"
 msgstr "Eelmise lugemata sõnumi kuvamine"
 
-#: ../ui/evolution-mail-message.xml.h:33
 msgid "F_orward As..."
 msgstr "_Edasta kui..."
 
-#: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Filter _postiloendi järgi"
 
-#: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "Filter _saatja järgi"
 
-#: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "Filter _adressaatide järgi"
 
-#: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "Filter _teema järgi"
 
-#: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
 msgstr "Valitud sõnumitest rämpsu filtreerimine"
 
-#: ../ui/evolution-mail-message.xml.h:39
 msgid "Flag selected messages for follow-up"
 msgstr "Valitud sõnumite märgistamine järeltoiminguks"
 
-#: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr "_Jälgi..."
 
-#: ../ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr "HTML-vormingus sõnumi piltide laadimine"
 
-#: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "Valitud sõnumi kellelegi edastamine (saadetava sõnumi sees)"
 
-#: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "Valitud sõnumi kellelegi edastamine (tsitaadina)"
 
-#: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "Valitud sõnumi kellelegi edastamine"
 
-#: ../ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Valitud sõnumi kellelegi edastamine (manusena)"
 
-#: ../ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Teksti suuruse suurendamine"
 
-#: ../ui/evolution-mail-message.xml.h:49
 msgid "Mar_k as"
 msgstr "Märgi _kui"
 
-#: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected messages as having been read"
 msgstr "Valitud sõnumite märkimine loetuks"
 
-#: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages as important"
 msgstr "Valitud sõnumite märkimine tähtsaks"
 
-#: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected messages as junk"
 msgstr "Valitud sõnumite märkimine rämpsuks"
 
-#: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected messages as not being junk"
 msgstr "Valitud sõnumite märkimine mitterämpsuks"
 
-#: ../ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected messages as not having been read"
 msgstr "Valitud sõnumite märkimine lugemata sõnumiteks"
 
-#: ../ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages as unimportant"
 msgstr "Valitud sõnumite märkimine vähetähtsaks"
 
-#: ../ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected messages for deletion"
 msgstr "Valitud sõnumite märkimine kustutatuks"
 
-#: ../ui/evolution-mail-message.xml.h:57
 msgid "Move selected messages to another folder"
 msgstr "Valitud sõnumite ümbertõstmine teise kausta"
 
-#: ../ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
 msgstr "Jä_rgmine tähtis sõnum"
 
-#: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Thread"
 msgstr "Järgmine _lõim"
 
-#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Unread Message"
 msgstr "Järgmine _lugemata sõnum"
 
-#: ../ui/evolution-mail-message.xml.h:62
 msgid "Not Junk"
 msgstr "Pole rämps"
 
-#: ../ui/evolution-mail-message.xml.h:63
 msgid "Open a window for composing a mail message"
 msgstr "Sõnumi koostamiseks uue akna avamine"
 
-#: ../ui/evolution-mail-message.xml.h:64
 msgid "Open the selected messages in a new window"
 msgstr "Valitud sõnumi avamine uues aknas"
 
-#: ../ui/evolution-mail-message.xml.h:65
 msgid "Open the selected messages in the composer for editing"
 msgstr "Valitud sõnumi avamine sõnumiredaktoris"
 
-#: ../ui/evolution-mail-message.xml.h:66
 msgid "P_revious Unread Message"
 msgstr "_Eelmine lugemata sõnum"
 
-#: ../ui/evolution-mail-message.xml.h:67
 msgid "Paste messages from the clipboard"
 msgstr "Sõnumite asetamine lõikepuhvrist"
 
-#: ../ui/evolution-mail-message.xml.h:68
 msgid "Pos_t New Message to Folder"
 msgstr "Pos_tita uus sõnum kausta"
 
-#: ../ui/evolution-mail-message.xml.h:69
 msgid "Post a Repl_y"
 msgstr "Postita _vastus"
 
-#: ../ui/evolution-mail-message.xml.h:70
 msgid "Post a message to a Public folder"
 msgstr "Sõnumi postitamine avalikku kausta"
 
-#: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a reply to a message in a Public folder"
 msgstr "Vastuse postitamine avalikku kausta"
 
-#: ../ui/evolution-mail-message.xml.h:72
 msgid "Pr_evious Important Message"
 msgstr "_Eelmine tähtis sõnum"
 
-#: ../ui/evolution-mail-message.xml.h:73
 msgid "Preview the message to be printed"
 msgstr "Prinditava sõnumi eelvaatlemine"
 
-#: ../ui/evolution-mail-message.xml.h:77
 msgid "Print this message"
 msgstr "Valitud sõnumi printimine"
 
-#: ../ui/evolution-mail-message.xml.h:78
 msgid "Re_direct"
 msgstr "Ümber_suunamine"
 
-#: ../ui/evolution-mail-message.xml.h:79
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Valitud sõnumite edastamine kellelegi"
 
-#: ../ui/evolution-mail-message.xml.h:84
 msgid "Reset the text to its original size"
 msgstr "Teksti algse suuruse taastamine"
 
-#: ../ui/evolution-mail-message.xml.h:85
 msgid "Save the selected messages as a text file"
 msgstr "Sõnumi salvestamine tekstifaili"
 
-#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search Folder from Mailing _List..."
 msgstr "Otsingukaust posti_loendi järgi..."
 
-#: ../ui/evolution-mail-message.xml.h:87
 msgid "Search Folder from Recipien_ts..."
 msgstr "Otsingukaust a_dressaatide järgi..."
 
-#: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from S_ubject..."
 msgstr "Otsingukaust _teema järgi..."
 
-#: ../ui/evolution-mail-message.xml.h:89
 msgid "Search Folder from Sen_der..."
 msgstr "Otsingukaust _saatja järgi..."
 
-#: ../ui/evolution-mail-message.xml.h:90
 msgid "Search for text in the body of the displayed message"
 msgstr "Teksti otsimine kuvatava sõnumi sisust"
 
-#: ../ui/evolution-mail-message.xml.h:91
 msgid "Select _All Text"
 msgstr "V_ali kogu tekst"
 
-#: ../ui/evolution-mail-message.xml.h:92
 msgid "Select all the text in a message"
 msgstr "Sõnumi kogu teksti valimine"
 
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "Lehekülje sätted aktiivse printeri jaoks"
 
-#: ../ui/evolution-mail-message.xml.h:94
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Kuvatava sõnumi sisus vilkuva kursori näitamine"
 
-#: ../ui/evolution-mail-message.xml.h:95
 msgid "Show messages with all email headers"
 msgstr "Sõnumit näitamine koos kõigi e-posti päistega"
 
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "Sõnumit näitamine töötlemata kujul"
 
-#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "Valitud sõnumi kustutamise tühistamine"
 
-#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "_Vähetähtis"
 
-#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "_Vähenda"
 
-#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "_Manustatud"
 
-#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "_Kursorirežiim"
 
-#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "_Eemalda märgistus"
 
-#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "_Kustuta sõnum"
 
-#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "_Otsi sõnumist..."
 
-#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "Märgista kui _lõpetatud"
 
-#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "_Liigu"
 
-#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "_Tähtis"
 
-#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "Samal _joonel"
 
-#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "_Rämps"
 
-#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "_Laadi pildid"
 
-#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "Sõnumi _lähtetekst"
 
-#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "_Järgmine sõnum"
 
-#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "_Tavaline suurus"
 
-#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "_Pole rämps"
 
-#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "_Ava uues aknas"
 
-#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "_Eelmine sõnum"
 
-#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "_Tsitaadina"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "_Loetud"
 
-#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "_Salvesta sõnum..."
 
-#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "_Tühista kustutus"
 
-#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "Lu_gemata"
 
-#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
 msgstr "_Suurendus"
 
-#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "_Suurenda"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:1
 msgid "Close"
 msgstr "Sulge"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Peatööriistariba"
 
-#: ../ui/evolution-memos.xml.h:3
 msgid "Copy selected memo"
 msgstr "Valitud märkme kopeerimine"
 
-#: ../ui/evolution-memos.xml.h:5
 msgid "Cut selected memo"
 msgstr "Valitud märkme lõikamine"
 
-#: ../ui/evolution-memos.xml.h:7
 msgid "Delete selected memos"
 msgstr "Valitud märkmete kustutamine"
 
-#: ../ui/evolution-memos.xml.h:9
 msgid "Paste memo from the clipboard"
 msgstr "Märkme asetamine lõikepuhvrist"
 
-#: ../ui/evolution-memos.xml.h:10
 msgid "Previews the list of memos to be printed"
 msgstr "Prinditavate märkmete eelvaatlemine"
 
-#: ../ui/evolution-memos.xml.h:13
 msgid "Print the list of memos"
 msgstr "Märkmete loendi printimine"
 
-#: ../ui/evolution-memos.xml.h:14
 msgid "View the selected memo"
 msgstr "Valitud märkme vaatamine"
 
-#: ../ui/evolution-memos.xml.h:18
 msgid "_Open Memo"
 msgstr "_Ava märge"
 
-#: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "Valitud ülesannete kopeerimine"
 
-#: ../ui/evolution-tasks.xml.h:5
 msgid "Cut selected tasks"
 msgstr "Valitud ülesannete lõikamine"
 
-#: ../ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "Lõpetatud ülesannete kustutamine"
 
-#: ../ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "Valitud ülesannete kustutamine"
 
-#: ../ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "_Märgi lõpetatuks"
 
-#: ../ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "Valitud ülesannete märkimine lõpetatuks"
 
-#: ../ui/evolution-tasks.xml.h:12
 msgid "Paste tasks from the clipboard"
 msgstr "Lõikepuhvrist ülesannete asetamine"
 
-#: ../ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "Prinditavate kontaktide eelvaatlemine"
 
-#: ../ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "Ülesannete loendi printimine"
 
-#: ../ui/evolution-tasks.xml.h:18
 msgid "Show task preview window"
 msgstr "Ülesande kuvamine eelvaateaknas"
 
-#: ../ui/evolution-tasks.xml.h:19
 msgid "Task _Preview"
 msgstr "Ülesande _eelvaade"
 
-#: ../ui/evolution-tasks.xml.h:20
 msgid "View the selected task"
 msgstr "Valitud ülesande vaatamine"
 
-#: ../ui/evolution-tasks.xml.h:27
 msgid "_Open Task"
 msgstr "Ava _ülesanne"
 
-#: ../ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "Evolutionist..."
 
-#: ../ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Evolutioni sätete muutmine"
 
-#: ../ui/evolution.xml.h:3
 msgid "Change the visibility of the toolbar"
 msgstr "Tööriistariba näitamine/peitmine"
 
-#: ../ui/evolution.xml.h:5
 msgid "Create a new window displaying this folder"
 msgstr "Uue akna loomine, mis kuvab seda kausta"
 
-#: ../ui/evolution.xml.h:6
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Aknanuppude kuvamine vastavalt töölaua tööriistariba sätetele"
 
-#: ../ui/evolution.xml.h:7
 msgid "Display window buttons with icons and text"
 msgstr "Aknanuppude kuvamine ikoonide ja tekstina"
 
-#: ../ui/evolution.xml.h:8
 msgid "Display window buttons with icons only"
 msgstr "Aknanuppude kuvamine ainult ikoonidena"
 
-#: ../ui/evolution.xml.h:9
 msgid "Display window buttons with text only"
 msgstr "Aknanuppude kuvamine ainult tekstina"
 
-#: ../ui/evolution.xml.h:10
 msgid "Evolution _FAQ"
 msgstr "Evolutioni _KKK"
 
-#: ../ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Programmist väljumine"
 
-#: ../ui/evolution.xml.h:12
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 "Meeldejäetud paroolide unustamine, vajadusel küsitakse paroolid uuesti."
 
-#: ../ui/evolution.xml.h:13
 msgid "Hide window buttons"
 msgstr "Akna nuppude peitmine"
 
-#: ../ui/evolution.xml.h:14
 msgid "I_mport..."
 msgstr "_Impordi..."
 
-#: ../ui/evolution.xml.h:15
 msgid "Icons _and Text"
 msgstr "Ikoonid j_a tekst"
 
-#: ../ui/evolution.xml.h:16
 msgid "Import data from other programs"
 msgstr "Andmete importimine teistest programmidest"
 
-#: ../ui/evolution.xml.h:17
 msgid "Lay_out"
 msgstr "Pai_gutus"
 
-#: ../ui/evolution.xml.h:19
 msgid "New _Window"
 msgstr "Uus _aken"
 
-#: ../ui/evolution.xml.h:20
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Korduma Kippuvate Küsimuste veebilehe avamine"
 
-#: ../ui/evolution.xml.h:21
 msgid "Page Set_up..."
 msgstr "Le_hekülje sätted..."
 
-#: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
 msgstr "_Eelistused"
 
-#: ../ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Saatmine ja vastuvõtmine"
 
-#: ../ui/evolution.xml.h:24
 msgid "Send / _Receive"
 msgstr "Saada / _võta vastu"
 
-#: ../ui/evolution.xml.h:25
 msgid "Send queued items and retrieve new items"
 msgstr "Järjekorras olevate sõnumite ärasaatmine ja uute vastuvõtmine"
 
-#: ../ui/evolution.xml.h:26
 msgid "Set up Pilot configuration"
 msgstr "Pilot'i sätete määramine"
 
-#: ../ui/evolution.xml.h:28
 msgid "Show Side _Bar"
 msgstr "Näita _külgpaani"
 
-#: ../ui/evolution.xml.h:29
 msgid "Show _Status Bar"
 msgstr "Näita _olekuriba"
 
-#: ../ui/evolution.xml.h:30
 msgid "Show _Toolbar"
 msgstr "Näita _tööriistariba"
 
-#: ../ui/evolution.xml.h:31
 msgid "Show information about Evolution"
 msgstr "Evolutioni kohta teabe näitamine"
 
-#: ../ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "Saada veateade"
 
-#: ../ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "Saada _veateade"
 
-#: ../ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Veateate saatmine Bug Buddy abil"
 
-#: ../ui/evolution.xml.h:35
 msgid "Toggle whether we are working offline."
 msgstr "Võrguvaba oleku sisse- või väljalülitamine"
 
-#: ../ui/evolution.xml.h:36
 msgid "Tool_bar Style"
 msgstr "Tööriistari_ba laad"
 
-#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Side Bar"
 msgstr "Külgpaani näitamine/peitmine"
 
-#: ../ui/evolution.xml.h:38
 msgid "View/Hide the Status Bar"
 msgstr "Olekuriba näitamine/peitmine"
 
-#: ../ui/evolution.xml.h:39
 msgid "Work _Offline"
 msgstr "Tööta _võrguvabas olekus"
 
-#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "_Programmist lähemalt"
 
-#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "_Sulge aken"
 
-#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "Unusta _paroolid"
 
-#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "_Korduma kippuvad küsimused"
 
-#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "_Peida nupud"
 
-#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "Ainult _ikoonid"
 
-#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "Välk_juhend"
 
-#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "_Välju"
 
-#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "Ümber_lülitaja välimus"
 
-#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "_Sünkroniseerimisvalikud..."
 
-#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "Ainult _tekst"
 
-#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_Aken"
 
-#: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "_Firma järgi"
 
-#: ../views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
 msgstr "_Aadressikaardid"
 
-#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
 msgid "_List View"
 msgstr "_Loeteluvaade"
 
-#: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
 msgstr "_Nädala vaade"
 
-#: ../views/calendar/galview.xml.h:2
 msgid "_Day View"
 msgstr "_Päeva vaade"
 
-#: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "_Kuu vaade"
 
-#: ../views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "_Töönädala vaade"
 
-#: ../views/mail/galview.xml.h:1
 msgid "As Sent Folder for Wi_de View"
 msgstr "Saa_detud sõnumite kausta laivaatena"
 
-#: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr "S_aadetud sõnumite kaustana"
 
-#: ../views/mail/galview.xml.h:3
 msgid "By S_tatus"
 msgstr "_Oleku järgi"
 
-#: ../views/mail/galview.xml.h:4
 msgid "By Se_nder"
 msgstr "_Saatja järgi"
 
-#: ../views/mail/galview.xml.h:5
 msgid "By Su_bject"
 msgstr "_Teema järgi"
 
-#: ../views/mail/galview.xml.h:6
 msgid "By _Follow Up Flag"
 msgstr "_Järeltoimingu märgistuse järgi"
 
-#: ../views/mail/galview.xml.h:7
 msgid "For _Wide View"
 msgstr "_Laivaade"
 
-#: ../views/mail/galview.xml.h:8
 msgid "_Messages"
 msgstr "_Sõnumitena"
 
-#: ../views/memos/galview.xml.h:1
 msgid "_Memos"
 msgstr "_Märkmed"
 
-#: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
 msgstr "_Tähtajaga"
 
-#: ../views/tasks/galview.xml.h:2
 msgid "With _Status"
 msgstr "_Staatusega"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "<b>Time Zones</b>"
 msgstr "<b>Ajavööndid</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "<b>_Selection</b>"
 msgstr "<b>_Valik</b>"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "Select a Time Zone"
 msgstr "Ajavööndi valimine"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Timezone drop-down combination box"
-msgstr ""
+msgstr "Ajavööndi kombineeritud valikukast"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -22557,367 +16888,255 @@ msgstr ""
 "Kasuta vasakut hiirenuppu, et kaarti suurendada ja ajavööndit valida.\n"
 "Parema hiirenupuga saab kaarti vähendada."
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
-#: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "Kollektsioon"
 
-#: ../widgets/menus/gal-define-views-dialog.c:358
-#: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Vaadete kirjeldamine %s jaoks"
 
-#: ../widgets/menus/gal-define-views-dialog.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:368
 msgid "Define Views"
 msgstr "Kirjelda vaateid"
 
-#: ../widgets/menus/gal-define-views.glade.h:2
 #, no-c-format
 msgid "Define Views for \"%s\""
 msgstr "\"%s\" jaoks vaadete kirjeldamine"
 
-#: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1922
-#: ../widgets/table/e-table-scrolled.c:215
-#: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
 msgstr "Tabel"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
 msgid "Instance"
 msgstr "Instants"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "Salvesta käesolev vaade"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
 msgid "_Create new view"
 msgstr "_Loo uue vaade"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Replace existing view"
 msgstr "_Asenda olemasolev vaade"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:582
-#: ../widgets/menus/gal-view-menus.c:368
 msgid "Custom View"
 msgstr "Kohandatud vaade"
 
-#: ../widgets/menus/gal-view-instance.c:583
 msgid "Save Custom View"
 msgstr "Salvesta kohandatud vaade"
 
-#: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:392
 msgid "Define Views..."
 msgstr "Kirjelda vaateid..."
 
-#: ../widgets/menus/gal-view-menus.c:305
 msgid "C_urrent View"
 msgstr "Käesolev _vaade"
 
-#: ../widgets/menus/gal-view-menus.c:329
 #, c-format
 msgid "Select View: %s"
 msgstr "Vaate \"%s\" valimine"
 
-#: ../widgets/menus/gal-view-menus.c:373
 msgid "Current view is a customized view"
 msgstr "Praegune vaade on kohandatud vaade"
 
-#: ../widgets/menus/gal-view-menus.c:378
 msgid "Save Custom View..."
 msgstr "Salvesta kohandatud vaade..."
 
-#: ../widgets/menus/gal-view-menus.c:383
 msgid "Save current custom view"
 msgstr "Käesoleva vaate salvestamine"
 
-#: ../widgets/menus/gal-view-menus.c:397
 msgid "Create or edit views"
 msgstr "Vaadete loomine ja muutmine"
 
-#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "Factory"
 
-#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "Uue vaate kirjeldamine"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
 msgid "Name of new view:"
 msgstr "Uue vaate nimi:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
 msgid "Type of View"
 msgstr "Vaate liik"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
 msgid "Type of view:"
 msgstr "Vaate liik:"
 
-#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "Manuseriba"
 
-#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
-#: ../widgets/misc/e-attachment.c:591 ../widgets/misc/e-attachment.c:608
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Faili pole võimalik manusesse lisada: %s: %s"
 
-#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Faili %s pole võimalik manusesse lisada: see ei ole tavaline fail"
 
-#: ../widgets/misc/e-attachment.glade.h:1
 msgid "Attachment Properties"
 msgstr "Manuse omadused"
 
-#: ../widgets/misc/e-attachment.glade.h:3
 msgid "File name:"
 msgstr "Faili nimi:"
 
-#: ../widgets/misc/e-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "MIME tüüp:"
 
-#: ../widgets/misc/e-attachment.glade.h:5
 msgid "Suggest automatic display of attachment"
 msgstr "Soovitan manust automaatselt kuvada"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1267
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
 msgstr "Kuu kalender"
 
-#: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
-#: ../widgets/text/e-text.c:3644
 msgid "Fill color"
 msgstr "Täitevärvus"
 
-#: ../widgets/misc/e-canvas-background.c:460
-#: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
-#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
-#: ../widgets/text/e-text.c:3659
 msgid "GDK fill color"
 msgstr "GDK täitevärvus"
 
-#: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
-#: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "Täpiline täide"
 
-#: ../widgets/misc/e-canvas-background.c:481
-#: ../widgets/misc/e-canvas-background.c:482
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:488
-#: ../widgets/misc/e-canvas-background.c:489
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:495
-#: ../widgets/misc/e-canvas-background.c:496
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:502
-#: ../widgets/misc/e-canvas-background.c:503
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:999
-#: ../widgets/table/e-table-group-leaf.c:644
-#: ../widgets/table/e-table-item.c:3074
 msgid "Minimum width"
 msgstr "Vähim laius"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:1000
-#: ../widgets/table/e-table-group-leaf.c:645
-#: ../widgets/table/e-table-item.c:3075
 msgid "Minimum Width"
 msgstr "Vähim laius"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "Jaotus"
 
-#: ../widgets/misc/e-cell-date-edit.c:290
 msgid "Now"
 msgstr "Praegu"
 
-#: ../widgets/misc/e-cell-date-edit.c:847
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Kellaaeg peab olema sisestatud %s formaadis"
 
-#: ../widgets/misc/e-cell-percent.c:78
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Protsendi väärtus peab olema 0 - 100."
 
-#: ../widgets/misc/e-charset-picker.c:57
 msgid "Arabic"
 msgstr "Araabia"
 
-#: ../widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Balti"
 
-#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Kesk-Euroopa"
 
-#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Hiina"
 
-#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Kirillitsa"
 
-#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Kreeka"
 
-#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
 msgstr "Heebrea"
 
-#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "Jaapani"
 
-#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "Korea"
 
-#: ../widgets/misc/e-charset-picker.c:66
 msgid "Thai"
 msgstr "Tai"
 
-#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Türgi"
 
-#: ../widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr "Lääne-Euroopa"
 
-#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "Lääne-Euroopa, uust"
 
-#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
-#: ../widgets/misc/e-charset-picker.c:91
 msgid "Traditional"
 msgstr "Traditsiooniline"
 
-#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
 msgid "Simplified"
 msgstr "Lihtsustatud"
 
-#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
 msgstr "Ukraina"
 
-#: ../widgets/misc/e-charset-picker.c:101
 msgid "Visual"
 msgstr "Visuaalne"
 
-#: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Tundmatu kooditabel: %s"
 
-#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "Kooditabel"
 
-#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr "Sisesta kasutatav kooditabel"
 
-#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "Muu..."
 
-#: ../widgets/misc/e-charset-picker.c:599
 msgid "Ch_aracter Encoding"
 msgstr "K_ooditabel"
 
-#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "Kuupäev ja aeg"
 
-#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "Tekstiväli kuupäeva sisestamiseks"
 
-#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "Kalendri näitamiseks klõpsa sellel nupul"
 
-#: ../widgets/misc/e-dateedit.c:394
 msgid "Drop-down combination box to select time"
 msgstr "Ajavalimiseks kasutatav kombineeritud valikukast"
 
-#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "_Praegu"
 
-#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "_Täna"
 
-#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "Vigane kuupäeva väärtus"
 
-#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "Vigane aja väärtus"
 
-#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "Laiendatud"
 
-#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "Kas laiendaja on laiendatud või mitte"
 
-#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "Laiendaja sildi tekst"
 
-#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "Kasuta allakriipsutust"
 
-#: ../widgets/misc/e-expander.c:197
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -22925,90 +17144,68 @@ msgstr ""
 "Määramise korral tähendab tekstis olev alakriips, et sellest järgnevale "
 "märgile vastav klahv on menemooniline kiirendusklahv"
 
-#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "Sildividin"
 
-#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3390
 msgid "Expander Size"
 msgstr "Laiendaja suurus"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3391
 msgid "Size of the expander arrow"
 msgstr "Laienduse noole suurus"
 
-#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "Indikaatorivahe"
 
-#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "Ruum laiendaja noole ümber"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:126 ../widgets/misc/e-filter-bar.c:179
-#: ../widgets/misc/e-filter-bar.c:307 ../widgets/misc/e-filter-bar.c:749
 msgid "Advanced Search"
 msgstr "Laiendatud otsing"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
 msgstr "Salvesta otsing"
 
-#: ../widgets/misc/e-filter-bar.c:267
 msgid "_Searches"
 msgstr "_Otsingud"
 
-#: ../widgets/misc/e-filter-bar.c:269
 msgid "Searches"
 msgstr "Otsingud"
 
-#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
 msgid "_Save Search..."
 msgstr "_Salvesta otsing..."
 
-#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
 msgid "_Edit Saved Searches..."
 msgstr "_Redigeeri salvestatud otsinguid..."
 
-#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
 msgid "_Advanced Search..."
 msgstr "_Laiendatud otsing..."
 
-#: ../widgets/misc/e-filter-bar.h:107
 msgid "All Accounts"
 msgstr "Kõigist kontodest"
 
-#: ../widgets/misc/e-filter-bar.h:108
 msgid "Current Account"
 msgstr "Käesolevast kontost"
 
-#: ../widgets/misc/e-filter-bar.h:109
 msgid "Current Folder"
 msgstr "Käesolevast kaustast"
 
-#: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
 msgstr "Käesolevast sõnumist"
 
-#: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
 msgstr "Vali pilt"
 
-#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Maailmakaart"
 
-#: ../widgets/misc/e-map.c:629
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -23016,146 +17213,108 @@ msgstr ""
 "Hiirel põhinev interaktiivne kaart ajavööndi valimiseks. "
 "Klaviatuurikasutajad peaksid ajavööndi valima allolevast valikukastist."
 
-#: ../widgets/misc/e-online-button.c:106
 msgid "Online"
 msgstr ""
 
-#: ../widgets/misc/e-online-button.c:107
 msgid "The button state is online"
 msgstr ""
 
-#: ../widgets/misc/e-pilot-settings.c:102
 msgid "Sync with:"
 msgstr "Millega sünkroniseerida:"
 
-#: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
 msgstr "Isiklike kirjete sünkroniseerimine"
 
-#: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
 msgstr "Katekooriate sünkroniseerimine:"
 
-#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
 msgid "Empty message"
 msgstr "Tühi sõnum"
 
-#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
 msgid "Reflow model"
 msgstr ""
 
-#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
 msgid "Column width"
 msgstr "Veeru laius"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
 msgid "Search"
 msgstr "Otsing"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
 msgid "Click here to change the search type"
 msgstr "Otsinguliigi muutmiseks klõpsa siia"
 
-#: ../widgets/misc/e-search-bar.c:603
 msgid "_Search"
 msgstr "_Otsing"
 
-#: ../widgets/misc/e-search-bar.c:609
 msgid "_Find Now"
 msgstr "_Otsing"
 
-#: ../widgets/misc/e-search-bar.c:610
 msgid "_Clear"
 msgstr "_Puhasta"
 
-#: ../widgets/misc/e-search-bar.c:865
 msgid "Item ID"
 msgstr "Kirje ID"
 
-#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3565
-#: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Tekst"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1003
 msgid "Sho_w: "
 msgstr "_Kategooria: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1020
 msgid "Sear_ch: "
 msgstr "Ot_sing: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1032
 msgid " i_n "
 msgstr ""
 
-#: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:806
 msgid "Cursor Row"
 msgstr "Kursori rida"
 
-#: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:813
 msgid "Cursor Column"
 msgstr "Kursori veerg"
 
-#: ../widgets/misc/e-selection-model.c:209
 msgid "Sorter"
 msgstr "Sortija"
 
-#: ../widgets/misc/e-selection-model.c:216
 msgid "Selection Mode"
 msgstr "Valimise režiim"
 
-#: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
 msgstr "Kursorirežiim"
 
-#: ../widgets/misc/e-send-options.c:522
 msgid "When de_leted:"
 msgstr "Kui _kustutatakse:"
 
-#: ../widgets/misc/e-send-options.glade.h:1
 msgid "<b>Delivery Options</b>"
 msgstr "<b>Kohaletoimetamise valikud</b>"
 
-#: ../widgets/misc/e-send-options.glade.h:2
 msgid "<b>Replies</b>"
 msgstr "<b>Vastused</b>"
 
-#: ../widgets/misc/e-send-options.glade.h:3
 msgid "<b>Return Notification</b>"
 msgstr "<b>Tagastustest teavitamine</b>"
 
-#: ../widgets/misc/e-send-options.glade.h:4
 msgid "<b>Status Tracking</b>"
 msgstr "<b>Oleku jälgimine</b>"
 
-#: ../widgets/misc/e-send-options.glade.h:5
 msgid "A_uto-delete sent item"
 msgstr "Saadetud kirje a_utomaatne kustutamine"
 
-#: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:8
 msgid "Deli_vered and opened"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:9
 msgid "Gene_ral Options"
 msgstr "Ü_ldised valikud"
 
-#: ../widgets/misc/e-send-options.glade.h:10
 msgid ""
 "None\n"
 "Mail Receipt"
@@ -23163,7 +17322,6 @@ msgstr ""
 "Puudub\n"
 "Kinnituse saatmine e-postiga"
 
-#: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
 "Normal\n"
 "Proprietary\n"
@@ -23179,15 +17337,12 @@ msgstr ""
 "Täiesti salajane\n"
 "Ainult Sinu silmadele"
 
-#: ../widgets/misc/e-send-options.glade.h:18
 msgid "R_eply requested"
 msgstr "_Vastuse soov"
 
-#: ../widgets/misc/e-send-options.glade.h:20
 msgid "Sta_tus Tracking"
 msgstr "_Oleku jälgimine"
 
-#: ../widgets/misc/e-send-options.glade.h:21
 msgid ""
 "Undefined\n"
 "High\n"
@@ -23199,258 +17354,189 @@ msgstr ""
 "Tavaline\n"
 "Madal"
 
-#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When acce_pted:"
 msgstr "Kui _nõustutakse:"
 
-#: ../widgets/misc/e-send-options.glade.h:26
 msgid "When co_mpleted:"
 msgstr "Kui _lõpetatakse:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
 msgid "When decli_ned:"
 msgstr "Kui k_eeldutakse:"
 
-#: ../widgets/misc/e-send-options.glade.h:28
 msgid "Wi_thin"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_After:"
 msgstr "_Pärast:"
 
-#: ../widgets/misc/e-send-options.glade.h:30
 msgid "_All information"
 msgstr "_Kogu teave"
 
 #. To translators: This means Delay the message delivery for some time
-#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
 msgstr "_Viivita kohaletoimetamisega"
 
-#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
 msgstr "_Kohale toimetatud"
 
-#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
 msgstr "_Määra aegumistähtaeg"
 
-#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
 msgstr "_Kuni:"
 
-#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:38
 msgid "_When opened:"
 msgstr "Kui _avatakse:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:255
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% valmis)"
 
-#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "URL-i avamiseks klõpsa siin"
 
-#: ../widgets/misc/gal-categories.glade.h:1
 msgid "Edit Master Category List..."
 msgstr "Redigeeri peamist kategooriate nimekirja..."
 
-#: ../widgets/misc/gal-categories.glade.h:2
 msgid "Item(s) belong to these _categories:"
 msgstr "See kontakt kuulub järgnevatesse _kategooriatesse:"
 
-#: ../widgets/misc/gal-categories.glade.h:3
 msgid "_Available Categories:"
 msgstr "_Saadaolevad kategooriad:"
 
-#: ../widgets/misc/gal-categories.glade.h:4
 msgid "categories"
 msgstr "kategooriad"
 
-#: ../widgets/table/e-cell-combo.c:170
 msgid "popup list"
 msgstr "hüpikakende loend"
 
-#: ../widgets/table/e-cell-date.c:62
 msgid "%l:%M %p"
 msgstr "%l:%M %p"
 
-#: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "Valitud veerg"
 
-#: ../widgets/table/e-cell-pixbuf.c:367
 msgid "Focused Column"
 msgstr "Fokusseeritud veerg"
 
-#: ../widgets/table/e-cell-pixbuf.c:374
 msgid "Unselected Column"
 msgstr "Valimata veerg"
 
-#: ../widgets/table/e-cell-text.c:1807
 msgid "Strikeout Column"
 msgstr "Läbikriipsutatud veerg"
 
-#: ../widgets/table/e-cell-text.c:1814
 msgid "Underline Column"
 msgstr "Allajoonitud veerg"
 
-#: ../widgets/table/e-cell-text.c:1821
 msgid "Bold Column"
 msgstr "Rasvane veerg"
 
-#: ../widgets/table/e-cell-text.c:1828
 msgid "Color Column"
 msgstr "Värviline veerg"
 
-#: ../widgets/table/e-cell-text.c:1842
 msgid "BG Color Column"
 msgstr "Taustavärviga veerg"
 
-#: ../widgets/table/e-table-config.c:152
 msgid "State"
 msgstr "Seisund"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(Kasvav)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(Kahanev)"
 
-#: ../widgets/table/e-table-config.c:392
 msgid "Not sorted"
 msgstr "Sortimata"
 
-#: ../widgets/table/e-table-config.c:433
 msgid "No grouping"
 msgstr "Rühmitus puudub"
 
-#: ../widgets/table/e-table-config.c:643
-#: ../widgets/table/e-table-config.glade.h:11
 msgid "Show Fields"
 msgstr "Näidatavad väljad"
 
-#: ../widgets/table/e-table-config.c:664
 msgid "Available Fields"
 msgstr "Saadaolevad väljad"
 
-#: ../widgets/table/e-table-config.glade.h:1
 msgid "A_vailable Fields:"
 msgstr "Saadaolevad _väljad:"
 
-#: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1583
 msgid "Ascending"
 msgstr "Kasvavas järjestuses"
 
-#: ../widgets/table/e-table-config.glade.h:3
 msgid "Clear All"
 msgstr "Puhasta kõik"
 
-#: ../widgets/table/e-table-config.glade.h:4
 msgid "Clear _All"
 msgstr "Puhasta _kõik"
 
-#: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1583
 msgid "Descending"
 msgstr "Kahanevas järjestuses"
 
-#: ../widgets/table/e-table-config.glade.h:8
 msgid "Group Items By"
 msgstr "Kirjete grupeerimine"
 
-#: ../widgets/table/e-table-config.glade.h:9
 msgid "Move _Down"
 msgstr "Liiguta _alla"
 
-#: ../widgets/table/e-table-config.glade.h:10
 msgid "Move _Up"
 msgstr "Liiguta ü_les"
 
-#: ../widgets/table/e-table-config.glade.h:12
 msgid "Show _field in View"
 msgstr "Välja _näidatakse vaates"
 
-#: ../widgets/table/e-table-config.glade.h:13
 msgid "Show field i_n View"
 msgstr "Välja näidatakse vaa_tes"
 
-#: ../widgets/table/e-table-config.glade.h:14
 msgid "Show field in _View"
 msgstr "Välja näidatakse vaat_es"
 
-#: ../widgets/table/e-table-config.glade.h:15
 msgid "Sort"
 msgstr "Sordi"
 
-#: ../widgets/table/e-table-config.glade.h:16
 msgid "Sort Items By"
 msgstr "Kirjete sortimine"
 
-#: ../widgets/table/e-table-config.glade.h:17
 msgid "Then By"
 msgstr "järgmine sortimisväli"
 
-#: ../widgets/table/e-table-config.glade.h:19
 msgid "_Fields Shown..."
 msgstr "_Näidatavad väljad..."
 
-#: ../widgets/table/e-table-config.glade.h:20
 msgid "_Group By..."
 msgstr "_Grupeerimine..."
 
-#: ../widgets/table/e-table-config.glade.h:22
 msgid "_Show field in View"
 msgstr "_Välja näidatakse vaates"
 
-#: ../widgets/table/e-table-config.glade.h:23
 msgid "_Show these fields in order:"
 msgstr "_Näita neid välju järjestuses:"
 
-#: ../widgets/table/e-table-config.glade.h:24
 msgid "_Sort..."
 msgstr "_Sortimine..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:633
-#: ../widgets/table/e-table-field-chooser.c:66
-#: ../widgets/table/e-table-header-item.c:1887
 msgid "DnD code"
 msgstr "DnD kood"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:640
-#: ../widgets/table/e-table-field-chooser.c:73
-#: ../widgets/table/e-table-header-item.c:1901
 msgid "Full Header"
 msgstr "Kogupäis"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:116
 msgid "Add a column..."
 msgstr "Veeru lisamine..."
 
-#: ../widgets/table/e-table-field-chooser.glade.h:1
 msgid "Field Chooser"
 msgstr "Väljavalija"
 
-#: ../widgets/table/e-table-field-chooser.glade.h:2
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -23458,303 +17544,207 @@ msgstr ""
 "Tabelisse veeru lisamiseks tuleb see\n"
 "lohistada kohale, kus sa seda näha soovid."
 
-#: ../widgets/table/e-table-group-container.c:344
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
 msgstr[0] "%s : %s (%d kirje)"
 msgstr[1] "%s : %s (%d kirjet)"
 
-#: ../widgets/table/e-table-group-container.c:350
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d kirje)"
 msgstr[1] "%s (%d kirjet)"
 
-#: ../widgets/table/e-table-group-container.c:922
-#: ../widgets/table/e-table-group-container.c:923
-#: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-group-leaf.c:582
-#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
 msgid "Alternating Row Colors"
 msgstr "Reavärvuste asendamine"
 
-#: ../widgets/table/e-table-group-container.c:929
-#: ../widgets/table/e-table-group-container.c:930
-#: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-group-leaf.c:589
-#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
-#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
 msgid "Horizontal Draw Grid"
 msgstr ""
 
-#: ../widgets/table/e-table-group-container.c:936
-#: ../widgets/table/e-table-group-container.c:937
-#: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-group-leaf.c:596
-#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
-#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
 msgid "Vertical Draw Grid"
 msgstr ""
 
-#: ../widgets/table/e-table-group-container.c:943
-#: ../widgets/table/e-table-group-container.c:944
-#: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-group-leaf.c:603
-#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
-#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
 msgid "Draw focus"
 msgstr ""
 
-#: ../widgets/table/e-table-group-container.c:950
-#: ../widgets/table/e-table-group-container.c:951
-#: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-group-leaf.c:610
-#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
 msgid "Cursor mode"
 msgstr "Kursorirežiim"
 
-#: ../widgets/table/e-table-group-container.c:957
-#: ../widgets/table/e-table-group-container.c:958
-#: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-group-leaf.c:624
-#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
 msgid "Selection model"
 msgstr "Valikumudel"
 
-#: ../widgets/table/e-table-group-container.c:964
-#: ../widgets/table/e-table-group-container.c:965
-#: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-group-leaf.c:617
-#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
-#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3337
-#: ../widgets/table/e-tree.c:3338
 msgid "Length Threshold"
 msgstr "Pikkuse lävi"
 
-#: ../widgets/table/e-table-group-container.c:971
-#: ../widgets/table/e-table-group-container.c:972
-#: ../widgets/table/e-table-group-leaf.c:658
-#: ../widgets/table/e-table-group-leaf.c:659
-#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
-#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3369
-#: ../widgets/table/e-tree.c:3370
 msgid "Uniform row height"
 msgstr ""
 
-#: ../widgets/table/e-table-group-container.c:978
-#: ../widgets/table/e-table-group-container.c:979
-#: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
 msgstr "Külmutatud"
 
-#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "Käesoleva vaate kohandamine"
 
-#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Ascending"
 msgstr "Sordi _kasvavalt"
 
-#: ../widgets/table/e-table-header-item.c:1474
 msgid "Sort _Descending"
 msgstr "Sordi ka_hanevalt"
 
-#: ../widgets/table/e-table-header-item.c:1475
 msgid "_Unsort"
 msgstr "Ä_ra sordi"
 
-#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By This _Field"
 msgstr "Grupeeri selle _välja järgi"
 
-#: ../widgets/table/e-table-header-item.c:1478
 msgid "Group By _Box"
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1480
 msgid "Remove This _Column"
 msgstr "Eemalda see _veerg"
 
-#: ../widgets/table/e-table-header-item.c:1481
 msgid "Add a C_olumn..."
 msgstr "Lisa _veerg..."
 
-#: ../widgets/table/e-table-header-item.c:1483
 msgid "A_lignment"
 msgstr "_Joondus"
 
-#: ../widgets/table/e-table-header-item.c:1484
 msgid "B_est Fit"
 msgstr "_Parim sobitus"
 
-#: ../widgets/table/e-table-header-item.c:1485
 msgid "Format Column_s..."
 msgstr "Kohanda veer_ge..."
 
-#: ../widgets/table/e-table-header-item.c:1487
 msgid "Custo_mize Current View..."
 msgstr "Kohanda käesolevat _vaadet..."
 
-#: ../widgets/table/e-table-header-item.c:1543
 msgid "_Sort By"
 msgstr "_Sordi välja järgi"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1561
 msgid "_Custom"
 msgstr "_Kohandatud"
 
-#: ../widgets/table/e-table-header-item.c:1894
 msgid "Font Description"
 msgstr "Kirjatüübi kirjeldus"
 
-#: ../widgets/table/e-table-header-item.c:1915
-#: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "Sortimisandmed"
 
-#: ../widgets/table/e-table-header-item.c:1929
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "Puu"
 
-#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "Tabeli päis"
 
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "Tabeli mudel"
 
-#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "Kursori rida"
 
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3376
-#: ../widgets/table/e-tree.c:3377
 msgid "Always search"
 msgstr ""
 
-#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "Klõpsa lisamiseks"
 
-#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
 msgid "ETree table adapter"
 msgstr ""
 
-#: ../widgets/table/e-tree.c:3383
 msgid "Retro Look"
 msgstr "Retrovälimus"
 
-#: ../widgets/table/e-tree.c:3384
 msgid "Draw lines and +/- expanders."
 msgstr "Joonte ning +/- laiendajate joonistamine."
 
-#: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
 msgstr "Sisestusmeetodid"
 
-#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "Sündmusteprotsessor"
 
-#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "Rasvane"
 
-#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "Läbikriipsutatud"
 
-#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "Ankur"
 
-#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "Joondamine"
 
-#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "Klambri laius"
 
-#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "Klambri kõrgus"
 
-#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "Klamber"
 
-#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "X-nihe"
 
-#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "Y-nihe"
 
-#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "Teksti laius"
 
-#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "Teksti kõrgus"
 
-#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
 msgstr "Ellipsite kasutamine"
 
-#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
 msgstr "Ellipsid"
 
-#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "Reamurdmine"
 
-#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr "Murdmismärgid"
 
-#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "Suurim ridade arv"
 
-#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "Piirjoonte näitamine"
 
-#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Allow newlines"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "Tausta joonistamine"
 
-#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "Nupu joonistamine"
 
-#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "Kursori asukoht"
 
-#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "Välksõnumikontekst"
 
-#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr ""
+
+#~ msgid "A_dd Filter Criteria"
+#~ msgstr "L_isa filtreerimisreegel"
+
+#~ msgid "Mark calendar offline"
+#~ msgstr "Kalendri märkimine võrguvaba režiimi jaoks"
+
+#~ msgid "Marks the selected calendar for offline viewing."
+#~ msgstr "Kalendri märkimine võrguvabas olekus vaatamiseks."
+
+#~ msgid "Select Importers"
+#~ msgstr "Vali importijad"
diff --git a/po/hu.po b/po/hu.po
index 6868bb7c47..6fb4c5ed6b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -11545,7 +11545,7 @@ msgstr "Evolution hálózati beállítások vezérlése"
 #: ../mail/mail-component.c:767
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
-msgstr "Levél"
+msgstr "Levelek"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
 #: ../mail/em-account-prefs.c:495
@@ -16225,11 +16225,11 @@ msgstr "Az Evolution adatainak és beállításainak mentése és visszaállít�
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
 msgid "R_estore Settings..."
-msgstr "Beállítások _visszaállítása…"
+msgstr "Biztonsági mentés _visszaállítása…"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
 msgid "_Backup Settings..."
-msgstr "Beállítások _mentése…"
+msgstr "Adatok biztonsági _mentése…"
 
 #: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3379d500ac..3965bccf13 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,13 +11,14 @@
 # Fabrício Godoy <skarllot@gmail.com>, 2008
 # Og Maciel <ogmaciel@gnome.org>, 2008.
 #
+#: ../shell/main.c:589
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-01 10:50-0400\n"
+"POT-Creation-Date: 2008-10-12 01:48+0000\n"
 "PO-Revision-Date: 2008-10-01 10:51-0400\n"
-"Last-Translator: Og Maciel <ogmaciel@gnome.org>\n"
+"Last-Translator: Leonardo Ferreira Fontenelle <leonardof@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -171,7 +172,7 @@ msgstr "%A %d %b %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
 #: ../calendar/gui/calendar-component.c:760
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1583
+#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1577
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -203,7 +204,7 @@ msgstr "%d %b %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
 #: ../calendar/gui/calendar-component.c:786
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1599
+#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1593
 #: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%d %b"
@@ -233,12 +234,12 @@ msgstr "Clique aqui, você pode localizar mais eventos."
 #: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
-msgstr "Exibição de Mês: %s. %s"
+msgstr "Visão de mês: %s. %s"
 
 #: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
-msgstr "Exibição de Semana: %s. %s"
+msgstr "Visão de semana: %s. %s"
 
 #: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
@@ -423,7 +424,7 @@ msgstr "Falha ao autenticar-se com o servidor LDAP."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1735
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "Falha ao excluir contatos"
 
@@ -688,22 +689,37 @@ msgstr "Pessoal"
 msgid "On LDAP Servers"
 msgstr "Em servidores LDAP"
 
+#: ../addressbook/gui/component/addressbook-component.c:229
+msgctxt "New"
+msgid "_Contact"
+msgstr "_Contato"
+
 #: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
-msgstr "Criar um novo contato"
+msgstr "Cria um novo contato"
+
+#: ../addressbook/gui/component/addressbook-component.c:237
+msgctxt "New"
+msgid "Contact _List"
+msgstr "_Lista de contatos"
 
 #: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
-msgstr "Criar uma nova lista de contatos"
+msgstr "Cria uma nova lista de contatos"
 
 #: ../addressbook/gui/component/addressbook-component.c:244
 #: ../addressbook/gui/component/addressbook-config.c:1223
 msgid "New Address Book"
 msgstr "Novo catálogo de endereços"
 
+#: ../addressbook/gui/component/addressbook-component.c:245
+msgctxt "New"
+msgid "Address _Book"
+msgstr "Catálogo de _endereços"
+
 #: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
-msgstr "Criar um novo catálogo de endereços"
+msgstr "Cria um novo catálogo de endereços"
 
 #: ../addressbook/gui/component/addressbook-component.c:409
 msgid "Failed upgrading Address Book settings or folders."
@@ -731,7 +747,7 @@ msgstr ""
 #: ../calendar/gui/dialogs/calendar-setup.c:378
 #: ../calendar/gui/dialogs/calendar-setup.c:389
 #: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2367
+#: ../plugins/itip-formatter/itip-formatter.c:2436
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Geral"
@@ -757,7 +773,7 @@ msgid "Details"
 msgstr "Detalhes"
 
 #: ../addressbook/gui/component/addressbook-config.c:1009
-#: ../mail/em-folder-browser.c:983
+#: ../mail/em-folder-browser.c:985
 msgid "Searching"
 msgstr "Pesquisando"
 
@@ -872,7 +888,7 @@ msgstr "E_xcluir"
 
 #: ../addressbook/gui/component/addressbook-view.c:948
 #: ../calendar/gui/calendar-component.c:622
-#: ../calendar/gui/dialogs/comp-editor.c:2035
+#: ../calendar/gui/dialogs/comp-editor.c:2039
 #: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
 #: ../composer/e-msg-composer.c:1041 ../mail/em-folder-tree.c:2120
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
@@ -901,7 +917,7 @@ msgstr "Digite a senha para %s (usuário %s)"
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
 #: ../plugins/google-account-setup/google-source.c:444
-#: ../plugins/publish-calendar/publish-calendar.c:190
+#: ../plugins/publish-calendar/publish-calendar.c:191
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Digite a senha"
@@ -1296,7 +1312,7 @@ msgstr "<b>Telefone</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Web Addresses</b>"
-msgstr "<b>Endereços web</b>"
+msgstr "<b>Endereços Web</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Work</b>"
@@ -2514,7 +2530,7 @@ msgstr "Serviço"
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
 #: ../calendar/gui/caltypes.xml.h:25
 #: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/publish-calendar/publish-calendar.c:694
 #: ../plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "Local"
@@ -2776,8 +2792,8 @@ msgstr "Serviço de M_I:"
 #: ../addressbook/gui/contact-editor/im.glade.h:4
 #: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:243
-#: ../plugins/exchange-operations/exchange-contacts.c:234
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
 msgid "_Location:"
 msgstr "_Local:"
 
@@ -2881,7 +2897,7 @@ msgstr "Juntar contatos"
 #: ../addressbook/gui/widgets/eab-contact-display.c:597
 #: ../addressbook/gui/widgets/eab-contact-display.c:600
 #: ../addressbook/gui/widgets/eab-contact-display.c:879
-#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:827
+#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "E-mail"
 
@@ -2954,12 +2970,12 @@ msgid "Type"
 msgstr "Tipo"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:813
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "Salvar como vCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/dialogs/comp-editor.c:2037
 #: ../calendar/gui/e-calendar-table.c:1573
 #: ../calendar/gui/e-calendar-view.c:1670 ../calendar/gui/e-memo-table.c:923
 #: ../ui/evolution-addressbook.xml.h:56
@@ -3015,7 +3031,7 @@ msgid "Cu_t"
 msgstr "Recor_tar"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:480
+#: ../calendar/gui/dialogs/comp-editor.c:484
 #: ../calendar/gui/e-calendar-table.c:1581
 #: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
 #: ../composer/e-msg-composer.c:2052 ../mail/em-folder-tree.c:1005
@@ -3031,9 +3047,9 @@ msgid "P_aste"
 msgstr "C_olar"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1525
-#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
-#: ../calendar/gui/cal-search-bar.c:691
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1524
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
 msgid "Any Category"
 msgstr "Qualquer categoria"
 
@@ -3209,7 +3225,7 @@ msgstr "Site da web"
 #: ../addressbook/gui/widgets/e-minicard-label.c:116
 #: ../addressbook/gui/widgets/e-minicard.c:155
 #: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
+#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
 #: ../widgets/table/e-table-click-to-add.c:523
 #: ../widgets/table/e-table-col.c:98
 #: ../widgets/table/e-table-field-chooser-item.c:654
@@ -3217,7 +3233,7 @@ msgstr "Site da web"
 #: ../widgets/table/e-table-group-container.c:993
 #: ../widgets/table/e-table-group-leaf.c:637
 #: ../widgets/table/e-table-group-leaf.c:638
-#: ../widgets/table/e-table-item.c:3081 ../widgets/table/e-table-item.c:3082
+#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
 #: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "Largura"
@@ -3225,14 +3241,14 @@ msgstr "Largura"
 #: ../addressbook/gui/widgets/e-minicard-label.c:123
 #: ../addressbook/gui/widgets/e-minicard.c:162
 #: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
+#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
 #: ../widgets/table/e-table-click-to-add.c:530
 #: ../widgets/table/e-table-field-chooser-item.c:661
 #: ../widgets/table/e-table-group-container.c:985
 #: ../widgets/table/e-table-group-container.c:986
 #: ../widgets/table/e-table-group-leaf.c:630
 #: ../widgets/table/e-table-group-leaf.c:631
-#: ../widgets/table/e-table-item.c:3087 ../widgets/table/e-table-item.c:3088
+#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
 #: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "Altura"
@@ -3898,7 +3914,7 @@ msgstr "Formato"
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
 #: ../widgets/table/e-table-field-chooser-item.c:647
 #: ../widgets/table/e-table-field-chooser.c:80
-#: ../widgets/table/e-table-header-item.c:1908
+#: ../widgets/table/e-table-header-item.c:1907
 #: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Cabeçalho"
@@ -4001,9 +4017,9 @@ msgstr "Sombreamento"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1069
-#: ../plugins/exchange-operations/exchange-calendar.c:232
-#: ../plugins/exchange-operations/exchange-contacts.c:217
+#: ../plugins/exchange-operations/exchange-account-setup.c:1080
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
 msgid "Size:"
 msgstr "Tamanho:"
 
@@ -4588,7 +4604,7 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Não foi possível gravar os dados do aplicativo de tarefas do PDA"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2358
+#: ../plugins/itip-formatter/itip-formatter.c:2427
 msgid "Calendar and Tasks"
 msgstr "Agenda e tarefas"
 
@@ -4714,7 +4730,7 @@ msgid "Snooze _time:"
 msgstr "_Tempo de adiamento:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1332
+#: ../calendar/gui/dialogs/comp-editor.c:1336
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:169
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
@@ -5072,7 +5088,7 @@ msgstr "Mostrar alarmes na área de notificação"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid "Show status field in the event/task/meeting editor"
-msgstr "Mostrar campo estado no editor de eventos, tarefas e encontros"
+msgstr "Mostrar campo status no editor de eventos, tarefas e encontros"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 #: ../mail/evolution-mail.schemas.in.h:124
@@ -5220,7 +5236,7 @@ msgstr "Mostrar o campo papel no editor de eventos, tarefas e encontros"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to show status field in the event/task/meeting editor"
-msgstr "Mostrar o campo estado no editor de eventos, tarefas e encontros"
+msgstr "Mostrar o campo status no editor de eventos, tarefas e encontros"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
@@ -5287,36 +5303,36 @@ msgstr "Comentário contém"
 msgid "Location contains"
 msgstr "Local contém"
 
-#: ../calendar/gui/cal-search-bar.c:633 ../calendar/gui/cal-search-bar.c:676
-#: ../calendar/gui/cal-search-bar.c:695
+#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
+#: ../calendar/gui/cal-search-bar.c:694
 msgid "Unmatched"
 msgstr "Não combinadas"
 
-#: ../calendar/gui/cal-search-bar.c:641
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Next 7 Days' Tasks"
 msgstr "Tarefas dos próximos 7 dias"
 
-#: ../calendar/gui/cal-search-bar.c:645
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Active Tasks"
 msgstr "Tarefas ativas"
 
-#: ../calendar/gui/cal-search-bar.c:649
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Overdue Tasks"
 msgstr "Tarefas atrasadas"
 
-#: ../calendar/gui/cal-search-bar.c:653
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Completed Tasks"
 msgstr "Tarefas completadas"
 
-#: ../calendar/gui/cal-search-bar.c:657
+#: ../calendar/gui/cal-search-bar.c:656
 msgid "Tasks with Attachments"
 msgstr "Tarefas com anexos"
 
-#: ../calendar/gui/cal-search-bar.c:703
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Active Appointments"
 msgstr "Compromissos ativos"
 
-#: ../calendar/gui/cal-search-bar.c:707
+#: ../calendar/gui/cal-search-bar.c:706
 msgid "Next 7 Days' Appointments"
 msgstr "Compromissos dos próximos 7 dias"
 
@@ -5402,49 +5418,69 @@ msgstr "Seletor de fonte de agenda"
 msgid "New appointment"
 msgstr "Novo compromisso"
 
+#: ../calendar/gui/calendar-component.c:1597
+msgctxt "New"
+msgid "_Appointment"
+msgstr "_Compromisso"
+
 #: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
-msgstr "Criar um novo compromisso"
+msgstr "Cria um novo compromisso"
 
 #: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "Nova reunião"
 
+#: ../calendar/gui/calendar-component.c:1605
+msgctxt "New"
+msgid "M_eeting"
+msgstr "_Reunião"
+
 #: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
-msgstr "Criar um novo pedido de reunião"
+msgstr "Cria um novo pedido de reunião"
 
 #: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "Novo compromisso de dia inteiro"
 
+#: ../calendar/gui/calendar-component.c:1613
+msgctxt "New"
+msgid "All Day A_ppointment"
+msgstr "Compromisso de _dia inteiro"
+
 #: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
-msgstr "Criar um novo compromisso de dia inteiro"
+msgstr "Cria um novo compromisso de dia inteiro"
 
 #: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "Nova agenda"
 
+#: ../calendar/gui/calendar-component.c:1621
+msgctxt "New"
+msgid "Cale_ndar"
+msgstr "Age_nda"
+
 #: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
-msgstr "Criar uma nova agenda"
+msgstr "Cria uma nova agenda"
 
 #: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
-msgstr "Exibição de dia"
+msgstr "Visão de dia"
 
 #: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
-msgstr "Exibição de semana útil"
+msgstr "Visão de semana útil"
 
 #: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
-msgstr "Exibição de semana"
+msgstr "Visão de semana"
 
 #: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
-msgstr "Exibição de mês"
+msgstr "Visão de mês"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
@@ -5599,7 +5635,7 @@ msgstr "Recorrência"
 #: ../calendar/gui/memotypes.xml.h:31 ../calendar/gui/tasktypes.xml.h:38
 #: ../mail/em-filter-i18n.h:86 ../mail/message-list.etspec.h:17
 msgid "Status"
-msgstr "Estado"
+msgstr "Status"
 
 #: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
 #: ../calendar/gui/tasktypes.xml.h:39
@@ -6080,7 +6116,7 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
-msgstr "C_or:"
+msgstr "Co_r:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
@@ -6184,14 +6220,14 @@ msgstr " (Prazo "
 msgid "Due "
 msgstr "Prazo "
 
-#: ../calendar/gui/dialogs/comp-editor.c:232
+#: ../calendar/gui/dialogs/comp-editor.c:236
 #, c-format
 msgid "Attached message - %s"
 msgstr "Mensagem anexa - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:237
-#: ../calendar/gui/dialogs/comp-editor.c:410 ../composer/e-msg-composer.c:1766
+#: ../calendar/gui/dialogs/comp-editor.c:241
+#: ../calendar/gui/dialogs/comp-editor.c:414 ../composer/e-msg-composer.c:1766
 #: ../composer/e-msg-composer.c:1985
 #, c-format
 msgid "Attached message"
@@ -6199,227 +6235,227 @@ msgid_plural "%d attached messages"
 msgstr[0] "Mensagem anexa"
 msgstr[1] "%d mensagens anexas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2053
+#: ../calendar/gui/dialogs/comp-editor.c:485 ../composer/e-msg-composer.c:2053
 #: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
 #: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2045
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2055
+#: ../calendar/gui/dialogs/comp-editor.c:487 ../composer/e-msg-composer.c:2055
 #: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "Cancelar _arraste"
 
-#: ../calendar/gui/dialogs/comp-editor.c:616
-#: ../calendar/gui/dialogs/comp-editor.c:3249 ../mail/em-utils.c:371
+#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
 #: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "anexo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:842
+#: ../calendar/gui/dialogs/comp-editor.c:846
 msgid "Could not update object"
 msgstr "Não foi possível atualizar objeto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:930
+#: ../calendar/gui/dialogs/comp-editor.c:934
 msgid "Edit Appointment"
 msgstr "Editar compromisso"
 
-#: ../calendar/gui/dialogs/comp-editor.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:941
 #, c-format
 msgid "Meeting - %s"
 msgstr "Reunião - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:943
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:949
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarefa atribuída - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952
+#: ../calendar/gui/dialogs/comp-editor.c:956
 #, c-format
 msgid "Memo - %s"
 msgstr "Memorandos - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:968
+#: ../calendar/gui/dialogs/comp-editor.c:972
 msgid "No Summary"
 msgstr "Sem resumo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1266
 msgid "Click here to close the current window"
 msgstr "Clicar aqui para fechar a janela atual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1269
+#: ../calendar/gui/dialogs/comp-editor.c:1273
 msgid "Copy selected text to the clipboard"
 msgstr "Copiar texto selecionado para a área de transferência"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1280
 msgid "Cut selected text to the clipboard"
-msgstr "Cortar texto selecionado para a área de transferência"
+msgstr "Recortar texto selecionado para a área de transferência"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1283
+#: ../calendar/gui/dialogs/comp-editor.c:1287
 msgid "Click here to view help available"
 msgstr "Clicar aqui para ver a ajuda disponível"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1294
 msgid "Paste text from the clipboard"
 msgstr "Colar texto da área de transferência"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1315
 msgid "Click here to save the current window"
 msgstr "Clicar aqui para salvar a janela atual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1322
 msgid "Select all text"
 msgstr "Selecionar todo o texto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1329
 msgid "_Classification"
 msgstr "C_lassificação"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../calendar/gui/dialogs/comp-editor.c:1343
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Arquivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../calendar/gui/dialogs/comp-editor.c:1350
 #: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "Aj_uda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1353
+#: ../calendar/gui/dialogs/comp-editor.c:1357
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1360
+#: ../calendar/gui/dialogs/comp-editor.c:1364
 msgid "_Options"
 msgstr "_Opções"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1367 ../mail/em-folder-tree.c:2098
+#: ../calendar/gui/dialogs/comp-editor.c:1371 ../mail/em-folder-tree.c:2098
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_Ver"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../calendar/gui/dialogs/comp-editor.c:1381
 #: ../composer/e-composer-actions.c:471
 msgid "_Attachment..."
 msgstr "_Anexo..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1383
 msgid "Click here to attach a file"
 msgstr "Clicar aqui para anexar um arquivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1391
 msgid "_Categories"
 msgstr "_Categorias"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
+#: ../calendar/gui/dialogs/comp-editor.c:1393
 msgid "Toggles whether to display categories"
 msgstr "Alterna a exibição do campo de categorias"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../calendar/gui/dialogs/comp-editor.c:1399
 msgid "Time _Zone"
 msgstr "F_uso horário"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1397
+#: ../calendar/gui/dialogs/comp-editor.c:1401
 msgid "Toggles whether the time zone is displayed"
 msgstr "Alterna a exibição do campo de fuso horário"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1406
+#: ../calendar/gui/dialogs/comp-editor.c:1410
 msgid "Pu_blic"
 msgstr "Pú_blico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1408
+#: ../calendar/gui/dialogs/comp-editor.c:1412
 msgid "Classify as public"
 msgstr "Classificar como público"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1413
+#: ../calendar/gui/dialogs/comp-editor.c:1417
 msgid "_Private"
 msgstr "_Particular"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1415
+#: ../calendar/gui/dialogs/comp-editor.c:1419
 msgid "Classify as private"
 msgstr "Classificar como privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1424
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1426
 msgid "Classify as confidential"
 msgstr "Classificar como confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1434
 msgid "R_ole Field"
 msgstr "Campo _papel"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1432
+#: ../calendar/gui/dialogs/comp-editor.c:1436
 msgid "Toggles whether the Role field is displayed"
 msgstr "Alterna a exibição do campo papel"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1442
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1440
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Alterna a exibição do campo RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1450
 msgid "_Status Field"
-msgstr "_Campo estado"
+msgstr "_Campo Status"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1448
+#: ../calendar/gui/dialogs/comp-editor.c:1452
 msgid "Toggles whether the Status field is displayed"
-msgstr "Alterna a exibição do campo de estado"
+msgstr "Alterna a exibição do campo Status"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1454
+#: ../calendar/gui/dialogs/comp-editor.c:1458
 msgid "_Type Field"
 msgstr "Campo _tipo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1460
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Alterna a exibição do campo de tipo de participante"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1766
-#: ../composer/e-composer-private.c:65 ../widgets/misc/e-attachment-bar.c:1381
+#: ../calendar/gui/dialogs/comp-editor.c:1770
+#: ../composer/e-composer-private.c:66 ../widgets/misc/e-attachment-bar.c:1381
 msgid "Recent _Documents"
 msgstr "_Documentos recentes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../calendar/gui/dialogs/comp-editor.c:1789
 #: ../composer/e-composer-actions.c:699
 msgid "Attach"
 msgstr "Anexar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1880
+#: ../calendar/gui/dialogs/comp-editor.c:1884
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> Anexo"
 msgstr[1] "<b>%d</b> Anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1912
+#: ../calendar/gui/dialogs/comp-editor.c:1916
 msgid "Hide Attachment _Bar"
 msgstr "Ocultar _barra de anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1915
-#: ../calendar/gui/dialogs/comp-editor.c:2223
+#: ../calendar/gui/dialogs/comp-editor.c:1919
+#: ../calendar/gui/dialogs/comp-editor.c:2227
 msgid "Show Attachment _Bar"
 msgstr "Mostrar _barra de anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/dialogs/comp-editor.c:2038
 #: ../calendar/gui/dialogs/event-page.c:1875
 #: ../calendar/gui/dialogs/task-page.c:1197 ../composer/e-msg-composer.c:1040
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
@@ -6428,30 +6464,30 @@ msgstr "Mostrar _barra de anexos"
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../calendar/gui/dialogs/comp-editor.c:2041
 #: ../composer/e-msg-composer.c:1043
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Adicionar anexo..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../calendar/gui/dialogs/comp-editor.c:2249
 #: ../mail/em-format-html-display.c:2201
 msgid "Show Attachments"
 msgstr "Mostrar anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2246
+#: ../calendar/gui/dialogs/comp-editor.c:2250
 msgid "Press space key to toggle attachment bar"
 msgstr "Pressione a tecla de espaço para alternar a barra de anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2390
-#: ../calendar/gui/dialogs/comp-editor.c:2437
-#: ../calendar/gui/dialogs/comp-editor.c:3282
+#: ../calendar/gui/dialogs/comp-editor.c:2394
+#: ../calendar/gui/dialogs/comp-editor.c:2441
+#: ../calendar/gui/dialogs/comp-editor.c:3286
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "As alterações feitas a este item poderão ser descartadas se houver uma "
 "atualização"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3311
+#: ../calendar/gui/dialogs/comp-editor.c:3315
 msgid "Unable to use current version!"
 msgstr "Não foi possível usar a versão atual!"
 
@@ -6706,7 +6742,7 @@ msgstr "Personalizar"
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates-user.c:195
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2021
+#: ../plugins/itip-formatter/itip-formatter.c:2088
 #: ../widgets/misc/e-cell-date-edit.c:306 ../widgets/misc/e-dateedit.c:1513
 #: ../widgets/misc/e-dateedit.c:1727
 #: ../widgets/misc/e-signature-combo-box.c:70
@@ -6735,7 +6771,7 @@ msgstr "Som de alarme personalizado"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Event Description"
-msgstr "Descrição do Evento"
+msgstr "Descrição do evento"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/memo-page.glade.h:4
@@ -6777,7 +6813,7 @@ msgstr "<b>_Participantes</b>"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:2
 msgid "C_hange Organizer"
-msgstr "_Alterar Organizador"
+msgstr "_Alterar organizador"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:3
 msgid "Co_ntacts..."
@@ -6844,15 +6880,15 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This Instance Only"
-msgstr "Esta Instância Apenas"
+msgstr "Apenas esta instância"
 
 #: ../calendar/gui/dialogs/recur-comp.c:93
 msgid "This and Prior Instances"
-msgstr "Esta e Instâncias Passadas"
+msgstr "Esta instância e as anteriores"
 
 #: ../calendar/gui/dialogs/recur-comp.c:99
 msgid "This and Future Instances"
-msgstr "Esta e Instâncias Futuras"
+msgstr "Esta instância e as próximas"
 
 #: ../calendar/gui/dialogs/recur-comp.c:104
 msgid "All Instances"
@@ -6917,7 +6953,7 @@ msgstr "último"
 #. * (dropdown menu options are in [square brackets]).
 #: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "Other Date"
-msgstr "Outra Data"
+msgstr "Outra data"
 
 #. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
@@ -7043,7 +7079,7 @@ msgstr "<span weight=\"bold\">Diversos</span>"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "<span weight=\"bold\">Status</span>"
-msgstr "<span weight=\"bold\">Estado</span>"
+msgstr "<span weight=\"bold\">Status</span>"
 
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
@@ -7074,7 +7110,7 @@ msgstr "Alta"
 #: ../calendar/gui/e-calendar-table.c:235
 #: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2551
 msgid "In Progress"
-msgstr "Em Progresso"
+msgstr "Em progresso"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:276
@@ -7098,7 +7134,7 @@ msgstr "Normal"
 #: ../calendar/gui/e-calendar-table.c:639 ../calendar/gui/print.c:2548
 #: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
-msgstr "Não Iniciada"
+msgstr "Não iniciada"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "P_ercent complete:"
@@ -7128,7 +7164,7 @@ msgstr "Página da _Web:"
 
 #: ../calendar/gui/dialogs/task-editor.c:113
 msgid "_Status Details"
-msgstr "Detalhes de _Estado"
+msgstr "Detalhes do _status"
 
 #: ../calendar/gui/dialogs/task-editor.c:115
 msgid "Click to change or view the status details of the task"
@@ -7137,7 +7173,7 @@ msgstr "Clique para alterar ou ver os detalhes de status da tarefa"
 #: ../calendar/gui/dialogs/task-editor.c:123
 #: ../composer/e-composer-actions.c:527
 msgid "_Send Options"
-msgstr "Opções de _Envio"
+msgstr "Opções de _envio"
 
 #: ../calendar/gui/dialogs/task-editor.c:318
 msgid "_Task"
@@ -7145,7 +7181,7 @@ msgstr "_Tarefa"
 
 #: ../calendar/gui/dialogs/task-editor.c:321
 msgid "Task Details"
-msgstr "Detalhes de Tarefa"
+msgstr "Detalhes da tarefa"
 
 #: ../calendar/gui/dialogs/task-page.c:372
 #: ../calendar/gui/dialogs/task-page.glade.h:4
@@ -7268,7 +7304,7 @@ msgstr "Sem título"
 #: ../calendar/gui/e-cal-component-preview.c:217
 #: ../calendar/gui/e-cal-component-preview.c:228
 msgid "Start Date:"
-msgstr "Data de Início:"
+msgstr "Data de início:"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:200
 #: ../calendar/gui/e-cal-component-preview.c:291
@@ -7291,16 +7327,16 @@ msgstr "Resumo:"
 
 #: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
-msgstr "Data de Conclusão:"
+msgstr "Data de conclusão:"
 
 #. write status
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:246
 #: ../calendar/gui/e-itip-control.c:1186
-#: ../plugins/exchange-operations/exchange-account-setup.c:267
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
 #: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
-msgstr "Estado:"
+msgstr "Status:"
 
 #: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
@@ -7308,12 +7344,12 @@ msgstr "Prioridade:"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
-msgstr "Data de Término"
+msgstr "Data de término"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
 msgid "Start Date"
-msgstr "Data de Início"
+msgstr "Data de início"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
 #: ../calendar/gui/e-calendar-table.c:618
@@ -7332,7 +7368,7 @@ msgid ""
 "\n"
 "45.436845,125.862501"
 msgstr ""
-"A posição geográfica deve ser  digitada no formato: \n"
+"A posição geográfica deve ser digitada no formato: \n"
 "\n"
 "45.436845,125.862501"
 
@@ -7360,8 +7396,8 @@ msgstr "Não"
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:146
 #: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/print.c:987
 #: ../calendar/gui/print.c:1004 ../mail/em-utils.c:1340
-#: ../plugins/itip-formatter/itip-formatter.c:409
-#: ../plugins/itip-formatter/itip-formatter.c:2046
+#: ../plugins/itip-formatter/itip-formatter.c:447
+#: ../plugins/itip-formatter/itip-formatter.c:2113
 #: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
@@ -7378,7 +7414,7 @@ msgstr "Atribuído"
 
 #: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:416
 msgid "Save As..."
-msgstr "Salvar Como..."
+msgstr "Salvar como..."
 
 #: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2035
 msgid "Select folder to save selected attachments..."
@@ -7393,7 +7429,7 @@ msgstr "imagem_sem_titulo.%s"
 #: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:925
 #: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
-msgstr "_Salvar Como..."
+msgstr "_Salvar como..."
 
 #: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:562
 #: ../mail/em-popup.c:573
@@ -7402,7 +7438,7 @@ msgstr "Usar como Imagem de _Fundo"
 
 #: ../calendar/gui/e-cal-popup.c:288
 msgid "_Save Selected"
-msgstr "_Salvar Selecionado"
+msgstr "_Salvar selecionado"
 
 #: ../calendar/gui/e-cal-popup.c:429 ../mail/em-popup.c:831
 #, c-format
@@ -7499,11 +7535,11 @@ msgstr "Salvar como..."
 #: ../calendar/gui/e-calendar-table.c:1570
 #: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Task"
-msgstr "Nova _Tarefa"
+msgstr "Nova _tarefa"
 
 #: ../calendar/gui/e-calendar-table.c:1574 ../calendar/gui/e-memo-table.c:924
 msgid "Open _Web Page"
-msgstr "Abrir Página da _Web"
+msgstr "Abrir página _Web"
 
 #: ../calendar/gui/e-calendar-table.c:1576
 #: ../calendar/gui/e-calendar-view.c:1656 ../calendar/gui/e-memo-table.c:926
@@ -7527,7 +7563,7 @@ msgstr "C_olar"
 
 #: ../calendar/gui/e-calendar-table.c:1586 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
-msgstr "_Atribuir Tarefa"
+msgstr "_Atribuir tarefa"
 
 #: ../calendar/gui/e-calendar-table.c:1587 ../calendar/gui/e-memo-table.c:936
 #: ../ui/evolution-tasks.xml.h:26
@@ -7536,7 +7572,7 @@ msgstr "_Encaminhar como iCalendar"
 
 #: ../calendar/gui/e-calendar-table.c:1588
 msgid "_Mark as Complete"
-msgstr "_Marcar Como Concluída"
+msgstr "_Marcar como concluída"
 
 #: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark Selected Tasks as Complete"
@@ -7552,7 +7588,7 @@ msgstr "_Marcas tarefas selecionadas como incompletas"
 
 #: ../calendar/gui/e-calendar-table.c:1596
 msgid "_Delete Selected Tasks"
-msgstr "_Excluir Tarefas Selecionadas"
+msgstr "_Excluir tarefas selecionadas"
 
 #: ../calendar/gui/e-calendar-table.c:1833
 #: ../calendar/gui/e-calendar-table.etspec.h:4
@@ -7596,28 +7632,28 @@ msgstr "Copiando os itens"
 
 #: ../calendar/gui/e-calendar-view.c:1650
 msgid "New _Appointment..."
-msgstr "Novo _Compromisso..."
+msgstr "Novo _compromisso..."
 
 #: ../calendar/gui/e-calendar-view.c:1651
 msgid "New All Day _Event"
-msgstr "Novo _Evento de Dia Inteiro"
+msgstr "Novo _evento de dia inteiro"
 
 #: ../calendar/gui/e-calendar-view.c:1652
 msgid "New _Meeting"
-msgstr "Nova _Reunião"
+msgstr "Nova _reunião"
 
 #. FIXME: hook in this somehow
 #: ../calendar/gui/e-calendar-view.c:1663
 msgid "_Current View"
-msgstr "_Visão Atual"
+msgstr "_Visão atual"
 
 #: ../calendar/gui/e-calendar-view.c:1665
 msgid "Select T_oday"
-msgstr "Selecionar _Hoje"
+msgstr "Selecionar _hoje"
 
 #: ../calendar/gui/e-calendar-view.c:1666
 msgid "_Select Date..."
-msgstr "_Selecionar Data..."
+msgstr "_Selecionar data..."
 
 #: ../calendar/gui/e-calendar-view.c:1672
 msgid "Pri_nt..."
@@ -7629,15 +7665,15 @@ msgstr "Copiar para a A_genda..."
 
 #: ../calendar/gui/e-calendar-view.c:1683
 msgid "Mo_ve to Calendar..."
-msgstr "Mo_ver para a Agenda..."
+msgstr "Mo_ver para a agenda..."
 
 #: ../calendar/gui/e-calendar-view.c:1684
 msgid "_Delegate Meeting..."
-msgstr "_Delegar Reunião..."
+msgstr "_Delegar reunião..."
 
 #: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Schedule Meeting..."
-msgstr "Agendar _Reunião..."
+msgstr "Agendar _reunião..."
 
 #: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Forward as iCalendar..."
@@ -7651,19 +7687,19 @@ msgstr "_Responder"
 #: ../mail/em-popup.c:566 ../mail/em-popup.c:577
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
-msgstr "Responder a _Todos"
+msgstr "Responder a _todos"
 
 #: ../calendar/gui/e-calendar-view.c:1693
 msgid "Make this Occurrence _Movable"
-msgstr "Tor_nar esta Ocorrência Móvel"
+msgstr "Tor_nar esta ocorrência móvel"
 
 #: ../calendar/gui/e-calendar-view.c:1694 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
-msgstr "Exc_luir esta Ocorrência"
+msgstr "Exc_luir esta ocorrência"
 
 #: ../calendar/gui/e-calendar-view.c:1695
 msgid "Delete _All Occurrences"
-msgstr "Excl_uir Todas as Ocorrências"
+msgstr "Excl_uir todas as ocorrências"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
 #: ../calendar/gui/e-calendar-view.c:2234 ../calendar/gui/print.c:2510
@@ -7711,26 +7747,26 @@ msgstr "%02i frações de minuto"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1566
+#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1560
 #: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1674
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:806 ../calendar/gui/e-week-view.c:540
+#: ../calendar/gui/e-day-view.c:800 ../calendar/gui/e-week-view.c:540
 #: ../calendar/gui/print.c:831
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:809 ../calendar/gui/e-week-view.c:543
+#: ../calendar/gui/e-day-view.c:803 ../calendar/gui/e-week-view.c:543
 #: ../calendar/gui/print.c:833
 msgid "pm"
 msgstr "pm"
 
 #: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
-msgstr "Sim. (Recorrência Complexa)"
+msgstr "Sim. (Recorrência complexa)"
 
 #: ../calendar/gui/e-itip-control.c:782
 #, c-format
@@ -7842,20 +7878,20 @@ msgstr ""
 #: ../calendar/gui/e-meeting-list-view.c:203
 #: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
 #: ../calendar/gui/itip-utils.c:664
-#: ../plugins/itip-formatter/itip-formatter.c:2034
+#: ../plugins/itip-formatter/itip-formatter.c:2101
 msgid "Accepted"
 msgstr "Aceito"
 
 #: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../plugins/itip-formatter/itip-formatter.c:2104
 msgid "Tentatively Accepted"
-msgstr "Aceito Preliminarmente"
+msgstr "Aceito preliminarmente"
 
 #: ../calendar/gui/e-itip-control.c:1199
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
 #: ../calendar/gui/itip-utils.c:670 ../calendar/gui/itip-utils.c:699
-#: ../plugins/itip-formatter/itip-formatter.c:2040
+#: ../plugins/itip-formatter/itip-formatter.c:2107
 msgid "Declined"
 msgstr "Recusado"
 
@@ -7877,25 +7913,25 @@ msgstr ""
 #: ../calendar/gui/e-itip-control.c:1363
 #, c-format
 msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> publicou informação de reunião."
+msgstr "<b>%s</b> publicou informações sobre a reunião."
 
 #: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
-msgstr "Informação de Reunião"
+msgstr "Informações de reunião"
 
 #: ../calendar/gui/e-itip-control.c:1370
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
-msgstr "<b>%s</b> requisita a presença de %s em uma reunião."
+msgstr "<b>%s</b> solicita a presença de %s em uma reunião."
 
 #: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> requisita a sua presença em uma reunião."
+msgstr "<b>%s</b> solicita a sua presença em uma reunião."
 
 #: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
-msgstr "Proposta de Reunião"
+msgstr "Proposta de reunião"
 
 #. FIXME Whats going on here?
 #: ../calendar/gui/e-itip-control.c:1379
@@ -7905,7 +7941,7 @@ msgstr "<b>%s</b> deseja ser adicionado a uma reunião existente."
 
 #: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
-msgstr "Atualização de Reunião"
+msgstr "Atualização de reunião"
 
 #: ../calendar/gui/e-itip-control.c:1384
 #, c-format
@@ -7914,7 +7950,7 @@ msgstr "<b>%s</b> deseja receber a informação de reunião mais recente."
 
 #: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
-msgstr "Pedido de Atualização de Reunião"
+msgstr "Pedido de atualização de reunião"
 
 #: ../calendar/gui/e-itip-control.c:1392
 #, c-format
@@ -7923,7 +7959,7 @@ msgstr "<b>%s</b> respondeu a um pedido de reunião."
 
 #: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
-msgstr "Resposta à Reunião"
+msgstr "Resposta à reunião"
 
 #: ../calendar/gui/e-itip-control.c:1400
 #, c-format
@@ -7932,7 +7968,7 @@ msgstr "<b>%s</b> cancelou uma reunião."
 
 #: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
-msgstr "Cancelamento de Reunião"
+msgstr "Cancelamento de reunião"
 
 #: ../calendar/gui/e-itip-control.c:1411 ../calendar/gui/e-itip-control.c:1488
 #: ../calendar/gui/e-itip-control.c:1528
@@ -7942,7 +7978,7 @@ msgstr "<b>%s</b> enviou uma mensagem incompreensível."
 
 #: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
-msgstr "Mensagem de Reunião Inválida"
+msgstr "Mensagem inválida de reunião"
 
 #: ../calendar/gui/e-itip-control.c:1439
 #, c-format
@@ -7951,21 +7987,21 @@ msgstr "<b>%s</b> publicou informação de tarefa."
 
 #: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
-msgstr "Informação de Tarefa"
+msgstr "Informações de tarefa"
 
 #: ../calendar/gui/e-itip-control.c:1447
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
-msgstr "<b>%s</b> requisita que %s execute uma tarefa."
+msgstr "<b>%s</b> solicita que %s execute uma tarefa."
 
 #: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> requisita que você execute uma tarefa."
+msgstr "<b>%s</b> solicita que você execute uma tarefa."
 
 #: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
-msgstr "Proposta de Tarefa"
+msgstr "Proposta de tarefa"
 
 #. FIXME Whats going on here?
 #: ../calendar/gui/e-itip-control.c:1456
@@ -7975,7 +8011,7 @@ msgstr "<b>%s</b> deseja ser adicionado a uma tarefa existente."
 
 #: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
-msgstr "Atualização de Tarefa"
+msgstr "Atualização de tarefa"
 
 #: ../calendar/gui/e-itip-control.c:1461
 #, c-format
@@ -7984,7 +8020,7 @@ msgstr "<b>%s</b> deseja receber a informação de tarefa mais recente."
 
 #: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
-msgstr "Pedido de Atualização de Tarefa"
+msgstr "Pedido de atualização de tarefa"
 
 #: ../calendar/gui/e-itip-control.c:1469
 #, c-format
@@ -7993,7 +8029,7 @@ msgstr "<b>%s</b> respondeu a uma atribuição de tarefa."
 
 #: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
-msgstr "Resposta à Tarefa"
+msgstr "Resposta à tarefa"
 
 #: ../calendar/gui/e-itip-control.c:1477
 #, c-format
@@ -8002,11 +8038,11 @@ msgstr "<b>%s</b> cancelou uma tarefa."
 
 #: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
-msgstr "Cancelamento de Tarefa"
+msgstr "Cancelamento de tarefa"
 
 #: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
-msgstr "Mensagem de Tarefa Inválida"
+msgstr "Mensagem inválida de tarefa"
 
 #: ../calendar/gui/e-itip-control.c:1513
 #, c-format
@@ -8020,11 +8056,11 @@ msgstr "Informação de disponibilidade"
 #: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> está requisitando sua informação de disponibilidade."
+msgstr "<b>%s</b> está solicitando sua informação de disponibilidade."
 
 #: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
-msgstr "Pedido de Disponibilidade"
+msgstr "Pedido de disponibilidade"
 
 #: ../calendar/gui/e-itip-control.c:1523
 #, c-format
@@ -8033,11 +8069,11 @@ msgstr "<b>%s</b> respondeu a um pedido de disponibilidade."
 
 #: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
-msgstr "Resposta de Disponibilidade"
+msgstr "Resposta de disponibilidade"
 
 #: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
-msgstr "Mensagem de Disponibilidade Inválida"
+msgstr "Mensagem inválida de disponibilidade"
 
 #: ../calendar/gui/e-itip-control.c:1605
 msgid "The message does not appear to be properly formed"
@@ -8071,17 +8107,19 @@ msgstr ""
 #: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
-"Estado do participante não pôde ser atualizado devido a um estado inválido!\n"
+"Não foi possível atualizar o status do participante por causa de um status "
+"inválido!\n"
 
 #: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
-msgstr "Estado do participante atualizado\n"
+msgstr "Status do participante atualizado\n"
 
 #: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1253
+#: ../plugins/itip-formatter/itip-formatter.c:1301
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
-"Estado do participante não pôde ser atualizado pois o item não existe mais"
+"Não foi possível atualizar o status do participante porque o item não existe "
+"mais"
 
 #: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
@@ -8115,15 +8153,15 @@ msgstr "Recusar"
 
 #: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
-msgstr "Enviar Informação de Disponibilidade"
+msgstr "Enviar informação de disponibilidade"
 
 #: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
-msgstr "Atualizar estado do respondente"
+msgstr "Atualizar status do respondente"
 
 #: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
-msgstr "Enviar Informação Mais Recente"
+msgstr "Enviar informação mais recente"
 
 #: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
@@ -8136,7 +8174,7 @@ msgstr "--para--"
 
 #: ../calendar/gui/e-itip-control.glade.h:2
 msgid "Calendar Message"
-msgstr "Mensagem da Agenda"
+msgstr "Mensagem da agenda"
 
 #: ../calendar/gui/e-itip-control.glade.h:3
 msgid "Date:"
@@ -8144,7 +8182,7 @@ msgstr "Data:"
 
 #: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Loading Calendar"
-msgstr "Carregando Agenda"
+msgstr "Carregando agenda"
 
 #: ../calendar/gui/e-itip-control.glade.h:6
 msgid "Loading calendar..."
@@ -8152,7 +8190,7 @@ msgstr "Carregando agenda..."
 
 #: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
-msgstr "Mensagem do Servidor:"
+msgstr "Mensagem do servidor:"
 
 #: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
@@ -8160,11 +8198,11 @@ msgstr "Moderadores"
 
 #: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
-msgstr "Participantes Necessários"
+msgstr "Participantes necessários"
 
 #: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
-msgstr "Participantes Opcionais"
+msgstr "Participantes opcionais"
 
 #: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
@@ -8208,25 +8246,25 @@ msgstr "Moderador"
 #: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
 #: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:1001
 msgid "Required Participant"
-msgstr "Participante Necessário"
+msgstr "Participante necessário"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
 #: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
 #: ../calendar/gui/print.c:1002
 msgid "Optional Participant"
-msgstr "Participante Opcional"
+msgstr "Participante opcional"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:144
 #: ../calendar/gui/print.c:1003
 msgid "Non-Participant"
-msgstr "Não Participante"
+msgstr "Não participante"
 
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
 #: ../calendar/gui/e-meeting-store.c:753
 msgid "Needs Action"
-msgstr "Necessita Ação"
+msgstr "Necessita de ação"
 
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
@@ -8237,7 +8275,7 @@ msgstr "Preliminar"
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
 #: ../calendar/gui/itip-utils.c:673
-#: ../plugins/itip-formatter/itip-formatter.c:2043
+#: ../plugins/itip-formatter/itip-formatter.c:2110
 msgid "Delegated"
 msgstr "Representado"
 
@@ -8254,7 +8292,7 @@ msgstr "RSVP"
 
 #: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
 msgid "In Process"
-msgstr "Em Andamento"
+msgstr "Em andamento"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
@@ -8280,11 +8318,11 @@ msgstr "%d/%m/%Y"
 
 #: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Out of Office"
-msgstr "Fora do Escritório"
+msgstr "Fora do escritório"
 
 #: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "No Information"
-msgstr "Sem Informação"
+msgstr "Sem informação"
 
 #: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "A_ttendees..."
@@ -8348,7 +8386,7 @@ msgstr "Clicar aqui para adicionar um participante"
 
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
-msgstr "Nome Comum"
+msgstr "Nome comum"
 
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated From"
@@ -8368,7 +8406,7 @@ msgstr "Membro"
 
 #: ../calendar/gui/e-memo-table.c:941
 msgid "_Delete Selected Memos"
-msgstr "_Excluir Memorandos Selecionadas"
+msgstr "_Excluir memorandos selecionadas"
 
 #: ../calendar/gui/e-memo-table.c:1092 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
@@ -8416,7 +8454,7 @@ msgstr "Excluindo permanentemente"
 
 #: ../calendar/gui/e-timezone-entry.c:128
 msgid "Select Timezone"
-msgstr "Selecionar um Fuso Horário"
+msgstr "Selecionar um fuso horário"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
@@ -8427,15 +8465,15 @@ msgstr "%d %B"
 
 #: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
-msgstr "_Visão Personalizada"
+msgstr "_Visão personalizada"
 
 #: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
-msgstr "_Salvar Visão Personalizada"
+msgstr "_Salvar visão personalizada"
 
 #: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
-msgstr "_Definir Visões..."
+msgstr "_Definir visões..."
 
 #: ../calendar/gui/gnome-cal.c:2791
 #, c-format
@@ -8507,7 +8545,7 @@ msgstr "Outubro"
 
 #: ../calendar/gui/goto-dialog.glade.h:12
 msgid "Select Date"
-msgstr "Selecionar Data"
+msgstr "Selecionar data"
 
 #: ../calendar/gui/goto-dialog.glade.h:13
 msgid "September"
@@ -8515,7 +8553,7 @@ msgstr "Setembro"
 
 #: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
-msgstr "_Selecionar Hoje"
+msgstr "_Selecionar hoje"
 
 #: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
 #: ../calendar/gui/itip-utils.c:544
@@ -8573,7 +8611,7 @@ msgstr "Você deve ser um participante do evento."
 
 #: ../calendar/gui/memos-component.c:464
 msgid "_New Memo List"
-msgstr "_Nova Lista de Memorandos"
+msgstr "_Nova lista de memorandos"
 
 #: ../calendar/gui/memos-component.c:544
 #, c-format
@@ -8606,35 +8644,50 @@ msgstr "Não existe agenda disponível para a criação de memorandos"
 
 #: ../calendar/gui/memos-component.c:1076
 msgid "Memo Source Selector"
-msgstr "Seletor de Fonte de Memorando"
+msgstr "Seletor de fonte de memorando"
 
 #: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "Novo memorando"
 
+#: ../calendar/gui/memos-component.c:1261
+msgctxt "New"
+msgid "Mem_o"
+msgstr "Mem_orando"
+
 #: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
-msgstr "Criar um novo memorando"
+msgstr "Cria um novo memorando"
 
 #: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "Novo memorando compartilhado"
 
+#: ../calendar/gui/memos-component.c:1269
+msgctxt "New"
+msgid "_Shared memo"
+msgstr "_Memorando compartilhado"
+
 #: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
-msgstr "Criar um novo memorando compartilhado"
+msgstr "Cria um novo memorando compartilhado"
 
 #: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "Nova lista de memorandos"
 
+#: ../calendar/gui/memos-component.c:1277
+msgctxt "New"
+msgid "Memo li_st"
+msgstr "Li_sta de memorandos"
+
 #: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
-msgstr "Criar uma nova lista de memorandos"
+msgstr "Cria uma nova lista de memorandos"
 
 #: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
-msgstr "Imprimir Memorandos"
+msgstr "Imprimir memorandos"
 
 #: ../calendar/gui/memotypes.xml.h:25
 msgid "Next 7 Days"
@@ -8863,7 +8916,7 @@ msgstr "Participantes: "
 #: ../calendar/gui/print.c:2564
 #, c-format
 msgid "Status: %s"
-msgstr "Estado: %s"
+msgstr "Status: %s"
 
 #: ../calendar/gui/print.c:2581
 #, c-format
@@ -8873,7 +8926,7 @@ msgstr "Prioridade: %s"
 #: ../calendar/gui/print.c:2593
 #, c-format
 msgid "Percent Complete: %i"
-msgstr "Porcentagem Concluída: %i"
+msgstr "Porcentagem concluída: %i"
 
 #: ../calendar/gui/print.c:2605
 #, c-format
@@ -8891,7 +8944,7 @@ msgstr "Contatos: "
 
 #: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
-msgstr "_Nova Lista de Tarefas"
+msgstr "_Nova lista de tarefas"
 
 #: ../calendar/gui/tasks-component.c:535
 #, c-format
@@ -8916,31 +8969,46 @@ msgstr "Não existe agenda disponível para a criação de tarefas"
 
 #: ../calendar/gui/tasks-component.c:1065
 msgid "Task Source Selector"
-msgstr "Seletor de Fonte de Tarefa"
+msgstr "Seletor de fonte de tarefa"
 
 #: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "Nova tarefa"
 
+#: ../calendar/gui/tasks-component.c:1326
+msgctxt "New"
+msgid "_Task"
+msgstr "_Tarefa"
+
 #: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
-msgstr "Criar uma nova tarefa"
+msgstr "Cria uma nova tarefa"
 
 #: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "Nova tarefa atribuída"
 
+#: ../calendar/gui/tasks-component.c:1334
+msgctxt "New"
+msgid "Assigne_d Task"
+msgstr "Tarefa _atribuída"
+
 #: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
-msgstr "Criar uma nova tarefa atribuída"
+msgstr "Cria uma nova tarefa atribuída"
 
 #: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "Nova lista de tarefas"
 
+#: ../calendar/gui/tasks-component.c:1342
+msgctxt "New"
+msgid "Tas_k list"
+msgstr "Lista de _tarefas"
+
 #: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
-msgstr "Criar uma nova lista de tarefas"
+msgstr "Cria uma nova lista de tarefas"
 
 #: ../calendar/gui/tasks-control.c:452
 msgid ""
@@ -8961,7 +9029,7 @@ msgstr "Não me pergunte novamente."
 
 #: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
-msgstr "Imprimir Tarefas"
+msgstr "Imprimir tarefas"
 
 #: ../calendar/gui/tasktypes.xml.h:2
 #, no-c-format
@@ -8986,11 +9054,11 @@ msgstr "é menor que"
 
 #: ../calendar/importers/icalendar-importer.c:75
 msgid "Appointments and Meetings"
-msgstr "Compromissos e Reuniões"
+msgstr "Compromissos e reuniões"
 
 #: ../calendar/importers/icalendar-importer.c:333
 #: ../calendar/importers/icalendar-importer.c:616
-#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../plugins/itip-formatter/itip-formatter.c:1635
 msgid "Opening calendar"
 msgstr "Abrindo agenda"
 
@@ -9016,11 +9084,11 @@ msgstr "Importador vCalendar do Evolution"
 
 #: ../calendar/importers/icalendar-importer.c:732
 msgid "Calendar Events"
-msgstr "Eventos de Agenda"
+msgstr "Eventos de agenda"
 
 #: ../calendar/importers/icalendar-importer.c:769
 msgid "Evolution Calendar intelligent importer"
-msgstr "Importador inteligente da Agenda do Evolution"
+msgstr "Importador inteligente da agenda do Evolution"
 
 #.
 #. *
@@ -9589,7 +9657,7 @@ msgstr "América/Fernando de Noronha"
 
 #: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
-msgstr "América/Dakota do Norte/Centro"
+msgstr "America/North_Dakota/Center"
 
 #: ../calendar/zones.h:162
 msgid "America/Panama"
@@ -10581,7 +10649,7 @@ msgstr "Não foi possível obter mensagem do editor"
 
 #: ../composer/e-composer-actions.c:47
 msgid "Insert Attachment"
-msgstr "Inserir Anexo"
+msgstr "Inserir anexo"
 
 #: ../composer/e-composer-actions.c:51
 msgid "A_ttach"
@@ -10589,7 +10657,7 @@ msgstr "Ane_xar"
 
 #: ../composer/e-composer-actions.c:142
 msgid "Untitled Message"
-msgstr "Mensagem sem Título"
+msgstr "Mensagem sem título"
 
 #: ../composer/e-composer-actions.c:473
 msgid "Attach a file"
@@ -10602,7 +10670,7 @@ msgstr "_Fechar"
 
 #: ../composer/e-composer-actions.c:480
 msgid "Close the current file"
-msgstr "Fechar o arquivo atual"
+msgstr "Fecha o arquivo atual"
 
 #: ../composer/e-composer-actions.c:485 ../mail/em-folder-view.c:1337
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
@@ -10615,7 +10683,7 @@ msgstr "Im_primir..."
 #: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
-msgstr "_Visualizar Impressão"
+msgstr "_Visualizar impressão"
 
 #: ../composer/e-composer-actions.c:501
 msgid "Save the current file"
@@ -10623,7 +10691,7 @@ msgstr "Salvar o arquivo atual"
 
 #: ../composer/e-composer-actions.c:506
 msgid "Save _As..."
-msgstr "Salvar _Como..."
+msgstr "Salvar _como..."
 
 #: ../composer/e-composer-actions.c:508
 msgid "Save the current file with a different name"
@@ -10631,7 +10699,7 @@ msgstr "Salvar o arquivo atual com um nome diferente"
 
 #: ../composer/e-composer-actions.c:513
 msgid "Save _Draft"
-msgstr "Salvar _Rascunho"
+msgstr "Salvar _rascunho"
 
 #: ../composer/e-composer-actions.c:515
 msgid "Save as draft"
@@ -10683,7 +10751,7 @@ msgstr "Assinar esta mensagem com a sua chave PGP"
 
 #: ../composer/e-composer-actions.c:576
 msgid "_Prioritize Message"
-msgstr "_Priorizar Mensagem"
+msgstr "_Priorizar mensagem"
 
 #: ../composer/e-composer-actions.c:578
 msgid "Set the message priority to high"
@@ -10724,11 +10792,11 @@ msgstr "Alterna a exibição do campo CCO"
 
 #: ../composer/e-composer-actions.c:616
 msgid "_Cc Field"
-msgstr "Campo _Cc"
+msgstr "Campo _CC"
 
 #: ../composer/e-composer-actions.c:618
 msgid "Toggles whether the CC field is displayed"
-msgstr "Alterna a exibição do campo Cc"
+msgstr "Exibe/oculta o campo CC"
 
 #: ../composer/e-composer-actions.c:624
 msgid "_From Field"
@@ -10736,15 +10804,15 @@ msgstr "Campo _De"
 
 #: ../composer/e-composer-actions.c:626
 msgid "Toggles whether the From chooser is displayed"
-msgstr "Alterna a exibição do campo De"
+msgstr "Exibe/oculta o campo De"
 
 #: ../composer/e-composer-actions.c:632
 msgid "_Post-To Field"
-msgstr "Campo _Publicar Em"
+msgstr "Campo _Publicar em"
 
 #: ../composer/e-composer-actions.c:634
 msgid "Toggles whether the Post-To field is displayed"
-msgstr "Alterna a exibição do campo Publicar em"
+msgstr "Exibe/oculta o campo Publicar em"
 
 #: ../composer/e-composer-actions.c:640
 msgid "_Reply-To Field"
@@ -10752,7 +10820,7 @@ msgstr "Campo _Responder a"
 
 #: ../composer/e-composer-actions.c:642
 msgid "Toggles whether the Reply-To field is displayed"
-msgstr "Alterna a exibição do campo Responder a"
+msgstr "Exibe/oculta o campo Responder a"
 
 #: ../composer/e-composer-actions.c:648
 msgid "_Subject Field"
@@ -10760,7 +10828,7 @@ msgstr "Campo a_ssunto"
 
 #: ../composer/e-composer-actions.c:650
 msgid "Toggles whether the Subject field is displayed"
-msgstr "Alterna a exibição do campo assunto"
+msgstr "Exibe/oculta o campo Assunto"
 
 #: ../composer/e-composer-actions.c:656
 msgid "_To Field"
@@ -10768,7 +10836,7 @@ msgstr "Campo _Para"
 
 #: ../composer/e-composer-actions.c:658
 msgid "Toggles whether the To field is displayed"
-msgstr "Alterna a exibição do campo Para"
+msgstr "Exibe/oculta o campo Para"
 
 #: ../composer/e-composer-header-table.c:66
 msgid "Enter the recipients of the message"
@@ -10800,7 +10868,7 @@ msgstr "_Para:"
 
 #: ../composer/e-composer-header-table.c:663
 msgid "_Cc:"
-msgstr "_Cc:"
+msgstr "_CC:"
 
 #: ../composer/e-composer-header-table.c:668
 msgid "_Bcc:"
@@ -10808,7 +10876,7 @@ msgstr "CC_O:"
 
 #: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
-msgstr "_Publicar Em:"
+msgstr "_Publicar em:"
 
 #: ../composer/e-composer-header-table.c:677
 msgid "S_ubject:"
@@ -10834,9 +10902,9 @@ msgstr "Escolha as pastas onde publicar a mensagem."
 msgid "Click here to select folders to post to"
 msgstr "Clique aqui para selecionar as pastas onde publicar"
 
-#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1553
+#: ../composer/e-composer-private.c:181 ../composer/e-msg-composer.c:1553
 msgid "Show _Attachment Bar"
-msgstr "Mostrar Barra de _Anexos"
+msgstr "Mostrar barra de _anexos"
 
 #: ../composer/e-msg-composer.c:867
 msgid ""
@@ -10863,11 +10931,11 @@ msgstr[1] "Anexos"
 
 #: ../composer/e-msg-composer.c:1551
 msgid "Hide _Attachment Bar"
-msgstr "Ocultar Barra de _Anexos"
+msgstr "Ocultar barra de _anexos"
 
 #: ../composer/e-msg-composer.c:1568 ../composer/e-msg-composer.c:2775
 msgid "Compose Message"
-msgstr "Redigir Mensagem"
+msgstr "Redigir mensagem"
 
 #: ../composer/e-msg-composer.c:4050
 msgid ""
@@ -11014,7 +11082,7 @@ msgstr "Foram localizadas mensagens não concluídas"
 
 #: ../composer/mail-composer.error.xml.h:26
 msgid "Warning: Modified Message"
-msgstr "Alerta: Mensagem Modificada"
+msgstr "Alerta: mensagem modificada"
 
 #: ../composer/mail-composer.error.xml.h:27
 msgid "You cannot attach the file `{0}' to this message."
@@ -11026,11 +11094,11 @@ msgstr "Você deve configurar uma conta antes de poder redigir uma mensagem."
 
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Continue Editing"
-msgstr "_Continuar Editando"
+msgstr "_Continuar editando"
 
 #: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
-msgstr "Não _Recuperar"
+msgstr "Não _recuperar"
 
 #: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
@@ -11042,7 +11110,7 @@ msgstr "_Salvar rascunho"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
-msgstr "Correio  e Agenda do Evolution"
+msgstr "Correio e agenda do Evolution"
 
 #: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
 msgid "Groupware Suite"
@@ -11090,10 +11158,10 @@ msgstr "Componente"
 msgid "Name of the component being logged"
 msgstr "Nome do componente logado"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:776
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
 #: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:988
 #: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:689
+#: ../plugins/publish-calendar/publish-calendar.c:690
 msgid "Enabled"
 msgstr "Habilitado"
 
@@ -11164,7 +11232,7 @@ msgstr "_Pessoal"
 #. green
 #: ../e-util/e-util-labels.c:40
 msgid "_To Do"
-msgstr "A Fa_zer"
+msgstr "A fa_zer"
 
 #. blue
 #: ../e-util/e-util-labels.c:41
@@ -11177,15 +11245,15 @@ msgstr "_Nome:"
 
 #: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
-msgstr "Editar Rótulo"
+msgstr "Editar rótulo"
 
 #: ../e-util/e-util-labels.c:332
 msgid "Add Label"
-msgstr "Adicionar Rótulo"
+msgstr "Adicionar rótulo"
 
 #: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
-msgstr "O rótulo não pode ser vázio."
+msgstr "O rótulo não pode ser vazio."
 
 #: ../e-util/e-util-labels.c:356
 msgid ""
@@ -11202,7 +11270,7 @@ msgstr "Erro do GConf: %s"
 
 #: ../e-util/gconf-bridge.c:1228
 msgid "All further errors shown only on terminal."
-msgstr "Todos os demais erros mostrados apenas no terminal"
+msgstr "Todos os demais erros mostrados apenas no terminal."
 
 #: ../filter/filter-datespec.c:81
 #, c-format
@@ -11331,15 +11399,15 @@ msgstr "Teste"
 
 #: ../filter/filter-rule.c:853
 msgid "R_ule name:"
-msgstr "Nome da _regra:"
+msgstr "_Nome da regra:"
 
 #: ../filter/filter-rule.c:881
 msgid "Find items that meet the following criteria"
-msgstr "Localizar itens que atendem os seguintes critérios"
+msgstr "Localizar itens que atendam aos seguintes critérios"
 
 #: ../filter/filter-rule.c:915
 msgid "A_dd Filter Criteria"
-msgstr "Adicionar critérios no Filtro"
+msgstr "_Adicionar critérios ao filtro"
 
 #: ../filter/filter-rule.c:921
 msgid "If all criteria are met"
@@ -11351,7 +11419,7 @@ msgstr "Se algum critério for atendido"
 
 #: ../filter/filter-rule.c:923
 msgid "_Find items:"
-msgstr "Localizar os i_tens:"
+msgstr "_Localizar os itens:"
 
 #: ../filter/filter-rule.c:945
 msgid "All related"
@@ -11428,7 +11496,7 @@ msgstr "Você deve especificar um nome de arquivo."
 
 #: ../filter/filter.glade.h:1
 msgid "<b>_Filter Rules</b>"
-msgstr "<b>_Regras de Filtro</b>"
+msgstr "<b>_Regras de filtro</b>"
 
 #: ../filter/filter.glade.h:2
 msgid "Compare against"
@@ -11501,21 +11569,21 @@ msgstr "semanas"
 msgid "years"
 msgstr "anos"
 
-#: ../filter/rule-editor.c:380
+#: ../filter/rule-editor.c:381
 msgid "Add Rule"
-msgstr "Adicionar Regra"
+msgstr "Adicionar regra"
 
-#: ../filter/rule-editor.c:459
+#: ../filter/rule-editor.c:462
 msgid "Edit Rule"
-msgstr "Editar Regra"
+msgstr "Editar regra"
 
-#: ../filter/rule-editor.c:786
+#: ../filter/rule-editor.c:808
 msgid "Rule name"
 msgstr "Nome da regra"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "Composer Preferences"
-msgstr "Preferências do Redator"
+msgstr "Preferências do redator"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid ""
@@ -11548,11 +11616,11 @@ msgstr "Controle de configuração de contas do correio do Evolution"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
-msgstr "Componente de Correio do Evolution"
+msgstr "Componente de correio do Evolution"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
-msgstr "Redator do Correio do Evolution"
+msgstr "Redator do correio do Evolution"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail composer configuration control"
@@ -11577,12 +11645,12 @@ msgstr "Correio"
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
 #: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
-msgstr "Contas de Correio"
+msgstr "Contas de correio"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
 #: ../mail/mail-config.glade.h:103
 msgid "Mail Preferences"
-msgstr "Preferências de Correio"
+msgstr "Preferências de correio"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
 msgid "Network Preferences"
@@ -11595,7 +11663,7 @@ msgstr "_Correio"
 #: ../mail/em-account-editor.c:386
 #, c-format
 msgid "%s License Agreement"
-msgstr "Acordo de Licença %s"
+msgstr "Acordo de licença %s"
 
 #: ../mail/em-account-editor.c:393
 #, c-format
@@ -11613,7 +11681,7 @@ msgstr ""
 #: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:239
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
-msgstr "Selecionar Pasta"
+msgstr "Selecionar pasta"
 
 #: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
 #: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:98
@@ -11630,7 +11698,7 @@ msgstr "Identidade"
 
 #: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
-msgstr "Recebendo E-mail"
+msgstr "Recebendo e-mail"
 
 #: ../mail/em-account-editor.c:2130
 msgid "Check for _new messages every"
@@ -11642,7 +11710,7 @@ msgstr "minu_tos"
 
 #: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:138
 msgid "Sending Email"
-msgstr "Enviando E-mail"
+msgstr "Enviando e-mail"
 
 #: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
 msgid "Defaults"
@@ -11650,26 +11718,26 @@ msgstr "Padrões"
 
 #. Security settings
 #: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:131
-#: ../plugins/exchange-operations/exchange-account-setup.c:315
+#: ../plugins/exchange-operations/exchange-account-setup.c:323
 msgid "Security"
 msgstr "Segurança"
 
 #. Most sections for this is auto-generated fromt the camel config
 #: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
 msgid "Receiving Options"
-msgstr "Opções de Recepção"
+msgstr "Opções de recepção"
 
 #: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Checking for New Messages"
-msgstr "Verificando Novas Mensagens"
+msgstr "Verificando novas mensagens"
 
 #: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
-msgstr "Editor de Contas"
+msgstr "Editor de contas"
 
 #: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
-msgstr "Assistente de Contas do Evolution"
+msgstr "Assistente de contas do Evolution"
 
 #. translators: default account indicator
 #: ../mail/em-account-prefs.c:429
@@ -11726,7 +11794,7 @@ msgstr "-------- Mensagem original --------"
 
 #: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
-msgstr "_Regras de Filtro"
+msgstr "_Regras de filtro"
 
 #.
 #. * This program is free software; you can redistribute it and/or
@@ -11747,15 +11815,15 @@ msgstr "_Regras de Filtro"
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:18
 msgid "Adjust Score"
-msgstr "Ajustar Pontuação"
+msgstr "Ajustar pontuação"
 
 #: ../mail/em-filter-i18n.h:19
 msgid "Assign Color"
-msgstr "Atribuir Cor"
+msgstr "Atribuir cor"
 
 #: ../mail/em-filter-i18n.h:20
 msgid "Assign Score"
-msgstr "Atribuir Pontuação"
+msgstr "Atribuir pontuação"
 
 #: ../mail/em-filter-i18n.h:22
 msgid "BCC"
@@ -11771,11 +11839,11 @@ msgstr "CC"
 
 #: ../mail/em-filter-i18n.h:25
 msgid "Completed On"
-msgstr "Concluída Em"
+msgstr "Concluída em"
 
 #: ../mail/em-filter-i18n.h:27
 msgid "Copy to Folder"
-msgstr "Copiar para Pasta"
+msgstr "Copiar para pasta"
 
 #: ../mail/em-filter-i18n.h:28
 msgid "Date received"
@@ -11872,7 +11940,7 @@ msgstr "Spam"
 
 #: ../mail/em-filter-i18n.h:57
 msgid "Junk Test"
-msgstr "Teste de Spam"
+msgstr "Teste de spam"
 
 #: ../mail/em-filter-i18n.h:58 ../widgets/misc/e-expander.c:190
 msgid "Label"
@@ -11884,35 +11952,35 @@ msgstr "Lista de discussão"
 
 #: ../mail/em-filter-i18n.h:60
 msgid "Match All"
-msgstr "Coincidir com Tudo"
+msgstr "Coincidir com tudo"
 
 #: ../mail/em-filter-i18n.h:61
 msgid "Message Body"
-msgstr "Corpo da Mensagem"
+msgstr "Corpo da mensagem"
 
 #: ../mail/em-filter-i18n.h:62
 msgid "Message Header"
-msgstr "Cabeçalho da Mensagem"
+msgstr "Cabeçalho da mensagem"
 
 #: ../mail/em-filter-i18n.h:63
 msgid "Message is Junk"
-msgstr "Mensagem é Spam"
+msgstr "Mensagem é spam"
 
 #: ../mail/em-filter-i18n.h:64
 msgid "Message is not Junk"
-msgstr "Mensagem não é Spam"
+msgstr "Mensagem não é spam"
 
 #: ../mail/em-filter-i18n.h:65
 msgid "Move to Folder"
-msgstr "Mover para a Pasta"
+msgstr "Mover para a pasta"
 
 #: ../mail/em-filter-i18n.h:66
 msgid "Pipe to Program"
-msgstr "Enviar (pipe) para um Programa"
+msgstr "Enviar (pipe) para um programa"
 
 #: ../mail/em-filter-i18n.h:67
 msgid "Play Sound"
-msgstr "Tocar Som"
+msgstr "Reproduzir som"
 
 #. Translators: "Read" as in "has been read" (em-filter-i18n.h)
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
@@ -11926,7 +11994,7 @@ msgstr "Destinatários"
 
 #: ../mail/em-filter-i18n.h:71
 msgid "Regex Match"
-msgstr "Coincidir Expr. Regular"
+msgstr "Coincidir expr. regular"
 
 #: ../mail/em-filter-i18n.h:72
 msgid "Replied to"
@@ -11946,7 +12014,7 @@ msgstr "retorna menor que"
 
 #: ../mail/em-filter-i18n.h:76
 msgid "Run Program"
-msgstr "Executar um Programa"
+msgstr "Executar um programa"
 
 #: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:13
 msgid "Score"
@@ -11958,11 +12026,11 @@ msgstr "Remetente"
 
 #: ../mail/em-filter-i18n.h:79
 msgid "Set Label"
-msgstr "Definir Rótulo"
+msgstr "Definir rótulo"
 
 #: ../mail/em-filter-i18n.h:80
 msgid "Set Status"
-msgstr "Atribuir Estado"
+msgstr "Definir status"
 
 #: ../mail/em-filter-i18n.h:81
 msgid "Size (kB)"
@@ -11974,7 +12042,7 @@ msgstr "se parece como"
 
 #: ../mail/em-filter-i18n.h:83
 msgid "Source Account"
-msgstr "Conta Fonte"
+msgstr "Conta fonte"
 
 #: ../mail/em-filter-i18n.h:84
 msgid "Specific header"
@@ -11986,19 +12054,19 @@ msgstr "começa com"
 
 #: ../mail/em-filter-i18n.h:87
 msgid "Stop Processing"
-msgstr "Parar o Processamento"
+msgstr "Parar o processamento"
 
 #: ../mail/em-filter-i18n.h:88 ../mail/em-format-quote.c:342
 #: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
 #: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:312
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1132
+#: ../smime/lib/e-cert.c:1115
 msgid "Subject"
 msgstr "Assunto"
 
 #: ../mail/em-filter-i18n.h:89
 msgid "Unset Status"
-msgstr "Desconfigurar Estado"
+msgstr "Reverter status"
 
 #. and now for the action area
 #: ../mail/em-filter-rule.c:522
@@ -12007,55 +12075,55 @@ msgstr "Então"
 
 #: ../mail/em-filter-rule.c:550
 msgid "Add Ac_tion"
-msgstr "Adicionar Açã_o"
+msgstr "Adicionar açã_o"
 
-#: ../mail/em-folder-browser.c:190
+#: ../mail/em-folder-browser.c:192
 msgid "C_reate Search Folder From Search..."
-msgstr "C_riar Pasta de Pesquisa a Partir da Pesquisa..."
+msgstr "_Criar pasta de pesquisa a partir da pesquisa..."
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:217
 msgid "All Messages"
-msgstr "Todas as Mensagens"
+msgstr "Todas as mensagens"
 
-#: ../mail/em-folder-browser.c:216
+#: ../mail/em-folder-browser.c:218
 msgid "Unread Messages"
 msgstr "Mensagem não lidas"
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:220
 msgid "No Label"
-msgstr "Sem Rótulo"
+msgstr "Sem rótulo"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:227
 msgid "Read Messages"
 msgstr "Mensagens lidas"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:228
 msgid "Recent Messages"
-msgstr "Mensagens Recentes"
+msgstr "Mensagens recentes"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:229
 msgid "Last 5 Days' Messages"
 msgstr "Mensagens dos últimos cinco dias"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:230
 msgid "Messages with Attachments"
 msgstr "Mensagens com anexo"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:231
 msgid "Important Messages"
-msgstr "Mensagens Importantes"
+msgstr "Mensagens importantes"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:232
 msgid "Messages Not Junk"
-msgstr "Mensagem Não Spam"
+msgstr "Mensagens não spam"
 
-#: ../mail/em-folder-browser.c:1171
+#: ../mail/em-folder-browser.c:1173
 msgid "Account Search"
-msgstr "Pesquisa na Conta"
+msgstr "Pesquisa na conta"
 
-#: ../mail/em-folder-browser.c:1224
+#: ../mail/em-folder-browser.c:1226
 msgid "All Account Search"
-msgstr "Pesquisa em Todas as Contas"
+msgstr "Pesquisa em todas as contas"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
 #: ../mail/em-folder-properties.c:174
@@ -12094,7 +12162,7 @@ msgstr "Entrada"
 #: ../mail/em-folder-properties.c:389
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
-msgstr "Propriedades da Pasta"
+msgstr "Propriedades da pasta"
 
 #: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12112,7 +12180,7 @@ msgstr "_Nome da pasta:"
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
 #: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
-msgstr "Pastas de Pesquisa"
+msgstr "Pastas de pesquisa"
 
 #. UNMATCHED is always last
 #: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
@@ -12135,9 +12203,30 @@ msgstr "Enviadas"
 msgid "Loading..."
 msgstr "Carregando..."
 
+#. Translators: This is the string used for displaying the
+#. * folder names in folder trees. "%s" will be replaced by
+#. * the folder's name and "%u" will be replaced with the
+#. * number of unread messages in the folder.
+#. *
+#. * Most languages should translate this as "%s (%u)". The
+#. * languages that use localized digits (like Persian) may
+#. * need to replace "%u" with "%Iu". Right-to-left languages
+#. * (like Arabic and Hebrew) may need to add bidirectional
+#. * formatting codes to take care of the cases the folder
+#. * name appears in either direction.
+#. *
+#. * Do not translate the "folder-display|" part. Remove it
+#. * from your translation.
+#.
+#: ../mail/em-folder-tree.c:380
+#, c-format
+msgctxt "folder-display"
+msgid "%s (%u)"
+msgstr "%s (%u)"
+
 #: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
-msgstr "Árvore de Pastas de Correio"
+msgstr "Árvore de pastas de correio"
 
 #: ../mail/em-folder-tree.c:900
 #, c-format
@@ -12165,11 +12254,11 @@ msgstr "Não foi possível depositar mensagem(ns) no repositório topo"
 
 #: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
-msgstr "_Copiar para Pasta"
+msgstr "_Copiar para pasta"
 
 #: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
 msgid "_Move to Folder"
-msgstr "_Mover para Pasta"
+msgstr "_Mover para pasta"
 
 #: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
 #, c-format
@@ -12178,12 +12267,12 @@ msgstr "Varrendo pastas em \"%s\""
 
 #: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
-msgstr "Abrir em uma _Nova Janela"
+msgstr "Abrir em uma _nova janela"
 
 #. FIXME: need to disable for nochildren folders
 #: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
-msgstr "_Nova Pasta..."
+msgstr "_Nova pasta..."
 
 #: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
@@ -12199,11 +12288,11 @@ msgstr "Atuali_zar"
 
 #: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
-msgstr "Limpar Cai_xa de saída"
+msgstr "Limpar cai_xa de saída"
 
 #: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
-msgstr "Es_vaziar Lixeira"
+msgstr "Es_vaziar lixeira"
 
 #: ../mail/em-folder-utils.c:101
 #, c-format
@@ -12248,17 +12337,17 @@ msgstr "Você não possui permissão para excluir esse e-mail."
 
 #: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
-msgstr "_Responder ao Remetente"
+msgstr "Responder ao _remetente"
 
 #: ../mail/em-folder-view.c:1331 ../mail/em-popup.c:568 ../mail/em-popup.c:579
 #: ../ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
-msgstr "Encamin_har"
+msgstr "E_ncaminhar"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
 #: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
-msgstr "_Editar Como Nova Mensagem..."
+msgstr "_Editar como nova mensagem..."
 
 #: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
@@ -12266,43 +12355,44 @@ msgstr "Des_fazer Exclusão"
 
 #: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
-msgstr "_Mover para Pasta..."
+msgstr "_Mover para pasta..."
 
 #: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
-msgstr "Copiar para P_asta..."
+msgstr "Copiar para p_asta..."
 
 #: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
-msgstr "Marcar Como Li_da"
+msgstr "Marcar como li_da"
 
 #: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
-msgstr "Marcar como _Não Lida"
+msgstr "Marcar como _não lida"
 
 #: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
-msgstr "Marcar Como _Importante"
+msgstr "Marcar como _importante"
 
 #: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
-msgstr "Marcar Como sem _Importância"
+msgstr "Marcar como sem _importância"
 
 #: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
-msgstr "Marcar Como _Spam"
+msgstr "Marcar como _spam"
 
 #: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
-msgstr "Marcar Como _Não Spam"
+msgstr "Marcar como _não spam"
 
 #: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
-msgstr "Marcar Como _Lembrete..."
+msgstr "Marcar como _lembrete..."
 
+# Qualquer tecla de acesso vai colidir com outro item de menu
 #: ../mail/em-folder-view.c:1354
 msgid "_Label"
-msgstr "Rótu_lo"
+msgstr "_Rótulo"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
@@ -12320,45 +12410,45 @@ msgstr "Marcar Como Concl_uída"
 
 #: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
-msgstr "Lim_par Marca"
+msgstr "Lim_par marca"
 
 #: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
-msgstr "Criar _Regra a Partir da Mensagem"
+msgstr "Criar _regra a partir da mensagem"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
 #: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
-msgstr "Pasta de Pesquisa por A_ssunto"
+msgstr "Pasta de pesquisa baseada no _assunto"
 
 #: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
-msgstr "Pasta de Pesquisa por Remete_nte"
+msgstr "Pasta de pesquisa baseada no _remetente"
 
 #: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
-msgstr "Pasta de Pesquisa por Destinatá_rios"
+msgstr "Pasta de Pesquisa baseada no _destinatários"
 
 #: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
-msgstr "Pasta de Pesquisa por _Lista de Discussão"
+msgstr "Pasta de pesquisa baseada na _lista de discussão"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
 #: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
-msgstr "Filtro por A_ssunto"
+msgstr "Filtro baseado no ass_unto"
 
 #: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
-msgstr "Filtro por R_emetente"
+msgstr "Filtro baseado no r_emetente"
 
 #: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
-msgstr "Filtro por Des_tinatários"
+msgstr "Filtro baseado nos des_tinatários"
 
 #: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
-msgstr "Filtro por L_ista de Discussão"
+msgstr "Filtro baseado na l_ista de discussão"
 
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
@@ -12376,7 +12466,7 @@ msgstr "Não foi possível obter a mensagem"
 
 #: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
-msgstr "Recuperando Mensagem..."
+msgstr "Recuperando mensagem..."
 
 #: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
@@ -12384,11 +12474,11 @@ msgstr "Ch_amar..."
 
 #: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
-msgstr "Criar Pasta de _Pesquisa"
+msgstr "Criar pasta de _pesquisa"
 
 #: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
-msgstr "_Deste Endereço"
+msgstr "_Deste endereço"
 
 #: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
@@ -12493,7 +12583,7 @@ msgstr ""
 
 #: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:660
 msgid "Unencrypted"
-msgstr "Não Criptografada"
+msgstr "Não criptografada"
 
 #: ../mail/em-format-html-display.c:959
 msgid ""
@@ -12545,7 +12635,7 @@ msgstr ""
 
 #: ../mail/em-format-html-display.c:1063 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
-msgstr "_Ver Certificado"
+msgstr "_Ver certificado"
 
 #: ../mail/em-format-html-display.c:1078
 msgid "This certificate is not viewable"
@@ -12565,7 +12655,7 @@ msgstr "até %d de %B, %Y, %H:%M"
 
 #: ../mail/em-format-html-display.c:1466
 msgid "_View Inline"
-msgstr "_Ver Embutido"
+msgstr "_Ver embutido"
 
 #: ../mail/em-format-html-display.c:1467
 msgid "_Hide"
@@ -12577,7 +12667,7 @@ msgstr "A_justar para Largura"
 
 #: ../mail/em-format-html-display.c:1469
 msgid "Show _Original Size"
-msgstr "Mostrar o Tamanho _Original"
+msgstr "Mostrar o tamanho _original"
 
 #: ../mail/em-format-html-display.c:1989
 msgid "Save attachment as"
@@ -12589,7 +12679,7 @@ msgstr "Selecionar a pasta para salvar todos os anexos"
 
 #: ../mail/em-format-html-display.c:2044
 msgid "_Save Selected..."
-msgstr "_Salvar Selecionado..."
+msgstr "_Salvar selecionado..."
 
 #. Cant i put in the number of attachments here ?
 #: ../mail/em-format-html-display.c:2111
@@ -12605,11 +12695,11 @@ msgstr "_Salvar"
 
 #: ../mail/em-format-html-display.c:2129
 msgid "S_ave All"
-msgstr "Salvar _Tudo"
+msgstr "Salvar _tudo"
 
 #: ../mail/em-format-html-display.c:2203
 msgid "No Attachment"
-msgstr "Sem Anexo"
+msgstr "Sem anexo"
 
 #: ../mail/em-format-html-display.c:2344 ../mail/em-format-html-display.c:2383
 msgid "View _Unformatted"
@@ -12737,7 +12827,7 @@ msgstr "Data"
 
 #: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
 msgid "Newsgroups"
-msgstr "Grupos de Notícias"
+msgstr "Grupos de notícias"
 
 #: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:83
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
@@ -12807,15 +12897,15 @@ msgstr "Uma vez por mês"
 
 #: ../mail/em-mailer-prefs.c:327
 msgid "Add Custom Junk Header"
-msgstr "Adicionar Cabeçalho Personalizado de SPAM"
+msgstr "Adicionar cabeçalho personalizado de spam"
 
 #: ../mail/em-mailer-prefs.c:331
 msgid "Header Name:"
-msgstr "Nome do Cabeçalho:"
+msgstr "Nome do cabeçalho:"
 
 #: ../mail/em-mailer-prefs.c:332
 msgid "Header Value Contains:"
-msgstr "Valor do Cabeçalho Contém:"
+msgstr "Valor do cabeçalho contém:"
 
 #: ../mail/em-mailer-prefs.c:437
 msgid "Contains Value"
@@ -12851,7 +12941,7 @@ msgstr "Não há plug-in de Spam disponível"
 #. green
 #: ../mail/em-migrate.c:1059
 msgid "To Do"
-msgstr "A Fazer"
+msgstr "A fazer"
 
 #. blue
 #: ../mail/em-migrate.c:1060
@@ -12940,12 +13030,12 @@ msgstr "_Responder ao remetente"
 #: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
-msgstr "Responder à _Lista"
+msgstr "Responder à _lista"
 
 #. make it first item
 #: ../mail/em-popup.c:629 ../mail/em-popup.c:852
 msgid "_Add to Address Book"
-msgstr "_Adicionar ao Catálogo de Endereços"
+msgstr "_Adicionar ao catálogo de endereços"
 
 #: ../mail/em-subscribe-editor.c:582
 msgid "This store does not support subscriptions, or they are not enabled."
@@ -12976,7 +13066,7 @@ msgstr "_Não mostrar esta mensagem novamente."
 
 #: ../mail/em-utils.c:316
 msgid "Message Filters"
-msgstr "Filtros de Mensagens"
+msgstr "Filtros de mensagens"
 
 #: ../mail/em-utils.c:369
 msgid "message"
@@ -12984,7 +13074,7 @@ msgstr "mensagem"
 
 #: ../mail/em-utils.c:653
 msgid "Save Message..."
-msgstr "Salvar Mensagem..."
+msgstr "Salvar mensagem..."
 
 #: ../mail/em-utils.c:703
 msgid "Add address"
@@ -13002,7 +13092,7 @@ msgstr "Pastas de P_esquisa"
 
 #: ../mail/em-vfolder-rule.c:593
 msgid "Search Folder source"
-msgstr "Fonte da Pasta de Pesquisa"
+msgstr "Fonte da pasta de pesquisa"
 
 #: ../mail/evolution-mail.schemas.in.h:1
 msgid "\"Send and Receive Mail\" window height"
@@ -13185,8 +13275,8 @@ msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr ""
-"Utiliza as mesmas fontes para ambas as linhas \"De\" e  \"Assunto\" na "
-"coluna \"Mensagens\" na visão vertical."
+"Utiliza as mesmas fontes para ambas as linhas \"De\" e \"Assunto\" na coluna "
+"\"Mensagens\" na visão vertical."
 
 #: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
@@ -13206,11 +13296,11 @@ msgstr "Exibir indicadores de erros ortográficos enquanto você digita."
 
 #: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
-msgstr "Esvaziar pastas de Spam ao sair"
+msgstr "Esvaziar pastas de spam ao sair"
 
 #: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
-msgstr "Esvaziar pastas Lixeira ao sair"
+msgstr "Esvaziar pastas lixeira ao sair"
 
 #: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
@@ -13218,7 +13308,7 @@ msgstr "Esvaziar todas as pastas de Spam ao sair do Evolution."
 
 #: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
-msgstr "Esvaziar todas as pastas Lixeiras ao sair do Evolution."
+msgstr "Esvaziar todas as pastas lixeiras ao sair do Evolution."
 
 #: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
@@ -13235,7 +13325,7 @@ msgstr "Habilitar ou desabilitar o recurso de pesquisa à medida que se escreve"
 
 #: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
-msgstr "Habilitar Pastas de Pesquisa"
+msgstr "Habilitar pastas de pesquisa"
 
 #: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
@@ -13453,11 +13543,11 @@ msgstr "Arquivo de registro onde registrar ações dos filtros."
 
 #: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
-msgstr "Marcar Como Lida após o tempo limite especificado"
+msgstr "Marcar como lida após o tempo limite especificado"
 
 #: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
-msgstr "Marcar Como Lida após o tempo limite especificado."
+msgstr "Marcar como lida após o tempo limite especificado."
 
 #: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
@@ -13598,7 +13688,7 @@ msgstr "Intervalo da sincronização do servidor"
 
 #: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
-msgstr "Mostrar Animações"
+msgstr "Mostrar animações"
 
 #: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
@@ -13777,11 +13867,11 @@ msgstr "Encadear a lista de mensagens baseado no assunto"
 
 #: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
-msgstr "Tempo limite para marcar a mensagem como Lida"
+msgstr "Tempo limite para marcar a mensagem como lida"
 
 #: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
-msgstr "Tempo limite para marcar a mensagem como Lida."
+msgstr "Tempo limite para marcar a mensagem como lida."
 
 #: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
@@ -13818,7 +13908,7 @@ msgstr "Usa apenas os testes de SPAM locais (sem DNS)."
 
 #: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
-msgstr "Usar disposição lado-a-lado ampla"
+msgstr "Usar disposição lado-a-lado ou ampla"
 
 #: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
@@ -13866,7 +13956,7 @@ msgstr "Item de menu Ver/Responder A está selecionado."
 
 #: ../mail/evolution-mail.schemas.in.h:175
 msgid "Whether a read receipt request gets added to every message by default."
-msgstr "Enviar pedido de recibo de leitura a cada mensagem por padrão."
+msgstr "Envia um pedido de recibo de leitura a cada mensagem por padrão."
 
 #: ../mail/evolution-mail.schemas.in.h:176
 msgid "Whether disable ellipsizing feature of folder names in folder tree."
@@ -13914,7 +14004,7 @@ msgstr "Selecionar pasta para onde importar"
 
 #: ../mail/importers/evolution-mbox-importer.c:219
 msgid "Berkeley Mailbox (mbox)"
-msgstr "Berkeley Mailbox (mbox)"
+msgstr "Berkeley mailbox (mbox)"
 
 #: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Importer Berkeley Mailbox format folders"
@@ -13968,7 +14058,7 @@ msgstr "Lista de discussão %s"
 
 #: ../mail/mail-autofilter.c:368
 msgid "Add Filter Rule"
-msgstr "Adicionar Regra de Filtro"
+msgstr "Adicionar regra de filtro"
 
 #: ../mail/mail-component.c:163 ../plugins/templates/templates.c:519
 #: ../plugins/templates/templates.c:689 ../plugins/templates/templates.c:724
@@ -14034,7 +14124,12 @@ msgstr[1] "%d total"
 
 #: ../mail/mail-component.c:922
 msgid "New Mail Message"
-msgstr "Nova Mensagem de Correio"
+msgstr "Nova mensagem de correio"
+
+#: ../mail/mail-component.c:923
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "_Mensagem de correio"
 
 #: ../mail/mail-component.c:924
 msgid "Compose a new mail message"
@@ -14042,7 +14137,12 @@ msgstr "Redige uma nova mensagem de correio"
 
 #: ../mail/mail-component.c:930
 msgid "New Mail Folder"
-msgstr "Nova Pasta de Correio"
+msgstr "Nova pasta de correio"
+
+#: ../mail/mail-component.c:931
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "_Pasta de correio"
 
 #: ../mail/mail-component.c:932
 msgid "Create a new mail folder"
@@ -14062,7 +14162,7 @@ msgstr "Erros"
 
 #: ../mail/mail-component.c:1596
 msgid "Warnings and Errors"
-msgstr "Avisos e Erros"
+msgstr "Avisos e erros"
 
 #: ../mail/mail-component.c:1597
 msgid "Debug"
@@ -14070,11 +14170,11 @@ msgstr "Depurar"
 
 #: ../mail/mail-component.c:1597
 msgid "Error, Warnings and Debug messages"
-msgstr "Erro, Mensagens de Aviso e de Depuração"
+msgstr "Mensagens de erro, aviso e depuração"
 
 #: ../mail/mail-component.c:1724
 msgid "Debug Logs"
-msgstr "Logs de Depuração"
+msgstr "Logs de depuração"
 
 #: ../mail/mail-component.c:1738
 msgid "Show _errors in the status bar for"
@@ -14088,11 +14188,11 @@ msgstr "segundo(s)."
 
 #: ../mail/mail-component.c:1760
 msgid "Log Messages:"
-msgstr "Mensagens do Log:"
+msgstr "Mensagens do log:"
 
 #: ../mail/mail-component.c:1801
 msgid "Log Level"
-msgstr "Nível do Log"
+msgstr "Nível do log"
 
 #: ../mail/mail-component.c:1810 ../widgets/misc/e-dateedit.c:391
 msgid "Time"
@@ -14106,7 +14206,7 @@ msgstr "Mensagens"
 #: ../mail/mail-component.c:1829 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
-msgstr "Fechar esta janela"
+msgstr "Fecha esta janela"
 
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
@@ -14130,7 +14230,7 @@ msgstr "<b>_Assinaturas</b>"
 
 #: ../mail/mail-config.glade.h:7
 msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr "<b>Opção de publicar sobre</b> (Não Recomendada)"
+msgstr "<b>Opção de publicar sobre</b> (não recomendada)"
 
 #: ../mail/mail-config.glade.h:8
 msgid "<b>_Languages</b>"
@@ -14138,7 +14238,7 @@ msgstr "<b>_Idiomas</b>"
 
 #: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
-msgstr "<span weight=\"bold\">Informação de Conta</span>"
+msgstr "<span weight=\"bold\">Informação de conta</span>"
 
 #: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
@@ -14146,7 +14246,7 @@ msgstr "<span weight=\"bold\">Autenticação</span>"
 
 #: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr "<span weight=\"bold\">Redigindo Mensagens</span>"
+msgstr "<span weight=\"bold\">Redigindo mensagens</span>"
 
 #: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
@@ -14154,40 +14254,40 @@ msgstr "<span weight=\"bold\">Configuração</span>"
 
 #: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
-msgstr "<span weight=\"bold\">Comportamento Padrão</span>"
+msgstr "<span weight=\"bold\">Comportamento padrão</span>"
 
 #: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr "<span weight=\"bold\">Excluir Correio</span>"
+msgstr "<span weight=\"bold\">Excluir correio</span>"
 
 #: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
-msgstr "<span weight=\"bold\">_Cabeçalhos de Correio Exibidos</span>"
+msgstr "<span weight=\"bold\">_Cabeçalhos de correio exibidos</span>"
 
 #: ../mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Labels</span>"
-msgstr "<span weight=\"bold\">Rótulo</span>"
+msgstr "<span weight=\"bold\">Rótulos</span>"
 
 #: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Loading Images</span>"
-msgstr "<span weight=\"bold\">Carregando Imagens</span>"
+msgstr "<span weight=\"bold\">Carregando imagens</span>"
 
 #: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Message Display</span>"
-msgstr "<span weight=\"bold\">Exibição de Mensagens</span>"
+msgstr "<span weight=\"bold\">Exibição de mensagens</span>"
 
 #: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Fonts</span>"
-msgstr "<span weight=\"bold\">Fontes de Mensagem</span>"
+msgstr "<span weight=\"bold\">Fontes de mensagem</span>"
 
 #: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Receipts</span>"
-msgstr "<span weight=\"bold\">Destinos da Mensagem</span>"
+msgstr "<span weight=\"bold\">Recibos da mensagem</span>"
 
 #: ../mail/mail-config.glade.h:23
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
-msgstr "<span weight=\"bold\">Informações Opcionais</span>"
+msgstr "<span weight=\"bold\">Informações opcionais</span>"
 
 #: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Options</span>"
@@ -14199,7 +14299,7 @@ msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
 #: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Printed Fonts</span>"
-msgstr "<span weight=\"bold\">Fontes de Impressão</span>"
+msgstr "<span weight=\"bold\">Fontes de impressão</span>"
 
 #: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Proxy Settings</span>"
@@ -14207,7 +14307,7 @@ msgstr "<span weight=\"bold\">Configurações de proxy</span>"
 
 #: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
-msgstr "<span weight=\"bold\">Informações Necessárias</span>"
+msgstr "<span weight=\"bold\">Informações necessárias</span>"
 
 #: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
@@ -14219,19 +14319,19 @@ msgstr "<span weight=\"bold\">Segurança</span>"
 
 #: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-msgstr "<span weight=\"bold\">Mensagens Enviadas e Rascunhos</span>"
+msgstr "<span weight=\"bold\">Mensagens enviadas e rascunhos</span>"
 
 #: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
-msgstr "<span weight=\"bold\">Configuração do Servidor</span>"
+msgstr "<span weight=\"bold\">Configuração do servidor</span>"
 
 #: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">_Authentication Type</span>"
-msgstr "<span weight=\"bold\">Tipo de Autenticação</span>"
+msgstr "<span weight=\"bold\">Tipo de autenticação</span>"
 
 #: ../mail/mail-config.glade.h:35
 msgid "Account Management"
-msgstr "Gerenciamento de Conta"
+msgstr "Gerenciamento de conta"
 
 #: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
@@ -14287,7 +14387,7 @@ msgstr "Con_junto de caracteres:"
 
 #: ../mail/mail-config.glade.h:50
 msgid "Ch_eck for Supported Types "
-msgstr "_Verificar Tipos com Suporte "
+msgstr "_Verificar tipos com suporte "
 
 #: ../mail/mail-config.glade.h:51
 msgid "Check cu_stom headers for junk"
@@ -14393,7 +14493,7 @@ msgstr "Habilitar Barra de E_spaço Mágica"
 
 #: ../mail/mail-config.glade.h:80
 msgid "Enable Sea_rch Folders"
-msgstr "Habilitar Pastas de Pesquisa"
+msgstr "Habilitar pastas de pesquisa"
 
 #: ../mail/mail-config.glade.h:81
 msgid "Encry_ption certificate:"
@@ -14413,7 +14513,7 @@ msgstr "Font_e de largura fixa:"
 
 #: ../mail/mail-config.glade.h:86
 msgid "Font Properties"
-msgstr "Propriedades da Fonte"
+msgstr "Propriedades da fonte"
 
 #: ../mail/mail-config.glade.h:87
 msgid "Format messages in _HTML"
@@ -14421,7 +14521,7 @@ msgstr "Formatar mensagens em _HTML"
 
 #: ../mail/mail-config.glade.h:88
 msgid "Full Nam_e:"
-msgstr "Nome _Completo:"
+msgstr "Nome _completo:"
 
 #: ../mail/mail-config.glade.h:90
 msgid "HTML Messages"
@@ -14457,15 +14557,15 @@ msgstr "Rótulo"
 
 #: ../mail/mail-config.glade.h:100
 msgid "Languages Table"
-msgstr "Tabela de Idiomas"
+msgstr "Tabela de idiomas"
 
 #: ../mail/mail-config.glade.h:101
 msgid "Mail Configuration"
-msgstr "Configuração de Correio"
+msgstr "Configuração de correio"
 
 #: ../mail/mail-config.glade.h:102
 msgid "Mail Headers Table"
-msgstr "Tabela de Cabeçalhos de Correio"
+msgstr "Tabela de cabeçalhos de correio"
 
 #: ../mail/mail-config.glade.h:104
 msgid "Mailbox location"
@@ -14473,7 +14573,7 @@ msgstr "Localização da caixa de correio"
 
 #: ../mail/mail-config.glade.h:105
 msgid "Message Composer"
-msgstr "Redator de Mensagens"
+msgstr "Redator de mensagens"
 
 #: ../mail/mail-config.glade.h:106
 msgid "No _Proxy for:"
@@ -14587,7 +14687,7 @@ msgstr "Enviar destinatário_s da mensagem:"
 
 #: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
-msgstr "Fonte _Padrão:"
+msgstr "Fonte _padrão:"
 
 #: ../mail/mail-config.glade.h:132
 msgid "Select Drafts Folder"
@@ -14615,11 +14715,11 @@ msgstr "Selecionar pasta de enviadas"
 
 #: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
-msgstr "Enviando Correio"
+msgstr "Enviando correio"
 
 #: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
-msgstr "Pasta de _Mensagens Enviadas:"
+msgstr "Pasta de _mensagens enviadas:"
 
 #: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
@@ -14627,7 +14727,7 @@ msgstr "Servi_dor requer autenticação"
 
 #: ../mail/mail-config.glade.h:142
 msgid "Server _Type: "
-msgstr "_Tipo do Servidor: "
+msgstr "_Tipo do servidor: "
 
 #: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
@@ -14643,11 +14743,11 @@ msgstr "Assinaturas"
 
 #: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
-msgstr "Tabelas de Assinaturas"
+msgstr "Tabelas de assinaturas"
 
 #: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
-msgstr "Verificação Ortográfica"
+msgstr "Verificação ortográfica"
 
 #: ../mail/mail-config.glade.h:148
 msgid "Start _typing at the bottom on replying"
@@ -14714,7 +14814,7 @@ msgstr ""
 
 #: ../mail/mail-config.glade.h:163
 msgid "_Add Signature"
-msgstr "_Adicionar Assinatura"
+msgstr "_Adicionar assinatura"
 
 #: ../mail/mail-config.glade.h:164
 msgid "_Always load images from the Internet"
@@ -14799,7 +14899,7 @@ msgstr "_Selecionar..."
 #. If enabled, show animation; if disabled, only display a static image without any animation
 #: ../mail/mail-config.glade.h:188
 msgid "_Show image animations"
-msgstr "Mostrar Animaçõe_s"
+msgstr "Mostrar animaçõe_s"
 
 #: ../mail/mail-config.glade.h:189
 msgid "_Show the photograph of sender in the message preview"
@@ -14811,7 +14911,7 @@ msgstr "Encurtar o_s cabeçalhos Para / Cc / CCO para "
 
 #: ../mail/mail-config.glade.h:191
 msgid "_Use Secure Connection:"
-msgstr "_Usar Conexão Segura:"
+msgstr "_Usar conexão segura:"
 
 #: ../mail/mail-config.glade.h:192
 msgid "_Use system defaults"
@@ -14839,11 +14939,11 @@ msgstr "    "
 
 #: ../mail/mail-dialogs.glade.h:2
 msgid "<b>Search Folder Sources</b>"
-msgstr "<b>Fontes de Pastas de Pesquisa</b>"
+msgstr "<b>Fontes de pastas de pesquisa</b>"
 
 #: ../mail/mail-dialogs.glade.h:3
 msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Assinatura Digital</span>"
+msgstr "<span weight=\"bold\">Assinatura digital</span>"
 
 #: ../mail/mail-dialogs.glade.h:4
 msgid "<span weight=\"bold\">Encryption</span>"
@@ -14879,19 +14979,19 @@ msgstr "Localizar na mensagem"
 
 #: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
-msgstr "Marcar Como Lembrete"
+msgstr "Marcar como lembrete"
 
 #: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
-msgstr "Inscrições de Pastas"
+msgstr "Inscrições de pastas"
 
 #: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
-msgstr "Acordo de Licença"
+msgstr "Acordo de licença"
 
 #: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
-msgstr "Nenhum Selecionado"
+msgstr "Nenhum selecionado"
 
 #: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
@@ -14899,7 +14999,7 @@ msgstr "S_ervidor:"
 
 #: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
-msgstr "Informação de Segurança"
+msgstr "Informação de segurança"
 
 #: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
@@ -14915,11 +15015,11 @@ msgstr ""
 
 #: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
-msgstr "_Aceitar Licença"
+msgstr "_Aceitar licença"
 
 #: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
-msgstr "_Prazo Até:"
+msgstr "_Prazo:"
 
 #: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
@@ -14936,11 +15036,11 @@ msgstr "Chamando %s"
 
 #: ../mail/mail-ops.c:106
 msgid "Filtering Selected Messages"
-msgstr "Filtrar Mensagens Selecionadas"
+msgstr "Filtrar mensagens selecionadas"
 
 #: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
-msgstr "Obtendo Correio"
+msgstr "Obtendo correio"
 
 #. sending mail, filtering failed
 #: ../mail/mail-ops.c:561
@@ -15052,7 +15152,7 @@ msgstr "Esvaziando a lixeira em \"%s\""
 
 #: ../mail/mail-ops.c:1737
 msgid "Local Folders"
-msgstr "Pastas Locais"
+msgstr "Pastas locais"
 
 #: ../mail/mail-ops.c:1818
 #, c-format
@@ -15117,7 +15217,7 @@ msgstr "Preparando conta \"%s\" para desconexão"
 
 #: ../mail/mail-ops.c:2529
 msgid "Checking Service"
-msgstr "Verificando Serviço"
+msgstr "Verificando serviço"
 
 #: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
@@ -15125,11 +15225,11 @@ msgstr "Cancelando..."
 
 #: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
-msgstr "Enviar e Receber Correio"
+msgstr "Enviar e receber correio"
 
 #: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
-msgstr "Cancelar _Tudo"
+msgstr "Cancelar _tudo"
 
 #: ../mail/mail-send-recv.c:498
 msgid "Updating..."
@@ -15144,26 +15244,26 @@ msgstr "Esperando..."
 msgid "Checking for new mail"
 msgstr "Verificando novas mensagens"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Digite a frase secreta para %s"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:211
 msgid "Enter Passphrase"
 msgstr "Digite a frase secreta"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 #: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
-msgstr "Digite a Senha para %s"
+msgstr "Digite a senha para %s"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:216
 msgid "Enter Password"
-msgstr "Digite a Senha"
+msgstr "Digite a senha"
 
-#: ../mail/mail-session.c:256
+#: ../mail/mail-session.c:258
 msgid "User canceled operation."
 msgstr "O usuário cancelou a operação."
 
@@ -15206,25 +15306,25 @@ msgstr "Pasta inválida: \"%s\""
 #: ../mail/mail-vfolder.c:89
 #, c-format
 msgid "Setting up Search Folder: %s"
-msgstr "Preparando Pasta de Pesquisa: %s"
+msgstr "Preparando pasta de pesquisa: %s"
 
 #: ../mail/mail-vfolder.c:233
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
-msgstr "Atualizando Pastas de Pesquisa para \"%s:%s\""
+msgstr "Atualizando pastas de pesquisa para \"%s:%s\""
 
 #: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s'"
-msgstr "Atualizando Pastas de Pesquisa para \"%s\""
+msgstr "Atualizando pastas de pesquisa para \"%s\""
 
 #: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
-msgstr "Editar Pasta de Pesquisa"
+msgstr "Editar pasta de pesquisa"
 
 #: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
-msgstr "Nova Pasta de Pesquisa"
+msgstr "Nova pasta de pesquisa"
 
 #: ../mail/mail.error.xml.h:1
 msgid "A folder named \"{0}\" already exists. Please use a different name."
@@ -15330,7 +15430,7 @@ msgstr "Devido a \"{2}\"."
 
 #: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
-msgstr "Assinatura em Branco"
+msgstr "Assinatura em branco"
 
 #: ../mail/mail.error.xml.h:22
 msgid "Cannot add Search Folder \"{0}\"."
@@ -15566,7 +15666,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
-msgstr "Marcar todas as mensagens como lidas"
+msgstr "Marca todas as mensagens como lidas"
 
 #: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
@@ -15651,7 +15751,7 @@ msgstr "Pastas de Pesquisa atualizadas automaticamente."
 
 #: ../mail/mail.error.xml.h:93
 msgid "Send Receipt"
-msgstr "Enviar Recibos de Leitura"
+msgstr "Enviar recibos de leitura"
 
 #: ../mail/mail.error.xml.h:94
 msgid "Signature Already Exists"
@@ -15783,7 +15883,7 @@ msgstr "Não foi possível ler o arquivo de licença."
 
 #: ../mail/mail.error.xml.h:122
 msgid "Use _Default"
-msgstr "Usar _Padrão"
+msgstr "Usar _padrão"
 
 #: ../mail/mail.error.xml.h:123
 msgid "Use default drafts folder?"
@@ -15844,19 +15944,19 @@ msgstr "_Descartar alterações"
 
 #: ../mail/mail.error.xml.h:137
 msgid "_Do not Synchronize"
-msgstr "_Não Sincronizar"
+msgstr "_Não sincronizar"
 
 #: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
-msgstr "_Excluir Permanentemente"
+msgstr "_Excluir permanentemente"
 
 #: ../mail/mail.error.xml.h:140
 msgid "_Open Messages"
-msgstr "A_brir Mensagens"
+msgstr "A_brir mensagens"
 
 #: ../mail/message-list.c:1052
 msgid "Unseen"
-msgstr "Não Lida"
+msgstr "Não lida"
 
 #: ../mail/message-list.c:1053
 msgid "Seen"
@@ -15872,11 +15972,11 @@ msgstr "Encaminhado"
 
 #: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
-msgstr "Várias Mensagens Não Lidas"
+msgstr "Várias mensagens não lidas"
 
 #: ../mail/message-list.c:1057
 msgid "Multiple Messages"
-msgstr "Várias Mensagens"
+msgstr "Várias mensagens"
 
 #: ../mail/message-list.c:1061
 msgid "Lowest"
@@ -15940,11 +16040,11 @@ msgstr "Não há mensagens nesta pasta."
 
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
-msgstr "Prazo Até"
+msgstr "Prazo"
 
 #: ../mail/message-list.etspec.h:4
 msgid "Flag Status"
-msgstr "Marcar Estado"
+msgstr "Marcar status"
 
 #: ../mail/message-list.etspec.h:5
 msgid "Flagged"
@@ -15952,7 +16052,7 @@ msgstr "Marcada"
 
 #: ../mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
-msgstr "Marca de Lembrete"
+msgstr "Marca de lembrete"
 
 #: ../mail/message-list.etspec.h:11
 msgid "Received"
@@ -15960,7 +16060,7 @@ msgstr "Recebida"
 
 #: ../mail/message-list.etspec.h:15
 msgid "Sent Messages"
-msgstr "Mensagens Enviadas"
+msgstr "Mensagens enviadas"
 
 #: ../mail/message-list.etspec.h:16
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
@@ -15973,7 +16073,7 @@ msgstr "Ligar"
 
 #: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
-msgstr "Não Encaminhar"
+msgstr "Não encaminhar"
 
 #: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
@@ -15981,7 +16081,7 @@ msgstr "Lembrete"
 
 #: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
-msgstr "Para Seu Conhecimento"
+msgstr "Para seu conhecimento"
 
 #: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
@@ -15989,7 +16089,7 @@ msgstr "Encaminhar"
 
 #: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
-msgstr "Não é Necessário Responder"
+msgstr "Não é necessário responder"
 
 #: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
@@ -15997,7 +16097,7 @@ msgstr "Responder"
 
 #: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
-msgstr "Responder a Todos"
+msgstr "Responder a todos"
 
 #: ../mail/message-tag-followup.c:66
 msgid "Review"
@@ -16033,7 +16133,7 @@ msgstr "Assunto ou remetente contém"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Local Address Books"
-msgstr "Catálogos de Endereços Locais"
+msgstr "Catálogos de endereços locais"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
 msgid "Provides core functionality for local address books."
@@ -16063,7 +16163,7 @@ msgstr "Palavras-chave"
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
 msgid "Attachment Reminder"
-msgstr "Lembrete de Anexos"
+msgstr "Lembrete de anexos"
 
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
 msgid ""
@@ -16153,7 +16253,7 @@ msgstr "Restaurar diretório do Evolution"
 
 #: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
-msgstr "Verificar o Backup do Evolution"
+msgstr "Verificar o backup do Evolution"
 
 #: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
@@ -16161,7 +16261,7 @@ msgstr "Reiniciar o Evolution"
 
 #: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
-msgstr "Com a Interface Gráfica"
+msgstr "Com a interface gráfica"
 
 #: ../plugins/backup-restore/backup.c:125
 #: ../plugins/backup-restore/backup.c:258
@@ -16286,7 +16386,7 @@ msgstr "Permissões insuficientes"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
-msgstr "Arquivo de Backup do Evolution Inválido"
+msgstr "Arquivo inválido de backup do Evolution"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Please select a valid backup file to restore."
@@ -16313,20 +16413,20 @@ msgstr ""
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
-msgstr "Fazer backup e restauração das configurações e dados do Evolution"
+msgstr "Faz backup e restaura configurações e dados do Evolution"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
 msgid "R_estore Settings..."
-msgstr "Configurações de R_estauração..."
+msgstr "Configurações de r_estauração..."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
 msgid "_Backup Settings..."
-msgstr "Configurações de _Backup..."
+msgstr "Configurações de _backup..."
 
 #: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
-msgstr "Contatos Automáticos"
+msgstr "Contatos automáticos"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:639
@@ -16337,11 +16437,11 @@ msgstr ""
 
 #: ../plugins/bbdb/bbdb.c:645
 msgid "Select Address book for Automatic Contacts"
-msgstr "Selecionar Catálogo de endereços para Contatos Automáticos"
+msgstr "Selecionar catálogo de endereços para contatos automáticos"
 
 #: ../plugins/bbdb/bbdb.c:660
 msgid "Instant Messaging Contacts"
-msgstr "Contatos dos Mensageiros Instantâneos"
+msgstr "Contatos de mensagem instantânea"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:675
@@ -16352,7 +16452,7 @@ msgstr ""
 
 #: ../plugins/bbdb/bbdb.c:681
 msgid "Select Address book for Pidgin buddy list"
-msgstr "Selecionar Catálogo de Endereços da lista de amigos do Pidgin"
+msgstr "Selecionar catálogo de endereços da lista de amigos do Pidgin"
 
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:692
@@ -16439,7 +16539,7 @@ msgstr "Usar _SSL"
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "CalDAV Calendar sources"
-msgstr "Fontes da Agenda CalDAV"
+msgstr "Fontes da agenda CalDAV"
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
 msgid "CalDAV sources"
@@ -16447,7 +16547,7 @@ msgstr "Fontes CalDAV"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 msgid "Local Calendars"
-msgstr "Agendas Locais"
+msgstr "Agendas locais"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
 msgid "Provides core functionality for local calendars."
@@ -16462,7 +16562,7 @@ msgstr "Atuali_zar:"
 
 #: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
-msgstr "Conexão _Segura"
+msgstr "Conexão _segura"
 
 #: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
@@ -16479,31 +16579,31 @@ msgstr "Provê funcionalidades básicas para agendas webcal e http."
 #: ../plugins/calendar-weather/calendar-weather.c:54
 #: ../plugins/calendar-weather/calendar-weather.c:60
 msgid "Weather: Cloudy"
-msgstr "Clima: Nublado"
+msgstr "Clima: nublado"
 
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
-msgstr "Clima: Neblina"
+msgstr "Clima: neblina"
 
 #: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Partly Cloudy"
-msgstr "Clima: Parcialmente Nublado"
+msgstr "Clima: parcialmente nublado"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Rain"
-msgstr "Clima: Chuva"
+msgstr "Clima: chuva"
 
 #: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Snow"
-msgstr "Clima: Neve"
+msgstr "Clima: neve"
 
 #: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Sunny"
-msgstr "Clima: Ensolarado"
+msgstr "Clima: ensolarado"
 
 #: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Thunderstorms"
-msgstr "Clima: Trovoadas"
+msgstr "Clima: trovoadas"
 
 #: ../plugins/calendar-weather/calendar-weather.c:267
 msgid "Select a location"
@@ -16527,7 +16627,7 @@ msgstr "Provê funcionalidades básicas para agendas de clima."
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
-msgstr "Agendas de Clima"
+msgstr "Agendas de clima"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
 msgid ""
@@ -16559,7 +16659,7 @@ msgstr ""
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
 msgid "Default Mail Client "
-msgstr "Cliente Padrão de Correio "
+msgstr "Cliente padrão de correio "
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
@@ -16576,19 +16676,19 @@ msgstr "Marcar como catálogo de endereços pa_drão"
 
 #: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default calendar"
-msgstr "Marcar como calendário pa_drão"
+msgstr "_Marcar como calendário padrão"
 
 #: ../plugins/default-source/default-source.c:104
 msgid "Mark as _default task list"
-msgstr "Marcar como lista de tarefas pa_drão"
+msgstr "_Marcar como lista de tarefas padrão"
 
 #: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default memo list"
-msgstr "Marcar como lista de memorandos pa_drão"
+msgstr "_Marcar como lista de memorandos padrão"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
-msgstr "Origens Padrão"
+msgstr "Origens padrão"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
 msgid ""
@@ -16650,7 +16750,7 @@ msgstr ""
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
-msgstr "Abrir a Pasta Outros Usuários"
+msgstr "Abrir a pasta outro usuário"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
 msgid "_Account:"
@@ -16658,19 +16758,19 @@ msgstr "_Conta:"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
 msgid "_Folder Name:"
-msgstr "_Nome da Pasta:"
+msgstr "_Nome da pasta:"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
 msgid "_User:"
 msgstr "_Usuário:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:61
+#: ../plugins/exchange-operations/exchange-account-setup.c:63
 msgid "Secure Password"
-msgstr "Senha Segura"
+msgstr "Senha segura"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:64
+#: ../plugins/exchange-operations/exchange-account-setup.c:66
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -16678,11 +16778,11 @@ msgstr ""
 "Esta opção conectará ao servidor Exchange usando autenticação de senha "
 "segura (NTLM)."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:72
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
-msgstr "Senha em Texto Aberto"
+msgstr "Senha em texto simples"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:76
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -16690,12 +16790,12 @@ msgstr ""
 "Esta opção conectará ao servidor Exchange usando a autenticação padrão de "
 "senha em texto aberto."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:255
+#: ../plugins/exchange-operations/exchange-account-setup.c:263
 msgid "Out Of Office"
-msgstr "Fora do Escritório"
+msgstr "Fora do escritório"
 
 # Ajuste para caber
-#: ../plugins/exchange-operations/exchange-account-setup.c:262
+#: ../plugins/exchange-operations/exchange-account-setup.c:270
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16703,88 +16803,88 @@ msgstr ""
 "A mensagem especificada abaixo será enviada automaticamente\n"
 "para quem enviar correio para você enquanto você estiver fora."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:282
+#: ../plugins/exchange-operations/exchange-account-setup.c:287
 msgid "I am out of the office"
 msgstr "Eu estou fora do escritório"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
+#: ../plugins/exchange-operations/exchange-account-setup.c:283
+#: ../plugins/exchange-operations/exchange-account-setup.c:286
 msgid "I am in the office"
 msgstr "Eu estou no escritório"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:334
 msgid "Change the password for Exchange account"
 msgstr "Alterar a senha para a conta do Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:336
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
-msgstr "Mudar a Senha"
+msgstr "Alterar senha"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:341
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Gerencia as definições do representante para a conta do Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:343
 msgid "Delegation Assistant"
-msgstr "Assistente de Representação"
+msgstr "Assistente de representação"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
+#: ../plugins/exchange-operations/exchange-account-setup.c:355
 msgid "Miscelleneous"
 msgstr "Diversos"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:365
 msgid "View the size of all Exchange folders"
 msgstr "Visualizar o tamanho de todas as pastas de Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:367
 msgid "Folders Size"
-msgstr "Tamanho das Pastas"
+msgstr "Tamanho das pastas"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/exchange-account-setup.c:374
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Configurações do Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:688
+#: ../plugins/exchange-operations/exchange-account-setup.c:696
 msgid "_OWA URL:"
 msgstr "URL _OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:714
+#: ../plugins/exchange-operations/exchange-account-setup.c:722
 msgid "A_uthenticate"
 msgstr "_Autenticar"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:735
+#: ../plugins/exchange-operations/exchange-account-setup.c:743
 msgid "_Mailbox:"
-msgstr "Cai_xa de Correio"
+msgstr "Cai_xa de correio:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:944
 msgid "_Authentication Type"
-msgstr "_Tipo de Autenticação"
+msgstr "_Tipo de autenticação"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:950
+#: ../plugins/exchange-operations/exchange-account-setup.c:958
 msgid "Ch_eck for Supported Types"
-msgstr "_Verificar por Tipos com Suporte"
+msgstr "_Verificar por tipos com suporte"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1062
-#: ../plugins/exchange-operations/exchange-contacts.c:212
+#: ../plugins/exchange-operations/exchange-account-setup.c:1073
+#: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1064
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-account-setup.c:1075
+#: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:165
+#: ../plugins/exchange-operations/exchange-calendar.c:196
+#: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -16810,15 +16910,15 @@ msgstr "As duas senhas não são iguais. Por favor, digite novamente as senhas."
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Confirm Password:"
-msgstr "Confirme a Senha:"
+msgstr "Confirme a senha:"
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:3
 msgid "Current Password:"
-msgstr "Senha Atual:"
+msgstr "Senha atual:"
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:4
 msgid "New Password:"
-msgstr "Nova Senha:"
+msgstr "Nova senha:"
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:5
 msgid "Your current password has expired. Please change your password now."
@@ -16852,7 +16952,7 @@ msgstr "Revisor (somente leitura)"
 #: ../plugins/exchange-operations/exchange-delegates-user.c:242
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
-msgstr "Permissões do Representante"
+msgstr "Permissões do representante"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:253
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
@@ -16900,7 +17000,7 @@ msgstr "Você foi designado como representante de %s"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To"
-msgstr "Delegar Para"
+msgstr "Delegar para"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
@@ -16961,9 +17061,8 @@ msgid ""
 "These users will be able to send mail on your behalf\n"
 "and access your folders with the permissions you give them."
 msgstr ""
-"Estes usuários poderão enviar mensagens em seu\n"
-"nome e acessar as suas pastas com a permissão\n"
-"que você deu a eles."
+"Estes usuários poderão enviar mensagens em seu nome e\n"
+"acessar as suas pastas com a permissão que você deu a eles."
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:14
 msgid "_Delegate can see private items"
@@ -16990,11 +17089,11 @@ msgstr "Permissões..."
 
 #: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
-msgstr "Nome da Pasta"
+msgstr "Nome da pasta"
 
 #: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
-msgstr "Tamanho da Pasta"
+msgstr "Tamanho da pasta"
 
 #. FIXME Limit to one user
 #: ../plugins/exchange-operations/exchange-folder-subscription.c:78
@@ -17004,17 +17103,17 @@ msgstr "Usuário"
 #: ../plugins/exchange-operations/exchange-folder-subscription.c:321
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
-msgstr "Assinar a Pasta de Outro Usuário"
+msgstr "Assina a pasta de outro usuário"
 
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 msgid "Exchange Folder Tree"
-msgstr "Árvore de Pastas do Exchange"
+msgstr "Árvore de pastas do Exchange"
 
 #: ../plugins/exchange-operations/exchange-folder.c:67
 #: ../plugins/exchange-operations/exchange-folder.c:236
 #: ../plugins/exchange-operations/exchange-folder.c:246
 msgid "Unsubscribe Folder..."
-msgstr "Cancelar a Inscrição na Pasta..."
+msgstr "Cancelar a inscrição na pasta..."
 
 #: ../plugins/exchange-operations/exchange-folder.c:466
 #: ../plugins/exchange-operations/exchange-folder.c:521
@@ -17034,17 +17133,17 @@ msgid ""
 "\n"
 "Would you like to change your status to \"In the Office\"? "
 msgstr ""
-"<b>Atualmente o seu estado é \"Fora do Escritório\". </b>\n"
+"<b>Atualmente o seu status é \"Fora do Escritório\". </b>\n"
 "\n"
-"Você deseja alterar o seu estado para \"No Escritório\"? "
+"Você deseja alterar o seu status para \"No Escritório\"? "
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:4
 msgid "<b>Out of Office Message:</b>"
-msgstr "<b>Mensagem de Fora do escritório:</b>"
+msgstr "<b>Mensagem de fora do escritório:</b>"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:5
 msgid "<b>Status:</b>"
-msgstr "<b>Estado:</b>"
+msgstr "<b>Status:</b>"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:6
 msgid ""
@@ -17066,19 +17165,19 @@ msgstr "Eu estou atualmente fora do escritório"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:10
 msgid "No, Don't Change Status"
-msgstr "Não, Não Altere o Estado"
+msgstr "Não, não altere o status"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:11
 msgid "Out of Office Assistant"
-msgstr "Assistente de Fora do Escritório"
+msgstr "Assistente de fora do escritório"
 
 #: ../plugins/exchange-operations/exchange-oof.glade.h:12
 msgid "Yes, Change Status"
-msgstr "Sim, Altere o Estado"
+msgstr "Sim, altere o status"
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
 msgid "Password Expiry Warning..."
-msgstr "Aviso de Vencimento de Senha..."
+msgstr "Aviso de vencimento de senha..."
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
 msgid "Your password will expire in 7 days..."
@@ -17086,7 +17185,7 @@ msgstr "Sua senha vencerá em 7 dias..."
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
 msgid "_Change Password"
-msgstr "_Mudar a Senha"
+msgstr "_Alterar senha"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 msgid "(Permission denied.)"
@@ -17094,14 +17193,14 @@ msgstr "(Permissão negada.)"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 msgid "Add User:"
-msgstr "Adicionar Usuário:"
+msgstr "Adicionar usuário:"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 #: ../plugins/exchange-operations/exchange-send-options.c:410
 #: ../plugins/groupwise-features/proxy.c:937
 #: ../plugins/groupwise-features/share-folder.c:716
 msgid "Add User"
-msgstr "Adicionar Usuário"
+msgstr "Adicionar usuário"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
 msgid "<b>Permissions</b>"
@@ -17125,19 +17224,19 @@ msgstr "Criar subpastas"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Delete Any Items"
-msgstr "Excluir Qualquer Item"
+msgstr "Excluir quaisquer itens"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Own Items"
-msgstr "Excluir Itens de Proprietários"
+msgstr "Excluir os próprios itens"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 msgid "Edit Any Items"
-msgstr "Editar Qualquer Item"
+msgstr "Editar quaisquer itens"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 msgid "Edit Own Items"
-msgstr "Editar Itens de Propriedade"
+msgstr "Editar os próprios itens"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 msgid "Folder contact"
@@ -17161,7 +17260,7 @@ msgstr "Papel: "
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:1
 msgid "<b>Message Settings</b>"
-msgstr "<b>Configuração de Mensagens</b>"
+msgstr "<b>Configuração de mensagens</b>"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:2
 msgid "<b>Tracking Options</b>"
@@ -17169,7 +17268,7 @@ msgstr "<b>Opções de rastreamento</b>"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:3
 msgid "Exchange - Send Options"
-msgstr "Exchange - Opções de Envio"
+msgstr "Exchange - opções de envio"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:4
 msgid "I_mportance: "
@@ -17219,19 +17318,19 @@ msgstr "_Usuário"
 
 #: ../plugins/exchange-operations/exchange-user-dialog.c:136
 msgid "Select User"
-msgstr "Selecionar Usuário"
+msgstr "Selecionar usuário"
 
 #: ../plugins/exchange-operations/exchange-user-dialog.c:174
 msgid "Address Book..."
-msgstr "Catálogo de Endereços..."
+msgstr "Catálogo de endereços..."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
 msgid "Subscribe to Other User's Contacts"
-msgstr "Assinar os Contatos de Outro Usuário"
+msgstr "Assina os contatos de outro usuário"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
 msgid "Subscribe to Other User's Calendar"
-msgstr "Assinar a Agenda Outro Usuário"
+msgstr "Assina a agenda outro usuário"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
 msgid ""
@@ -17389,7 +17488,7 @@ msgstr "Erro genérico"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Global Catalog Server is not reachable"
-msgstr "Servidor de Catálogo Global não esta acessível"
+msgstr "Servidor de catálogo global não esta acessível"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid ""
@@ -17421,7 +17520,7 @@ msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
-msgstr "Nenhum servidor Global de Catálogos configurado para esta conta."
+msgstr "Nenhum servidor global de catálogos configurado para esta conta."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No mailbox for user {0} on {1}."
@@ -17590,11 +17689,11 @@ msgstr "{0} já está na lista"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
 msgid "Subscribe to Other User's Tasks"
-msgstr "Assinar as Tarefas de Outro Usuário"
+msgstr "Assina as tarefas de outro usuário"
 
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
 msgid "Check folder permissions"
-msgstr "Verifique as permissões da pasta"
+msgstr "Verifica as permissões da pasta"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
 msgid "Default External Editor"
@@ -17615,11 +17714,11 @@ msgstr ""
 #. the path to the shared library
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
 msgid "External Editor"
-msgstr "Editor Externo"
+msgstr "Editor externo"
 
 #: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
 msgid "Cannot create Temporary File"
-msgstr "Não foi possível criar o arquivo temporário."
+msgstr "Não foi possível criar o arquivo temporário"
 
 #: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
 msgid "Editor not launchable"
@@ -17679,7 +17778,7 @@ msgid ""
 "configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
 "faces This will be used in messages that are sent further."
 msgstr ""
-"Anexar uma imagem da face  nas mensagens na caixa de saída. Primeiramente o "
+"Anexar uma imagem da face nas mensagens na caixa de saída. Primeiramente o "
 "usuário deve configurar uma imagem PNG de 48x48 pixels. Ela deve esta "
 "codificada na base64 e armazenada na pasta ~/.evolution/faces Esta opção "
 "será usada em todas mensagens enviadas a partir de agora."
@@ -17697,11 +17796,11 @@ msgstr ""
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
-msgstr "Cancelar a Inscrição em Pastas"
+msgstr "Cancelar a inscrição em pastas"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
-msgstr "_Cancelar a Inscrição"
+msgstr "_Cancelar a inscrição"
 
 #: ../plugins/google-account-setup/google-source.c:83
 #: ../plugins/google-account-setup/google-source.c:90
@@ -17753,7 +17852,7 @@ msgstr "Fontes do Google"
 
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 msgid "Checklist"
-msgstr "Lista de Tarefas"
+msgstr "Lista de tarefas"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
 msgid "A plugin to setup groupwise calendar and contacts sources."
@@ -17761,7 +17860,7 @@ msgstr "Um plug-in que configura fontes de agendas e de contatos do GroupWise."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "Groupwise Account Setup"
-msgstr "Configurações de Conta GroupWise"
+msgstr "Configurações de conta GroupWise"
 
 #: ../plugins/groupwise-features/install-shared.c:220
 #, c-format
@@ -17794,20 +17893,20 @@ msgstr "Renomear a pasta partilhada"
 
 #: ../plugins/groupwise-features/install-shared.c:227
 msgid "Shared Folder Installation"
-msgstr "Instalação de Pasta Compartilhada"
+msgstr "Instalação de pasta compartilhada"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
-msgstr "Configurações de Spam"
+msgstr "Configurações de spam"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:93
 #: ../plugins/groupwise-features/junk-settings.glade.h:3
 msgid "Junk Mail Settings"
-msgstr "Configurações de Spam"
+msgstr "Configurações de spam"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
-msgstr "Configurações de Spam..."
+msgstr "Configurações de spam..."
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
 msgid "<b>Junk List:</b>"
@@ -17818,7 +17917,7 @@ msgid "Email:"
 msgstr "E-mail:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
+#: ../plugins/mail-account-disable/mail-account-disable.c:45
 msgid "_Disable"
 msgstr "_Desabilitar"
 
@@ -17828,27 +17927,27 @@ msgstr "_Habilitar"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:7
 msgid "_Junk List"
-msgstr "Lista de Spa_ms"
+msgstr "Lista de spa_ms"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
 msgid "Message Retract"
-msgstr "Retirar mensagem"
+msgstr "Cancelar envio"
 
 #: ../plugins/groupwise-features/mail-retract.c:58
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this ?"
 msgstr ""
-"Retirar uma mensagem pode removê-la da caixa de correio do destinatário. "
-"Você tem certeza que quer fazer isso?"
+"Cancelar o envio de uma mensagem pode removê-la da caixa de correio do "
+"destinatário. Você tem certeza que quer fazer isso?"
 
 #: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
-msgstr "Mensagem retraída com sucesso"
+msgstr "Envio cancelado com sucesso"
 
 #: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
-msgstr "Obtendo Correio"
+msgstr "Cancelar envio"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
@@ -17940,7 +18039,7 @@ msgstr "Você tem que especificar um nome de usuário que quer adicionar à list
 
 #: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
-msgstr "Aceitar por Tentativa"
+msgstr "Aceitar peliminarmente"
 
 #: ../plugins/groupwise-features/properties.glade.h:1
 msgid "<b>Users:</b>"
@@ -17961,7 +18060,7 @@ msgstr "Mensagem"
 
 #: ../plugins/groupwise-features/properties.glade.h:6
 msgid "Shared Folder Notification"
-msgstr "Notificação de Pasta Compartilhada"
+msgstr "Notificação de pasta compartilhada"
 
 #: ../plugins/groupwise-features/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
@@ -17969,11 +18068,11 @@ msgstr "Os participantes receberão a seguinte notificação.\n"
 
 #: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Not Shared"
-msgstr "_Não Compartilhada"
+msgstr "_Não compartilhada"
 
 #: ../plugins/groupwise-features/properties.glade.h:14
 msgid "_Shared With..."
-msgstr "_Compartilhada Com..."
+msgstr "_Compartilhada com..."
 
 #: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Sharing"
@@ -17985,7 +18084,7 @@ msgstr "<b>Nome</b>"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
 msgid "Access Rights"
-msgstr "Direitos de Acesso"
+msgstr "Direitos de acesso"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
 msgid "Add/Edit"
@@ -18005,7 +18104,7 @@ msgstr "Ler itens marcados _particular"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
 msgid "Reminder Notes"
-msgstr "Notas de Lembrete"
+msgstr "Notas de lembrete"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
 msgid "Subscribe to my _alarms"
@@ -18030,14 +18129,14 @@ msgstr "Representante"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
 msgid "<b>Account Name</b>"
-msgstr "<b>Nome da Conta</b>"
+msgstr "<b>Nome da conta</b>"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
 msgid "Proxy Login"
 msgstr "Login de representante"
 
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy-login.c:206
+#: ../plugins/groupwise-features/proxy-login.c:248
 #: ../plugins/groupwise-features/proxy.c:491
 #: ../plugins/groupwise-features/send-options.c:85
 #, c-format
@@ -18047,9 +18146,9 @@ msgstr "%sDigite a senha para %s (usuário %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:512
+#: ../plugins/groupwise-features/proxy-login.c:510
 msgid "_Proxy Login..."
-msgstr "Login de _Representante..."
+msgstr "Login de _representante..."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 #: ../plugins/groupwise-features/proxy.c:692
@@ -18080,7 +18179,7 @@ msgstr "Digite os usuários e defina as permissões"
 
 #: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
-msgstr "_Nova Pasta Compartilhada..."
+msgstr "_Nova pasta compartilhada..."
 
 #: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
@@ -18100,7 +18199,7 @@ msgstr "Modificar"
 
 #: ../plugins/groupwise-features/status-track.c:107
 msgid "Message Status"
-msgstr "Estado da Mensagem"
+msgstr "Status da mensagem"
 
 #. Subject
 #: ../plugins/groupwise-features/status-track.c:121
@@ -18145,11 +18244,11 @@ msgstr "Completada: "
 
 #: ../plugins/groupwise-features/status-track.c:227
 msgid "Undelivered: "
-msgstr "Não Entregue: "
+msgstr "Não entregue: "
 
 #: ../plugins/groupwise-features/status-track.c:251
 msgid "Track Message Status..."
-msgstr "Estado do Rastreador de Mensagem..."
+msgstr "Rastrear status da mensagem..."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
 msgid "A plugin to setup hula calendar sources."
@@ -18157,11 +18256,11 @@ msgstr "Um plug-in que configura fontes de agendas hula."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
 msgid "Hula Account Setup"
-msgstr "Configurações de Conta Hula"
+msgstr "Configurações de conta Hula"
 
 #: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
-msgstr "Cabeçalhos Customizados"
+msgstr "Cabeçalhos personalizados"
 
 #: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
@@ -18169,15 +18268,15 @@ msgstr "Cabeçalhos IMAP"
 
 #: ../plugins/imap-features/imap-headers.glade.h:1
 msgid "<b>Custom Headers</b>"
-msgstr "<b>Cabeçalhos Customizados</b>"
+msgstr "<b>Cabeçalhos personalizados</b>"
 
 #: ../plugins/imap-features/imap-headers.glade.h:2
 msgid "<b>IMAP Headers</b>"
-msgstr "<b>Cabeçalho do IMAP </b>"
+msgstr "<b>Cabeçalho do IMAP</b>"
 
 #: ../plugins/imap-features/imap-headers.glade.h:3
 msgid "Basic and _Mailing List Headers (Default)"
-msgstr "Cabeçalhos Básicos e de Lista de Discussão (Padrão)"
+msgstr "Cabeçalhos básicos e de lista de discussão (Padrão)"
 
 #: ../plugins/imap-features/imap-headers.glade.h:4
 msgid "Fetch A_ll Headers"
@@ -18220,11 +18319,11 @@ msgstr "Funcionalidade do IMAP"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:78
 msgid "_Import to Calendar"
-msgstr "_Importar para Agenda"
+msgstr "_Importar para agenda"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Tasks"
-msgstr "_Importar para Tarefas"
+msgstr "_Importar para tarefas"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:201
 msgid "Import ICS"
@@ -18232,11 +18331,11 @@ msgstr "Importar ICS"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:224
 msgid "Select Task List"
-msgstr "Selecionar Lista de Tarefas"
+msgstr "Selecionar lista de tarefas"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Calendar"
-msgstr "Selecionar Agenda"
+msgstr "Selecionar agenda"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:260
 #: ../shell/e-shell-importer.c:696
@@ -18246,7 +18345,7 @@ msgstr "_Importar"
 #. the path to the shared library
 #: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
 msgid "Import to Calendar"
-msgstr "Importar para Agenda"
+msgstr "Importar para agenda"
 
 #: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
 msgid "Imports ICS attachments to calendar."
@@ -18297,147 +18396,148 @@ msgstr "Sincronizar para iPod"
 msgid "iPod Synchronization"
 msgstr "Sincronização de iPod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:443
-#: ../plugins/itip-formatter/itip-formatter.c:568
+#: ../plugins/itip-formatter/itip-formatter.c:481
+#: ../plugins/itip-formatter/itip-formatter.c:606
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Não é possível abrir a agenda \"%s\""
 
-#: ../plugins/itip-formatter/itip-formatter.c:588
+#: ../plugins/itip-formatter/itip-formatter.c:626
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Um compromisso na agenda \"%s\" está em conflito com esta reunião"
 
-#: ../plugins/itip-formatter/itip-formatter.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:652
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Localizado o compromisso na agenda \"%s\""
 
-#: ../plugins/itip-formatter/itip-formatter.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:738
 msgid "Unable to find any calendars"
 msgstr "Não é possível localizar nenhuma agenda"
 
-#: ../plugins/itip-formatter/itip-formatter.c:697
+#: ../plugins/itip-formatter/itip-formatter.c:745
 msgid "Unable to find this meeting in any calendar"
 msgstr "Não é possível encontrar esta reunião em nenhuma agenda"
 
-#: ../plugins/itip-formatter/itip-formatter.c:701
+#: ../plugins/itip-formatter/itip-formatter.c:749
 msgid "Unable to find this task in any task list"
 msgstr "Não é possível localizar esta tarefa em nenhuma lista de tarefas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:705
+#: ../plugins/itip-formatter/itip-formatter.c:753
 msgid "Unable to find this memo in any memo list"
 msgstr ""
 "Não foi possível localizar este memorando em nenhuma lista de memorandos"
 
-#: ../plugins/itip-formatter/itip-formatter.c:776
+#: ../plugins/itip-formatter/itip-formatter.c:824
 msgid "Searching for an existing version of this appointment"
 msgstr "Pesquisando por uma versão existente deste compromisso"
 
-#: ../plugins/itip-formatter/itip-formatter.c:945
+#: ../plugins/itip-formatter/itip-formatter.c:993
 msgid "Unable to parse item"
 msgstr "Não foi possível analisar item"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1003
+#: ../plugins/itip-formatter/itip-formatter.c:1051
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
-msgstr "Não foi possível enviar item para a agenda \"%s\".  %s"
+msgstr "Não foi possível enviar item para a agenda \"%s\". %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1015
+#: ../plugins/itip-formatter/itip-formatter.c:1063
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado para agenda \"%s\" como aceito"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1019
+#: ../plugins/itip-formatter/itip-formatter.c:1067
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado para a agenda \"%s\" como tentativa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1072
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado para a agenda \"%s\" como recusado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1029
+#: ../plugins/itip-formatter/itip-formatter.c:1077
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado para a agenda \"%s\" como cancelado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1171
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "O organizador removeu o representante %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1178
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviar uma notificação de cancelamento para o representante"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1180
 msgid "Could not send the cancelation notice to the delegate"
 msgstr ""
 "Não foi possível enviar a notificação de cancelamento para o representante"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1218
+#: ../plugins/itip-formatter/itip-formatter.c:1266
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
-"Estado do participante não pôde ser atualizado devido a um estado inválido"
+"Não foi possível atualizar o status do participante porque o status é "
+"inválido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1245
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Não é possível atualizar participante. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1249
+#: ../plugins/itip-formatter/itip-formatter.c:1297
 msgid "Attendee status updated"
-msgstr "Estado do participante atualizado"
+msgstr "Status do participante atualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1323
 msgid "Meeting information sent"
 msgstr "Informação de reunião enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1326
 msgid "Task information sent"
 msgstr "Informação de tarefa enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1329
 msgid "Memo information sent"
 msgstr "Informação do memorando enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1290
+#: ../plugins/itip-formatter/itip-formatter.c:1338
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Não pode enviar a informação de reunião, essa reunião não existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1293
+#: ../plugins/itip-formatter/itip-formatter.c:1341
 msgid "Unable to send task information, the task does not exist"
 msgstr "Não foi possível enviar esta tarefa, a tarefa não existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1296
+#: ../plugins/itip-formatter/itip-formatter.c:1344
 msgid "Unable to send memo information, the memo does not exist"
 msgstr ""
-"Não foi possível enviar a informação do memorando,  esse memorando não existe"
+"Não foi possível enviar a informação do memorando, esse memorando não existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1365
-#: ../plugins/itip-formatter/itip-formatter.c:1376
+#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1424
 msgid "The calendar attached is not valid"
 msgstr "A agenda anexada não é válida"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1414
+#: ../plugins/itip-formatter/itip-formatter.c:1425
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
 "A mensagem diz conter uma agenda, mas a agenda não é um iCalendar válido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
-#: ../plugins/itip-formatter/itip-formatter.c:1435
-#: ../plugins/itip-formatter/itip-formatter.c:1517
+#: ../plugins/itip-formatter/itip-formatter.c:1465
+#: ../plugins/itip-formatter/itip-formatter.c:1493
+#: ../plugins/itip-formatter/itip-formatter.c:1575
 msgid "The item in the calendar is not valid"
 msgstr "O item na agenda não é válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1418
-#: ../plugins/itip-formatter/itip-formatter.c:1436
-#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1466
+#: ../plugins/itip-formatter/itip-formatter.c:1494
+#: ../plugins/itip-formatter/itip-formatter.c:1576
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18445,11 +18545,11 @@ msgstr ""
 "A mensagem contém uma agenda, mas a agenda não contém eventos, tarefas ou "
 "informação de disponibilidade"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1447
+#: ../plugins/itip-formatter/itip-formatter.c:1505
 msgid "The calendar attached contains multiple items"
 msgstr "A agenda anexa contém múltiplos itens"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1506
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18457,31 +18557,31 @@ msgstr ""
 "Para processar todos estes itens, o arquivo deve ser salvo e a agenda "
 "importada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2148
+#: ../plugins/itip-formatter/itip-formatter.c:2215
 msgid "This meeting recurs"
 msgstr "Esta reunião se repete"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2151
+#: ../plugins/itip-formatter/itip-formatter.c:2218
 msgid "This task recurs"
 msgstr "Esta tarefa se repete"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2154
+#: ../plugins/itip-formatter/itip-formatter.c:2221
 msgid "This memo recurs"
 msgstr "Este memorando se repete"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2383
+#: ../plugins/itip-formatter/itip-formatter.c:2452
 msgid "_Delete message after acting"
 msgstr "E_xcluir mensagem depois da ação"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2393
-#: ../plugins/itip-formatter/itip-formatter.c:2425
+#: ../plugins/itip-formatter/itip-formatter.c:2462
+#: ../plugins/itip-formatter/itip-formatter.c:2494
 msgid "Conflict Search"
-msgstr "Pesquisa de Conflitos"
+msgstr "Pesquisa de conflitos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2408
+#: ../plugins/itip-formatter/itip-formatter.c:2477
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Selecione a agenda para pesquisar por conflitos de reunião"
 
@@ -18660,12 +18760,12 @@ msgstr "<b>%s</b> delegou a seguinte reunião para você:"
 #: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> requisita a sua presença na seguinte reunião através de %s:"
+msgstr "<b>%s</b> solicita a sua presença na seguinte reunião através de %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
-msgstr "<b>%s</b> requisita a sua presença na seguinte reunião:"
+msgstr "<b>%s</b> solicita a sua presença na seguinte reunião:"
 
 #: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
@@ -18746,7 +18846,7 @@ msgstr "<b>%s</b> publicou a seguinte tarefa:"
 #: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr "<b>%s</b> requisita a atribuição de %s para a seguinte tarefa:"
+msgstr "<b>%s</b> solicita a atribuição de %s para a seguinte tarefa:"
 
 #: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
@@ -18863,7 +18963,7 @@ msgstr "<b>%s</b> cancelou a seguinte tarefa compartilhada"
 #. Everything gets the open button
 #: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
-msgstr "_Abrir Agenda"
+msgstr "_Abrir agenda"
 
 #: ../plugins/itip-formatter/itip-view.c:824
 #: ../plugins/itip-formatter/itip-view.c:828
@@ -18903,12 +19003,12 @@ msgstr "_Aceitar tudo"
 #. FIXME Is this really the right button?
 #: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
-msgstr "_Enviar Informação"
+msgstr "_Enviar informação"
 
 #. FIXME Is this really the right button?
 #: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
-msgstr "_Atualizar Estado do Participante"
+msgstr "_Atualizar status do participante"
 
 #: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
@@ -18960,7 +19060,7 @@ msgstr "Exibe partes de texto/agenda nas mensagens."
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
-msgstr "Formatadores Itip"
+msgstr "Formatador iTIP"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
@@ -18980,7 +19080,7 @@ msgid ""
 msgstr ""
 "Esta resposta não é de um participante atual. Adicioná-lo como participante?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:47
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "Proxy _Logout"
 msgstr "_Logout de representante"
 
@@ -18990,7 +19090,7 @@ msgstr "Permitir desabilitação de contas."
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
 msgid "Disable Account"
-msgstr "Desabilitar Conta"
+msgstr "Desabilitar conta"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
@@ -19066,7 +19166,7 @@ msgstr "Para notificar novas mensagens apenas na caixa de entrada."
 
 #: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
-msgstr "Gerar Mensagens _D-Bus"
+msgstr "Gerar uma mensagem _D-Bus"
 
 #: ../plugins/mail-notification/mail-notification.c:378
 msgid "Evolution's Mail Notification"
@@ -19155,7 +19255,7 @@ msgstr ""
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Mail Notification"
-msgstr "Notificação de Mensagem"
+msgstr "Notificação de mensagem"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
 msgid ""
@@ -19167,7 +19267,7 @@ msgstr ""
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
 msgid "Con_vert to Meeting"
-msgstr "Con_verter para Reunião"
+msgstr "Con_verter para reunião"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
 msgid "Mail to meeting"
@@ -19197,7 +19297,7 @@ msgstr ""
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
 msgid "Con_vert to Task"
-msgstr "Con_verter para Tarefa"
+msgstr "_Converter para tarefa"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
 msgid "Mail to task"
@@ -19221,12 +19321,12 @@ msgstr "Obter informação sobre a _utilização da lista"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
 msgid "Mailing List Actions"
-msgstr "Ações da Lista de Discussão"
+msgstr "Ações da lista de discussão"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
 msgid "Mailing _List"
-msgstr "_Lista de Discussão"
+msgstr "_Lista de discussão"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
 msgid ""
@@ -19333,8 +19433,7 @@ msgstr "Contatar o pr_oprietário da lista"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
 msgid "Contact the owner of the mailing list this message belongs to"
-msgstr ""
-"Contatar o proprietário da lista de mensagens a qual esta mensagem pertence"
+msgstr "Contata o proprietário da lista de mensagens dessa mensagem"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
 msgid "Get List _Archive"
@@ -19346,25 +19445,23 @@ msgstr "Obter informação sobre a _utilização da lista"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get an archive of the list this message belongs to"
-msgstr "Obter um arquivo da lista a qual esta mensagem pertence"
+msgstr "Obtém um histórico da lista de discussão dessa mensagem"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get information about the usage of the list this message belongs to"
-msgstr ""
-"Obter informação sobre a utilização da lista a qual esta mensagem pertence"
+msgstr "Obtém informações sobre como usar a lista de discussão dessa mensagem"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
 msgid "Post a message to the mailing list this message belongs to"
-msgstr "Enviar uma mensagem para a lista de discussão da mensagem"
+msgstr "Envia uma mensagem para a lista de discussão dessa mensagem"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
 msgid "Subscribe to the mailing list this message belongs to"
-msgstr "Inscrever-se na lista de discussão a qual esta mensagem pertence"
+msgstr "Inscreve na lista de discussão dessa mensagem"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
 msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr ""
-"Cancelar a inscrição na lista de discussão a qual esta mensagem pertence"
+msgstr "Cancela a inscrição na lista de discussão dessa mensagem"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post Message to List"
@@ -19376,7 +19473,7 @@ msgstr "In_screver-se na lista"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Unsubscribe from List"
-msgstr "Sair da Lista"
+msgstr "_Desinscrever-se da lista"
 
 #: ../plugins/mark-all-read/mark-all-read.c:39
 msgid "Also mark messages in subfolders?"
@@ -19404,7 +19501,7 @@ msgstr "Marcar Tudo como Lido"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
 msgid "Mark Me_ssages as Read"
-msgstr "Marcar Men_sagens como Lidas"
+msgstr "M_arcar mensagens como lidas"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
 msgid "Used for marking all the messages under a folder as read"
@@ -19443,11 +19540,11 @@ msgstr ""
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
 #: ../plugins/plugin-manager/plugin-manager.c:252
 msgid "Plugin Manager"
-msgstr "Gerenciador de Plug-in"
+msgstr "Gerenciador de plug-in"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
 msgid "Enable and disable plugins"
-msgstr "Habilitar e desabilitar plug-ins"
+msgstr "Habilita e desabilita plug-ins"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
 msgid "_Plugins"
@@ -19489,11 +19586,11 @@ msgstr ""
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
 msgid "Plain Text Mode"
-msgstr "Modo de Texto sem Formatação"
+msgstr "Modo de texto simples"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
 msgid "Prefer plain-text"
-msgstr "Preferir texto sem formatação"
+msgstr "Preferir texto simples"
 
 #: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Show HTML if present"
@@ -19501,11 +19598,11 @@ msgstr "Mostrar HTML se presente"
 
 #: ../plugins/prefer-plain/prefer-plain.c:192
 msgid "Prefer PLAIN"
-msgstr "Preferir Texto Puro"
+msgstr "Preferir texto simples"
 
 #: ../plugins/prefer-plain/prefer-plain.c:193
 msgid "Only ever show PLAIN"
-msgstr "Só mostrar Texto Puro"
+msgstr "Só mostrar texto simples"
 
 #: ../plugins/prefer-plain/prefer-plain.c:236
 msgid "HTML _Mode"
@@ -19513,7 +19610,7 @@ msgstr "_Modo HTML"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
-msgstr "Controlador de Perfil do Evolution"
+msgstr "Controlador de perfil do Evolution"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
 msgid "Writes a log of profiling data events."
@@ -19525,7 +19622,7 @@ msgstr "Permite que agendas sejam publicadas na web"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Calendar Publishing"
-msgstr "Publicação de Agendas"
+msgstr "Publicação de agendas"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
 msgid "Locations"
@@ -19533,9 +19630,9 @@ msgstr "Locais"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
 msgid "_Publish Calendar Information"
-msgstr "_Publicar Informação de Agenda"
+msgstr "_Publicar informação de agenda"
 
-#: ../plugins/publish-calendar/publish-calendar.c:595
+#: ../plugins/publish-calendar/publish-calendar.c:596
 msgid "Are you sure you want to remove this URL?"
 msgstr "Você tem certeza de que deseja excluir esta URL?"
 
@@ -19567,11 +19664,11 @@ msgstr "_Porta:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:11
 msgid "Publishing Location"
-msgstr "Local de Publicação"
+msgstr "Local de publicação"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:12
 msgid "Publishing _Frequency:"
-msgstr "_Freqüência de Publicação:"
+msgstr "_Freqüência de publicação:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
 msgid ""
@@ -19593,7 +19690,7 @@ msgstr ""
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:20
 msgid "Service _type:"
-msgstr "_Tipo do Serviço:"
+msgstr "_Tipo do serviço:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:22
 msgid "_File:"
@@ -19613,7 +19710,7 @@ msgstr "_Lembrar senha"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Username:"
-msgstr "Nome do _Usuário:"
+msgstr "Nome do _usuário:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid ""
@@ -19723,7 +19820,7 @@ msgstr "Salvar anexos"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
 msgid "Save Attachments..."
-msgstr "Salvar Anexos..."
+msgstr "Salvar anexos..."
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
 msgid "Save all attachments"
@@ -19755,15 +19852,15 @@ msgstr "UID"
 
 #: ../plugins/save-calendar/csv-format.c:363
 msgid "Description List"
-msgstr "Lista de Descrição"
+msgstr "Lista de descrição"
 
 #: ../plugins/save-calendar/csv-format.c:364
 msgid "Categories List"
-msgstr "Lista de Categorias"
+msgstr "Lista de categorias"
 
 #: ../plugins/save-calendar/csv-format.c:365
 msgid "Comment List"
-msgstr "Lista de Comentários"
+msgstr "Lista de comentários"
 
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Created"
@@ -19771,7 +19868,7 @@ msgstr "Criado"
 
 #: ../plugins/save-calendar/csv-format.c:368
 msgid "Contact List"
-msgstr "Lista de Contatos"
+msgstr "Lista de contatos"
 
 #: ../plugins/save-calendar/csv-format.c:369
 msgid "Start"
@@ -19791,7 +19888,7 @@ msgstr "URL"
 
 #: ../plugins/save-calendar/csv-format.c:375
 msgid "Attendees List"
-msgstr "Lista de Participantes"
+msgstr "Lista de participantes"
 
 #: ../plugins/save-calendar/csv-format.c:377
 msgid "Modified"
@@ -19823,7 +19920,7 @@ msgstr "Formato de valores separados por vírgula (.csv)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
-msgstr "Salvar Selecionado"
+msgstr "Salvar selecionado"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
 msgid "Saves selected calendar or tasks list to disk."
@@ -19831,7 +19928,7 @@ msgstr "Salvar agendas ou lista de tarefas no disco."
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
 msgid "_Save to Disk"
-msgstr "_Salvar no Disco"
+msgstr "_Salvar no disco"
 
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
@@ -19860,15 +19957,15 @@ msgstr "Selecionar uma agenda ou fonte de tarefas para visualização."
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 msgid "Show _only this Calendar"
-msgstr "M_ostrar somente esta Agenda"
+msgstr "M_ostrar somente esta agenda"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
 msgid "Show _only this Memo List"
-msgstr "M_ostrar somente esta Lista de  Memorandos"
+msgstr "M_ostrar somente esta lista de memorandos"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
 msgid "Show _only this Task List"
-msgstr "M_ostrar somente esta Lista de Tarefas"
+msgstr "M_ostrar somente esta lista de tarefas"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Guides you through your initial account setup."
@@ -19880,7 +19977,7 @@ msgstr "Assistente de configuração"
 
 #: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
-msgstr "Assistente de Configuração do Evolution"
+msgstr "Assistente de configuração do Evolution"
 
 #: ../plugins/startup-wizard/startup-wizard.c:88
 msgid "Welcome"
@@ -19931,7 +20028,7 @@ msgstr "Indica se o encadeamento das mensagens deve retornar no assunto."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
-msgstr "Encadeamento de Assunto"
+msgstr "Encadeamento de assunto"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
 msgid "Thread messages by subject"
@@ -19972,7 +20069,7 @@ msgstr "Um plug-in simples que usa ytnef para decodificar anexos tnef."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
 msgid "TNEF Attachment decoder"
-msgstr "Decodificador de Anexos TNEF"
+msgstr "Decodificador de anexos TNEF"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
 msgid "A plugin to setup WebDAV contacts."
@@ -20002,7 +20099,7 @@ msgstr "Shell do Evolution"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
 msgid "Evolution Shell Config factory"
-msgstr "Fábrica de Configuração do Shell do Evolution"
+msgstr "Fábrica de configuração do shell do Evolution"
 
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
@@ -20010,7 +20107,7 @@ msgstr "Teste do Evolution"
 
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
 msgid "Evolution Test component"
-msgstr "Componente de Teste do Evolution"
+msgstr "Componente de teste do Evolution"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
@@ -20288,11 +20385,11 @@ msgstr "Botões de janela são visíveis"
 
 #: ../shell/e-active-connection-dialog.glade.h:1
 msgid "<b>Active Connections</b>"
-msgstr "<b>Conexões Ativas</b>"
+msgstr "<b>Conexões ativas</b>"
 
 #: ../shell/e-active-connection-dialog.glade.h:2
 msgid "Active Connections"
-msgstr "Conexões Ativas"
+msgstr "Conexões ativas"
 
 #: ../shell/e-active-connection-dialog.glade.h:3
 msgid "Click OK to close these connections and go offline"
@@ -20328,7 +20425,7 @@ msgstr ""
 
 #: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
-msgstr "_Nome do Arquivo:"
+msgstr "_Nome do arquivo:"
 
 #: ../shell/e-shell-importer.c:287
 msgid "Select a file"
@@ -20399,15 +20496,15 @@ msgstr "Erro ao abrir a página de FAQ."
 
 #: ../shell/e-shell-window-commands.c:1168
 msgid "_Work Online"
-msgstr "_Trabalhar Conectado"
+msgstr "_Trabalhar conectado"
 
 #: ../shell/e-shell-window-commands.c:1181 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
-msgstr "_Trabalhar Desconectado"
+msgstr "_Trabalhar desconectado"
 
 #: ../shell/e-shell-window-commands.c:1194
 msgid "Work Offline"
-msgstr "Trabalhar Desconectado"
+msgstr "Trabalhar desconectado"
 
 #: ../shell/e-shell-window.c:381
 msgid ""
@@ -20432,7 +20529,7 @@ msgstr ""
 #: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
-msgstr "Mudar para %s"
+msgstr "Alterna para %s"
 
 #: ../shell/e-shell.c:641
 msgid "Unknown system error."
@@ -20467,7 +20564,12 @@ msgstr "Novo"
 
 #: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
-msgstr "Novo Teste"
+msgstr "Novo teste"
+
+#: ../shell/test/evolution-test-component.c:106
+msgctxt "New"
+msgid "_Test"
+msgstr "_Teste"
 
 #: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
@@ -20480,27 +20582,27 @@ msgstr ""
 
 #: ../shell/import.glade.h:2
 msgid "Evolution Import Assistant"
-msgstr "Assistente de Importação do Evolution"
+msgstr "Assistente de importação do Evolution"
 
 #: ../shell/import.glade.h:3
 msgid "Import File"
-msgstr "Importar Arquivo"
+msgstr "Importar arquivo"
 
 #: ../shell/import.glade.h:4
 msgid "Import Location"
-msgstr "Importar Local"
+msgstr "Importar local"
 
 #: ../shell/import.glade.h:5
 msgid "Importer Type"
-msgstr "Importar Tipo"
+msgstr "Importar tipo"
 
 #: ../shell/import.glade.h:6
 msgid "Select Importers"
-msgstr "Selecionar Importadores"
+msgstr "Selecionar importadores"
 
 #: ../shell/import.glade.h:7
 msgid "Select a File"
-msgstr "Selecionar um Arquivo"
+msgstr "Selecionar um arquivo"
 
 #: ../shell/import.glade.h:8
 msgid ""
@@ -20563,35 +20665,36 @@ msgstr "Não me diga novamente"
 
 #: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
-msgstr "Iniciar o Evolution ativando o componente especificado"
+msgstr "Inicia o Evolution ativando o componente especificado"
 
 #: ../shell/main.c:473
 msgid "Start in online mode"
-msgstr "Iniciar no modo conectado"
+msgstr "Inicia no modo conectado"
 
 #: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
-msgstr "Desligar a força todos os componentes do Evolution"
+msgstr "Desliga à força todos os componentes do Evolution"
 
 #: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "Executar novamente a migração do Evolution 1.4"
+msgstr "Executa novamente a migração do Evolution 1.4"
 
 #: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
-msgstr "Enviar a saída de depuração de todos os componentes para um arquivo."
+msgstr "Envia a saída de depuração de todos os componentes para um arquivo."
 
 #: ../shell/main.c:485
 msgid "Disable loading of any plugins."
-msgstr "Desabilitar o carregamento de qualquer plug-ins."
+msgstr "Desabilita o carregamento de qualquer plug-ins."
 
 #: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
-msgstr "Desabilitar o painel de visualização do Correio, Contatos e Tarefas."
+msgstr "Desabilita o painel de visualização do Correio, Contatos e Tarefas."
 
+# Descrição obtida com "evolution --help"
 #: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
-msgstr "- O PIM e Cliente de E-mail Evolution"
+msgstr "- Cliente de e-mail e gerenciador de informações pessoais (PIM)"
 
 #: ../shell/main.c:600
 #, c-format
@@ -20725,11 +20828,11 @@ msgstr "_Esquecer"
 
 #: ../shell/shell.error.xml.h:33
 msgid "_Keep Data"
-msgstr "_Manter Dados"
+msgstr "_Manter dados"
 
 #: ../shell/shell.error.xml.h:34
 msgid "_Remind Me Later"
-msgstr "_Lembre-me Mais Tarde"
+msgstr "_Lembre-me mais tarde"
 
 #: ../shell/shell.error.xml.h:35
 msgid ""
@@ -20794,7 +20897,7 @@ msgstr "Todos os arquivos"
 #: ../smime/gui/certificate-manager.c:480
 #: ../smime/gui/certificate-manager.c:702
 msgid "Certificate Name"
-msgstr "Nome do Certificado"
+msgstr "Nome do certificado"
 
 #: ../smime/gui/certificate-manager.c:280
 #: ../smime/gui/certificate-manager.c:498
@@ -20802,9 +20905,9 @@ msgid "Purposes"
 msgstr "Propósitos"
 
 #: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:570
+#: ../smime/lib/e-cert.c:553
 msgid "Serial Number"
-msgstr "Número de Série"
+msgstr "Número de série"
 
 #: ../smime/gui/certificate-manager.c:297
 msgid "Expires"
@@ -20816,7 +20919,7 @@ msgstr "Todos os arquivos de certificados de e-mail"
 
 #: ../smime/gui/certificate-manager.c:489
 msgid "E-Mail Address"
-msgstr "Endereço de E-mail"
+msgstr "Endereço de e-mail"
 
 #: ../smime/gui/certificate-manager.c:613
 msgid "All CA certificate files"
@@ -20825,7 +20928,7 @@ msgstr "Todos os arquivos de certificados CA"
 #: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
-msgstr "Visualizador de Certificado: %s"
+msgstr "Visualizador de certificado: %s"
 
 #: ../smime/gui/component.c:46
 #, c-format
@@ -20849,7 +20952,7 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 "Emitido para:\n"
-"       Assunto: %s\n"
+"     Assunto: %s\n"
 
 #: ../smime/gui/e-cert-selector.c:118
 #, c-format
@@ -20858,7 +20961,7 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 "Emitido por:\n"
-"     Assunto: %s\n"
+"    Assunto: %s\n"
 
 #: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
@@ -20866,31 +20969,31 @@ msgstr "Selecionar certificado"
 
 #: ../smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
-msgstr "<Não é Parte do Certificado>"
+msgstr "<Não é parte do certificado>"
 
 #: ../smime/gui/smime-ui.glade.h:2
 msgid "<b>Certificate Fields</b>"
-msgstr "<b>Campos do Certificado</b>"
+msgstr "<b>Campos do certificado</b>"
 
 #: ../smime/gui/smime-ui.glade.h:3
 msgid "<b>Certificate Hierarchy</b>"
-msgstr "<b>Hierarquia do Certificado</b>"
+msgstr "<b>Hierarquia do certificado</b>"
 
 #: ../smime/gui/smime-ui.glade.h:4
 msgid "<b>Field Value</b>"
-msgstr "<b>Valor do Campo</b>"
+msgstr "<b>Valor do campo</b>"
 
 #: ../smime/gui/smime-ui.glade.h:5
 msgid "<b>Fingerprints</b>"
-msgstr "<b>Impressões Digitais</b>"
+msgstr "<b>Impressões digitais</b>"
 
 #: ../smime/gui/smime-ui.glade.h:6
 msgid "<b>Issued By</b>"
-msgstr "<b>Emitido Por</b>"
+msgstr "<b>Emitido por</b>"
 
 #: ../smime/gui/smime-ui.glade.h:7
 msgid "<b>Issued To</b>"
-msgstr "<b>Emitido Para</b>"
+msgstr "<b>Emitido para</b>"
 
 #: ../smime/gui/smime-ui.glade.h:8
 msgid "<b>This certificate has been verified for the following uses:</b>"
@@ -20910,7 +21013,7 @@ msgstr "Backup"
 
 #: ../smime/gui/smime-ui.glade.h:12
 msgid "Backup All"
-msgstr "Fazer Backup de Tudo"
+msgstr "Fazer backup de tudo"
 
 #: ../smime/gui/smime-ui.glade.h:13
 msgid ""
@@ -20920,13 +21023,13 @@ msgstr ""
 "Antes de confiar neste CA para qualquer propósito você deve examinar o seu "
 "certificado e as suas políticas e procedimentos (se disponíveis)."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
 msgid "Certificate"
 msgstr "Certificado"
 
 #: ../smime/gui/smime-ui.glade.h:15
 msgid "Certificate Authority Trust"
-msgstr "Confiança da Autoridade Certificadora"
+msgstr "Confiança da autoridade certificadora"
 
 #: ../smime/gui/smime-ui.glade.h:16
 msgid "Certificate details"
@@ -20934,15 +21037,15 @@ msgstr "Detalhes do certificado"
 
 #: ../smime/gui/smime-ui.glade.h:17
 msgid "Certificates Table"
-msgstr "Tabela de Certificados"
+msgstr "Tabela de certificados"
 
 #: ../smime/gui/smime-ui.glade.h:18
 msgid "Common Name (CN)"
-msgstr "Common Name (CN)"
+msgstr "Nome comum (CN)"
 
 #: ../smime/gui/smime-ui.glade.h:19
 msgid "Contact Certificates"
-msgstr "Certificados do Contato"
+msgstr "Certificados do contato"
 
 #: ../smime/gui/smime-ui.glade.h:21
 msgid "Do not trust the authenticity of this certificate"
@@ -20958,19 +21061,19 @@ msgstr "Editar"
 
 #: ../smime/gui/smime-ui.glade.h:24
 msgid "Email Certificate Trust Settings"
-msgstr "Configurações de Confiança do Certificado da E-mail"
+msgstr "Configurações de confiança do certificado do e-mail"
 
 #: ../smime/gui/smime-ui.glade.h:25
 msgid "Email Recipient Certificate"
-msgstr "Certificado do Destinatário do E-mail"
+msgstr "Certificado do destinatário do e-mail"
 
 #: ../smime/gui/smime-ui.glade.h:26
 msgid "Email Signer Certificate"
-msgstr "Certificado de Quem Assina o E-mail"
+msgstr "Certificado de quem assina o e-mail"
 
 #: ../smime/gui/smime-ui.glade.h:27
 msgid "Expires On"
-msgstr "Válido Até"
+msgstr "Válido até"
 
 #: ../smime/gui/smime-ui.glade.h:29
 msgid "Import"
@@ -20978,11 +21081,11 @@ msgstr "Importar"
 
 #: ../smime/gui/smime-ui.glade.h:30
 msgid "Issued On"
-msgstr "Emitido Em"
+msgstr "Emitido em"
 
 #: ../smime/gui/smime-ui.glade.h:31
 msgid "MD5 Fingerprint"
-msgstr "Impressão Digital MD5"
+msgstr "Impressão digital MD5"
 
 #: ../smime/gui/smime-ui.glade.h:32
 msgid "Organization (O)"
@@ -20990,19 +21093,19 @@ msgstr "Organização (O)"
 
 #: ../smime/gui/smime-ui.glade.h:33
 msgid "Organizational Unit (OU)"
-msgstr "Unidade Organizacional (OU)"
+msgstr "Unidade organizacional (OU)"
 
 #: ../smime/gui/smime-ui.glade.h:34
 msgid "SHA1 Fingerprint"
-msgstr "Impressão Digital SHA1"
+msgstr "Impressão digital SHA1"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
 msgid "SSL Client Certificate"
-msgstr "Certificado do Cliente SSL"
+msgstr "Certificado do cliente SSL"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
 msgid "SSL Server Certificate"
-msgstr "Certificado do Servidor SSL"
+msgstr "Certificado do servidor SSL"
 
 #: ../smime/gui/smime-ui.glade.h:38
 msgid "Trust the authenticity of this certificate"
@@ -21041,191 +21144,191 @@ msgstr "Você possui certificados em arquivo que identificam estas pessoas:"
 
 #: ../smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
-msgstr "Seus Certificados"
+msgstr "Seus certificados"
 
 #: ../smime/gui/smime-ui.glade.h:47
 msgid "_Edit CA Trust"
-msgstr "_Editar Confiança do CA"
+msgstr "_Editar confiança da CA"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:672
+#: ../smime/lib/e-cert-db.c:656
 msgid "Certificate already exists"
 msgstr "O certificado já existe"
 
-#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:408
 msgid "Sign"
 msgstr "Assinar"
 
-#: ../smime/lib/e-cert.c:426
+#: ../smime/lib/e-cert.c:409
 msgid "Encrypt"
 msgstr "Criptografar"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:514
 msgid "Version"
 msgstr "Versão"
 
-#: ../smime/lib/e-cert.c:546
+#: ../smime/lib/e-cert.c:529
 msgid "Version 1"
 msgstr "Versão 1"
 
-#: ../smime/lib/e-cert.c:549
+#: ../smime/lib/e-cert.c:532
 msgid "Version 2"
 msgstr "Versão 2"
 
-#: ../smime/lib/e-cert.c:552
+#: ../smime/lib/e-cert.c:535
 msgid "Version 3"
 msgstr "Versão 3"
 
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-cert.c:617
 msgid "PKCS #1 MD2 With RSA Encryption"
-msgstr "PKCS #1 MD2 com Criptografia RSA"
+msgstr "PKCS #1 MD2 com criptografia RSA"
 
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-cert.c:620
 msgid "PKCS #1 MD5 With RSA Encryption"
-msgstr "PKCS #1 MD5 com Criptografia RSA"
+msgstr "PKCS #1 MD5 com criptografia RSA"
 
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-cert.c:623
 msgid "PKCS #1 SHA-1 With RSA Encryption"
-msgstr "PKCS #1 SHA-1 com Criptografia RSA"
+msgstr "PKCS #1 SHA-1 com criptografia RSA"
 
-#: ../smime/lib/e-cert.c:667
+#: ../smime/lib/e-cert.c:650
 msgid "PKCS #1 RSA Encryption"
-msgstr "PKCS #1 Criptografia RSA"
+msgstr "PKCS #1 criptografia RSA"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:653
 msgid "Certificate Key Usage"
-msgstr "Utilização da Chave do Certificado"
+msgstr "Utilização da chave do certificado"
 
-#: ../smime/lib/e-cert.c:673
+#: ../smime/lib/e-cert.c:656
 msgid "Netscape Certificate Type"
-msgstr "Tipo de Certificado Netscape"
+msgstr "Tipo de certificado Netscape"
 
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:659
 msgid "Certificate Authority Key Identifier"
-msgstr "Identificador da Chave da Autoridade Certificadora"
+msgstr "Identificador da chave da autoridade certificadora"
 
-#: ../smime/lib/e-cert.c:688
+#: ../smime/lib/e-cert.c:671
 #, c-format
 msgid "Object Identifier (%s)"
-msgstr "Identificador do Objeto (%s)"
+msgstr "Identificador de objeto (%s)"
 
-#: ../smime/lib/e-cert.c:739
+#: ../smime/lib/e-cert.c:722
 msgid "Algorithm Identifier"
-msgstr "Identificador do Algoritmo"
+msgstr "Identificador do algoritmo"
 
-#: ../smime/lib/e-cert.c:747
+#: ../smime/lib/e-cert.c:730
 msgid "Algorithm Parameters"
-msgstr "Parâmetros do Algoritmo"
+msgstr "Parâmetros do algoritmo"
 
-#: ../smime/lib/e-cert.c:769
+#: ../smime/lib/e-cert.c:752
 msgid "Subject Public Key Info"
-msgstr "Informação da Chave Pública do Sujeito"
+msgstr "Informação da chave pública do sujeito"
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:757
 msgid "Subject Public Key Algorithm"
-msgstr "Algoritmo da Chave Pública do Sujeito"
+msgstr "Algoritmo da chave pública do sujeito"
 
-#: ../smime/lib/e-cert.c:789
+#: ../smime/lib/e-cert.c:772
 msgid "Subject's Public Key"
-msgstr "Chave Pública do Assunto"
+msgstr "Chave pública do sujeito"
 
-#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
 msgid "Error: Unable to process extension"
 msgstr "Erro: Não é possível processar extensão"
 
-#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
 msgid "Object Signer"
-msgstr "Autor da Assinatura do Objeto"
+msgstr "Autor da assinatura do objeto"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:818
 msgid "SSL Certificate Authority"
-msgstr "Autoridade Certificadora SSL"
+msgstr "Autoridade certificadora SSL"
 
-#: ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:822
 msgid "Email Certificate Authority"
-msgstr "Autoridade Certificadora de E-mail"
+msgstr "Autoridade certificadora do e-mail"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:850
 msgid "Signing"
 msgstr "Assinando"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:854
 msgid "Non-repudiation"
 msgstr "Não-repúdio"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:858
 msgid "Key Encipherment"
-msgstr "Criptografia da Chave"
+msgstr "Criptografia da chave"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:862
 msgid "Data Encipherment"
-msgstr "Criptografia de Dados"
+msgstr "Criptografia de dados"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:866
 msgid "Key Agreement"
-msgstr "Acordo de Chave"
+msgstr "Acordo de chave"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:870
 msgid "Certificate Signer"
-msgstr "Autor da Assinatura do Certificado"
+msgstr "Autor da assinatura do certificado"
 
-#: ../smime/lib/e-cert.c:891
+#: ../smime/lib/e-cert.c:874
 msgid "CRL Signer"
-msgstr "Autor da Assinatura CRL"
+msgstr "Autor da assinatura CRL"
 
-#: ../smime/lib/e-cert.c:939
+#: ../smime/lib/e-cert.c:922
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
 msgid "Not Critical"
-msgstr "Não Crítico"
+msgstr "Não crítico"
 
-#: ../smime/lib/e-cert.c:965
+#: ../smime/lib/e-cert.c:948
 msgid "Extensions"
 msgstr "Extensões"
 
-#: ../smime/lib/e-cert.c:1036
+#: ../smime/lib/e-cert.c:1019
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
+#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
 msgid "Certificate Signature Algorithm"
-msgstr "Algoritmo da Assinatura do Certificado"
+msgstr "Algoritmo da assinatura do certificado"
 
-#: ../smime/lib/e-cert.c:1101
+#: ../smime/lib/e-cert.c:1084
 msgid "Issuer"
 msgstr "Emissor"
 
-#: ../smime/lib/e-cert.c:1155
+#: ../smime/lib/e-cert.c:1138
 msgid "Issuer Unique ID"
-msgstr "ID Único do Emissor"
+msgstr "ID único do emissor"
 
-#: ../smime/lib/e-cert.c:1174
+#: ../smime/lib/e-cert.c:1157
 msgid "Subject Unique ID"
-msgstr "ID Único do Assunto"
+msgstr "ID único do assunto"
 
-#: ../smime/lib/e-cert.c:1217
+#: ../smime/lib/e-cert.c:1200
 msgid "Certificate Signature Value"
-msgstr "Valor da Assinatura do Certificado"
+msgstr "Valor da assinatura do certificado"
 
-#: ../smime/lib/e-pkcs12.c:244
+#: ../smime/lib/e-pkcs12.c:249
 msgid "PKCS12 File Password"
-msgstr "Senha de Arquivo PKCS12"
+msgstr "Senha de arquivo PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:244
+#: ../smime/lib/e-pkcs12.c:249
 msgid "Enter password for PKCS12 file:"
 msgstr "Digite a senha para o arquivo PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:343
+#: ../smime/lib/e-pkcs12.c:348
 msgid "Imported Certificate"
-msgstr "Certificado Importado"
+msgstr "Certificado importado"
 
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
@@ -21242,40 +21345,41 @@ msgstr "Desligando %s (%s)\n"
 
 #: ../ui/evolution-addressbook.xml.h:1
 msgid "Address _Book Properties"
-msgstr "Propriedades do _Catálogo de Endereços"
+msgstr "Propriedades do _catálogo de endereços"
 
 #: ../ui/evolution-addressbook.xml.h:3
 msgid "Change the properties of the selected folder"
-msgstr "Alterar as propriedades da pasta selecionada"
+msgstr "Altera as propriedades da pasta selecionada"
 
 #: ../ui/evolution-addressbook.xml.h:4
 msgid "Co_py All Contacts To..."
-msgstr "Co_piar Todos os Contatos para..."
+msgstr "Co_piar todos os contatos para..."
 
 #: ../ui/evolution-addressbook.xml.h:5
 msgid "Contact _Preview"
-msgstr "_Visualização dos Contatos"
+msgstr "_Visualização dos contatos"
 
 #: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
 
+# O original não deveria ter reticências
 #: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
-msgstr "Copiar o(s) Contato(s) Selecionado(s) para Outra Pasta..."
+msgstr "Copiar o(s) contato(s) selecionado(s) para outra pasta..."
 
 #: ../ui/evolution-addressbook.xml.h:8
 msgid "Copy the contacts of the selected folder into another folder"
-msgstr "Copiar os contatos da pasta selecionada para outra pasta"
+msgstr "Copia os contatos da pasta selecionada para outra pasta"
 
 #: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
-msgstr "Copiar a seleção"
+msgstr "Copia a seleção"
 
 #: ../ui/evolution-addressbook.xml.h:10
 msgid "Copy to Folder..."
-msgstr "Copiar para Pasta..."
+msgstr "Copiar para pasta..."
 
 #: ../ui/evolution-addressbook.xml.h:11
 msgid "Create a new address book folder"
@@ -21288,39 +21392,39 @@ msgstr "Recortar"
 
 #: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
-msgstr "Recortar a seleção"
+msgstr "Recorta a seleção"
 
 #: ../ui/evolution-addressbook.xml.h:14
 msgid "Del_ete Address Book"
-msgstr "Remov_er Catálogo de Endereços"
+msgstr "Remov_er catálogo de endereços"
 
 #: ../ui/evolution-addressbook.xml.h:16
 msgid "Delete selected contacts"
-msgstr "Excluir contatos selecionados"
+msgstr "Exclui os contatos selecionados"
 
 #: ../ui/evolution-addressbook.xml.h:17
 msgid "Delete the selected folder"
-msgstr "Excluir a pasta selecionada"
+msgstr "Exclui a pasta selecionada"
 
 #: ../ui/evolution-addressbook.xml.h:18
 msgid "Forward Contact"
-msgstr "Encaminhar Contato"
+msgstr "Encaminhar contato"
 
 #: ../ui/evolution-addressbook.xml.h:19
 msgid "Mo_ve All Contacts To..."
-msgstr "Mo_ver Todos os Contatos para..."
+msgstr "Mo_ver Todos os contatos para..."
 
 #: ../ui/evolution-addressbook.xml.h:20
 msgid "Move Selected Contacts to Another Folder..."
-msgstr "Mover o(s) Contato(s) Selecionado(s) para Outra Pasta..."
+msgstr "Mover o(s) contato(s) selecionado(s) para outra pasta..."
 
 #: ../ui/evolution-addressbook.xml.h:21
 msgid "Move the contacts of the selected folder into another folder"
-msgstr "Mover os contatos da pasta selecionada para outra pasta"
+msgstr "Move os contatos da pasta selecionada para outra pasta"
 
 #: ../ui/evolution-addressbook.xml.h:22
 msgid "Move to Folder..."
-msgstr "Mover para Pasta..."
+msgstr "Mover para pasta..."
 
 #: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
@@ -21329,7 +21433,7 @@ msgstr "Colar"
 
 #: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
-msgstr "Colar a área de transferência"
+msgstr "Cola o conteúdo da área de transferência"
 
 #: ../ui/evolution-addressbook.xml.h:25
 msgid "Previews the contacts to be printed"
@@ -21337,55 +21441,58 @@ msgstr "Visualiza os contatos a serem impressos"
 
 #: ../ui/evolution-addressbook.xml.h:28
 msgid "Print selected contacts"
-msgstr "Imprimir contatos selecionados"
+msgstr "Imprime os contatos selecionados"
 
 #: ../ui/evolution-addressbook.xml.h:29
 msgid "Rename the selected folder"
-msgstr "Renomear a pasta selecionada"
+msgstr "Renomeia a pasta selecionada"
 
 #: ../ui/evolution-addressbook.xml.h:30
 msgid "S_ave Address Book As VCard"
-msgstr "S_alvar Catálogo de Endereços Como VCard"
+msgstr "S_alvar catálogo de endereços Como vCard"
 
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
-msgstr "Salvar como VCard..."
+msgstr "Salvar como vCard..."
 
+# O original tem ponto, mas não deveria.
 #: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
-msgstr "Salva os contatos selecionados como um VCard."
+msgstr "Salva os contatos selecionados como um vCard"
 
 #: ../ui/evolution-addressbook.xml.h:33
 msgid "Save the contacts of the selected folder as VCard"
-msgstr "Salvar os contatos da pasta selecionada como VCard"
+msgstr "Salva os contatos da pasta selecionada como vCard"
 
 #: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
 msgid "Select All"
-msgstr "Selecionar Tudo"
+msgstr "Selecionar tudo"
 
 #: ../ui/evolution-addressbook.xml.h:35
 msgid "Select _All"
-msgstr "Selecionar _Tudo"
+msgstr "Selecionar _tudo"
 
 #: ../ui/evolution-addressbook.xml.h:36
 msgid "Select all contacts"
-msgstr "Selecionar todos os contatos"
+msgstr "Seleciona todos os contatos"
 
+# O original não deveria ter ponto final
 #: ../ui/evolution-addressbook.xml.h:37
 msgid "Send a message to the selected contacts."
-msgstr "Enviar uma mensagem aos contatos selecionados."
+msgstr "Envia uma mensagem aos contatos selecionados."
 
 #: ../ui/evolution-addressbook.xml.h:38
 msgid "Send message to contact"
-msgstr "Enviar mensagem ao contato"
+msgstr "Envia mensagem ao contato"
 
+# O original não deveria ter ponto final.
 #: ../ui/evolution-addressbook.xml.h:39
 msgid "Send selected contacts to another person."
-msgstr "Enviar contatos selecionados a outra pessoa."
+msgstr "Envia os contatos selecionados a outra pessoa"
 
 #: ../ui/evolution-addressbook.xml.h:40
 msgid "Show contact preview window"
-msgstr "Mostrar janela de visualização de contatos"
+msgstr "Mostra a janela de visualização de contatos"
 
 #: ../ui/evolution-addressbook.xml.h:41
 msgid "St_op"
@@ -21397,7 +21504,7 @@ msgstr "Parar"
 
 #: ../ui/evolution-addressbook.xml.h:43
 msgid "Stop Loading"
-msgstr "Parar o Carregamento"
+msgstr "Parar o carregamento"
 
 #: ../ui/evolution-addressbook.xml.h:44
 msgid "View the current contact"
@@ -21410,27 +21517,27 @@ msgstr "Açõe_s"
 
 #: ../ui/evolution-addressbook.xml.h:47
 msgid "_Copy Contact to..."
-msgstr "_Copiar Contato para..."
+msgstr "_Copiar contato para..."
 
 #: ../ui/evolution-addressbook.xml.h:48
 msgid "_Copy Folder Contacts To"
-msgstr "_Copiar a Pasta de Contatos Para"
+msgstr "_Copiar a pasta de contatos para"
 
 #: ../ui/evolution-addressbook.xml.h:50
 msgid "_Delete Contact"
-msgstr "Excluir Contato"
+msgstr "E_xcluir contato"
 
 #: ../ui/evolution-addressbook.xml.h:52
 msgid "_Forward Contact..."
-msgstr "_Encaminhar Contato..."
+msgstr "_Encaminhar contato..."
 
 #: ../ui/evolution-addressbook.xml.h:53
 msgid "_Move Contact to..."
-msgstr "_Mover Contato para..."
+msgstr "_Mover contato para..."
 
 #: ../ui/evolution-addressbook.xml.h:54
 msgid "_Move Folder Contacts To"
-msgstr "_Mover a Pasta de Contatos Para"
+msgstr "_Mover a pasta de contatos para"
 
 #: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
@@ -21442,15 +21549,15 @@ msgstr "_Renomear"
 
 #: ../ui/evolution-addressbook.xml.h:61
 msgid "_Save Contact as VCard..."
-msgstr "_Salvar Contatos como VCard..."
+msgstr "_Salvar contatos como vCard..."
 
 #: ../ui/evolution-addressbook.xml.h:62
 msgid "_Save Folder Contacts As VCard"
-msgstr "_Salvar Pasta Contatos Como VCard"
+msgstr "_Salvar pasta contatos como vCard"
 
 #: ../ui/evolution-addressbook.xml.h:63
 msgid "_Send Message to Contact..."
-msgstr "_Enviar Mensagem ao Contato..."
+msgstr "E_nviar mensagem ao contato..."
 
 #: ../ui/evolution-calendar.xml.h:4
 msgid "Day"
@@ -21458,23 +21565,23 @@ msgstr "Dia"
 
 #: ../ui/evolution-calendar.xml.h:6
 msgid "Delete _all Occurrences"
-msgstr "Excluir tod_as as Ocorrências"
+msgstr "Excluir tod_as as ocorrências"
 
 #: ../ui/evolution-calendar.xml.h:7
 msgid "Delete all occurrences"
-msgstr "Excluir todas as ocorrências"
+msgstr "Exclui todas as ocorrências"
 
 #: ../ui/evolution-calendar.xml.h:8
 msgid "Delete the appointment"
-msgstr "Excluir o compromisso"
+msgstr "Exclui o compromisso"
 
 #: ../ui/evolution-calendar.xml.h:10
 msgid "Delete this occurrence"
-msgstr "Excluir esta ocorrência"
+msgstr "Exclui esta ocorrência"
 
 #: ../ui/evolution-calendar.xml.h:11
 msgid "Go To"
-msgstr "Ir Para"
+msgstr "Ir para"
 
 #: ../ui/evolution-calendar.xml.h:12
 msgid "Go back"
@@ -21512,27 +21619,27 @@ msgstr "Imprimir esta agenda"
 
 #: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
-msgstr "Excluir _Permanentemente"
+msgstr "Excluir _permanentemente"
 
 #: ../ui/evolution-calendar.xml.h:24
 msgid "Purge old appointments and meetings"
-msgstr "Excluir permanentemente compromissos e reuniões antigas"
+msgstr "Exclui permanentemente compromissos e reuniões antigas"
 
 #: ../ui/evolution-calendar.xml.h:25
 msgid "Select _Date"
-msgstr "Selecionar _Data"
+msgstr "Selecionar _data"
 
 #: ../ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
-msgstr "Selecionar _Hoje"
+msgstr "Selecionar _hoje"
 
 #: ../ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
-msgstr "Selecionar uma data específica"
+msgstr "Seleciona uma data específica"
 
 #: ../ui/evolution-calendar.xml.h:28
 msgid "Select today"
-msgstr "Selecionar hoje"
+msgstr "Seleciona o dia de hoje"
 
 #: ../ui/evolution-calendar.xml.h:29
 msgid "Show as list"
@@ -21564,39 +21671,39 @@ msgstr "Semana"
 
 #: ../ui/evolution-calendar.xml.h:37
 msgid "Work Week"
-msgstr "Semana Útil"
+msgstr "Semana útil"
 
 #: ../ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
-msgstr "_Abrir Compromisso"
+msgstr "_Abrir compromisso"
 
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
-msgstr "Cancelar a operação de correio atual"
+msgstr "Cancela a operação de correio atual"
 
 #: ../ui/evolution-mail-global.xml.h:3
 msgid "Copy the selected folder into another folder"
-msgstr "Copiar a pasta selecionada em outra pasta"
+msgstr "Copia a pasta selecionada em outra pasta"
 
 #: ../ui/evolution-mail-global.xml.h:4
 msgid "Create a new folder for storing mail"
-msgstr "Criar uma nova pasta para armazenar mensagens"
+msgstr "Cria uma nova pasta para armazenar mensagens"
 
 #: ../ui/evolution-mail-global.xml.h:5
 msgid "Create or edit Search Folder definitions"
-msgstr "Criar ou editar as definições da Pasta de Pesquisa"
+msgstr "Cria ou editar as definições da pasta de pesquisa"
 
 #: ../ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
-msgstr "Criar ou editar as regras para filtragem de correio"
+msgstr "Cria ou edita as regras para filtragem de correio"
 
 #: ../ui/evolution-mail-global.xml.h:7
 msgid "Download messages of accounts/folders marked for offline"
-msgstr "Baixar mensagens das contas e pastas marcadas como desconectadas"
+msgstr "Baixa mensagens das contas e pastas marcadas como desconectadas"
 
 #: ../ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
-msgstr "Esvaziar _Lixeira"
+msgstr "Esvaziar _lixeira"
 
 #: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
 msgid "F_older"
@@ -21604,53 +21711,52 @@ msgstr "_Pasta"
 
 #: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
-msgstr "Mover a pasta selecionada para outra pasta"
+msgstr "Move a pasta selecionada para outra pasta"
 
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
-msgstr ""
-"Remover permanentemente todas as mensagens excluídas em todas as pastas"
+msgstr "Remove permanentemente todas as mensagens excluídas em todas as pastas"
 
 #: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
-msgstr "Pesq_uisar Pastas"
+msgstr "P_astas de pesquisa"
 
 #: ../ui/evolution-mail-global.xml.h:14
 msgid "Show Message _Preview"
-msgstr "Visualizar Mensagem"
+msgstr "Visualizar _mensagem"
 
 #: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview below the message list"
-msgstr "Visualizar mensagem abaixo da lista de mensagens"
+msgstr "Visualiza a mensagem abaixo da lista de mensagens"
 
 #: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview side-by-side with the message list"
-msgstr "Visualizar mensagens lado-a-lado com a lista de mensagens"
+msgstr "Visualiza a mensagem lado-a-lado com a lista de mensagens"
 
 #: ../ui/evolution-mail-global.xml.h:17
 msgid "Show message preview window"
-msgstr "Mostrar janela de visualização de mensagem"
+msgstr "Mostra a janela de visualização de mensagem"
 
 #: ../ui/evolution-mail-global.xml.h:18
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Inscrever ou cancelar a inscrição de pastas em servidores remotos"
+msgstr "Inscreve em ou cancela a inscrição de pastas em servidores remotos"
 
 #: ../ui/evolution-mail-global.xml.h:19
 msgid "View the debug console for log messages"
-msgstr "Ver o console de depuração mas as mensagens de log"
+msgstr "Vê o console de depuração para as mensagens de log"
 
 #: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
-msgstr "Visão _Clássica"
+msgstr "Visão _clássica"
 
 #: ../ui/evolution-mail-global.xml.h:21
 msgid "_Copy Folder To..."
-msgstr "_Copiar a Pasta Para..."
+msgstr "_Copiar a pasta para..."
 
 #: ../ui/evolution-mail-global.xml.h:22
 msgid "_Debug Logs"
-msgstr "_Logs de Depuração"
+msgstr "_Logs de depuração"
 
 #: ../ui/evolution-mail-global.xml.h:23
 msgid "_Download Messages for Offline Usage"
@@ -21658,11 +21764,11 @@ msgstr "Baixar mensagens para uso _desconectado"
 
 #: ../ui/evolution-mail-global.xml.h:25
 msgid "_Message Filters"
-msgstr "F_iltros de Mensagens"
+msgstr "F_iltros de mensagens"
 
 #: ../ui/evolution-mail-global.xml.h:26
 msgid "_Move Folder To..."
-msgstr "_Mover a Pasta Para..."
+msgstr "_Mover a pasta para..."
 
 #: ../ui/evolution-mail-global.xml.h:27
 msgid "_New..."
@@ -21682,23 +21788,23 @@ msgstr "In_scrições..."
 
 #: ../ui/evolution-mail-global.xml.h:33
 msgid "_Vertical View"
-msgstr "Visualização _Vertical"
+msgstr "Visão _vertical"
 
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
-msgstr "Alterar o nome desta pasta"
+msgstr "Altera o nome desta pasta"
 
 #: ../ui/evolution-mail-list.xml.h:2
 msgid "Change the properties of this folder"
-msgstr "Alterar as propriedades desta pasta"
+msgstr "Altera as propriedades desta pasta"
 
 #: ../ui/evolution-mail-list.xml.h:3
 msgid "Collapse All _Threads"
-msgstr "Agrupar _Todas as Discussões"
+msgstr "Agrupar _todas as discussões"
 
 #: ../ui/evolution-mail-list.xml.h:4
 msgid "Collapse all message threads"
-msgstr "Agrupar todas as discussões"
+msgstr "Agrupa todas as discussões"
 
 #: ../ui/evolution-mail-list.xml.h:5
 msgid "Copy selected message(s) to the clipboard"
@@ -21707,56 +21813,56 @@ msgstr "Copiar a(s) mensagem(ns) selecionada(s) para a área de transferência"
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-list.xml.h:7
 msgid "Cut selected message(s) to the clipboard"
-msgstr "Cortar mensagem(ns) selecionada(s) para a área de transferência"
+msgstr "Recortar mensagem(ns) selecionada(s) para a área de transferência"
 
 #: ../ui/evolution-mail-list.xml.h:8
 msgid "E_xpand All Threads"
-msgstr "E_xpandir Todas as Discussões"
+msgstr "E_xpandir todas as discussões"
 
 #: ../ui/evolution-mail-list.xml.h:9
 msgid "E_xpunge"
-msgstr "Exc_luir Permanentemente"
+msgstr "Exc_luir permanentemente"
 
 #: ../ui/evolution-mail-list.xml.h:10
 msgid "Expand all message threads"
-msgstr "Expandir todas as discussões"
+msgstr "Expande todas as discussões"
 
 #: ../ui/evolution-mail-list.xml.h:12
 msgid "Hide S_elected Messages"
-msgstr "Ocultar Mensagens S_elecionadas"
+msgstr "Ocultar mensagens s_elecionadas"
 
 #: ../ui/evolution-mail-list.xml.h:13
 msgid "Hide _Deleted Messages"
-msgstr "Ocultar Mensagens _Excluídas"
+msgstr "Ocultar mensagens _excluídas"
 
 #: ../ui/evolution-mail-list.xml.h:14
 msgid "Hide _Read Messages"
-msgstr "Oculta_r Mensagens Lidas"
+msgstr "Oculta_r mensagens lidas"
 
 #: ../ui/evolution-mail-list.xml.h:15
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
-msgstr "Ocultar mensagens excluídas ao invés de exibi-las cortadas"
+msgstr "Oculta as mensagens excluídas ao invés de exibi-las cortadas"
 
 #: ../ui/evolution-mail-list.xml.h:16
 msgid "Mar_k All Messages as Read"
-msgstr "Marcar Mensagens como Lidas"
+msgstr "Marcar mensagens como lidas"
 
 #: ../ui/evolution-mail-list.xml.h:17
 msgid "Mark all messages in the folder as read"
-msgstr "Marcar todas as mensagens nesta pasta e como lidas"
+msgstr "Marca todas as mensagens nesta pasta e como lidas"
 
 #: ../ui/evolution-mail-list.xml.h:18
 msgid "Paste message(s) from the clipboard"
-msgstr "Colar mensagem(ns) da área de transferência"
+msgstr "Cola mensagem(ns) da área de transferência"
 
 #: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove all deleted messages from this folder"
-msgstr "Remover permanentemente todas as mensagens excluídas nesta pasta"
+msgstr "Remove permanentemente todas as mensagens excluídas nesta pasta"
 
 #: ../ui/evolution-mail-list.xml.h:20
 msgid "Permanently remove this folder"
-msgstr "Remover permanentemente esta pasta"
+msgstr "Remove permanentemente esta pasta"
 
 # Não gera um novo diálogo, então não precisa de reticências.
 #: ../ui/evolution-mail-list.xml.h:21
@@ -21765,19 +21871,19 @@ msgstr "Atuali_zar"
 
 #: ../ui/evolution-mail-list.xml.h:22
 msgid "Refresh the folder"
-msgstr "Atualizando a pasta"
+msgstr "Atualiza a pasta"
 
 #: ../ui/evolution-mail-list.xml.h:23
 msgid "Select Message S_ubthread"
-msgstr "Selecionar o S_ubabeçalhos da Mensagem"
+msgstr "Selecionar a _subdiscussão da mensagem"
 
 #: ../ui/evolution-mail-list.xml.h:24
 msgid "Select Message _Thread"
-msgstr "Selecionar o Ca_beçalhos da Mensagem"
+msgstr "Selecionar a _discussão da mensagem"
 
 #: ../ui/evolution-mail-list.xml.h:25
 msgid "Select _All Messages"
-msgstr "Selecion_ar Todas as Mensagens"
+msgstr "Selecionar _todas as mensagens"
 
 #: ../ui/evolution-mail-list.xml.h:26
 msgid "Select all and only the messages that are not currently selected"
@@ -21787,16 +21893,15 @@ msgstr ""
 #: ../ui/evolution-mail-list.xml.h:27
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
-"Selecionar todas as mensagens no mesmo encadeamento como a mensagem "
-"selecionada"
+"Seleciona todas as mensagens no mesmo encadeamento que a mensagem selecionada"
 
 #: ../ui/evolution-mail-list.xml.h:28
 msgid "Select all replies to the currently selected message"
-msgstr "Selecionar todas as respostas para a mensagem selecionada atualmente"
+msgstr "Seleciona todas as respostas para a mensagem selecionada atualmente"
 
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "Select all visible messages"
-msgstr "Selecionar todas as mensagens visíveis"
+msgstr "Seleciona todas as mensagens visíveis"
 
 #: ../ui/evolution-mail-list.xml.h:30
 msgid "Show Hidde_n Messages"
@@ -21804,23 +21909,23 @@ msgstr "Mostrar Me_nsagens Ocultas"
 
 #: ../ui/evolution-mail-list.xml.h:31
 msgid "Show messages that have been temporarily hidden"
-msgstr "Mostrar as mensagens que foram temporariamente escondidas"
+msgstr "Mostra as mensagens que tinham sido ocultadas temporariamente"
 
 #: ../ui/evolution-mail-list.xml.h:32
 msgid "Temporarily hide all messages that have already been read"
-msgstr "Ocultar temporariamente todas as mensagens que já foram lidas"
+msgstr "Oculta temporariamente todas as mensagens que já foram lidas"
 
 #: ../ui/evolution-mail-list.xml.h:33
 msgid "Temporarily hide the selected messages"
-msgstr "Ocultar temporariamente as mensagens selecionadas"
+msgstr "Oculta temporariamente as mensagens selecionadas"
 
 #: ../ui/evolution-mail-list.xml.h:34
 msgid "Threaded Message list"
-msgstr "Lista de Discussões"
+msgstr "Organiza a lista de mensagens por discussões"
 
 #: ../ui/evolution-mail-list.xml.h:36
 msgid "_Group By Threads"
-msgstr "A_grupar Por Discussão"
+msgstr "Agrupar por _discussão"
 
 #: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
@@ -21829,152 +21934,152 @@ msgstr "_Mensagem"
 
 #: ../ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
-msgstr "A_dicionar Remetente ao Catálogo de Endereços"
+msgstr "A_dicionar remetente ao catálogo de endereços"
 
 #: ../ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
-msgstr "A_plicar Filtros"
+msgstr "A_plicar filtros"
 
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-message.xml.h:4
 msgid "Add Sender to Address Book"
-msgstr "Adicionar Remetente ao Catálogo de Endereços"
+msgstr "Adiciona o remetente ao catálogo de endereços"
 
 #: ../ui/evolution-mail-message.xml.h:5
 msgid "All Message _Headers"
-msgstr "Todos os Ca_beçalhos de Mensagem"
+msgstr "Todos os ca_beçalhos de mensagem"
 
 #: ../ui/evolution-mail-message.xml.h:6
 msgid "Apply filter rules to the selected messages"
-msgstr "Aplicar as regras de filtros às mensagens selecionadas"
+msgstr "Aplica as regras de filtros às mensagens selecionadas"
 
 #: ../ui/evolution-mail-message.xml.h:7
 msgid "Check for _Junk"
-msgstr "Verificar por _Spam"
+msgstr "Verificar por _spam"
 
 #: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose _New Message"
-msgstr "Redigir _Nova Mensagem"
+msgstr "Redigir _nova mensagem"
 
 #: ../ui/evolution-mail-message.xml.h:9
 msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "Redigir uma resposta a todos os destinatários da mensagem selecionada"
+msgstr "Redige uma resposta a todos os destinatários da mensagem selecionada"
 
 #: ../ui/evolution-mail-message.xml.h:10
 msgid "Compose a reply to the mailing list of the selected message"
-msgstr "Redigir uma resposta à lista de discussão da mensagem selecionada"
+msgstr "Redige uma resposta à lista de discussão da mensagem selecionada"
 
 #: ../ui/evolution-mail-message.xml.h:11
 msgid "Compose a reply to the sender of the selected message"
-msgstr "Redigir uma resposta ao remetente da mensagem selecionada"
+msgstr "Redige uma resposta ao remetente da mensagem selecionada"
 
 #: ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected messages to another folder"
-msgstr "Copiar mensagens selecionadas para outra pasta"
+msgstr "Copia as mensagens selecionadas para outra pasta"
 
 #: ../ui/evolution-mail-message.xml.h:13
 msgid "Copy selected messages to the clipboard"
-msgstr "Copiar as mensagens selecionadas para a área de transferência"
+msgstr "Copia as mensagens selecionadas para a área de transferência"
 
 #: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
-msgstr "Criar Re_gra"
+msgstr "Criar re_gra"
 
 #: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a Search Folder for these recipients"
-msgstr "Criar uma Pasta de Pesquisa para estes destinatários"
+msgstr "Cria uma pasta de pesquisa para estes destinatários"
 
 #: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a Search Folder for this mailing list"
-msgstr "Criar uma Pasta de Pesquisa para esta lista de discussão"
+msgstr "Cria uma pasta de pesquisa para esta lista de discussão"
 
 #: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a Search Folder for this sender"
-msgstr "Criar uma Pasta de Pesquisa para este remetente"
+msgstr "Cria uma pasta de pesquisa para este remetente"
 
 #: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a Search Folder for this subject"
-msgstr "Criar uma Pasta de Pesquisa para este assunto"
+msgstr "Cria uma pasta de pesquisa para este assunto"
 
 #: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a rule to filter messages from this sender"
-msgstr "Criar uma regra para filtrar mensagens deste remetente"
+msgstr "Cria uma regra para filtrar mensagens deste remetente"
 
 #: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages to these recipients"
-msgstr "Criar uma regra para filtrar mensagens para estes destinatários"
+msgstr "Cria uma regra para filtrar mensagens para estes destinatários"
 
 #: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages to this mailing list"
-msgstr "Criar uma regra para filtrar mensagens para esta lista de discussão"
+msgstr "Cria uma regra para filtrar mensagens para esta lista de discussão"
 
 #: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a rule to filter messages with this subject"
-msgstr "Criar uma regra para filtrar mensagens com este assunto"
+msgstr "Cria uma regra para filtrar mensagens com este assunto"
 
 #: ../ui/evolution-mail-message.xml.h:23
 msgid "Cut selected messages to the clipboard"
-msgstr "Cortar mensagens selecionadas para a área de transferência"
+msgstr "Recorta as mensagens selecionadas para a área de transferência"
 
 #: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
-msgstr "Diminuir o tamanho do texto"
+msgstr "Diminui o tamanho do texto"
 
 #: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next important message"
-msgstr "Exibir a próxima mensagem importante"
+msgstr "Exibe a próxima mensagem importante"
 
 #: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next message"
-msgstr "Exibir a próxima mensagem"
+msgstr "Exibe a próxima mensagem"
 
 #: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next thread"
-msgstr "Exibir o próximo tópico"
+msgstr "Exibe o próximo tópico"
 
 #: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread message"
-msgstr "Exibir a próxima mensagem não lida"
+msgstr "Exibe a próxima mensagem não lida"
 
 #: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous important message"
-msgstr "Exibir a mensagem importante anterior"
+msgstr "Exibe a mensagem importante anterior"
 
 #: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous message"
-msgstr "Exibir a mensagem anterior"
+msgstr "Exibe a mensagem anterior"
 
 #: ../ui/evolution-mail-message.xml.h:32
 msgid "Display the previous unread message"
-msgstr "Exibir a mensagem não lida anterior"
+msgstr "Exibe a mensagem não lida anterior"
 
 #: ../ui/evolution-mail-message.xml.h:33
 msgid "F_orward As..."
-msgstr "E_ncaminhar Como..."
+msgstr "E_ncaminhar como..."
 
 #: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
-msgstr "Filtro por _Lista de Discussão..."
+msgstr "Filtro por _lista de discussão..."
 
 #: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
-msgstr "Filtro por _Remetente..."
+msgstr "Filtro por _remetente..."
 
 #: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
-msgstr "Filtro por _Destinatários..."
+msgstr "Filtro por _destinatários..."
 
 #: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
-msgstr "Filtro por _Assunto..."
+msgstr "Filtro por _assunto..."
 
 #: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
-msgstr "Filtrar as mensagens selecionadas pelo estado de spam"
+msgstr "Filtra as mensagens selecionadas pelo status de spam"
 
 #: ../ui/evolution-mail-message.xml.h:39
 msgid "Flag selected messages for follow-up"
-msgstr "Marcar as mensagens selecionadas como lembrete"
+msgstr "Marca as mensagens selecionadas como lembrete"
 
 #: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
@@ -21982,27 +22087,27 @@ msgstr "_Lembrete..."
 
 #: ../ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
-msgstr "Forçar as imagens em correio HTML a serem carregadas"
+msgstr "Força as imagens em correio HTML a serem carregadas"
 
 #: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
-msgstr "Encaminhar a mensagem selecionada no corpo da nova mensagem"
+msgstr "Encaminha a mensagem selecionada no corpo da nova mensagem"
 
 #: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
-msgstr "Encaminhar a mensagem selecionada citada como uma resposta"
+msgstr "Encaminha a mensagem selecionada citada como uma resposta"
 
 #: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
-msgstr "Encaminhar a mensagem selecionada a alguém"
+msgstr "Encaminha a mensagem selecionada a alguém"
 
 #: ../ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
-msgstr "Encaminhar a mensagem selecionada a alguém como um anexo"
+msgstr "Encaminha a mensagem selecionada a alguém como um anexo"
 
 #: ../ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
-msgstr "Aumentar o tamanho do texto"
+msgstr "Aumenta o tamanho do texto"
 
 #: ../ui/evolution-mail-message.xml.h:49
 msgid "Mar_k as"
@@ -22010,167 +22115,167 @@ msgstr "M_arcar como"
 
 #: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected messages as having been read"
-msgstr "Marcar as mensagens selecionadas como lidas"
+msgstr "Marca as mensagens selecionadas como lidas"
 
 #: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages as important"
-msgstr "Marcar as mensagens selecionadas como importantes"
+msgstr "Marca as mensagens selecionadas como importantes"
 
 #: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected messages as junk"
-msgstr "Marcar as mensagens selecionadas como spam"
+msgstr "Marca as mensagens selecionadas como spam"
 
 #: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected messages as not being junk"
-msgstr "Marcar as mensagens selecionadas como não sendo spam"
+msgstr "Marca as mensagens selecionadas como não sendo spam"
 
 #: ../ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected messages as not having been read"
-msgstr "Marcar as mensagens selecionadas como não lidas"
+msgstr "Marca as mensagens selecionadas como não lidas"
 
 #: ../ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages as unimportant"
-msgstr "Marcar as mensagens selecionadas como sem importância"
+msgstr "Marca as mensagens selecionadas como sem importância"
 
 #: ../ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected messages for deletion"
-msgstr "Marcar as mensagens selecionadas para exclusão"
+msgstr "Marca as mensagens selecionadas para exclusão"
 
 #: ../ui/evolution-mail-message.xml.h:57
 msgid "Move selected messages to another folder"
-msgstr "Mover as mensagens selecionadas para outra pasta"
+msgstr "Moveras mensagens selecionadas para outra pasta"
 
 #: ../ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
-msgstr "Próxima Mensagem _Importante"
+msgstr "Próxima mensagem _importante"
 
 #: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Thread"
-msgstr "Próxima _Discussão"
+msgstr "Próxima _discussão"
 
 #: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Unread Message"
-msgstr "Próxima Mensagem _Não Lida"
+msgstr "Próxima mensagem _não lida"
 
 #: ../ui/evolution-mail-message.xml.h:62
 msgid "Not Junk"
-msgstr "Não é Spam"
+msgstr "Não é spam"
 
 #: ../ui/evolution-mail-message.xml.h:63
 msgid "Open a window for composing a mail message"
-msgstr "Abrir uma janela para redigir uma mensagem de correio"
+msgstr "Abre uma janela para redigir uma mensagem de correio"
 
 #: ../ui/evolution-mail-message.xml.h:64
 msgid "Open the selected messages in a new window"
-msgstr "Abrir a mensagem selecionada em uma nova janela"
+msgstr "Abre a mensagem selecionada em uma nova janela"
 
 #: ../ui/evolution-mail-message.xml.h:65
 msgid "Open the selected messages in the composer for editing"
-msgstr "Abrir a mensagem selecionada para edição"
+msgstr "Abre a mensagem selecionada para edição"
 
 #: ../ui/evolution-mail-message.xml.h:66
 msgid "P_revious Unread Message"
-msgstr "Mensagem Não Lida An_terior"
+msgstr "Mensagem não lida an_terior"
 
 #: ../ui/evolution-mail-message.xml.h:67
 msgid "Paste messages from the clipboard"
-msgstr "Colar mensagens da área de transferência"
+msgstr "Cola mensagens da área de transferência"
 
 #: ../ui/evolution-mail-message.xml.h:68
 msgid "Pos_t New Message to Folder"
-msgstr "P_ublicar uma Nova Mensagem na Pasta"
+msgstr "P_ublicar uma nova mensagem na pasta"
 
 #: ../ui/evolution-mail-message.xml.h:69
 msgid "Post a Repl_y"
-msgstr "Pu_blicar uma Resposta"
+msgstr "Pu_blicar uma resposta"
 
 #: ../ui/evolution-mail-message.xml.h:70
 msgid "Post a message to a Public folder"
-msgstr "Publicar uma mensagem em uma Pasta Pública"
+msgstr "Publica uma mensagem em uma pasta pública"
 
 #: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a reply to a message in a Public folder"
-msgstr "Publicar uma resposta a uma mensagem em uma pasta pública"
+msgstr "Publica uma resposta a uma mensagem em uma pasta pública"
 
 #: ../ui/evolution-mail-message.xml.h:72
 msgid "Pr_evious Important Message"
-msgstr "Mensagem Im_portante Anterior"
+msgstr "Mensagem im_portante anterior"
 
 #: ../ui/evolution-mail-message.xml.h:73
 msgid "Preview the message to be printed"
-msgstr "Visualizar a mensagem a ser impressa"
+msgstr "Visualiza a mensagem a ser impressa"
 
 #: ../ui/evolution-mail-message.xml.h:77
 msgid "Print this message"
-msgstr "Imprimir esta mensagem"
+msgstr "Imprime esta mensagem"
 
 #: ../ui/evolution-mail-message.xml.h:78
 msgid "Re_direct"
-msgstr "_Redirecionar"
+msgstr "_Redirecionada"
 
 #: ../ui/evolution-mail-message.xml.h:79
 msgid "Redirect (bounce) the selected message to someone"
-msgstr "Redirecionar (bounce) a alguém a mensagem selecionada"
+msgstr "Redireciona (bounce) a mensagem selecionada para alguém"
 
 #: ../ui/evolution-mail-message.xml.h:84
 msgid "Reset the text to its original size"
-msgstr "Restaurar o texto ao seu tamanho original"
+msgstr "Restaura o tamanho original do texto"
 
 #: ../ui/evolution-mail-message.xml.h:85
 msgid "Save the selected messages as a text file"
-msgstr "Salvar a mensagem selecionada como um arquivo texto"
+msgstr "Salva a mensagem selecionada como um arquivo texto"
 
 #: ../ui/evolution-mail-message.xml.h:86
 msgid "Search Folder from Mailing _List..."
-msgstr "Pasta de Pesquisa por _Lista de Discussão..."
+msgstr "Pasta de pesquisa a partir de _lista de discussão..."
 
 #: ../ui/evolution-mail-message.xml.h:87
 msgid "Search Folder from Recipien_ts..."
-msgstr "Pasta de Pesquisa por Des_tinatários..."
+msgstr "Pasta de Pesquisa a partir de des_tinatários..."
 
 #: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from S_ubject..."
-msgstr "Pasta de Pesquisa por Ass_unto..."
+msgstr "Pasta de Pesquisa a partir de ass_unto..."
 
 #: ../ui/evolution-mail-message.xml.h:89
 msgid "Search Folder from Sen_der..."
-msgstr "Pasta _de Pesquisa por Remetente..."
+msgstr "Pasta _de pesquisa a partir de remetente..."
 
 #: ../ui/evolution-mail-message.xml.h:90
 msgid "Search for text in the body of the displayed message"
-msgstr "Pesquisar texto no corpo da mensagem exibida"
+msgstr "Pesquisa texto no corpo da mensagem exibida"
 
 #: ../ui/evolution-mail-message.xml.h:91
 msgid "Select _All Text"
-msgstr "Selecion_ar Todo o Texto"
+msgstr "Selecion_ar todo o texto"
 
 #: ../ui/evolution-mail-message.xml.h:92
 msgid "Select all the text in a message"
-msgstr "Selecionar todo o texto em uma mensagem"
+msgstr "Seleciona todo o texto em uma mensagem"
 
 #: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
-msgstr "Configurar a página para a sua impressora atual"
+msgstr "Configura a página para a sua impressora atual"
 
 #: ../ui/evolution-mail-message.xml.h:94
 msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "Mostrar um cursor intermitente no corpo das mensagens exibidas"
+msgstr "Mostra um cursor intermitente no corpo das mensagens exibidas"
 
 #: ../ui/evolution-mail-message.xml.h:95
 msgid "Show messages with all email headers"
-msgstr "Mostrar a mensagem com todos os cabeçalhos de e-mail"
+msgstr "Mostra a mensagem com todos os cabeçalhos de e-mail"
 
 #: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
-msgstr "Mostrar o código-fonte bruto do e-mail"
+msgstr "Mostra o código-fonte bruto do e-mail"
 
 #: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
-msgstr "Desfazer a exclusão das mensagens selecionadas"
+msgstr "Desfaz a exclusão das mensagens selecionadas"
 
 #: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
-msgstr "Não I_mportante"
+msgstr "Não i_mportante"
 
 #: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
@@ -22178,31 +22283,31 @@ msgstr "_Reduzir"
 
 #: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
-msgstr "_Anexar"
+msgstr "_Anexada"
 
 #: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
-msgstr "Modo _Cursor"
+msgstr "Modo _cursor"
 
 #: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
-msgstr "Lim_par Marca"
+msgstr "Lim_par marca"
 
 #: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
-msgstr "E_xcluir Mensagem"
+msgstr "E_xcluir mensagem"
 
 #: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
-msgstr "_Procurar na Mensagem..."
+msgstr "_Localizar na mensagem..."
 
 #: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
-msgstr "Marcação Concl_uída"
+msgstr "Marcar como concl_uída"
 
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
-msgstr "_Ir Para"
+msgstr "_Ir para"
 
 #: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
@@ -22210,7 +22315,7 @@ msgstr "_Importante"
 
 #: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
-msgstr "_Embutido"
+msgstr "_Embutida"
 
 #: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
@@ -22218,35 +22323,35 @@ msgstr "_Spam"
 
 #: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
-msgstr "Carregar _Imagens"
+msgstr "Carregar _imagens"
 
 #: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
-msgstr "_Código-Fonte da Mensagem"
+msgstr "_Código-fonte da mensagem"
 
 #: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
-msgstr "_Próxima Mensagem"
+msgstr "_Próxima mensagem"
 
 #: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
-msgstr "Tamanho _Normal"
+msgstr "Tamanho _normal"
 
 #: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
-msgstr "_Não é Spam"
+msgstr "_Não é spam"
 
 #: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
-msgstr "Abrir em N_ova Janela"
+msgstr "Abrir em n_ova janela"
 
 #: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
-msgstr "_Mensagem Anterior"
+msgstr "_Mensagem anterior"
 
 #: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
-msgstr "_Citado"
+msgstr "_Citada"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
 #: ../ui/evolution-mail-message.xml.h:126
@@ -22255,15 +22360,15 @@ msgstr "_Lida"
 
 #: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
-msgstr "_Salvar Mensagem..."
+msgstr "_Salvar mensagem..."
 
 #: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
-msgstr "_Desfazer Exclusão da Mensagem"
+msgstr "_Desfazer exclusão da mensagem"
 
 #: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
-msgstr "_Não Lida"
+msgstr "_Não lida"
 
 #: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
@@ -22283,19 +22388,19 @@ msgstr "Barra de tarefas principal"
 
 #: ../ui/evolution-memos.xml.h:3
 msgid "Copy selected memo"
-msgstr "Copiar memorando selecionado"
+msgstr "Copia os memorando selecionado"
 
 #: ../ui/evolution-memos.xml.h:5
 msgid "Cut selected memo"
-msgstr "Cortar memorando selecionado"
+msgstr "Recorta os memorando selecionado"
 
 #: ../ui/evolution-memos.xml.h:7
 msgid "Delete selected memos"
-msgstr "Excluir memorandos selecionados"
+msgstr "Exclui os memorandos selecionados"
 
 #: ../ui/evolution-memos.xml.h:9
 msgid "Paste memo from the clipboard"
-msgstr "Colar memorando da área de transferência"
+msgstr "Cola memorando da área de transferência"
 
 #: ../ui/evolution-memos.xml.h:10
 msgid "Previews the list of memos to be printed"
@@ -22303,7 +22408,7 @@ msgstr "Visualiza a lista de memorandos a ser impressa"
 
 #: ../ui/evolution-memos.xml.h:13
 msgid "Print the list of memos"
-msgstr "Imprimir a lista de memorandos"
+msgstr "Imprime a lista de memorandos"
 
 #: ../ui/evolution-memos.xml.h:14
 msgid "View the selected memo"
@@ -22315,31 +22420,31 @@ msgstr "A_brir Memorando"
 
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
-msgstr "Copiar tarefas selecionadas"
+msgstr "Copia as tarefas selecionadas"
 
 #: ../ui/evolution-tasks.xml.h:5
 msgid "Cut selected tasks"
-msgstr "Cortar tarefas selecionadas"
+msgstr "Recorta as tarefas selecionadas"
 
 #: ../ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
-msgstr "Excluir tarefas concluídas"
+msgstr "Exclui as tarefas concluídas"
 
 #: ../ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
-msgstr "Excluir tarefas selecionadas"
+msgstr "Exclui as tarefas selecionadas"
 
 #: ../ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
-msgstr "_Marcar Como Concluída"
+msgstr "_Marcar como concluída"
 
 #: ../ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
-msgstr "Marcar tarefas selecionadas como concluídas"
+msgstr "Marca as tarefas selecionadas como concluídas"
 
 #: ../ui/evolution-tasks.xml.h:12
 msgid "Paste tasks from the clipboard"
-msgstr "Colar tarefas da área de transferência"
+msgstr "Cola as tarefas da área de transferência"
 
 #: ../ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
@@ -22347,23 +22452,23 @@ msgstr "Visualiza a lista de tarefas a serem impressas"
 
 #: ../ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
-msgstr "Imprimir a lista de tarefas"
+msgstr "Imprimi a lista de tarefas"
 
 #: ../ui/evolution-tasks.xml.h:18
 msgid "Show task preview window"
-msgstr "Mostrar janela de visualização de tarefas"
+msgstr "Mostra a janela de visualização de tarefas"
 
 #: ../ui/evolution-tasks.xml.h:19
 msgid "Task _Preview"
-msgstr "_Visualizar Tarefas"
+msgstr "_Visualizar tarefa"
 
 #: ../ui/evolution-tasks.xml.h:20
 msgid "View the selected task"
-msgstr "Ver a tarefa selecionada"
+msgstr "Vê a tarefa selecionada"
 
 #: ../ui/evolution-tasks.xml.h:27
 msgid "_Open Task"
-msgstr "_Abrir Tarefa"
+msgstr "_Abrir tarefa"
 
 #: ../ui/evolution.xml.h:1
 msgid "About Evolution..."
@@ -22371,11 +22476,14 @@ msgstr "Sobre o Evolution..."
 
 #: ../ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
-msgstr "Alterar as Configurações do Evolution"
+msgstr "Altera as configurações do Evolution"
 
+# Tradução pouco ao pé da letra para manter o parelelismo
+# com outros itens de menu
+#
 #: ../ui/evolution.xml.h:3
 msgid "Change the visibility of the toolbar"
-msgstr "Alterar a visibilidade de barra de ferramentas"
+msgstr "Exibe ou oculta a barra de ferramentas"
 
 #: ../ui/evolution.xml.h:5
 msgid "Create a new window displaying this folder"
@@ -22384,20 +22492,20 @@ msgstr "Cria uma nova janela exibindo esta pasta"
 #: ../ui/evolution.xml.h:6
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
-"Mostrar botões de janela usando as configurações de barra de ferramentas do "
+"Exibe os botões de janela usando as configurações de barra de ferramentas do "
 "Ambiente de trabalho"
 
 #: ../ui/evolution.xml.h:7
 msgid "Display window buttons with icons and text"
-msgstr "Mostrar botões de janela usando ícones e texto"
+msgstr "Exibe os botões de janela usando ícones e texto"
 
 #: ../ui/evolution.xml.h:8
 msgid "Display window buttons with icons only"
-msgstr "Mostrar botões de janela usando ícones"
+msgstr "Exibe os botões de janela usando ícones"
 
 #: ../ui/evolution.xml.h:9
 msgid "Display window buttons with text only"
-msgstr "Mostrar botões de janela usando texto"
+msgstr "Exibe os botões de janela usando texto"
 
 #: ../ui/evolution.xml.h:10
 msgid "Evolution _FAQ"
@@ -22405,17 +22513,15 @@ msgstr "_FAQ do Evolution"
 
 #: ../ui/evolution.xml.h:11
 msgid "Exit the program"
-msgstr "Sair do programa"
+msgstr "Sai do programa"
 
 #: ../ui/evolution.xml.h:12
 msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr ""
-"Esquecer senhas armazenadas de tal forma que você tenha que fornecê-las "
-"novamente"
+msgstr "Esquece senhas armazenadas de forma a perguntá-las da próxima vez"
 
 #: ../ui/evolution.xml.h:13
 msgid "Hide window buttons"
-msgstr "Ocultar botões de janela"
+msgstr "Oculta os botões da janela"
 
 #: ../ui/evolution.xml.h:14
 msgid "I_mport..."
@@ -22427,7 +22533,7 @@ msgstr "Ícones _e texto"
 
 #: ../ui/evolution.xml.h:16
 msgid "Import data from other programs"
-msgstr "Importar dados de outros programas"
+msgstr "Importa dados de outros programas"
 
 #: ../ui/evolution.xml.h:17
 msgid "Lay_out"
@@ -22435,15 +22541,15 @@ msgstr "Disposição"
 
 #: ../ui/evolution.xml.h:19
 msgid "New _Window"
-msgstr "Nova _Janela"
+msgstr "Nova _janela"
 
 #: ../ui/evolution.xml.h:20
 msgid "Open the Frequently Asked Questions webpage"
-msgstr "Abrir página do Perguntas Feitas com Freqüência (FAQ)"
+msgstr "Abre a página das perguntas freqüentes (FAQ)"
 
 #: ../ui/evolution.xml.h:21
 msgid "Page Set_up..."
-msgstr "Confi_gurar Página..."
+msgstr "Confi_gurar página..."
 
 #: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
@@ -22451,47 +22557,49 @@ msgstr "Preferê_ncias"
 
 #: ../ui/evolution.xml.h:23
 msgid "Send / Receive"
-msgstr "Enviar/Receber"
+msgstr "Enviar/receber"
 
 #: ../ui/evolution.xml.h:24
 msgid "Send / _Receive"
-msgstr "Enviar / Re_ceber"
+msgstr "Enviar/re_ceber"
 
+# "Recuperar" é a tradução padrão de "retrieve", mas é técnico demais para a 
+# maioria dos usuários, e pode trazer a ambigüidade com "desfazer exclusão".
 #: ../ui/evolution.xml.h:25
 msgid "Send queued items and retrieve new items"
-msgstr "Enviar itens na fila de saída e buscar novos itens"
+msgstr "Envia itens na fila de saída e obtém novos itens"
 
 #: ../ui/evolution.xml.h:26
 msgid "Set up Pilot configuration"
-msgstr "Definir a configuração do Pilot"
+msgstr "Configura o Pilot"
 
 #: ../ui/evolution.xml.h:28
 msgid "Show Side _Bar"
-msgstr "Mostrar _Barra de Lateral"
+msgstr "Mostrar _barra lateral"
 
 #: ../ui/evolution.xml.h:29
 msgid "Show _Status Bar"
-msgstr "Mostrar Barra de _Status"
+msgstr "Mostrar barra de _status"
 
 #: ../ui/evolution.xml.h:30
 msgid "Show _Toolbar"
-msgstr "Mostrar Barra de Ferramen_tas"
+msgstr "Mostrar barra de _ferramentas"
 
 #: ../ui/evolution.xml.h:31
 msgid "Show information about Evolution"
-msgstr "Mostrar informação sobre o Evolution"
+msgstr "Mostra informações sobre o Evolution"
 
 #: ../ui/evolution.xml.h:32
 msgid "Submit Bug Report"
-msgstr "Enviar Relatório de Erro"
+msgstr "Envia um relatório de erro"
 
 #: ../ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
-msgstr "Enviar Relatório de _Erro"
+msgstr "Enviar relatório de _erro"
 
 #: ../ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
-msgstr "Enviar relatório de erro usando a Ferramenta de Relatório de Erros"
+msgstr "Envia um relatório de erro usando a Ferramenta de Relatório de Erros"
 
 #: ../ui/evolution.xml.h:35
 msgid "Toggle whether we are working offline."
@@ -22503,11 +22611,11 @@ msgstr "Estilo da _barra de ferramentas"
 
 #: ../ui/evolution.xml.h:37
 msgid "View/Hide the Side Bar"
-msgstr "Exibir/Ocultar a Barra Lateral"
+msgstr "Exibe ou oculta a barra lateral"
 
 #: ../ui/evolution.xml.h:38
 msgid "View/Hide the Status Bar"
-msgstr "Exibir/Ocultar a Barra de Status"
+msgstr "Exibe ou oculta a barra de status"
 
 #: ../ui/evolution.xml.h:39
 msgid "Work _Offline"
@@ -22519,15 +22627,15 @@ msgstr "_Sobre"
 
 #: ../ui/evolution.xml.h:41
 msgid "_Close Window"
-msgstr "_Fechar esta Janela"
+msgstr "_Fechar esta janela"
 
 #: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
-msgstr "Es_quecer Senhas"
+msgstr "Es_quecer senhas"
 
 #: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
-msgstr "FAQ - Perguntas Feitas com _Freqüência"
+msgstr "_FAQ (Perguntas freqüentes)"
 
 #: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
@@ -22535,27 +22643,29 @@ msgstr "_Ocultar botões"
 
 #: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
-msgstr "Somente _Ícones"
+msgstr "_Somente ícones"
 
 #: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
-msgstr "_Referência Rápida"
+msgstr "_Referência rápida"
 
 #: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "Sai_r"
 
+# http://library.gnome.org/users/evolution/stable/apx-gloss.html
+# Correio | Contatos | Agendas | Tarefas | Memorandos
 #: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
-msgstr "Al_ternador de Aparência"
+msgstr "_Aparência do alternador"
 
 #: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
-msgstr "Opções de _Sincronização..."
+msgstr "Opções de _sincronização..."
 
 #: ../ui/evolution.xml.h:54
 msgid "_Text Only"
-msgstr "Somente _Texto"
+msgstr "Somente _texto"
 
 #: ../ui/evolution.xml.h:56
 msgid "_Window"
@@ -22563,35 +22673,35 @@ msgstr "_Janela"
 
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
-msgstr "Por _Empresa"
+msgstr "Por _empresa"
 
 #: ../views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
-msgstr "_Cartões de Endereço"
+msgstr "_Cartões de endereço"
 
 #: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
 msgid "_List View"
-msgstr "Visão de _Lista"
+msgstr "Visão de _lista"
 
 #: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
-msgstr "Visão de _Semana"
+msgstr "Visão de _semana"
 
 #: ../views/calendar/galview.xml.h:2
 msgid "_Day View"
-msgstr "Visão de _Dia"
+msgstr "Visão de _dia"
 
 #: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
-msgstr "Visão de _Mês"
+msgstr "Visão de _mês"
 
 #: ../views/calendar/galview.xml.h:5
 msgid "_Work Week View"
-msgstr "Visão de Semana Ú_til"
+msgstr "Visão de semana ú_til"
 
 #: ../views/mail/galview.xml.h:1
 msgid "As Sent Folder for Wi_de View"
-msgstr "Como Pasta de Enviadas para a formato amplo"
+msgstr "Como pasta de Enviadas para a visão ampla"
 
 #: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
@@ -22599,23 +22709,23 @@ msgstr "Pasta _Enviadas"
 
 #: ../views/mail/galview.xml.h:3
 msgid "By S_tatus"
-msgstr "Por Es_tado"
+msgstr "Por s_tatus"
 
 #: ../views/mail/galview.xml.h:4
 msgid "By Se_nder"
-msgstr "Por _Remetente"
+msgstr "Por _remetente"
 
 #: ../views/mail/galview.xml.h:5
 msgid "By Su_bject"
-msgstr "Por _Assunto"
+msgstr "Por _assunto"
 
 #: ../views/mail/galview.xml.h:6
 msgid "By _Follow Up Flag"
-msgstr "Pela _Marca de Lembrete"
+msgstr "Pela _marca de lembrete"
 
 #: ../views/mail/galview.xml.h:7
 msgid "For _Wide View"
-msgstr "Para a formato amplo"
+msgstr "Para visão ampla"
 
 #: ../views/mail/galview.xml.h:8
 msgid "_Messages"
@@ -22627,11 +22737,11 @@ msgstr "_Memorandos"
 
 #: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
-msgstr "Com _Prazo de Conclusão"
+msgstr "Com _prazo de conclusão"
 
 #: ../views/tasks/galview.xml.h:2
 msgid "With _Status"
-msgstr "Com _Estado"
+msgstr "Com _status"
 
 #. Put the "UTC" entry at the top of the combo's list.
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
@@ -22644,7 +22754,7 @@ msgstr "UTC"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "<b>Time Zones</b>"
-msgstr "<b>Fusos Horários</b>"
+msgstr "<b>Fusos horários</b>"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "<b>_Selection</b>"
@@ -22652,7 +22762,7 @@ msgstr "<b>_Seleção</b>"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "Select a Time Zone"
-msgstr "Selecionar um Fuso Horário"
+msgstr "Selecionar um fuso horário"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Timezone drop-down combination box"
@@ -22677,20 +22787,20 @@ msgstr "Coleção"
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
-msgstr "Definir Visões para %s"
+msgstr "Definir visões para %s"
 
 #: ../widgets/menus/gal-define-views-dialog.c:366
 #: ../widgets/menus/gal-define-views-dialog.c:368
 msgid "Define Views"
-msgstr "Definir Visões"
+msgstr "Definir visões"
 
 #: ../widgets/menus/gal-define-views.glade.h:2
 #, no-c-format
 msgid "Define Views for \"%s\""
-msgstr "Definir Visões para \"%s\""
+msgstr "Definir visões para \"%s\""
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1922
+#: ../widgets/table/e-table-header-item.c:1921
 #: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
@@ -22702,7 +22812,7 @@ msgstr "Instância"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
-msgstr "Salvar a Visão Atual"
+msgstr "Salvar a visão atual"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
 msgid "_Create new view"
@@ -22716,25 +22826,25 @@ msgstr "Substitui_r a visão existente"
 #: ../widgets/menus/gal-view-instance.c:582
 #: ../widgets/menus/gal-view-menus.c:368
 msgid "Custom View"
-msgstr "Visão Personalizada"
+msgstr "Visão personalizada"
 
 #: ../widgets/menus/gal-view-instance.c:583
 msgid "Save Custom View"
-msgstr "Salvar Visão Personalizada"
+msgstr "Salvar visão personalizada"
 
 #: ../widgets/menus/gal-view-instance.c:587
 #: ../widgets/menus/gal-view-menus.c:392
 msgid "Define Views..."
-msgstr "Definir Visões..."
+msgstr "Definir visões..."
 
 #: ../widgets/menus/gal-view-menus.c:305
 msgid "C_urrent View"
-msgstr "Visão A_tual"
+msgstr "Visão a_tual"
 
 #: ../widgets/menus/gal-view-menus.c:329
 #, c-format
 msgid "Select View: %s"
-msgstr "Selecionar Visão: %s"
+msgstr "Seleciona a visão %s"
 
 #: ../widgets/menus/gal-view-menus.c:373
 msgid "Current view is a customized view"
@@ -22742,7 +22852,7 @@ msgstr "Visão atual é personalizada"
 
 #: ../widgets/menus/gal-view-menus.c:378
 msgid "Save Custom View..."
-msgstr "Salvar Visão Personalizada..."
+msgstr "Salvar visão personalizada..."
 
 #: ../widgets/menus/gal-view-menus.c:383
 msgid "Save current custom view"
@@ -22750,7 +22860,7 @@ msgstr "Salvar visão atual personalizada"
 
 #: ../widgets/menus/gal-view-menus.c:397
 msgid "Create or edit views"
-msgstr "Criar ou editar visões"
+msgstr "Cria ou edita visões"
 
 #: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
@@ -22758,7 +22868,7 @@ msgstr "Fábrica"
 
 #: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
-msgstr "Definir Nova Visão"
+msgstr "Definir nova visão"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:1
 msgid "Name of new view:"
@@ -22766,7 +22876,7 @@ msgstr "Nome da nova visão:"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:2
 msgid "Type of View"
-msgstr "Tipo de Visão"
+msgstr "Tipo de visão"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:3
 msgid "Type of view:"
@@ -22774,7 +22884,7 @@ msgstr "Tipo de visão:"
 
 #: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
-msgstr "Barra de Anexos"
+msgstr "Barra de anexos"
 
 #: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
 #: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
@@ -22789,7 +22899,7 @@ msgstr "Não é possível anexar o arquivo %s: não é um arquivo comum"
 
 #: ../widgets/misc/e-attachment.glade.h:1
 msgid "Attachment Properties"
-msgstr "Propriedades do Anexo"
+msgstr "Propriedades do anexo"
 
 #: ../widgets/misc/e-attachment.glade.h:3
 msgid "File name:"
@@ -22810,7 +22920,7 @@ msgstr "%B %Y"
 
 #: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
-msgstr "Agenda Mensal"
+msgstr "Agenda mensal"
 
 #: ../widgets/misc/e-canvas-background.c:454
 #: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3643
@@ -22853,19 +22963,19 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1426
+#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
 #: ../widgets/table/e-table-group-container.c:999
 #: ../widgets/table/e-table-group-leaf.c:644
-#: ../widgets/table/e-table-item.c:3074
+#: ../widgets/table/e-table-item.c:3070
 msgid "Minimum width"
 msgstr "Largura mínima"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1427
+#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
 #: ../widgets/table/e-table-group-container.c:1000
 #: ../widgets/table/e-table-group-leaf.c:645
-#: ../widgets/table/e-table-item.c:3075
+#: ../widgets/table/e-table-item.c:3071
 msgid "Minimum Width"
-msgstr "Largura Mínima"
+msgstr "Largura mínima"
 
 #: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
 #: ../widgets/misc/e-expander.c:206
@@ -22935,11 +23045,11 @@ msgstr "Unicode"
 
 #: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European"
-msgstr "Oeste Europeu"
+msgstr "Europeu Ocidental"
 
 #: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
-msgstr "Oeste Europeu, Novo"
+msgstr "Europeu Ocidental, Novo"
 
 #: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
 #: ../widgets/misc/e-charset-picker.c:91
@@ -22966,7 +23076,7 @@ msgstr "Conjunto de caracteres desconhecido: %s"
 
 #: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
-msgstr "Codificação de Caracteres"
+msgstr "Codificação de caracteres"
 
 #: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
@@ -22978,11 +23088,11 @@ msgstr "Outro..."
 
 #: ../widgets/misc/e-charset-picker.c:599
 msgid "Ch_aracter Encoding"
-msgstr "Codificação de C_aracteres"
+msgstr "C_odificação de caracteres"
 
 #: ../widgets/misc/e-dateedit.c:305
 msgid "Date and Time"
-msgstr "Data e Hora"
+msgstr "Data e hora"
 
 #: ../widgets/misc/e-dateedit.c:326
 msgid "Text entry to input date"
@@ -23058,7 +23168,7 @@ msgstr "Tamanho da seta do expansor"
 
 #: ../widgets/misc/e-expander.c:232
 msgid "Indicator Spacing"
-msgstr "Espaçamento do Indicador"
+msgstr "Espaçamento do indicador"
 
 #: ../widgets/misc/e-expander.c:233
 msgid "Spacing around expander arrow"
@@ -23066,14 +23176,14 @@ msgstr "Espaçamento ao redor da seta do expansor"
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:126 ../widgets/misc/e-filter-bar.c:179
-#: ../widgets/misc/e-filter-bar.c:307 ../widgets/misc/e-filter-bar.c:749
+#: ../widgets/misc/e-filter-bar.c:307 ../widgets/misc/e-filter-bar.c:750
 msgid "Advanced Search"
-msgstr "Pesquisa Avançada"
+msgstr "Pesquisa avançada"
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
-msgstr "Salvar Pesquisa"
+msgstr "Salvar pesquisa"
 
 #: ../widgets/misc/e-filter-bar.c:267
 msgid "_Searches"
@@ -23085,35 +23195,35 @@ msgstr "Pesquisas"
 
 #: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
 msgid "_Save Search..."
-msgstr "Salvar Pe_squisa..."
+msgstr "_Salvar pesquisa..."
 
 #: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
 msgid "_Edit Saved Searches..."
-msgstr "_Editar Pesquisas Salvas..."
+msgstr "_Editar pesquisas salvas..."
 
 #: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
 msgid "_Advanced Search..."
-msgstr "Pesquisa _Avançada..."
+msgstr "Pesquisa _avançada..."
 
 #: ../widgets/misc/e-filter-bar.h:107
 msgid "All Accounts"
-msgstr "Todas as Contas"
+msgstr "Todas as contas"
 
 #: ../widgets/misc/e-filter-bar.h:108
 msgid "Current Account"
-msgstr "Conta Atual"
+msgstr "Conta atual"
 
 #: ../widgets/misc/e-filter-bar.h:109
 msgid "Current Folder"
-msgstr "Pasta Atual"
+msgstr "Pasta atual"
 
 #: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
-msgstr "Mensagem Atual"
+msgstr "Mensagem atual"
 
 #: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
-msgstr "Escolher Imagem"
+msgstr "Escolher imagem"
 
 #: ../widgets/misc/e-map.c:627
 msgid "World Map"
@@ -23142,21 +23252,21 @@ msgstr "Sincronizar com:"
 
 #: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
-msgstr "Sincronizar Registros Particulares:"
+msgstr "Sincronizar registros particulares:"
 
 #: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
-msgstr "Categorias de Sincronização:"
+msgstr "Sincronizar categorias:"
 
-#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
+#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
 msgid "Empty message"
 msgstr "Mensagem vazia"
 
-#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
+#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
 msgid "Reflow model"
 msgstr "Modelo de refluxo"
 
-#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
+#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
 msgid "Column width"
 msgstr "Largura da coluna"
 
@@ -23176,11 +23286,11 @@ msgstr "_Pesquisar"
 
 #: ../widgets/misc/e-search-bar.c:609
 msgid "_Find Now"
-msgstr "_Pesquisar Agora"
+msgstr "_Localizar agora"
 
 #: ../widgets/misc/e-search-bar.c:610
 msgid "_Clear"
-msgstr "_Limpar"
+msgstr "Lim_par"
 
 #: ../widgets/misc/e-search-bar.c:865
 msgid "Item ID"
@@ -23195,13 +23305,13 @@ msgstr "Texto"
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
 #: ../widgets/misc/e-search-bar.c:1003
 msgid "Sho_w: "
-msgstr "Mostrar: "
+msgstr "M_ostrar: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
 #: ../widgets/misc/e-search-bar.c:1020
 msgid "Sear_ch: "
-msgstr "Pesquisar: "
+msgstr "Pesquisa_r: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
@@ -23212,12 +23322,12 @@ msgstr " em "
 #: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:806
 msgid "Cursor Row"
-msgstr "Linha do Cursor"
+msgstr "Linha do cursor"
 
 #: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:813
 msgid "Cursor Column"
-msgstr "Coluna do Cursor"
+msgstr "Coluna do cursor"
 
 #: ../widgets/misc/e-selection-model.c:209
 msgid "Sorter"
@@ -23225,11 +23335,11 @@ msgstr "Ordenador"
 
 #: ../widgets/misc/e-selection-model.c:216
 msgid "Selection Mode"
-msgstr "Modo de Seleção"
+msgstr "Modo de seleção"
 
 #: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
-msgstr "Modo do Cursor"
+msgstr "Modo do cursor"
 
 #: ../widgets/misc/e-send-options.c:522
 msgid "When de_leted:"
@@ -23237,7 +23347,7 @@ msgstr "Quando exc_luída:"
 
 #: ../widgets/misc/e-send-options.glade.h:1
 msgid "<b>Delivery Options</b>"
-msgstr "<b>Opções de Entrega</b>"
+msgstr "<b>Opções de entrega</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:2
 msgid "<b>Replies</b>"
@@ -23245,15 +23355,15 @@ msgstr "<b>Respostas</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:3
 msgid "<b>Return Notification</b>"
-msgstr "<b>Retornar Notificação</b>"
+msgstr "<b>Retornar notificação</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:4
 msgid "<b>Status Tracking</b>"
-msgstr "<b>Acompanhamento de Estado</b>"
+msgstr "<b>Acompanhamento de status</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:5
 msgid "A_uto-delete sent item"
-msgstr "A_uto-excluir item enviado"
+msgstr "E_xcluir automaticamente item enviado"
 
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
@@ -23273,7 +23383,7 @@ msgid ""
 "Mail Receipt"
 msgstr ""
 "Nenhum\n"
-"Enviar Recibo"
+"Enviar recibo"
 
 #: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
@@ -23288,16 +23398,16 @@ msgstr ""
 "Proprietário\n"
 "Confidencial\n"
 "Secreto\n"
-"Altamente Secreto\n"
-"Apenas Para Seus Olhos"
+"Altamente secreto\n"
+"Apenas para seus olhos"
 
 #: ../widgets/misc/e-send-options.glade.h:18
 msgid "R_eply requested"
-msgstr "R_esposta requisitada"
+msgstr "R_esposta solicitada"
 
 #: ../widgets/misc/e-send-options.glade.h:20
 msgid "Sta_tus Tracking"
-msgstr "Acompanhamento de Es_tado"
+msgstr "Acompanhamento de s_tatus"
 
 #: ../widgets/misc/e-send-options.glade.h:21
 msgid ""
@@ -23379,7 +23489,7 @@ msgstr "Clicar aqui para ir para URL"
 
 #: ../widgets/misc/gal-categories.glade.h:1
 msgid "Edit Master Category List..."
-msgstr "Editar a Lista de Categorias Principal..."
+msgstr "Editar a lista de categorias principal..."
 
 #: ../widgets/misc/gal-categories.glade.h:2
 msgid "Item(s) belong to these _categories:"
@@ -23403,35 +23513,35 @@ msgstr "%l:%M %p"
 
 #: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
-msgstr "Coluna Selecionada"
+msgstr "Coluna selecionada"
 
 #: ../widgets/table/e-cell-pixbuf.c:367
 msgid "Focused Column"
-msgstr "Coluna Com Foco"
+msgstr "Coluna com foco"
 
 #: ../widgets/table/e-cell-pixbuf.c:374
 msgid "Unselected Column"
-msgstr "Coluna Não Selecionada"
+msgstr "Coluna não selecionada"
 
 #: ../widgets/table/e-cell-text.c:1807
 msgid "Strikeout Column"
-msgstr "Coluna Riscada"
+msgstr "Coluna riscada"
 
 #: ../widgets/table/e-cell-text.c:1814
 msgid "Underline Column"
-msgstr "Coluna Sublinhada"
+msgstr "Coluna sublinhada"
 
 #: ../widgets/table/e-cell-text.c:1821
 msgid "Bold Column"
-msgstr "Coluna em Negrito"
+msgstr "Coluna em negrito"
 
 #: ../widgets/table/e-cell-text.c:1828
 msgid "Color Column"
-msgstr "Coluna Colorida"
+msgstr "Coluna colorida"
 
 #: ../widgets/table/e-cell-text.c:1842
 msgid "BG Color Column"
-msgstr "Coluna da Cor de Fundo"
+msgstr "Coluna da cor de fundo"
 
 #: ../widgets/table/e-table-config.c:152
 msgid "State"
@@ -23456,45 +23566,45 @@ msgstr "Sem agrupamento"
 #: ../widgets/table/e-table-config.c:643
 #: ../widgets/table/e-table-config.glade.h:11
 msgid "Show Fields"
-msgstr "Mostrar Campos"
+msgstr "Mostrar campos"
 
 #: ../widgets/table/e-table-config.c:664
 msgid "Available Fields"
-msgstr "Campos Disponíveis"
+msgstr "Campos disponíveis"
 
 #: ../widgets/table/e-table-config.glade.h:1
 msgid "A_vailable Fields:"
 msgstr "Campos Disponí_veis:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Ascending"
 msgstr "Crescente"
 
 #: ../widgets/table/e-table-config.glade.h:3
 msgid "Clear All"
-msgstr "Limpar Tudo"
+msgstr "Limpa tudo"
 
 #: ../widgets/table/e-table-config.glade.h:4
 msgid "Clear _All"
-msgstr "Limp_ar Tudo"
+msgstr "Limpar _tudo"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Descending"
 msgstr "Decrescente"
 
 #: ../widgets/table/e-table-config.glade.h:8
 msgid "Group Items By"
-msgstr "Agrupar Itens Por"
+msgstr "Agrupar itens por"
 
 #: ../widgets/table/e-table-config.glade.h:9
 msgid "Move _Down"
-msgstr "Mover para _Baixo"
+msgstr "Mover para _baixo"
 
 #: ../widgets/table/e-table-config.glade.h:10
 msgid "Move _Up"
-msgstr "Mover para _Cima"
+msgstr "Mover para _cima"
 
 #: ../widgets/table/e-table-config.glade.h:12
 msgid "Show _field in View"
@@ -23514,19 +23624,19 @@ msgstr "Ordenar"
 
 #: ../widgets/table/e-table-config.glade.h:16
 msgid "Sort Items By"
-msgstr "Ordenar os Itens Por"
+msgstr "Ordenar os itens por"
 
 #: ../widgets/table/e-table-config.glade.h:17
 msgid "Then By"
-msgstr "Então Por"
+msgstr "Então por"
 
 #: ../widgets/table/e-table-config.glade.h:19
 msgid "_Fields Shown..."
-msgstr "_Campos Mostrados..."
+msgstr "_Campos mostrados..."
 
 #: ../widgets/table/e-table-config.glade.h:20
 msgid "_Group By..."
-msgstr "A_grupar Por..."
+msgstr "A_grupar por..."
 
 #: ../widgets/table/e-table-config.glade.h:22
 msgid "_Show field in View"
@@ -23543,16 +23653,16 @@ msgstr "_Ordenar..."
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
 #: ../widgets/table/e-table-field-chooser-item.c:633
 #: ../widgets/table/e-table-field-chooser.c:66
-#: ../widgets/table/e-table-header-item.c:1887
+#: ../widgets/table/e-table-header-item.c:1886
 msgid "DnD code"
 msgstr "Código DnD"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
 #: ../widgets/table/e-table-field-chooser-item.c:640
 #: ../widgets/table/e-table-field-chooser.c:73
-#: ../widgets/table/e-table-header-item.c:1901
+#: ../widgets/table/e-table-header-item.c:1900
 msgid "Full Header"
-msgstr "Cabeçalho Completo"
+msgstr "Cabeçalho completo"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:116
 msgid "Add a column..."
@@ -23560,7 +23670,7 @@ msgstr "Adicionar uma coluna..."
 
 #: ../widgets/table/e-table-field-chooser.glade.h:1
 msgid "Field Chooser"
-msgstr "Selecionador de Campo"
+msgstr "Selecionador de campo"
 
 # ajustei para ter o mesmo número de linhas
 #: ../widgets/table/e-table-field-chooser.glade.h:2
@@ -23589,33 +23699,33 @@ msgstr[1] "%s (%d itens)"
 #: ../widgets/table/e-table-group-container.c:923
 #: ../widgets/table/e-table-group-leaf.c:581
 #: ../widgets/table/e-table-group-leaf.c:582
-#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
 msgid "Alternating Row Colors"
-msgstr "Cores de Linha Alternantes"
+msgstr "Cores de linha alternantes"
 
 #: ../widgets/table/e-table-group-container.c:929
 #: ../widgets/table/e-table-group-container.c:930
 #: ../widgets/table/e-table-group-leaf.c:588
 #: ../widgets/table/e-table-group-leaf.c:589
-#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
 #: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
 msgid "Horizontal Draw Grid"
-msgstr "Grade Desenhada Horizontalmente"
+msgstr "Grade desenhada horizontalmente"
 
 #: ../widgets/table/e-table-group-container.c:936
 #: ../widgets/table/e-table-group-container.c:937
 #: ../widgets/table/e-table-group-leaf.c:595
 #: ../widgets/table/e-table-group-leaf.c:596
-#: ../widgets/table/e-table-item.c:3046 ../widgets/table/e-table-item.c:3047
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
 #: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
 msgid "Vertical Draw Grid"
-msgstr "Grade Desenhada Verticalmente"
+msgstr "Grade desenhada verticalmente"
 
 #: ../widgets/table/e-table-group-container.c:943
 #: ../widgets/table/e-table-group-container.c:944
 #: ../widgets/table/e-table-group-leaf.c:602
 #: ../widgets/table/e-table-group-leaf.c:603
-#: ../widgets/table/e-table-item.c:3053 ../widgets/table/e-table-item.c:3054
+#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
 #: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
 msgid "Draw focus"
 msgstr "Foco de desenho"
@@ -23624,7 +23734,7 @@ msgstr "Foco de desenho"
 #: ../widgets/table/e-table-group-container.c:951
 #: ../widgets/table/e-table-group-leaf.c:609
 #: ../widgets/table/e-table-group-leaf.c:610
-#: ../widgets/table/e-table-item.c:3060 ../widgets/table/e-table-item.c:3061
+#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
 msgid "Cursor mode"
 msgstr "Modo do cursor"
 
@@ -23632,7 +23742,7 @@ msgstr "Modo do cursor"
 #: ../widgets/table/e-table-group-container.c:958
 #: ../widgets/table/e-table-group-leaf.c:623
 #: ../widgets/table/e-table-group-leaf.c:624
-#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
 msgid "Selection model"
 msgstr "Modelo de seleção"
 
@@ -23640,17 +23750,17 @@ msgstr "Modelo de seleção"
 #: ../widgets/table/e-table-group-container.c:965
 #: ../widgets/table/e-table-group-leaf.c:616
 #: ../widgets/table/e-table-group-leaf.c:617
-#: ../widgets/table/e-table-item.c:3067 ../widgets/table/e-table-item.c:3068
+#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
 #: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3337
 #: ../widgets/table/e-tree.c:3338
 msgid "Length Threshold"
-msgstr "Comprimento do Limiar"
+msgstr "Limiar de comprimento"
 
 #: ../widgets/table/e-table-group-container.c:971
 #: ../widgets/table/e-table-group-container.c:972
 #: ../widgets/table/e-table-group-leaf.c:658
 #: ../widgets/table/e-table-group-leaf.c:659
-#: ../widgets/table/e-table-item.c:3101 ../widgets/table/e-table-item.c:3102
+#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
 #: ../widgets/table/e-table.c:3333 ../widgets/table/e-tree.c:3369
 #: ../widgets/table/e-tree.c:3370
 msgid "Uniform row height"
@@ -23663,87 +23773,87 @@ msgstr "Altura de linha uniforme"
 msgid "Frozen"
 msgstr "Congelado"
 
-#: ../widgets/table/e-table-header-item.c:1453
+#: ../widgets/table/e-table-header-item.c:1452
 msgid "Customize Current View"
-msgstr "Personalizar Visão Atual"
+msgstr "Personalizar visão atual"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1472
 msgid "Sort _Ascending"
-msgstr "Ordem _Crescente"
+msgstr "Ordem _crescente"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Descending"
-msgstr "Ordem _Decrescente"
+msgstr "Ordem _decrescente"
 
-#: ../widgets/table/e-table-header-item.c:1475
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "_Unsort"
-msgstr "Não _Ordenar"
+msgstr "Não _ordenar"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Group By This _Field"
-msgstr "Agrupar Por Este _Campo"
+msgstr "Agrupar por este _campo"
 
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By _Box"
-msgstr "Agrupar Por C_aixa"
+msgstr "Agrupar por c_aixa"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "Remove This _Column"
-msgstr "Remover Esta _Coluna"
+msgstr "Remover esta _coluna"
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Add a C_olumn..."
-msgstr "Adicionar uma C_oluna..."
+msgstr "Adicionar uma c_oluna..."
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1482
 msgid "A_lignment"
 msgstr "A_linhamento"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "B_est Fit"
-msgstr "M_elhor Ajuste"
+msgstr "M_elhor ajuste"
 
-#: ../widgets/table/e-table-header-item.c:1485
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "Format Column_s..."
-msgstr "Formatar Coluna_s..."
+msgstr "Formatar coluna_s..."
 
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Custo_mize Current View..."
-msgstr "Perso_nalizar Visão Atual..."
+msgstr "Perso_nalizar visão atual..."
 
-#: ../widgets/table/e-table-header-item.c:1543
+#: ../widgets/table/e-table-header-item.c:1542
 msgid "_Sort By"
 msgstr "_Ordenar por"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1561
+#: ../widgets/table/e-table-header-item.c:1560
 msgid "_Custom"
 msgstr "_Personalizar"
 
-#: ../widgets/table/e-table-header-item.c:1894
+#: ../widgets/table/e-table-header-item.c:1893
 msgid "Font Description"
-msgstr "Descrição do Fonte"
+msgstr "Descrição do fonte"
 
-#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-header-item.c:1914
 #: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
-msgstr "Ordenar Informação"
+msgstr "Ordenar informação"
 
-#: ../widgets/table/e-table-header-item.c:1929
+#: ../widgets/table/e-table-header-item.c:1928
 #: ../widgets/table/e-tree-scrolled.c:225
 #: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "Árvore"
 
-#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
+#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
 msgid "Table header"
 msgstr "Cabeçalho da tabela"
 
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
+#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
 msgid "Table model"
 msgstr "Modelo de tabela"
 
-#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
+#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
 msgid "Cursor row"
 msgstr "Linha do cursor"
 
@@ -23762,7 +23872,7 @@ msgstr "Adaptador de tabela ETree"
 
 #: ../widgets/table/e-tree.c:3383
 msgid "Retro Look"
-msgstr "Visual Retrô"
+msgstr "Visual retrô"
 
 #: ../widgets/table/e-tree.c:3384
 msgid "Draw lines and +/- expanders."
@@ -23770,11 +23880,11 @@ msgstr "Desenhar linhas e expansores +/-."
 
 #: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
-msgstr "Métodos de Entrada"
+msgstr "Métodos de entrada"
 
 #: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
 msgid "Event Processor"
-msgstr "Processador de Eventos"
+msgstr "Processador de eventos"
 
 #: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
 msgid "Bold"
@@ -23794,11 +23904,11 @@ msgstr "Alinhamento"
 
 #: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 msgid "Clip Width"
-msgstr "Largura do Clip"
+msgstr "Largura do clip"
 
 #: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
 msgid "Clip Height"
-msgstr "Altura do Clip"
+msgstr "Altura do clip"
 
 #: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
 msgid "Clip"
@@ -23830,7 +23940,7 @@ msgstr "Usar omissão de palavra óbvia"
 
 #: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
-msgstr "Omissão de Palavras"
+msgstr "Omissão de palavras"
 
 #: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
 msgid "Line wrap"
@@ -23871,75 +23981,7 @@ msgstr "Contexto do ME"
 
 #: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
-msgstr "Alça do Popup"
-
-#~ msgctxt "New"
-#~ msgid "_Contact"
-#~ msgstr "_Contato"
-
-#~ msgctxt "New"
-#~ msgid "Contact _List"
-#~ msgstr "_Lista de contatos"
-
-#~ msgctxt "New"
-#~ msgid "Address _Book"
-#~ msgstr "Catálogo de _endereços"
-
-#~ msgctxt "New"
-#~ msgid "_Appointment"
-#~ msgstr "_Compromisso"
-
-#~ msgctxt "New"
-#~ msgid "M_eeting"
-#~ msgstr "_Reunião"
-
-#~ msgctxt "New"
-#~ msgid "All Day A_ppointment"
-#~ msgstr "Compromisso de _dia inteiro"
-
-#~ msgctxt "New"
-#~ msgid "Cale_ndar"
-#~ msgstr "Age_nda"
-
-#~ msgctxt "New"
-#~ msgid "Mem_o"
-#~ msgstr "Mem_orando"
-
-#~ msgctxt "New"
-#~ msgid "_Shared memo"
-#~ msgstr "_Memorando compartilhado"
-
-#~ msgctxt "New"
-#~ msgid "Memo li_st"
-#~ msgstr "Li_sta de memorandos"
-
-#~ msgctxt "New"
-#~ msgid "_Task"
-#~ msgstr "_Tarefa"
-
-#~ msgctxt "New"
-#~ msgid "Assigne_d Task"
-#~ msgstr "Tarefa _atribuída"
-
-#~ msgctxt "New"
-#~ msgid "Tas_k list"
-#~ msgstr "Lista de _tarefas"
-
-#~ msgctxt "folder-display"
-#~ msgid "%s (%u)"
-#~ msgstr "%s (%u)"
-
-#~ msgctxt "New"
-#~ msgid "_Mail Message"
-#~ msgstr "_Mensagem de correio"
-
-#~ msgctxt "New"
-#~ msgid "Mail _Folder"
-#~ msgstr "_Pasta de correio"
-
-#~ msgctxt "New"
-#~ msgid "_Test"
-#~ msgstr "_Teste"
+msgstr "Alça do popup"
 
 #~ msgid "Permission Denied."
 #~ msgstr "Permissão negada."
@@ -23957,16 +23999,16 @@ msgstr "Alça do Popup"
 #~ msgstr "Atualizando consulta"
 
 #~ msgid "Upcoming Appointments"
-#~ msgstr "Próximos Compromissos"
+#~ msgstr "Próximos compromissos"
 
 #~ msgid "Unknown reason"
 #~ msgstr "Razão desconhecida"
 
 #~ msgid "Open File"
-#~ msgstr "Abrir Arquivo"
+#~ msgstr "Abrir arquivo"
 
 #~ msgid "_Save Message"
-#~ msgstr "_Salvar Mensagem"
+#~ msgstr "_Salvar mensagem"
 
 #~ msgid "Cannot open file &quot;{0}&quot;."
 #~ msgstr "Não é possível abrir arquivo o &quot;{0}&quot;."
@@ -24006,10 +24048,10 @@ msgstr "Alça do Popup"
 #~ msgstr "Você deseja que a operação seja executada também nas subpastas?"
 
 #~ msgid "Mark all messages in this folder and subfolders as read?"
-#~ msgstr "Marcar todas as mensagens nesta pasta e sub-pastas como lidas?"
+#~ msgstr "Marca todas as mensagens nesta pasta e sub-pastas como lidas?"
 
 #~ msgid "Only on _Current Folder"
-#~ msgstr "Apenas _Pasta Atual"
+#~ msgstr "Apenas na _pasta atual"
 
 #~ msgid "Enable attachment reminder plugin"
 #~ msgstr "Habilitar plug-in de lembrete de anexo"
@@ -24033,10 +24075,10 @@ msgstr "Alça do Popup"
 #~ msgstr "Fornecer uma opção para imprimir a mensagem a partir do redator."
 
 #~ msgid "Print Message"
-#~ msgstr "Imprimir Mensagem"
+#~ msgstr "Imprimir mensagem"
 
 #~ msgid "Prints the message"
-#~ msgstr "Imprimir esta mensagem"
+#~ msgstr "Imprime a mensagem"
 
 #~ msgid "A plugin that handles the Startup wizard."
 #~ msgstr "Um plug-in que controla o Assistente de inicialização."
@@ -24075,7 +24117,7 @@ msgstr "Alça do Popup"
 #~ msgstr "\".\" e \"..\" são nomes de pastas reservados."
 
 #~ msgid "Evolution Crash Detection"
-#~ msgstr "Restaurador do Evolution"
+#~ msgstr "Detecção de travamento do Evolution"
 
 #~ msgid "Ig_nore"
 #~ msgstr "Ig_norar"
@@ -24099,7 +24141,7 @@ msgstr "Alça do Popup"
 #~ msgstr "Copiar seleção para a área de transferência"
 
 #~ msgid "Cut selection to clipboard"
-#~ msgstr "Cortar seleção para a área de transferência"
+#~ msgstr "Recortar seleção para a área de transferência"
 
 #~ msgid "Paste from clipboard"
 #~ msgstr "Colar da área de transferência"
@@ -24108,7 +24150,7 @@ msgstr "Alça do Popup"
 #~ msgstr "Evento de dia inteiro"
 
 #~ msgid "Send _Options"
-#~ msgstr "_Opções de Envio"
+#~ msgstr "_Opções de envio"
 
 #~ msgid "Show messages in the normal style"
 #~ msgstr "Mostrar a mensagem no estilo normal"
@@ -24162,16 +24204,16 @@ msgstr "Alça do Popup"
 #~ msgstr "H_TML"
 
 #~ msgid "Save and _Close"
-#~ msgstr "Salvar e _Fechar"
+#~ msgstr "Salvar e _fechar"
 
 #~ msgid "Save the current file and close the window"
 #~ msgstr "Salvar o arquivo atual e fechar esta janela"
 
 #~ msgid "Refresh List"
-#~ msgstr "Atualizar Lista"
+#~ msgstr "Atualizar lista"
 
 #~ msgid "Refresh List of Folders"
-#~ msgstr "Atualizar Lista de Pastas"
+#~ msgstr "Atualizar lista de pastas"
 
 #~ msgid "Remove folder from your list of subscribed folders"
 #~ msgstr "Remover pasta de sua lista de pastas inscritas"
@@ -24180,25 +24222,25 @@ msgstr "Alça do Popup"
 #~ msgstr "Inscrever"
 
 #~ msgid "Unsubscribe"
-#~ msgstr "Cancelar a Inscrição"
+#~ msgstr "Cancelar a inscrição"
 
 #~ msgid "_Invert Selection"
-#~ msgstr "_Inverter Seleção"
+#~ msgstr "_Inverter seleção"
 
 #~ msgid "Status Details"
-#~ msgstr "Detalhes de Estado"
+#~ msgstr "Detalhes de status"
 
 #~ msgid "Time Zone"
 #~ msgstr "Fuso horário"
 
 #~ msgid "TimeZone Combobox"
-#~ msgstr "Seletor de Fuso horário"
+#~ msgstr "Seletor de fuso horário"
 
 #~ msgid "<b>Display</b>"
 #~ msgstr "<b>Exibição</b>"
 
 #~ msgid "<b>Server Information</b>"
-#~ msgstr "<b>Informação do Servidor</b>"
+#~ msgstr "<b>Informação do servidor</b>"
 
 #~ msgid "Migrating `%s':"
 #~ msgstr "Migrando \"%s\":"
@@ -24213,4 +24255,4 @@ msgstr "Alça do Popup"
 #~ msgstr "Atualizar a cada"
 
 #~ msgid "Mark All Messages as Read"
-#~ msgstr "Marcar todas as mensagens como lidas"
+#~ msgstr "Marca todas as mensagens como lidas"
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 4ea93c997e..4ba417f5d8 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-30  Matthew Barnes  <mbarnes@redhat.com>
+
+	* importer/evolution-importer-client.h:
+	* importer/intelligent.c:
+	* test/evolution-test-component.c:
+	Only include the toplevel GTK+ header.
+
 2008-10-17  Kandepu Prasad  <kaprasad@novell.com>
 
 	** Fix for bug #311479
diff --git a/shell/importer/evolution-importer-client.h b/shell/importer/evolution-importer-client.h
index 043a639c5d..35cde858d6 100644
--- a/shell/importer/evolution-importer-client.h
+++ b/shell/importer/evolution-importer-client.h
@@ -24,7 +24,7 @@
 #define EVOLUTION_IMPORTER_CLIENT_H
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <importer/evolution-importer.h>
 #include <importer/evolution-importer-listener.h>
 
diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c
index a9a8fed024..c7cb6b3b0c 100644
--- a/shell/importer/intelligent.c
+++ b/shell/importer/intelligent.c
@@ -26,25 +26,7 @@
 
 #include "intelligent.h"
 
-#include <glib.h>
-
-#include <gtk/gtkdrawingarea.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkclist.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include <libgnome/gnome-config.h>
 /*#include <libgnome/gnome-util.h>*/
diff --git a/ui/ChangeLog b/ui/ChangeLog
index b1ee2caa0a..c591ce10b6 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,18 @@
+2008-11-03  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #559040
+
+	* evolution-addressbook.xml:
+	* evolution-mail-global.xml:
+	* evolution-mail-list.xml:
+	No period at the end of tooltips, and use sentence case.
+
+2008-11-03  Ashish Shrivastava  <shashish@novell.com>
+
+	** Support for Non-intrusive error in calendar.
+
+	* evolution-calendar.xml: Add menu for HelpDebug.
+
 2008-08-27  Philip Withnall  <philip@tecnocode.co.uk>
 
 	** Fix for bug #534762
diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml
index 737914f640..c582cd6b62 100644
--- a/ui/evolution-mail-global.xml
+++ b/ui/evolution-mail-global.xml
@@ -109,7 +109,7 @@
 <!--
         <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 -->
-        <menuitem name="ToolsSubscriptions" verb="" _label="_Subscriptions"/>
+        <menuitem name="ToolsSubscriptions" verb="" _label="_Subscriptions..."/>
 
  	<separator f="" name="Folder1"/>
 
diff --git a/ui/evolution-mail-list.xml b/ui/evolution-mail-list.xml
index 5071228f8d..95b62eb996 100644
--- a/ui/evolution-mail-list.xml
+++ b/ui/evolution-mail-list.xml
@@ -130,7 +130,7 @@
 
  	<placeholder name="FolderOps">
 	  <menuitem name="FolderRename" verb="" _label="_Rename..."/>
-          <menuitem name="FolderRefresh" verb="" _label="Re_fresh..."/>
+          <menuitem name="FolderRefresh" verb="" _label="Re_fresh"/>
 	  <menuitem name="FolderDelete" verb="" _label="_Delete"/>
 
  	  <separator f="" name="FolderOps1"/>
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index ef2cb7e355..296d3210d5 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,17 @@
+2008-11-03  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #559041
+
+	* text/e-text.c (e_text_class_init):
+	Add translator comment for "im_context" property.
+
+2008-10-30  Matthew Barnes  <mbarnes@redhat.com>
+
+	* widgets/menus/gal-view-menus.c:
+	* widgets/misc/e-activity-handler.c:
+	* widgets/table/e-table-config-field.h:
+	Only include the toplevel GTK+ header.
+
 2008-10-17  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 85ec90411f..e7b9460b10 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-29  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-url-entry.c:
+	* e-url-entry.h:
+
 2008-10-21  Sankar P  <psankar@novell.com>
 
 	* e-spinner.c (e_spinner_stop),
diff --git a/widgets/misc/e-url-entry.c b/widgets/misc/e-url-entry.c
index 9db87b3ecd..26d081fc85 100644
--- a/widgets/misc/e-url-entry.c
+++ b/widgets/misc/e-url-entry.c
@@ -1,12 +1,8 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-url-entry.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2 of the License, or (at your option) version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,11 +10,14 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		JP Rosevear <jpr@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * Author: JP Rosevear
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/widgets/misc/e-url-entry.h b/widgets/misc/e-url-entry.h
index f2ebf54eae..1c051ac0e8 100644
--- a/widgets/misc/e-url-entry.h
+++ b/widgets/misc/e-url-entry.h
@@ -1,12 +1,8 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-url-entry.h
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
+/*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2 of the License, or (at your option) version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,11 +10,14 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		JP Rosevear <jpr@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * Author: JP Rosevear
  */
 
 #ifndef _E_URL_ENTRY_H_
diff --git a/widgets/table/e-table-config-field.h b/widgets/table/e-table-config-field.h
index 3e21147ef5..382ff941b1 100644
--- a/widgets/table/e-table-config-field.h
+++ b/widgets/table/e-table-config-field.h
@@ -23,7 +23,7 @@
 #ifndef _E_TABLE_CONFIG_FIELD_H_
 #define _E_TABLE_CONFIG_FIELD_H_
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include <table/e-table-sort-info.h>
 #include <table/e-table-specification.h>
 
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index d608f7e96a..713a84050d 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -3777,7 +3777,9 @@ e_text_class_init (ETextClass *klass)
 
 	g_object_class_install_property (gobject_class, PROP_IM_CONTEXT,
 					 g_param_spec_object ("im_context",
+							      /* Translators: Input Method Context */
 							      _( "IM Context" ),
+							      /* Translators: Input Method Context */
 							      _( "IM Context" ),
 							      GTK_TYPE_IM_CONTEXT,
 							      G_PARAM_READWRITE));