Merge revisions 36016:36533 from trunk.

svn path=/branches/kill-bonobo/; revision=36534
author: Matthew Barnes <mbarnes@src.gnome.org> 2008-10-02 04:56:04 +0800
committer: Matthew Barnes <mbarnes@src.gnome.org> 2008-10-02 04:56:04 +0800
commit: b2cda1d0c6d44f53f71bad9e256f41188677dfba (patch)
tree: 65bd7560e802baf1740482ae48b952dc5c5957fc
parent: e52986f4225cbe8496043da74ca250521d244705 (diff)
download: gsoc2013-evolution-b2cda1d0c6d44f53f71bad9e256f41188677dfba.tar.gz
gsoc2013-evolution-b2cda1d0c6d44f53f71bad9e256f41188677dfba.tar.zst
gsoc2013-evolution-b2cda1d0c6d44f53f71bad9e256f41188677dfba.zip
366 files changed, 148661 insertions, 124013 deletions
diff --git a/COPYING.LGPL2 b/COPYING.LGPL2
new file mode 100644
index 0000000000..9084f4c4ad
--- /dev/null
+++ b/COPYING.LGPL2
@@ -0,0 +1,503 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+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 and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, 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 library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete 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 distribute a copy of this License along with the
+Library.
+
+  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 Library or any portion
+of it, thus forming a work based on the Library, 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) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+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 Library, 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 Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you 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.
+
+  If distribution of 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 satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be 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.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library 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.
+
+  9. 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 Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+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 with
+this License.
+
+  11. 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 Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library 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 Library.
+
+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.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library 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.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser 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 Library
+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 Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+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
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "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
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. 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 LIBRARY 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
+LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), 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 Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  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 library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library 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.1 of the License, or (at your option) any later version.
+
+    This library 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 this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+
+
diff --git a/COPYING.LGPL3 b/COPYING.LGPL3
new file mode 100644
index 0000000000..3f7b8b1e5c
--- /dev/null
+++ b/COPYING.LGPL3
@@ -0,0 +1,166 @@
+		   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions. 
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version. 
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser 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
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+
diff --git a/ChangeLog b/ChangeLog
index b6e061892a..1d44cf0449 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,57 @@
+2008-10-01  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #554458
+
+	* configure.in:
+	Bump glib version to 2.18.0 because of g_content_type_from_mime_type.
+
+2008-09-22  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* configure.in: Fix 'cs' build break due to my git-merge issues.
+
+2008-09-22  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* configure.in: Version bump for Evolution 2.25.1
+
+2008-09-22  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* COPYING.LGPL2: Add LGPL v2, v3 licensing header.
+	* COPYING.LGPL3:
+
+2008-09-22  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* NEWS, configure.in: Evolution 2.24.0 release.
+
+2008-09-22  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* configure.in: Fix for build break. 
+
+2008-09-22  Luca Ferretti  <elle.uca@libero.it>
+
+	* configure.in: 
+	Add mail/default/it/Makefile to AC_OUTPUT.
+
+2008-09-17  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* configure.in:
+	Add mail/default/hu/Makefile to AC_OUTPUT.
+
+2008-09-16  Matthew Barnes  <mbarnes@redhat.com>
+
+	* configure.in:
+	Add mail/default/sr@latin/Makefile to AC_OUTPUT.
+
+2008-09-16  Matthew Barnes  <mbarnes@redhat.com>
+
+	* configure.in:
+	Add mail/default/sr/Makefile to AC_OUTPUT (bug #552508).
+
+2008-09-12  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* iconv-detect.c:
+
 2008-09-10  Michael Meeks  <michael.meeks@novell.com>
 
 	* server.mk: use top_builddir for config.h #551560
diff --git a/Makefile.am b/Makefile.am
index c1f66cc831..217bdf9e83 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,8 @@ EXTRA_DIST = 			\
 	AUTHORS			\
 	$(changelogs)		\
 	COPYING-DOCS		\
+	COPYING.LGPL2		\
+	COPYING.LGPL3		\
 	README			\
 	HACKING			\
 	MAINTAINERS		\
diff --git a/NEWS b/NEWS
index bbfd699ccd..020caf47d5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,70 @@
+Evolution 2.24.0 2008-09-22
+---------------------------
+
+New in 2.24.0:
+
+	* Message Templates
+	* WebDAV Contacts Plugin
+	* Google Contacts Plugin
+	* Custom header support while sending mails 
+	* Single Model view for Calendar
+	* Sqlite Based message summary
+	* New Bonobo-less composer for Evolution 
+	* Quota support to IMAP/POP accounts
+	* Gtk+ Recent manager integration in Composer
+
+Bug Fixes:
+	#504767: Expand also parent nodes, if necessary (Milan Crha)
+	#505016: Check for NULL to prevent crash when error occurred. (Milan Crha)
+	#514299: Connect to signals only once, when creating new status icon (Milan Crha)
+	#534039: Dropped unnecessary and offending code causing infinite loops when deleting search folder. (Milan Crha)
+	#539536: Add "Face" header to default headers and allow it to be hidden (Paul Bolle)
+	#551548: Enable selection of S/MIME for individual messages (Matthew Barnes)
+	#551628: Remove old events from the view when objects are modified. (Chenthill Palanisamy)
+	#551895: Fix a warning message (Paul Bolle)
+	#551915: Manage error on idle, to call gtk functions in the main thread (Milan Crha)
+	#552911: Do not use spaces in file names (Milan Crha)
+
+Updated Translations:
+	Wadim Dziedzic (pl)
+	Osama Khalid, Usama Akkad, Abou Manal (ar)
+	Gabor Kelemen (hu)
+	Kenneth Nielsen (da)
+	Luca Ferretti (it)
+	Fabrício Godoy, Vladimir Melo and Leonardo Ferreira Fontenelle (pt_BR)
+	Laurent Dhima (sq)
+	Igor Nestorović(sr, sr@latin)
+	Pierros Papadeas (el)
+	Žygimantas Beručka (lt)
+	Tirumurthi Vasudevan (ta)
+	Inaki Larrañaga Murgoitio (eu)
+	Shankar Prasad (kn)
+	Chao-Hsiung Liao (zh_HK, zh_TW)
+	Jiri Eischmann (cs)
+	Jorge Gonzalez (es)
+	Ivar Smolin (et)
+	David Planella (ca)
+	Tino Meinen (nl)
+	Ilkka Tuohela (fi)
+	Sandeep Shedmake (mr)
+	Daniel Nylander (sv)
+	Baris Cicek (tr)
+	Hendrik Richter (de)
+	Philip Withnall (en_GB)
+	Duarte Loreto (pt)
+	Runa Bhattacharjee (bn_IN)
+	Luca Ferretti (it)
+	Rajesh Ranjan (hi)
+	Robert Sedak (hr)
+	David Planella (ca)
+	Yavor Doganov (bg)
+	Theppitak Karoonboonyanan (th)
+
 Evolution 2.23.92 2008-09-08
 ----------------------------
 
 New in 2.23.92:
-	Evolution source code license changed to LGPLv2 or later (Sankar P)
+	Evolution source code license changed to LGPLv2 & LGPLV3 (Sankar P)
 
 Bug Fixes:
 	#549968: Use the same mnemonic for "Recent Documents" as composer (Matthew Barnes)
diff --git a/a11y/ChangeLog b/a11y/ChangeLog
index 8364cd3393..a5395fff94 100644
--- a/a11y/ChangeLog
+++ b/a11y/ChangeLog
@@ -1,3 +1,22 @@
+2008-09-24  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-table/gal-a11y-e-cell-tree.c:
+
+2008-09-19  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* addressbook/ea-addressbook-view.c:
+	* addressbook/ea-minicard-view.c:
+
+2008-09-16  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-table/gal-a11y-e-cell-text.c:
+
 2008-09-04  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/a11y/addressbook/ea-addressbook-view.c b/a11y/addressbook/ea-addressbook-view.c
index 7667feb108..eff7eb4044 100644
--- a/a11y/addressbook/ea-addressbook-view.c
+++ b/a11y/addressbook/ea-addressbook-view.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * ea-addressbook-view.c
- * 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 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 the program; if not, see <http://www.gnu.org/licenses/>  
  *
- * You should have received a copy of the GNU 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.
  *
- * Author:  Leon Zhang <leon.zhang@sun.com> Sun Microsystem Inc., 2003
+ * Authors:
+ *		Leon Zhang <leon.zhang@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/a11y/addressbook/ea-minicard-view.c b/a11y/addressbook/ea-minicard-view.c
index fc5638d51d..944060b91a 100644
--- a/a11y/addressbook/ea-minicard-view.c
+++ b/a11y/addressbook/ea-minicard-view.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * ea-minicard-view.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author:  Leon Zhang < leon.zhang@sun.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Leon Zhang < leon.zhang@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * You should have received a copy of the GNU 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.
  */
 
 #include <config.h>
diff --git a/a11y/e-table/gal-a11y-e-cell-text.c b/a11y/e-table/gal-a11y-e-cell-text.c
index 95d98792ac..e77c0739a9 100644
--- a/a11y/e-table/gal-a11y-e-cell-text.c
+++ b/a11y/e-table/gal-a11y-e-cell-text.c
@@ -1,9 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
+ * 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/>  
+ *
+ *
  * Authors:
- *   Christopher James Lahey <clahey@ximian.com>
+ *		Christopher James Lahey <clahey@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/a11y/e-table/gal-a11y-e-cell-tree.c b/a11y/e-table/gal-a11y-e-cell-tree.c
index 5a170c4ad4..2e6a8839a1 100644
--- a/a11y/e-table/gal-a11y-e-cell-tree.c
+++ b/a11y/e-table/gal-a11y-e-cell-tree.c
@@ -1,9 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
+ * 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/>  
+ *
+ *
  * Authors:
- *   Tim Wo <tim.wo@sun.com>, Sun Microsystem Inc. 2003.
+ *		Tim Wo <tim.wo@sun.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 8381d07b44..2ca19f74ff 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,106 @@
+2008-10-01  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* gui/component/addressbook-config.c:
+	* gui/widgets/e-minicard.c:
+	* importers/evolution-ldif-importer.c:
+	* importers/evolution-vcard-importer.c:
+
+2008-09-30  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* gui/component/addressbook.c:
+
+2008-09-29  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* gui/component/addressbook-view.c:
+
+2008-09-25  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fix for bug #553148
+
+	* gui/contact-editor/contact-editor.glade:
+	* gui/contact-editor/e-contact-editor-im.c: Standardise "GroupWise"
+	usage in translatable strings.
+
+2008-09-24  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* gui/contact-editor/e-contact-editor.c:
+	* gui/contact-editor/e-contact-quick-add.c:
+	* gui/widgets/e-addressbook-view.c:
+
+2008-09-24  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* gui/widgets/e-addressbook-model.c:
+	* gui/widgets/eab-gui-util.c:
+	* gui/widgets/eab-vcard-control.c:
+
+2008-09-24  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fixes bug #553479
+
+	* gui/component/ldap-config.glade: String capitalisation improvements.
+
+2008-09-23  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #553273
+
+	* gui/component/addressbook-view.c: (delete_addressbook_folder),
+	(delete_addressbook_cb):
+	* gui/widgets/eab-gui-util.c: (save_it):
+	* gui/contact-list-editor/e-contact-list-model.c:
+	(e_contact_list_model_add_email):
+	* gui/contact-list-editor/e-contact-list-editor.c:
+	(contact_list_editor_contact_exists):
+	Always end e_error_run/e_error_new calls with NULL parameter.
+
+2008-09-23  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #552575
+
+	* gui/widgets/eab-gui-util.c: (eab_send_contact_list_as_attachment):
+	Register default callbacks to composer to be able to send/save draft.
+
+2008-09-23  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #272391
+
+	* gui/component/apps_evolution_addressbook.schemas.in:
+	* gui/component/autocompletion-config.c: (struct AutocompletionConfig),
+	(config_control_destroy_notify), (add_section),
+	(show_address_check_toggled_cb), (autocompletion_config_control_new):
+	New UI for Edit->Preferences->Autocompletion, with the checkbox for
+	the key "/apps/evolution/addressbook/completion/show_address" to be
+	able to setup whether show mail address for the autocompleted contact.
+
+2008-09-19  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* gui/widgets/e-minicard-label.c:
+	* tools/evolution-addressbook-export.c:
+
+2008-09-16  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* gui/component/addressbook-component.c:
+	* gui/contact-editor/eab-editor.c:
+
+2008-09-12  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* gui/component/addressbook-migrate.c:
+
 2008-09-08  Milan Crha  <mcrha@redhat.com>
 
 	** Part of fix for bug #361413
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index 49e138e0de..a04bde676a 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -1,28 +1,27 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* addressbook-component.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 version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
  *
- * 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.
  *
- * Author: Ettore Perazzoli <ettore@ximian.com>
+ * Authors:
+ *		Ettore Perazzoli <ettore@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 /* EPFIXME: Add autocompletion setting.  */
 
-
 #include <config.h>
 
 #include "addressbook-component.h"
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
index e6dc8e1a2a..c1f3d76b75 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/addressbook/gui/component/addressbook-config.c
@@ -1,11 +1,27 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
+ * 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/>  
+ *
+ *
  * Authors:
- * Chris Toshok <toshok@ximian.com>
- * Chris Lahey <clahey@ximian.com>
- * Michael Zucchi <notzed@ximian.com>
- *  And no doubt others ...
- **/
+ *		Chris Toshok <toshok@ximian.com>
+ *		Chris Lahey <clahey@ximian.com>
+ *		Michael Zucchi <notzed@ximian.com>
+ *		And no doubt others ...
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
 
 /*#define STANDALONE*/
 
diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c
index 54f07704ce..c77c70e2b8 100644
--- a/addressbook/gui/component/addressbook-migrate.c
+++ b/addressbook/gui/component/addressbook-migrate.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * 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 version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
  *
- * 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.
  *
- * Author: Chris Toshok (toshok@ximian.com)
+ * Authors:
+ *		Chris Toshok <toshok@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 132ad51cea..c8285d8171 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* addressbook.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 version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
  *
- * 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.
  *
- * Author: Chris Lahey (clahey@ximian.com)
+ * Authors:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/addressbook/gui/component/apps_evolution_addressbook.schemas.in b/addressbook/gui/component/apps_evolution_addressbook.schemas.in
index 010073331e..4a336409df 100644
--- a/addressbook/gui/component/apps_evolution_addressbook.schemas.in
+++ b/addressbook/gui/component/apps_evolution_addressbook.schemas.in
@@ -27,6 +27,18 @@
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/apps/evolution/addressbook/completion/show_address</key>
+      <applyto>/apps/evolution/addressbook/completion/show_address</applyto>
+      <owner>evolution-addressbook</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Show autocompleted name with an address</short>
+        <long>Whether force showing the mail address with the name of the autocompleted contact in the entry.</long>
+      </locale>
+    </schema>
+
     <!-- Select names last used uri -->
 
     <schema>
diff --git a/addressbook/gui/component/autocompletion-config.c b/addressbook/gui/component/autocompletion-config.c
index f093564f7e..a2c40200d5 100644
--- a/addressbook/gui/component/autocompletion-config.c
+++ b/addressbook/gui/component/autocompletion-config.c
@@ -25,6 +25,7 @@
 #include "autocompletion-config.h"
 
 #include <e-shell.h>
+#include <libedataserverui/e-name-selector-entry.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <e-preferences-window.h>
diff --git a/addressbook/gui/component/ldap-config.glade b/addressbook/gui/component/ldap-config.glade
index 1e1c4d5fea..58ffba43bf 100644
--- a/addressbook/gui/component/ldap-config.glade
+++ b/addressbook/gui/component/ldap-config.glade
@@ -475,7 +475,7 @@
 			  <child>
 			    <widget class="GtkEntry" id="server-name-entry">
 			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">This is the full name of your ldap server. For example, &quot;ldap.mycompany.com&quot;.</property>
+			      <property name="tooltip" translatable="yes">This is the full name of your LDAP server. For example, &quot;ldap.mycompany.com&quot;.</property>
 			      <property name="can_focus">True</property>
 			      <property name="has_focus">True</property>
 			      <property name="editable">True</property>
@@ -635,7 +635,7 @@
 			  <child>
 			    <widget class="GtkOptionMenu" id="auth-optionmenu">
 			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">This is the method Evolution will use to authenticate you.  Note that setting this to &quot;Email Address&quot; requires anonymous access to your ldap server.</property>
+			      <property name="tooltip" translatable="yes">This is the method Evolution will use to authenticate you.  Note that setting this to &quot;Email Address&quot; requires anonymous access to your LDAP server.</property>
 			      <property name="can_focus">True</property>
 			      <property name="history">0</property>
 
diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade
index 2d6854cca1..bc6cbf1e54 100644
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ b/addressbook/gui/contact-editor/contact-editor.glade
@@ -1422,7 +1422,7 @@
 				  <child>
 				    <widget class="GtkMenuItem" id="menuitem389">
 				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Novell Groupwise</property>
+				      <property name="label" translatable="yes">Novell GroupWise</property>
 				      <property name="use_underline">True</property>
 				      <signal name="activate" handler="on_novell_groupwise1_activate" last_modification_time="Fri, 12 Mar 2004 18:38:59 GMT"/>
 				    </widget>
diff --git a/addressbook/gui/contact-editor/e-contact-editor-im.c b/addressbook/gui/contact-editor/e-contact-editor-im.c
index 6121eb8be8..7facb68b45 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-im.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-im.c
@@ -52,7 +52,7 @@ enum {
 
 static const char *im_labels[] = {
 	N_("AOL Instant Messenger"),
-        N_("Novell Groupwise"),
+        N_("Novell GroupWise"),
 	N_("Jabber"),
 	N_("Yahoo Messenger"),
 	N_("Gadu-Gadu Messenger"),
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 7e85394f02..07d4a9ec0f 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-contact-editor.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * You should have received a copy of the GNU 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.
  */
 
 #include <config.h>
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index 41d77413f1..175af68d43 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -1,27 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-contact-quick-add.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
 /*
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Jon Trowbridge <trow@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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.
  */
 
 #include <config.h>
diff --git a/addressbook/gui/contact-editor/eab-editor.c b/addressbook/gui/contact-editor/eab-editor.c
index 4b3b8f4395..25a6e5d3e5 100644
--- a/addressbook/gui/contact-editor/eab-editor.c
+++ b/addressbook/gui/contact-editor/eab-editor.c
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* eab-editor.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Chris Toshok <toshok@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * You should have received a copy of the GNU 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.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index 7146bc7100..7f15ff1350 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -259,7 +259,7 @@ contact_list_editor_contact_exists (EContactListModel *model,
 	if (!e_contact_list_model_has_email (model, email))
 		return FALSE;
 
-	return (e_error_run (NULL, tag, email) != GTK_RESPONSE_YES);
+	return (e_error_run (NULL, tag, email, NULL) != GTK_RESPONSE_YES);
 }
 
 static void
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.c b/addressbook/gui/contact-list-editor/e-contact-list-model.c
index c91bfb44d5..f381e6754e 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-model.c
@@ -152,7 +152,7 @@ e_contact_list_model_add_email (EContactListModel *model,
 	g_return_if_fail (email != NULL);
 
 	if (e_contact_list_model_has_email (model, email))
-		if (e_error_run (NULL, tag, email) != GTK_RESPONSE_YES)
+		if (e_error_run (NULL, tag, email, NULL) != GTK_RESPONSE_YES)
 			return;
 
 	destination = e_destination_new ();
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
index b129051228..772e72e3af 100644
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ b/addressbook/gui/widgets/e-addressbook-model.c
@@ -1,10 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
+ * 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.
  *
- * Author:
- *   Christopher James Lahey <clahey@ximian.com>
+ * 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/>  
+ *
+ *
+ * Authors:
+ *		Christopher James Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * (C) 1999 Ximian, Inc.
  */
 
 #include <config.h>
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 550fb2dc23..1120ae2569 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-addressbook-view.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey@ximian.com>
- *         Chris Toshok <toshok@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Chris Lahey <clahey@ximian.com>
+ *      Chris Toshok <toshok@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * You should have received a copy of the GNU 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.
  */
 
 #include <config.h>
diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h
index aad4a5ac39..009222fd71 100644
--- a/addressbook/gui/widgets/e-addressbook-view.h
+++ b/addressbook/gui/widgets/e-addressbook-view.h
@@ -19,6 +19,7 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
+
 #ifndef E_ADDRESSBOOK_VIEW_H
 #define E_ADDRESSBOOK_VIEW_H
 
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 8e4c9c8966..89107dafbf 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-minicard-label.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * You should have received a copy of the GNU 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.
  */
 
 #include <config.h>
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 8d50b6ee5b..cbbcc80d5c 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-minicard.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * You should have received a copy of the GNU 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.
  */
 
 #include <config.h>
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index 154e5bb0c1..76153b9d30 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-table-field-chooser.c
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Chris Toshok <toshok@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * You should have received a copy of the GNU 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.
  */
 
 #include <config.h>
@@ -403,7 +404,7 @@ save_it(GtkWidget *widget, SaveAsInfo *info)
 		 * {0}, {1} and {2}, respectively in the error message formed
 		 */
 		e_error_run (GTK_WINDOW (info->filesel), "addressbook:save-error",
-					 err_str_ext, filename, g_strerror (errno));
+					 err_str_ext, filename, g_strerror (errno), NULL);
 		gtk_widget_destroy(GTK_WIDGET(info->filesel));
 		return;
 	}
@@ -890,6 +891,7 @@ eab_send_contact_list_as_attachment (GList *contacts)
 
 	composer = e_msg_composer_new ();
 	table = e_msg_composer_get_header_table (composer);
+	em_composer_utils_setup_default_callbacks (composer);
 
 	attachment = camel_mime_part_new ();
 	data = eab_contact_list_to_string (contacts);
diff --git a/addressbook/gui/widgets/eab-vcard-control.c b/addressbook/gui/widgets/eab-vcard-control.c
index 431229498e..786e54632d 100644
--- a/addressbook/gui/widgets/eab-vcard-control.c
+++ b/addressbook/gui/widgets/eab-vcard-control.c
@@ -1,26 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * eab-vcard-control.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 version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
  *
- * 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.
  *
  * Authors:
- *    Chris Lahey <clahey@ximian.com>
- *    Chris Toshok <toshok@ximian.com>
+ *		Chris Lahey <clahey@ximian.com>
+ *		Chris Toshok <toshok@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c
index 41b2ac342a..2f7b2cced9 100644
--- a/addressbook/importers/evolution-ldif-importer.c
+++ b/addressbook/importers/evolution-ldif-importer.c
@@ -1,4 +1,19 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * 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)
+ */
 
 /*
  * LDIF importer.  LDIF is the file format of an exported Netscape
diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c
index b03c36d07a..bd526e37cc 100644
--- a/addressbook/importers/evolution-vcard-importer.c
+++ b/addressbook/importers/evolution-vcard-importer.c
@@ -1,25 +1,27 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar importer component
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+/*
+ * Evolution calendar importer component
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
  *
- * 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.
  *
- * Authors: Chris Toshok <toshok@ximian.com>
- *          JP Rosevear <jpr@ximian.com>
+ * Authors:
+ *		Chris Toshok <toshok@ximian.com>
+ *      JP Rosevear <jpr@ximian.com>
  * 	    Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/addressbook/tools/evolution-addressbook-export.c b/addressbook/tools/evolution-addressbook-export.c
index 2f9df1fabc..38a73b7b02 100644
--- a/addressbook/tools/evolution-addressbook-export.c
+++ b/addressbook/tools/evolution-addressbook-export.c
@@ -1,23 +1,22 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* evolution-addressbook-export.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 version 2 of the GNU 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
- * General Public License for more details.
+ * Lesser 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.
+ * 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/>  
  *
- * Author: Gilbert Fang <gilbert.fang@sun.com>
+ *
+ * Authors:
+ *		Gilbert Fang <gilbert.fang@sun.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 92de5afd33..04bfe0d70a 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,153 @@
+2008-10-01  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #554418
+
+	* gui/dialogs/comp-editor.c: (set_attachment_list):
+	* gui/e-cal-popup.c: (ecalp_standard_menu_factory):
+	Allow/disallow guessing of the mime_type based on the file content.
+
+2008-10-01  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #554458
+
+	* gui/e-cal-popup.c: (ecalp_standard_menu_factory):
+	Use content-type to call of g_app_info_get_all_for_type.
+
+2008-10-01  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* gui/dialogs/recurrence-page.c:
+	* importers/icalendar-importer.c:
+
+2008-09-30  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* gui/e-week-view.c:
+	* gui/goto.c:
+
+2008-09-29  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* shell.error.xml: Unbreak build, sorry for the inconvenience.
+
+2008-09-29  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* calendar.error.xml: Mark some forgotten strings for translation. Fixes bug #553105
+
+2008-09-26  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #553297
+
+	* gui/e-day-view.c: (e_day_view_on_editing_stopped):
+	Do not try to access uninitialized variables.
+
+2008-09-25  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* gui/e-itip-control.c:
+	* gui/e-itip-control.h:
+	* gui/itip-utils.c:
+	* gui/itip-utils.h:
+	* gui/main.c:
+
+2008-09-24  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* gui/alarm-notify/config-data.c:
+	* gui/cal-search-bar.c:
+	* gui/calendar-component.c:
+	* gui/comp-util.c:
+	* gui/comp-util.h:
+	* gui/dialogs/cal-prefs-dialog.c:
+	* gui/dialogs/e-send-options-utils.c:
+	* gui/dialogs/event-page.c:
+	* gui/dialogs/memo-page.c:
+	* gui/dialogs/task-page.c:
+	* gui/e-cal-component-memo-preview.c:
+	* gui/e-cal-component-preview.c:
+	* gui/e-day-view-main-item.c:
+	* gui/e-day-view-top-item.c:
+	* gui/e-week-view-event-item.c:
+	* gui/e-week-view.h:
+	* gui/memos-component.c:
+	* gui/tasks-component.c:
+
+2008-09-24  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* gui/dialogs/delete-comp.c:
+	* gui/e-alarm-list.c:
+
+2008-09-23  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #553273
+
+	* gui/alarm-notify/alarm-queue.c: (edit_component):
+	* gui/tasks-component.c: (delete_task_list_cb):
+	* gui/calendar-component.c: (delete_calendar_cb):
+	* gui/memos-component.c: (delete_memo_list_cb):
+	Always end e_error_run/e_error_new calls with NULL parameter.
+
+2008-09-19  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* gui/alarm-notify/alarm-queue.c:
+	* gui/e-calendar-view.c:
+
+2008-09-16  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* gui/alarm-notify/alarm.h:
+	* gui/comp-editor-factory.c:
+	* gui/dialogs/changed-comp.c:
+	* gui/dialogs/copy-source-dialog.c:
+	* gui/dialogs/delete-error.c:
+	* gui/e-cal-model-tasks.c:
+	* gui/e-cal-popup.c:
+	* gui/e-calendar-table.c:
+	* gui/e-memo-table.c:
+	* gui/e-timezone-entry.c:
+	* gui/print.c:
+	* gui/tasks-control.c:
+
+2008-09-14  Chenthill Palanisamy  <pchenthill@novell.com>
+
+	** Fix for bug #551628
+
+	* gui/e-cal-model.c: (e_cal_view_objects_modified_cb):
+	* gui/e-day-view.c: (update_row), (model_comps_deleted_cb):
+	* gui/e-week-view.c: (update_row): Remove old events from the 
+	view when objects are modified. 
+
+2008-09-12  Paul Bolle  <pebolle@tiscali.nl>
+
+	** Fix for bug #551895
+
+	* gui/dialogs/alarm-list-dialog.c: (edit_clicked_cb):
+	Copy paste error.
+
+2008-09-12  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* gui/alarm-notify/notify-main.c:
+	* gui/calendar-config-keys.h:
+	* gui/calendar-config.c:
+	* gui/calendar-config.h:
+	* gui/dialogs/cal-prefs-dialog.h:
+	* gui/dialogs/recur-comp.c:
+	* gui/e-meeting-store.c:
+	* gui/e-meeting-store.h:
+	* gui/e-meeting-time-sel.c:
+	* gui/e-meeting-time-sel.h:
+	* gui/migration.c:
+
 2008-09-09  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #551382
diff --git a/calendar/calendar.error.xml b/calendar/calendar.error.xml
index d7bd50b85d..d74c27b1fe 100644
--- a/calendar/calendar.error.xml
+++ b/calendar/calendar.error.xml
@@ -93,7 +93,7 @@
  </error>
 
  <error id="prompt-save-appointment" type="warning" default="GTK_RESPONSE_YES">
-  <title>Save Appointment</title>
+  <_title>Save Appointment</_title>
   <_primary>Would you like to save your changes to this appointment?</_primary>
   <_secondary>You have changed this appointment, but not yet saved it.</_secondary>
   <button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
@@ -102,7 +102,7 @@
  </error>
 
  <error id="prompt-save-task" type="warning" default="GTK_RESPONSE_YES">
- <title>Save Task</title>
+ <_title>Save Task</_title>
  <_primary>Would you like to save your changes to this task?</_primary>
  <_secondary>You have changed this task, but not yet saved it.</_secondary>
  <button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
@@ -111,7 +111,7 @@
  </error>
 
  <error id="prompt-save-memo" type="warning" default="GTK_RESPONSE_YES">
- <title>Save Memo</title>
+ <_title>Save Memo</_title>
  <_primary>Would you like to save your changes to this memo?</_primary>
  <_secondary>You have made changes to this memo, but not yet saved them.</_secondary>
  <button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
@@ -255,7 +255,7 @@
  </error>
 
  <error id="server-version" type="warning">
- <title>Server Version</title> 
+ <_title>Server Version</_title> 
  <_primary>Some features may not work properly with your current server.</_primary>
  <_secondary>You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results, the server should be upgraded to a supported version.</_secondary>
  </error>
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 720a757eed..f320ccc42b 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -1,21 +1,25 @@
-/* Evolution calendar - Alarm queueing engine
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
+/*
+ * Alarm queueing engine
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Federico Mena-Quintero <federico@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
@@ -926,7 +930,7 @@ edit_component (ECal *client, ECalComponent *comp)
 						      0, NULL, &ev);
 
 	if (BONOBO_EX (&ev)) {
-		e_error_run (NULL, "editor-error", bonobo_exception_get_text (&ev));
+		e_error_run (NULL, "editor-error", bonobo_exception_get_text (&ev), NULL);
 		CORBA_exception_free (&ev);
 		return;
 	}
@@ -943,7 +947,7 @@ edit_component (ECal *client, ECalComponent *comp)
 	GNOME_Evolution_Calendar_CompEditorFactory_editExisting (factory, uri, (char *) uid, corba_type, &ev);
 
 	if (BONOBO_EX (&ev))
-		e_error_run (NULL, "editor-error", bonobo_exception_get_text (&ev));
+		e_error_run (NULL, "editor-error", bonobo_exception_get_text (&ev), NULL);
 
 	CORBA_exception_free (&ev);
 
diff --git a/calendar/gui/alarm-notify/alarm.h b/calendar/gui/alarm-notify/alarm.h
index 06e0fc04a6..bbedf392c7 100644
--- a/calendar/gui/alarm-notify/alarm.h
+++ b/calendar/gui/alarm-notify/alarm.h
@@ -1,23 +1,26 @@
-/* Evolution calendar - Low-level alarm timer mechanism
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Miguel de Icaza <miguel@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
+/*
+ * Evolution calendar - Low-level alarm timer mechanism
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Miguel de Icaza <miguel@ximian.com>
+ *      Federico Mena-Quintero <federico@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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 ALARM_H
diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c
index 269a5bc5dd..81cbc3480c 100644
--- a/calendar/gui/alarm-notify/config-data.c
+++ b/calendar/gui/alarm-notify/config-data.c
@@ -1,21 +1,25 @@
-/* Evolution calendar - Configuration values for the alarm notification daemon
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
+/*
+ * Evolution calendar - Configuration values for the alarm notification daemon
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Federico Mena-Quintero <federico@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_CONFIOH
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
index 6043700c33..3504b0db77 100644
--- a/calendar/gui/alarm-notify/notify-main.c
+++ b/calendar/gui/alarm-notify/notify-main.c
@@ -1,23 +1,26 @@
-/* Evolution calendar - Alarm notification service main file
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Rodrigo Moya <rodrigo@ximian.com>
+/*
+ * Evolution calendar - Alarm notification service main file
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Federico Mena-Quintero <federico@ximian.com>
+ *      Rodrigo Moya <rodrigo@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c
index a799d062bb..d816aa7cd9 100644
--- a/calendar/gui/cal-search-bar.c
+++ b/calendar/gui/cal-search-bar.c
@@ -1,21 +1,25 @@
-/* Evolution calendar - Search bar widget for calendar views
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
+/*
+ * Evolution calendar - Search bar widget for calendar views
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Federico Mena-Quintero <federico@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 183c339c5e..cdec256ac3 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-component.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 version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
  *
- * 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.
  *
- * Authors: Ettore Perazzoli <ettore@ximian.com>
- *          Rodrigo Moya <rodrigo@ximian.com>
+ * Authors:
+ *		Ettore Perazzoli <ettore@ximian.com>
+ *      Rodrigo Moya <rodrigo@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifdef HAVE_CONFIG_H
@@ -363,7 +363,7 @@ delete_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data)
 		return;
 
 	if (e_error_run((GtkWindow *)gtk_widget_get_toplevel(ep->target->widget),
-			"calendar:prompt-delete-calendar", e_source_peek_name(selected_source)) != GTK_RESPONSE_YES)
+			"calendar:prompt-delete-calendar", e_source_peek_name(selected_source), NULL) != GTK_RESPONSE_YES)
 		return;
 
 	/* first, ask the backend to remove the calendar */
diff --git a/calendar/gui/calendar-config-keys.h b/calendar/gui/calendar-config-keys.h
index ce869cd952..12b294b7a5 100644
--- a/calendar/gui/calendar-config-keys.h
+++ b/calendar/gui/calendar-config-keys.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Authors :
- *  JP Rosevear <jpr@ximian.com>
- *
- * 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 version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		JP Rosevear <jpr@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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 _CALENDAR_CONFIG_KEYS_H_
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index b6b7a375ca..b6a2ee5619 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Authors :
- *  Damon Chaplin <damon@ximian.com>
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * 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 version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Damon Chaplin <damon@ximian.com>
+ *		Rodrigo Moya <rodrigo@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
  */
 
 /*
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
index 33b4731221..03a9a6e461 100644
--- a/calendar/gui/calendar-config.h
+++ b/calendar/gui/calendar-config.h
@@ -1,26 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Authors :
- *  Damon Chaplin <damon@ximian.com>
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * 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 version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Damon Chaplin <damon@ximian.com>
+ *		Rodrigo Moya <rodrigo@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
  */
 
 /*
diff --git a/calendar/gui/comp-editor-factory.c b/calendar/gui/comp-editor-factory.c
index cd0f49517a..a6694bbbcc 100644
--- a/calendar/gui/comp-editor-factory.c
+++ b/calendar/gui/comp-editor-factory.c
@@ -1,21 +1,25 @@
-/* Evolution calendar - Component editor factory object
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
+/*
+ * Evolution calendar - Component editor factory object
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Federico Mena-Quintero <federico@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c
index a5ed54ff3f..0e63a9c336 100644
--- a/calendar/gui/comp-util.c
+++ b/calendar/gui/comp-util.c
@@ -1,22 +1,25 @@
-/* Evolution calendar - Utilities for manipulating ECalComponent objects
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
+/*
+ * Evolution calendar - Utilities for manipulating ECalComponent objects
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Federico Mena-Quintero <federico@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/calendar/gui/comp-util.h b/calendar/gui/comp-util.h
index a1c677630e..5e471815c6 100644
--- a/calendar/gui/comp-util.h
+++ b/calendar/gui/comp-util.h
@@ -1,22 +1,25 @@
-/* Evolution calendar - Utilities for manipulating ECalComponent objects
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
+/*
+ * Evolution calendar - Utilities for manipulating ECalComponent objects
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Federico Mena-Quintero <federico@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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 COMP_UTIL_H
diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c
index b078e3123b..07395a4782 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.c
+++ b/calendar/gui/dialogs/alarm-list-dialog.c
@@ -160,7 +160,7 @@ edit_clicked_cb (GtkButton *button, gpointer data)
 
 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->list));
 	if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) {
-		g_warning ("Could not get a selection to delete.");
+		g_warning ("Could not get a selection to edit.");
 		return;
 	}
 
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index c5fab53133..8ba51259e5 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -1,25 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Authors :
- *  Damon Chaplin <damon@ximian.com>
- *  Ettore Perazzoli <ettore@ximian.com>
- *  David Trowbridge <trowbrds cs colorado edu>
- *
- * 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 version 2 of the GNU 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 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 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.
+ * 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/>  
+ *
+ *
+ * Authors:
+ *		Damon Chaplin <damon@ximian.com>
+ *		Ettore Perazzoli <ettore@ximian.com>
+ *		David Trowbridge <trowbrds cs colorado edu>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.h b/calendar/gui/dialogs/cal-prefs-dialog.h
index 9ab4ebefd9..49d4c56482 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.h
+++ b/calendar/gui/dialogs/cal-prefs-dialog.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  David Trowbridge <trowbrds cs colorado edu>
- *  Damon Chaplin <damon@ximian.com>
- *
- * 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 version 2 of the GNU 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 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 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.
+ * 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/>  
+ *
+ *
+ * Authors:
+ *		David Trowbridge <trowbrds cs colorado edu>
+ *		Damon Chaplin <damon@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c
index 5f62e54624..ae215463be 100644
--- a/calendar/gui/dialogs/changed-comp.c
+++ b/calendar/gui/dialogs/changed-comp.c
@@ -1,21 +1,25 @@
-/* Evolution calendar - Send calendar component dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: JP Rosevear <jpr@ximian.com>
+/*
+ * Evolution calendar - Send calendar component dialog
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		JP Rosevear <jpr@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 14d20b1b86..5e19e690eb 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -2877,7 +2877,7 @@ set_attachment_list (CompEditor *editor, GSList *attach_list)
 			return;
 		}
 
-		mime_type = e_util_guess_mime_type (file_name);
+		mime_type = e_util_guess_mime_type (file_name, TRUE);
 		if (mime_type) {
 			if (!g_ascii_strcasecmp (mime_type, "message/rfc822")) {
 				wrapper = (CamelDataWrapper *) camel_mime_message_new ();
diff --git a/calendar/gui/dialogs/copy-source-dialog.c b/calendar/gui/dialogs/copy-source-dialog.c
index c4863cede1..5bb970433b 100644
--- a/calendar/gui/dialogs/copy-source-dialog.c
+++ b/calendar/gui/dialogs/copy-source-dialog.c
@@ -1,21 +1,25 @@
-/* Evolution calendar - Copy source dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Rodrigo Moya <rodrigo@ximian.com>
+/*
+ * Evolution calendar - Copy source dialog
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Rodrigo Moya <rodrigo@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index 228e84f464..3508f38f02 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -1,21 +1,25 @@
-/* Evolution calendar - Delete calendar component dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Federico Mena-Quintero <federico@ximian.com>
+/*
+ * Evolution calendar - Delete calendar component dialog
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Federico Mena-Quintero <federico@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c
index 7c264d0638..d42ef1af91 100644
--- a/calendar/gui/dialogs/delete-error.c
+++ b/calendar/gui/dialogs/delete-error.c
@@ -1,21 +1,25 @@
-/* Evolution calendar - Send calendar component dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: JP Rosevear <jpr@ximian.com>
+/*
+ * Evolution calendar - Send calendar component dialog
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		JP Rosevear <jpr@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c
index 08df95b1b2..fde53ca336 100644
--- a/calendar/gui/dialogs/e-send-options-utils.c
+++ b/calendar/gui/dialogs/e-send-options-utils.c
@@ -1,23 +1,27 @@
-/* Evolution calendar - Timezone selector dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Damon Chaplin <damon@ximian.com>
+/*
+ * Evolution calendar - Timezone selector dialog
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Damon Chaplin <damon@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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.
  */
+
 #include "e-send-options-utils.h"
 #include "../calendar-config.h"
 #include <glib.h>
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 9737d08fca..2855113e92 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -1,24 +1,28 @@
-/* Evolution calendar - Main page of the event editor dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
+/*
+ * Evolution calendar - Main page of the event editor dialog
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Federico Mena-Quintero <federico@ximian.com>
+ *      Miguel de Icaza <miguel@ximian.com>
+ *      Seth Alves <alves@hungry.com>
+ *      JP Rosevear <jpr@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index b8822cee15..421fdcf56b 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -1,25 +1,29 @@
-/* Evolution calendar - Main page of the memo editor dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *          Nathan Owens <pianocomp81@yahoo.com>
+/*
+ * Evolution calendar - Main page of the memo editor dialog
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Federico Mena-Quintero <federico@ximian.com>
+ *      Miguel de Icaza <miguel@ximian.com>
+ *      Seth Alves <alves@hungry.com>
+ *      JP Rosevear <jpr@ximian.com>
+ *		Nathan Owens <pianocomp81@yahoo.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c
index 6556d1c708..e90cfd237f 100644
--- a/calendar/gui/dialogs/recur-comp.c
+++ b/calendar/gui/dialogs/recur-comp.c
@@ -1,21 +1,25 @@
-/* Evolution calendar - Recurring calendar component dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: JP Rosevear <jpr@ximian.com>
+/*
+ * Evolution calendar - Recurring calendar component dialog
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		JP Rosevear <jpr@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 062d0ad0c0..6c879ae8e3 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -1,27 +1,29 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Evolution calendar - Recurrence page of the calendar component dialogs
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
- *          Hans Petter Jansson <hpj@ximiman.com>
+/*
+ * Evolution calendar - Recurrence page of the calendar component dialogs
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Federico Mena-Quintero <federico@ximian.com>
+ *		Miguel de Icaza <miguel@ximian.com>
+ *		Seth Alves <alves@hungry.com>
+ *		JP Rosevear <jpr@ximian.com>
+ *		Hans Petter Jansson <hpj@ximiman.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 29f443c0d6..a4bc4816a3 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -1,24 +1,28 @@
-/* Evolution calendar - Main page of the task editor dialog
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Federico Mena-Quintero <federico@ximian.com>
- *          Miguel de Icaza <miguel@ximian.com>
- *          Seth Alves <alves@hungry.com>
- *          JP Rosevear <jpr@ximian.com>
+/*
+ * Evolution calendar - Main page of the task editor dialog
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Federico Mena-Quintero <federico@ximian.com>
+ *		Miguel de Icaza <miguel@ximian.com>
+ *      Seth Alves <alves@hungry.com>
+ *      JP Rosevear <jpr@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c
index 886cae707a..795d0437a0 100644
--- a/calendar/gui/e-alarm-list.c
+++ b/calendar/gui/e-alarm-list.c
@@ -1,23 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* EAlarmList - list of calendar alarms with GtkTreeModel interface.
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+/*
+ * EAlarmList - list of calendar alarms with GtkTreeModel interface.
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 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 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.
  *
- * Authors:  Hans Petter Jansson  <hpj@ximian.com>
+ * Authors:
+ *		Hans Petter Jansson  <hpj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c
index 3d8be3abd2..853183bf53 100644
--- a/calendar/gui/e-cal-component-preview.c
+++ b/calendar/gui/e-cal-component-preview.c
@@ -1,25 +1,25 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-tasks.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 version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
  *
- * 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.
  *
- * Authors: Federico Mena Quintero <federico@ximian.com>
+ * Authors:
+ *		Federico Mena Quintero <federico@ximian.com>
  *	    Damon Chaplin <damon@ximian.com>
- *          Rodrigo Moya <rodrigo@ximian.com>
+ *      Rodrigo Moya <rodrigo@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index 98d56661bc..095cfabc4b 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -1,21 +1,25 @@
-/* Evolution calendar - Data model for ETable
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.com>
+/*
+ * Evolution calendar - Data model for ETable
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Rodrigo Moya <rodrigo@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 3bd6ae38d8..47922c0ba9 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -1499,7 +1499,7 @@ e_cal_view_objects_modified_cb (ECalView *query, GList *objects, gpointer user_d
 
 	/*  re-add only the recurrence objects */
 	for (l = objects; l != NULL; l = g_list_next (l)) {
-		if (e_cal_util_component_has_recurrences (l->data) && (priv->flags & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES)) 
+		if (!e_cal_util_component_is_instance (l->data) && e_cal_util_component_has_recurrences (l->data) && (priv->flags & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES)) 
 			list = g_list_prepend (list, l->data);
 		else {
 			int pos;
@@ -1507,7 +1507,7 @@ e_cal_view_objects_modified_cb (ECalView *query, GList *objects, gpointer user_d
 			ECalComponentId *id;
 			ECalComponent *comp = e_cal_component_new ();
 			ECal *client = e_cal_view_get_client (query);
-		
+
 			if (!e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (l->data))) {
 				g_object_unref (comp);
 				continue;
@@ -1516,13 +1516,34 @@ e_cal_view_objects_modified_cb (ECalView *query, GList *objects, gpointer user_d
 			e_table_model_pre_change (E_TABLE_MODEL (model));
 
 			id = e_cal_component_get_id (comp);
-				
+
 			comp_data = search_by_id_and_client (priv, client, id);
-			icalcomponent_free (comp_data->icalcomp);
-			
+			if (comp_data->icalcomp)
+				icalcomponent_free (comp_data->icalcomp);
+			if (comp_data->dtstart) {
+				g_free (comp_data->dtstart);
+				comp_data->dtstart = NULL;
+			}
+			if (comp_data->dtend) {
+				g_free (comp_data->dtend);
+				comp_data->dtend = NULL;
+			}
+			if (comp_data->due) {
+				g_free (comp_data->due);
+				comp_data->due = NULL;
+			}
+			if (comp_data->completed) {
+				g_free (comp_data->completed);
+				comp_data->completed = NULL;
+			}
+			if (comp_data->color) {
+				g_free (comp_data->color);
+				comp_data->color = NULL;
+			}
+
 			comp_data->icalcomp = icalcomponent_new_clone (l->data);
 			e_cal_model_set_instance_times (comp_data, priv->zone);
-			
+
 			pos = get_position_in_array (priv->objects, comp_data);
 			
 			e_table_model_row_changed (E_TABLE_MODEL (model), pos);
diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c
index a805ee8002..7f61282a5a 100644
--- a/calendar/gui/e-cal-popup.c
+++ b/calendar/gui/e-cal-popup.c
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@ximian.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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  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; version 2 of the License.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
@@ -396,17 +397,18 @@ ecalp_standard_menu_factory (EPopup *ecalp, void *data)
                 for (cp = mime_type; *cp != '\0'; cp++)
                         *cp = g_ascii_tolower (*cp);
 
-		/* TODO: g_app_info_get_all_for_type expects content_type, not a mime_type, thus it will work fine
-		    on Linux/Unix systems, but not on Win32. They will add hopefully some function to convert between
-		    these two soon. */
-		apps = g_app_info_get_all_for_type (mime_type);
+		cp = g_content_type_from_mime_type (mime_type);
+		apps = g_app_info_get_all_for_type (cp ? cp : mime_type);
+		g_free (cp);
 
 		if (apps == NULL && strcmp(mime_type, "application/octet-stream") == 0) {
 			if (filename) {
 				gchar *name_type;
 
-				name_type = e_util_guess_mime_type (filename);
-				apps = g_app_info_get_all_for_type (name_type);
+				name_type = e_util_guess_mime_type (filename, FALSE);
+				cp = g_content_type_from_mime_type (name_type);
+				apps = g_app_info_get_all_for_type (cp ? cp : name_type);
+				g_free (cp);
 				g_free (name_type);
 			}
 		}
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index ff245aad2a..40cce5f5ec 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -1,25 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Authors :
- *  Damon Chaplin <damon@ximian.com>
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * 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 version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Damon Chaplin <damon@ximian.com>
+ *		Rodrigo Moya <rodrigo@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
  */
 
 /*
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 346e1e9db5..ee76bf4e66 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * 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 version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Rodrigo Moya <rodrigo@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index 7987d8bad6..1d0b052440 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -1,25 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * 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 version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Damon Chaplin <damon@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
  */
 
 /*
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index 24812bb814..4523fa6978 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * 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 version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Damon Chaplin <damon@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
  */
 
 /*
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 33ee6aa5e6..7607e027b8 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -554,12 +554,30 @@ update_row (EDayView *day_view, int row)
 {
 	ECalModelComponent *comp_data;
 	ECalModel *model;
+	gint day, event_num;
+	const char *uid = NULL;
+	char *rid = NULL;
 
 	e_day_view_stop_editing_event (day_view);
 
 	model = e_calendar_view_get_model (E_CALENDAR_VIEW (day_view));
 	comp_data = e_cal_model_get_component_at (model, row);
 	g_return_if_fail (comp_data != NULL);
+
+	uid = icalcomponent_get_uid (comp_data->icalcomp);
+	if (e_cal_util_component_is_instance (comp_data->icalcomp)) {
+		icalproperty *prop;
+
+		prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_RECURRENCEID_PROPERTY);
+		if (prop)
+			rid = icaltime_as_ical_string (icalcomponent_get_recurrenceid (comp_data->icalcomp));
+	}
+
+	if (e_day_view_find_event_from_uid (day_view, comp_data->client, uid, rid, &day, &event_num))
+		e_day_view_remove_event_cb (day_view, day, event_num, NULL);
+
+	g_free (rid);
+
 	process_component (day_view, comp_data);
 
 	gtk_widget_queue_draw (day_view->top_canvas);
@@ -640,7 +658,6 @@ model_comps_deleted_cb (ETableModel *etm, gpointer data, gpointer user_data)
 		const char *uid = NULL;
 		char *rid = NULL;
 
-
 		uid = icalcomponent_get_uid (comp_data->icalcomp);
 		if (e_cal_util_component_is_instance (comp_data->icalcomp)) {
 			icalproperty *prop;
@@ -6303,6 +6320,9 @@ e_day_view_on_editing_stopped (EDayView *day_view,
 
 				if (mod == CALOBJ_MOD_THIS) {
 					ECalComponentDateTime olddt, dt;
+					icaltimetype itt;
+
+					dt.value = &itt;
 
 					e_cal_component_get_dtstart (comp, &olddt);
 					if (olddt.value->zone) {
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 4285c14c2c..6089e08863 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-itip-control.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 version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
  *
- * 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.
  *
- * Author: JP Rosevear
+ * Authors:
+ *		JP Rosevear <jpr@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/calendar/gui/e-itip-control.h b/calendar/gui/e-itip-control.h
index e64ee86e89..642eccfe8d 100644
--- a/calendar/gui/e-itip-control.h
+++ b/calendar/gui/e-itip-control.h
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-itip-control.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 version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
  *
- * 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.
  *
- * Author: JP Rosevear
+ * Authors:
+ *		JP Rosevear <jpr@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _E_ITIP_CONTROL_H_
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index d5f9eec067..218dbad7e3 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -1,24 +1,24 @@
 /*
- * e-meeting-store.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: JP Rosevear  <jpr@ximian.com>
- * 	    Mike Kestner  <mkestner@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		JP Rosevear  <jpr@ximian.com>
+ * 	    Mike Kestner  <mkestner@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/calendar/gui/e-meeting-store.h b/calendar/gui/e-meeting-store.h
index 111744dd5d..d20c1224f3 100644
--- a/calendar/gui/e-meeting-store.h
+++ b/calendar/gui/e-meeting-store.h
@@ -1,23 +1,23 @@
 /*
- * e-meeting-store.h
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author: Mike Kestner
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Mike Kestner
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_MEETING_STORE_H_
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 019b2642ff..798d6508b0 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -1,26 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Authors :
- *  Damon Chaplin <damon@gtk.org>
- *  Rodrigo Moya <rodrigo@novell.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * 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 version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Damon Chaplin <damon@gtk.org>
+ *		Rodrigo Moya <rodrigo@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/calendar/gui/e-meeting-time-sel.h b/calendar/gui/e-meeting-time-sel.h
index b895963f5c..deb91c2397 100644
--- a/calendar/gui/e-meeting-time-sel.h
+++ b/calendar/gui/e-meeting-time-sel.h
@@ -1,25 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@gtk.org>
- *
- * 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 version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Damon Chaplin <damon@gtk.org>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_MEETING_TIME_SELECTOR_H_
 #define _E_MEETING_TIME_SELECTOR_H_
 
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index d85c10a28b..b286dc3fc7 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -1,25 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Authors :
- *  Damon Chaplin <damon@ximian.com>
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * 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 version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Damon Chaplin <damon@ximian.com>
+ *		Rodrigo Moya <rodrigo@ximian.com>
+ *		Nathan Owens <pianocomp81@yahoo.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
  */
 
 /*
diff --git a/calendar/gui/e-memo-table.h b/calendar/gui/e-memo-table.h
index 536c545633..e17c9506bb 100644
--- a/calendar/gui/e-memo-table.h
+++ b/calendar/gui/e-memo-table.h
@@ -1,4 +1,5 @@
 /*
+ *
  * 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
@@ -15,6 +16,7 @@
  *
  * Authors:
  *		Damon Chaplin <damon@ximian.com>
+ *		Nathan Owens <pianocomp81@yahoo.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index d0c57dc0d3..3b11e27d46 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * 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 version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Damon Chaplin <damon@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
  */
 
 /*
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index c3873c2fab..248e618bda 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -1,25 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * 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 version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Damon Chaplin <damon@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
  */
 
 /*
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 0e1a424a57..ffbb32a398 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -1,26 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Authors :
- *  Damon Chaplin <damon@ximian.com>
- *  Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * 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 version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Damon Chaplin <damon@ximian.com>
+ *		Rodrigo Moya <rodrigo@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
  */
 
 /*
@@ -336,10 +334,28 @@ update_row (EWeekView *week_view, int row)
 {
 	ECalModelComponent *comp_data;
 	ECalModel *model;
+	gint event_num;
+	const char *uid;
+	char *rid = NULL;
 
 	model = e_calendar_view_get_model (E_CALENDAR_VIEW (week_view));
 	comp_data = e_cal_model_get_component_at (model, row);
 	g_return_if_fail (comp_data != NULL);
+
+	uid = icalcomponent_get_uid (comp_data->icalcomp);
+	if (e_cal_util_component_is_instance (comp_data->icalcomp)) {
+		icalproperty *prop;
+
+		prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_RECURRENCEID_PROPERTY);
+		if (prop)
+			rid = icaltime_as_ical_string (icalcomponent_get_recurrenceid (comp_data->icalcomp));
+	}
+
+	if (e_week_view_find_event_from_uid (week_view, comp_data->client, uid, rid, &event_num))
+		e_week_view_remove_event_cb (week_view, event_num, NULL);
+
+	g_free (rid);
+
 	process_component (week_view, comp_data);
 
 	gtk_widget_queue_draw (week_view->main_canvas);
diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h
index 1b7d680357..132857c712 100644
--- a/calendar/gui/e-week-view.h
+++ b/calendar/gui/e-week-view.h
@@ -1,26 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
 /*
- * Author :
- *  Damon Chaplin <damon@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * 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 version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Damon Chaplin <damon@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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_WEEK_VIEW_H_
 #define _E_WEEK_VIEW_H_
 
diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c
index fe10894a21..f345bbb7df 100644
--- a/calendar/gui/goto.c
+++ b/calendar/gui/goto.c
@@ -1,11 +1,27 @@
-/* Go to date dialog for Evolution
+/*
+ * Go to date dialog for Evolution
+ *
+ * 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/>  
+ *
+ *
+ * Authors:
+ *		Federico Mena <federico@ximian.com>
+ *      JP Rosevear <jpr@ximian.com>
  *
- * Copyright (C) 1998 Red Hat, Inc.
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * Copyright (C) 1998 Red Hat, Inc.
  *
- * Authors: Federico Mena <federico@ximian.com>
- *          JP Rosevear <jpr@ximian.com>
  */
 
 #include <config.h>
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index b70225bbe6..eb407a8117 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Authors:
- *  JP Rosevear <jpr@ximian.com>
- *
- * 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 version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		JP Rosevear <jpr@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/calendar/gui/itip-utils.h b/calendar/gui/itip-utils.h
index 1e8ebc2849..c41171cfe4 100644
--- a/calendar/gui/itip-utils.h
+++ b/calendar/gui/itip-utils.h
@@ -1,3 +1,21 @@
+/*
+ * 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)
+ *
+ */
 
 #ifndef ITIP_UTILS_HEADER
 #define ITIP_UTILS_HEADER
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index 2a3fab8b42..259ac2ecb9 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* main.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 version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
  *
- * 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.
  *
- * Author: Ettore Perazzoli
+ * Authors:
+ *		Ettore Perazzoli <ettore@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c
index 462a62b1b6..b6174202d2 100644
--- a/calendar/gui/migration.c
+++ b/calendar/gui/migration.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-component.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 version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
  *
- * 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.
  *
- * Author: Rodrigo Moya <rodrigo@ximian.com>
+ * Authors:
+ *		Rodrigo Moya <rodrigo@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 97e4734427..231067bf1f 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -1,25 +1,27 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Evolution calendar - Print support
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Michael Zucchi <notzed@ximian.com>
- *          Federico Mena-Quintero <federico@ximian.com>
- *	    Damon Chaplin <damon@ximian.com>
+/*
+ * Evolution calendar - Print support
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Michael Zucchi <notzed@ximian.com>
+ *      Federico Mena-Quintero <federico@ximian.com>
+ *	    Damon Chaplin <damon@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 020b586fc8..3800f01f0f 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* tasks-component.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 version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
  *
- * 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.
  *
- * Author: Rodrigo Moya <rodrigo@ximian.com>
+ * Authors:
+ *		Rodrigo Moya <rodrigo@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifdef HAVE_CONFIG_H
@@ -267,7 +267,7 @@ delete_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
 		return;
 
 	if (e_error_run((GtkWindow *)gtk_widget_get_toplevel(ep->target->widget),
-			"calendar:prompt-delete-task-list", e_source_peek_name(selected_source)) != GTK_RESPONSE_YES)
+			"calendar:prompt-delete-task-list", e_source_peek_name(selected_source), NULL) != GTK_RESPONSE_YES)
 		return;
 
 	/* first, ask the backend to remove the task list */
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index ff5a78226c..0d2888efdf 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* tasks-control.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 version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
  *
- * 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.
  *
- * Authors: Damon Chaplin <damon@ximian.com>
- *	    Ettore Perazzoli
+ * Authors:
+ *		Damon Chaplin <damon@ximian.com>
+ *	    Ettore Perazzoli <ettore@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
index c5ff8bae39..da10434890 100644
--- a/calendar/importers/icalendar-importer.c
+++ b/calendar/importers/icalendar-importer.c
@@ -1,23 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar importer component
- *
- * Authors: Rodrigo Moya <rodrigo@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+/*
+ * Evolution calendar importer component
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Rodrigo Moya <rodrigo@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 7afbe38079..0e5a3dd328 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,31 @@
+2008-10-01  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #554418
+
+	* e-msg-composer.c: (handle_uri),
+	(e_msg_composer_add_inline_image_from_file): Guess mime_type based
+	on the file content, if failed, then on the filename.
+
+2008-09-29  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-msg-composer.c:
+
+2008-09-25  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fix for bug #553148
+
+	* mail-composer.error.xml: Standardise "GroupWise" usage in
+	translatable strings.
+
+2008-09-23  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #553273
+
+	* e-composer-actions.c: (action_save_cb):
+	Always end e_error_run/e_error_new calls with NULL parameter.
+
 2008-09-10  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes bug #551548
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index 3146d9614b..c88f7e301e 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -246,7 +246,7 @@ action_save_cb (GtkAction *action,
 			e_error_run (
 				GTK_WINDOW (composer),
 				E_ERROR_NO_SAVE_FILE, filename,
-				g_strerror (errno_saved));
+				g_strerror (errno_saved), NULL);
 			return;
 		}
 	} else
@@ -256,7 +256,7 @@ action_save_cb (GtkAction *action,
 		e_error_run (
 			GTK_WINDOW (composer),
 			E_ERROR_NO_SAVE_FILE,
-			filename, error->message);
+			filename, error->message, NULL);
 		g_error_free (error);
 		return;
 	}
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 11b64a7ff9..f2ef200219 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1,28 +1,25 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-msg-composer.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 version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
- * 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
  *
- * 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.
  *
  * Authors:
- *   Ettore Perazzoli (ettore@ximian.com)
- *   Jeffrey Stedfast (fejj@ximian.com)
- *   Miguel de Icaza  (miguel@ximian.com)
- *   Radek Doulik     (rodo@ximian.com)
+ *		Ettore Perazzoli (ettore@ximian.com)
+ *		Jeffrey Stedfast (fejj@ximian.com)
+ *		Miguel de Icaza  (miguel@ximian.com)
+ *		Radek Doulik     (rodo@ximian.com)
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
@@ -3969,7 +3966,7 @@ handle_uri (EMsgComposer *composer,
 			return;
 
 		if (!g_ascii_strcasecmp (url->protocol, "file")) {
-			type = e_util_guess_mime_type (uri + strlen ("file://"));
+			type = e_util_guess_mime_type (uri + strlen ("file://"), TRUE);
 			if (!type)
 				return;
 
@@ -4201,7 +4198,7 @@ e_msg_composer_add_inline_image_from_file (EMsgComposer *composer,
 	camel_data_wrapper_construct_from_stream (wrapper, stream);
 	camel_object_unref (CAMEL_OBJECT (stream));
 
-	mime_type = e_util_guess_mime_type (dec_file_name);
+	mime_type = e_util_guess_mime_type (dec_file_name, TRUE);
 	if (mime_type == NULL)
 		mime_type = g_strdup ("application/octet-stream");
 	camel_data_wrapper_set_mime_type (wrapper, mime_type);
diff --git a/composer/mail-composer.error.xml b/composer/mail-composer.error.xml
index 6f76887bc8..a13fe34054 100644
--- a/composer/mail-composer.error.xml
+++ b/composer/mail-composer.error.xml
@@ -79,6 +79,6 @@ Please make sure that you have the correct version of gtkhtml and libgtkhtml ins
 
  <error id="send-options-support" type="error" modal="true">
   <_primary>Send options not available.</_primary>
-  <_secondary>Send options available only for Novell Groupwise and Microsoft Exchange accounts.</_secondary>
+  <_secondary>Send options available only for Novell GroupWise and Microsoft Exchange accounts.</_secondary>
  </error>
 </error-list>
diff --git a/configure.in b/configure.in
index ecbfc88169..c47eaf2a77 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 
-AC_INIT(evolution, 2.23.92, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)
+AC_INIT(evolution, 2.25.1, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)
 AC_CONFIG_SRCDIR(README)
 
 # Some requirements have versioned package names
@@ -11,7 +11,7 @@ EDS_PACKAGE=1.2
 GTKHTML_PACKAGE=3.14
 
 # Required Packages
-m4_define([glib_minimum_version], [2.16.0])
+m4_define([glib_minimum_version], [2.18.0])
 m4_define([gtk_minimum_version], [2.12.0])
 m4_define([eds_minimum_version], [2.23.91])
 m4_define([gnome_icon_theme_minimum_version], [2.19.91])
@@ -60,7 +60,7 @@ dnl This is for api/versioning tracking for things like bonobo .server files
 dnl
 dnl This should always be the major/minor of the stable version or stable version to be
 dnl *************************************************************************************************
-BASE_VERSION=2.24
+BASE_VERSION=2.26
 AC_SUBST(BASE_VERSION)
 AC_DEFINE_UNQUOTED(BASE_VERSION, "$BASE_VERSION", [Base version (Major.Minor)])
 
@@ -2019,10 +2019,12 @@ composer/Makefile
 mail/Makefile
 mail/default/Makefile
 mail/default/C/Makefile
+mail/default/cs/Makefile
 mail/default/de/Makefile
 mail/default/es/Makefile
 mail/default/fi/Makefile
 mail/default/fr/Makefile
+mail/default/it/Makefile
 mail/default/lt/Makefile
 mail/default/mk/Makefile
 mail/default/zh_CN/Makefile
@@ -2031,7 +2033,10 @@ mail/default/ko/Makefile
 mail/default/nl/Makefile
 mail/default/pl/Makefile
 mail/default/pt/Makefile
+mail/default/sr/Makefile
+mail/default/sr@latin/Makefile
 mail/default/sv/Makefile
+mail/default/hu/Makefile
 mail/importers/Makefile
 plugins/Makefile
 plugins/mark-all-read/Makefile
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 520505af3a..4c2e1d14d6 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,50 @@
+2008-10-01  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #554418
+
+	* e-util.h: (e_util_guess_mime_type):
+	* e-util.c: (e_util_guess_mime_type): Guess mime_type based on
+	the file content only when permitted by the caller, otherwise
+	check based on the filename only, where it fallbacks if file
+	content guess fails.
+
+2008-09-29  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-util.c:
+	* e-util.h:
+	* e-xml-utils.c:
+
+2008-09-26  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #535248
+
+	* e-logger.c: (flush_logfile), (logger_set_component),
+	(logger_finalize), (e_logger_log), (e_logger_get_logs):
+	Check if log file has been opened successfully before using it.
+
+2008-09-24  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-event.c:
+
+2008-09-16  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-error.c:
+	* e-icon-factory.c:
+	* e-plugin.c:
+
+2008-09-12  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* e-dialog-utils.c:
+	* e-sorter-array.c:
+
 2008-09-04  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c
index 2bb7bc7770..ecf9e7ec1e 100644
--- a/e-util/e-dialog-utils.c
+++ b/e-util/e-dialog-utils.c
@@ -1,25 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-dialog-utils.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 version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
  *
- * 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.
  *
  * Authors:
- *   Michael Meeks <michael@ximian.com>
- *   Ettore Perazzoli <ettore@ximian.com>
+ *		Michael Meeks <michael@ximian.com>
+ *   	Ettore Perazzoli <ettore@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/e-util/e-error.c b/e-util/e-error.c
index 14d94dc240..763a9ca540 100644
--- a/e-util/e-error.c
+++ b/e-util/e-error.c
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- *
+/*
+ * 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.
  *
- *  Authors: Michael Zucchi <notzed@ximian.com>
+ * 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.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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/>  
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of version 2 of the GNU General Public
- *  License as published by the Free Software Foundation.
  *
- *  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.
+ * Authors:
+ *		Michael Zucchi <notzed@ximian.com>
  *
- *  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.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/e-util/e-event.c b/e-util/e-event.c
index f8d634feec..73111229f9 100644
--- a/e-util/e-event.c
+++ b/e-util/e-event.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@ximian.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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  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.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c
index aa053001c5..d26717e9e0 100644
--- a/e-util/e-icon-factory.c
+++ b/e-util/e-icon-factory.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  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.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Jeffrey Stedfast <fejj@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/e-util/e-logger.c b/e-util/e-logger.c
index 9e46daeeaf..88f3a24327 100644
--- a/e-util/e-logger.c
+++ b/e-util/e-logger.c
@@ -60,7 +60,8 @@ static gpointer parent_class;
 static gboolean
 logger_flush (ELogger *logger)
 {
-	fflush (logger->priv->fp);
+	if (logger->priv->fp)
+		fflush (logger->priv->fp);
 	logger->priv->timer = 0;
 
 	return FALSE;
@@ -91,6 +92,9 @@ logger_set_name (ELogger *logger,
 	logger->priv->fp = g_fopen (logger->priv->logfile, "w");
 	logger->priv->timer = 0;
 
+	if (!logger->priv->fp)
+		g_warning ("%s: Failed to open log file '%s' for writing.", G_STRFUNC, logger->priv->logfile ? logger->priv->logfile : "[null]");
+
 	g_free (temp);
 }
 
@@ -136,7 +140,8 @@ logger_finalize (GObject *object)
 	if (logger->priv->timer)
 		g_source_remove (logger->priv->timer);
 	logger_flush (logger);
-	fclose (logger->priv->fp);
+	if (logger->priv->fp)
+		fclose (logger->priv->fp);
 
 	g_free (logger->priv->name);
 	g_free (logger->priv->logfile);
@@ -230,6 +235,9 @@ e_logger_log (ELogger *logger,
 	g_return_if_fail (primary != NULL);
 	g_return_if_fail (secondary != NULL);
 
+	if (!logger->priv->fp)
+		return;
+
 	fprintf (logger->priv->fp, "%d:%ld:%s\n", level, t, primary);
 	fprintf (logger->priv->fp, "%d:%ld:%s\n", level, t, secondary);
 	logger_set_dirty (logger);
@@ -247,11 +255,12 @@ e_logger_get_logs (ELogger *logger,
 	g_return_if_fail (func != NULL);
 
 	/* Flush everything before we get the logs */
-	fflush (logger->priv->fp);	
+	if (logger->priv->fp)
+		fflush (logger->priv->fp);	
 	fp = g_fopen (logger->priv->logfile, "r");
 
 	if (!fp) {
-		fprintf (stderr, "Cannot open log file '%s' for reading! No flush yet?\n", logger->priv->logfile ? logger->priv->logfile : "[null]");
+		g_warning ("%s: Cannot open log file '%s' for reading! No flush yet?\n", G_STRFUNC, logger->priv->logfile ? logger->priv->logfile : "[null]");
 		return;
 	}
 
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index 85c1edb060..93ec47f3b6 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -1,19 +1,19 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  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 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.
+ * 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 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.
+ * 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)
  */
 
 #include <config.h>
diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c
index 503df30ca6..582ed959ad 100644
--- a/e-util/e-sorter-array.c
+++ b/e-util/e-sorter-array.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-sorter-array.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) version 3.
  *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
+ * 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.
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * 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/>  
  *
- * This library 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
- * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library 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.
+ * Authors:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 0c737d08a3..f13fc4c452 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-util.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) version 3.
  *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
+ * 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.
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * 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/>  
  *
- * This library 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
- * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library 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.
+ * Authors:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
@@ -1229,37 +1228,51 @@ e_file_lock_exists ()
 /**
  * e_util_guess_mime_type:
  * @filename: it's a local file name, or URI.
+ * @localfile: set to TRUE if can check the local file content, FALSE to check only based on the filename itself.
  * Returns: NULL or newly allocated string with a mime_type of the given file. Free with g_free.
  *
- * Guesses mime_type for the given file_name.
+ * Guesses mime_type for the given filename.
  **/
 char *
-e_util_guess_mime_type (const char *filename)
+e_util_guess_mime_type (const char *filename, gboolean localfile)
 {
-	GFile *file;
-	GFileInfo *fi;
-	char *mime_type;
+	char *mime_type = NULL;
 
 	g_return_val_if_fail (filename != NULL, NULL);
 
-	if (strstr (filename, "://"))
-		file = g_file_new_for_uri (filename);
-	else
-		file = g_file_new_for_path (filename);
+	if (localfile) {
+		GFile *file;
 
-	if (!file)
-		return NULL;
+		if (strstr (filename, "://"))
+			file = g_file_new_for_uri (filename);
+		else
+			file = g_file_new_for_path (filename);
 
-	fi = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, NULL);
-	if (!fi) {
-		g_object_unref (file);
-		return NULL;
+		if (file) {
+			GFileInfo *fi;
+
+			fi = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, NULL);
+			if (fi) {
+				mime_type = g_content_type_get_mime_type (g_file_info_get_content_type (fi));
+	
+				g_object_unref (fi);
+			}
+
+			g_object_unref (file);
+		}
 	}
 
-	mime_type = g_content_type_get_mime_type (g_file_info_get_content_type (fi));
+	if (!mime_type) {
+		/* file doesn't exists locally, thus guess based on the filename */
+		gboolean uncertain = FALSE;
+		gchar *content_type;
 
-	g_object_unref (fi);
-	g_object_unref (file);
+		content_type = g_content_type_guess (filename, NULL, 0, &uncertain);
+		if (content_type) {
+			mime_type = g_content_type_get_mime_type (content_type);
+			g_free (content_type);
+		}
+	}
 
 	return mime_type;
 }
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 63cdafe058..e9750176eb 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-util.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) version 3.
  *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
+ * 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.
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * 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/>  
  *
- * This library 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
- * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library 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.
+ * Authors:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #ifndef _E_UTIL_H_
@@ -121,7 +120,7 @@ gboolean	e_file_lock_create		(void);
 void		e_file_lock_destroy		(void);
 gboolean 	e_file_lock_exists		(void);
 
-gchar *		e_util_guess_mime_type		(const gchar *filename);
+gchar *		e_util_guess_mime_type		(const gchar *filename, gboolean localfile);
 gchar *		e_util_filename_to_uri		(const gchar *filename);
 gchar *		e_util_uri_to_filename		(const gchar *uri);
 
diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c
index f0f5e83c86..653669b381 100644
--- a/e-util/e-xml-utils.c
+++ b/e-util/e-xml-utils.c
@@ -1,24 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * e-xml-utils.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) version 3.
  *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
+ * 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.
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
+ * 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/>  
  *
- * This library 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
- * Library General Public License for more details.
  *
- * You should have received a copy of the GNU Library 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.
+ * Authors:
+ *		Chris Lahey <clahey@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
  */
 
 #include <config.h>
diff --git a/filter/ChangeLog b/filter/ChangeLog
index 740a192178..12ee719755 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,36 @@
+2008-10-01  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* filter-rule.c:
+
+2008-09-29  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* rule-editor.c:
+
+2008-09-25  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* filter-element.c:
+	* filter-int.c:
+	* filter-int.h:
+
+2008-09-24  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* filter-datespec.c:
+
+2008-09-16  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* filter-option.c:
+	* filter-part.c:
+
 2008-09-02  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c
index fbcc78a0aa..82b0e08197 100644
--- a/filter/filter-datespec.c
+++ b/filter/filter-datespec.c
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/filter/filter-element.c b/filter/filter-element.c
index d63dd1e491..4369c65050 100644
--- a/filter/filter-element.c
+++ b/filter/filter-element.c
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/filter/filter-int.c b/filter/filter-int.c
index 22d1f0b819..5336884eae 100644
--- a/filter/filter-int.c
+++ b/filter/filter-int.c
@@ -1,26 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  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.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/filter/filter-int.h b/filter/filter-int.h
index 7a25ae6c9b..06add3fd05 100644
--- a/filter/filter-int.h
+++ b/filter/filter-int.h
@@ -1,26 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  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.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifndef _FILTER_INT_H
 #define _FILTER_INT_H
 
diff --git a/filter/filter-option.c b/filter/filter-option.c
index 5c4283b889..1685fe06ce 100644
--- a/filter/filter-option.c
+++ b/filter/filter-option.c
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/filter/filter-part.c b/filter/filter-part.c
index 7ed7c306e6..08434eadac 100644
--- a/filter/filter-part.c
+++ b/filter/filter-part.c
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/filter/filter-rule.c b/filter/filter-rule.c
index 80c8c8440c..6b80bf5a3a 100644
--- a/filter/filter-rule.c
+++ b/filter/filter-rule.c
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/filter/rule-editor.c b/filter/rule-editor.c
index 82bfd4aa68..53c576540c 100644
--- a/filter/rule-editor.c
+++ b/filter/rule-editor.c
@@ -1,26 +1,26 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Not Zed <notzed@lostzed.mmc.com.au>
+ *      Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/help/C/evolution.xml b/help/C/evolution.xml
index 0cc18b54ba..c1d5431038 100644
--- a/help/C/evolution.xml
+++ b/help/C/evolution.xml
@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
 
  <!ENTITY appname "Evolution" >
- <!ENTITY appversion "2.22" >
+ <!ENTITY appversion "2.24" >
  <!ENTITY z-3rdParty "*" >
  <!ENTITY z-SM "(SM)" >
  <!ENTITY z-CM "(CM)" >
@@ -1114,6 +1114,9 @@
     <para><link linkend="usage-mail-getnsend-send">Composing New Email Messages</link></para>
    </listitem>
    <listitem>
+    <para><link linkend="b1dlaazl">Templates</link></para>
+   </listitem>
+   <listitem>
     <para><link linkend="rsvp-stuff">Sending Invitations by Mail</link></para>
    </listitem>
    <listitem>
@@ -1173,9 +1176,70 @@
 
    <section id="b17qh4uo">
     <title>New Mail Notification</title>
-    <para>Evolution notifies you of new email. When you receive a new mail in your inbox, a blinking icon appears on the Switcher.</para>
+    <para>Evolution can notify you of new messages. When you receive a new message in your inbox, a blinking icon appears on the Switcher.</para>
+    <para>You can also view a blinking icon<inlinegraphic format="PNG" fileref="figures/evo_blink.png"/> in the notification area that disappears when you open the new message. Mouse over the icon to view the notification message.</para>
     <mediaobject id="b1a5asi6"><imageobject><imagedata format="PNG" fileref="figures/evo_newmail.png"/></imageobject></mediaobject>
-    <para>You can also see a blinking icon <inlinegraphic format="PNG" fileref="figures/evo_blink.png"/> in the notification area that disappears when you open the new email. You can keep the mouse over the <inlinegraphic format="PNG" fileref="figures/evo_blink.png"/> icon to view the notification message.</para>
+    <para>To enable this feature, select Edit &gt; Plugins, then select the Mail Notification check box. You can configure the plugin by specifing the following in the Plugin Manager.</para>
+    <mediaobject id="b1dl90p1"><imageobject><imagedata format="PNG" fileref="figures/evo_mailnotification.png"/></imageobject></mediaobject>
+    <formalpara id="b1dl8zqx">
+     <title>Notify new messages for Inbox only:</title>
+     <para>Select this option to restrict the mail notification to Inbox. With this option enabled, you are notified of each new message arrival in the Inbox.</para>
+    </formalpara>
+    <formalpara id="b1dl93cp">
+     <title>Generate D-Bus message:</title>
+     <para>D-Bus is a fast, lightweight message bus system that allows applications to communicate with each other. Select this option to generate a D-Bus message on the session bus whenever a new message arrives.</para>
+    </formalpara>
+    <formalpara id="b1dl94v1">
+     <title>Show icon in the notification area:</title>
+     <para>Select this option to display a new mail icon in the notification area when a new message arrives. You have two options to select from:</para>
+    </formalpara>
+    <itemizedlist>
+     <listitem>
+      <formalpara id="b1dl95ux">
+       <title>Blinking icon in the notification area:</title>
+       <para>Select this option to make the new mail icon blink in the notification area on arrival of a new message.</para>
+      </formalpara>
+     </listitem>
+     <listitem>
+      <formalpara id="b1dl998a">
+       <title>Popup message together with the icon:</title>
+       <para>Select this option to make the new message pop up along with the new mail icon.</para>
+      </formalpara>
+     </listitem>
+    </itemizedlist>
+    <formalpara id="b1dl986k">
+     <title>Play sound when new messages arrive:</title>
+     <para>You have two options to select from:</para>
+    </formalpara>
+    <itemizedlist>
+     <listitem>
+      <formalpara id="b1dl9b9h">
+       <title>Beep:</title>
+       <para>Select this option to play a beep sound on the arrival of a new message.</para>
+      </formalpara>
+     </listitem>
+     <listitem>
+      <formalpara id="b1dl9bbt">
+       <title>Play sound file:</title>
+       <para>Select this option to play a sound file of your choice on the arrival of a new message.</para>
+      </formalpara>
+     </listitem>
+    </itemizedlist>
+    <para>To specify the sound file you want to play: </para>
+    <orderedlist>
+     <listitem id="b1dl9dx3">
+      <para>Click None to open the Select Sound File browser window.</para>
+     </listitem>
+     <listitem id="b1dl9p3d">
+      <para>Browse to find the sound file of your choice.</para>
+     </listitem>
+     <listitem id="b1dl9qm3">
+      <para>Click Open to select the sound file.</para>
+     </listitem>
+     <listitem id="b1dl9qrp">
+      <para>Click Play to confirm the selection.</para>
+     </listitem>
+    </orderedlist>
    </section>
 
    <section id="b131ni8g">
@@ -1434,6 +1498,30 @@
     </section>
    </section>
 
+   <section id="b1a5azam">
+    <title>Custom Header</title>
+    <para>To enable the Custom Header plugin:</para>
+    <para>Select Edit &gt; Plugins.</para>
+     <para>Then select  Custom Header. You can configure custom headers to set sensitivity and caveats to the outgoing messages.</para>
+    <mediaobject id="b1dl7ytg"><imageobject><imagedata format="PNG" fileref="figures/evo_customheader.png"/></imageobject></mediaobject>
+    <para>In the Plugin Manager, select the Configuration tab to customize your header fields. You can add, edit, or remove the header fields. For every header field you add, you can specify the keys and values. The key is used as the title of the Custom Header. You can enter multiple values for the keys. You must use a semicolon to separate every value you enter.</para>
+    <orderedlist>
+     <listitem id="b1a5c4iy">
+      <para>Select New &gt; Mail Message or Shift+Ctrl+M to open a Compose Message window.</para>
+     </listitem>
+     <listitem id="b1a5c6rw">
+      <para>Select Insert &gt; Custom Header to open the Email Custom Header window.</para>
+      <mediaobject id="b1a5c7i8"><imageobject><imagedata format="PNG" fileref="figures/evo_custom_header.png"/></imageobject></mediaobject>
+      <para>In the Email Custom Header window, you can view all the header fields and values you add.</para>
+     </listitem>
+     <listitem id="b1a5c7re">
+      <para>Set the values for the header fields by using the respective drop-down list.</para>
+     </listitem>
+     <listitem id="b1a5c8q9">
+      <para>Click OK.</para>
+     </listitem>
+    </orderedlist>
+   </section>
    <section id="usage-mail-getnsend-send-delay">
     <title>Sending Composed Messages Later</title>
     <para>Evolution normally sends mail as soon as you click Send. However, can save a message to be sent later:</para>
@@ -1972,6 +2060,107 @@
    </section>
   </section>
 
+  <section id="b1dlaazl">
+   <title>Templates</title>
+   <para>A message template is a standard message that you can use at any time to send mail with the same pattern. Evolution allows you to create and edit message templates.</para>
+   <itemizedlist>
+    <listitem>
+     <para><link linkend="b1dlbad4">Creating a Message Template from an Existing Message</link></para>
+    </listitem>
+    <listitem>
+     <para><link linkend="b1dlbckm">Saving a New Message as a Template</link></para>
+    </listitem>
+    <listitem>
+     <para><link linkend="b1dlbec6">Using a Message Template as a Reply</link></para>
+    </listitem>
+    <listitem>
+     <para><link linkend="b1dlbgwb">Configuring Message Templates</link></para>
+    </listitem>
+   </itemizedlist>
+   <para>To enable the Message Template Plugin:</para>
+   <orderedlist>
+    <listitem id="b1dlb9w8">
+     <para>Select Edit &gt; Plugins, then select Templates.</para>
+    </listitem>
+   </orderedlist>
+   
+   <section id="b1dlbad4">
+    <title>Creating a Message Template from an Existing Message</title>
+    <orderedlist>
+     <listitem id="b1dlbakg">
+      <para>Select the message.</para>
+     </listitem>
+     <listitem id="b1dlbbvc">
+      <para>Right-click &gt; Move to folder / Copy to folder.</para>
+     </listitem>
+     <listitem id="b1dlbc28">
+      <para>Select the Template local folder.</para>
+     </listitem>
+    </orderedlist>
+    <para>You can also edit an existing message and save it as a template.</para>
+    <orderedlist>
+     <listitem id="b1dlbczb">
+      <para>Open the message and click Reply.</para>
+     </listitem>
+     <listitem id="b1dlbd4s">
+      <para>Edit the message body or the addresses according to your requirements.</para>
+     </listitem>
+     <listitem id="b1dlbdbq">
+      <para>Select File &gt; Save as Template.</para>
+     </listitem>
+    </orderedlist>
+   </section>
+   
+   <section id="b1dlbckm">
+    <title>Saving a New Message as a Template</title>
+    <orderedlist>
+     <listitem id="b1dlbe1w">
+      <para>Click New and enter the information in the New Message window, according to your requirements.</para>
+     </listitem>
+     <listitem id="b1dlbe2y">
+      <para>Select File &gt; Save as Template.</para>
+     </listitem>
+    </orderedlist>
+   </section>
+   
+   <section id="b1dlbec6">
+    <title>Using a Message Template as a Reply</title>
+    <orderedlist>
+     <listitem id="b1dlbf4b">
+      <para>Right-click the message you are replying to, then click Templates.</para>
+      <para>This option lists all the message templates in the Template folder.</para>
+     </listitem>
+     <listitem id="b1dlbf5a">
+      <para>Select Open the message template of your choice and make changes if required.</para>
+     </listitem>
+     <listitem id="b1dlbgaq">
+      <para>Click Send.</para>
+      <para>When you select a message template for replying, the subject of the reply is preserved.</para>
+     </listitem>
+    </orderedlist>
+   </section>
+   
+   <section id="b1dlbgwb">
+    <title>Configuring Message Templates</title>
+    <para>In the Plugin Manager, select the Configuration tab to customize your message templates. You can add, edit or remove the key-value pairs. You can specify any number of key-value pairs.</para>
+    <para>In any template, the occurrence of every $key is replaced by the value it has in the configuration. For example, if you set the key to Manager and the value to Harry, any occurrence of $Manager is replaced by Harry in the message.</para>
+    <para>Assume that you have 1000 message templates with your current manager&apos;s name has a reference in them. When the current manager is replaced by a new one, it&apos;s not easy for you to manually replace the manager&apos;s name in all the 1000 messages. If the messages have a $Manager key value, you can reset the value in the Configuration tab of this plugin.</para>
+    <para>By default, the entire environment variables are used as a key-value pair. An occurrence of $env_variable is replaced by the value it carries. For example, an occurrence of $PATH in your template is replaced by its value when the template is used.</para>
+    <para>The replacement process uses the following order of precedence:</para>
+    <itemizedlist>
+     <listitem>
+      <para>$key is replaced by the value set for it in the Configuration tab of the Templates plugin.</para>
+     </listitem>
+     <listitem>
+      <para>If the key is not found, it is then replaced with the value of its environment variable.</para>
+     </listitem>
+     <listitem>
+      <para>If key is neither a configuration option nor an environment variable, no changes are made.</para>
+     </listitem>
+    </itemizedlist>
+   </section>
+  </section>
+  
   <section id="rsvp-stuff">
    <title>Sending Invitations by Mail</title>
    <para>If you create an event in the calendar component, you can then send invitations to the attendee list through the Evolution email tool. The invitation card is sent as an attachment in iCal format.</para>
@@ -2390,7 +2579,7 @@
     <para>To sort messages, perform the following procedure:</para>
     <orderedlist>
      <listitem id="b131itxb">
-      <para>Right click message header bar.</para>
+      <para>Right-click message header bar.</para>
      </listitem>
      <listitem id="b131iu51">
       <para>Click Sort by to get a list of options.</para>
@@ -3252,8 +3441,65 @@
      </orderedlist>
     </section>
    </section>
+  
+   <section id="b1dl9th7">
+    <title>Google Contacts</title>
+    <para>Evolution allows you to access your Google Address Book. You can view the Google contacts offline and create, modify and delete the contacts online.</para>
+    <para>To configure your Google Address Book in Evolution contacts:</para>
+    <orderedlist>
+     <listitem id="b1dl9x1r">
+      <para>Select File &gt; New &gt; Address book to open the New Address Book window.</para>
+      <mediaobject id="b1dl9yef"><imageobject><imagedata format="PNG" fileref="figures/evo_googlecontacts.png"/></imageobject></mediaobject>
+      
+     </listitem>
+     <listitem id="b1dl9x69">
+      <para>Select Google from the Type drop-down list.</para>
+     </listitem>
+     <listitem id="b1dl9z6j">
+      <para>Specify a name for the address book.</para>
+     </listitem>
+     <listitem id="b1dl9zh8">
+      <para>Select or deselect the following options and provide the username for the Google account:</para>
+      <itemizedlist>
+       <listitem>
+        <formalpara id="b1dla0di">
+         <title>Mark as default address book:</title>
+         <para>Select this option to make the Google address book as your default address book.</para>
+        </formalpara>
+       </listitem>
+       <listitem>
+        <formalpara id="b1dla0sn">
+         <title>Copy book content locally for offline operations:</title>
+         <para>Select this option to copy the address book to your machine so you can access the contacts even when you are not connected to the network.</para>
+        </formalpara>
+       </listitem>
+       <listitem>
+        <formalpara id="b1dla28w">
+         <title>Username:</title>
+         <para>Specify the username of your Google account.</para>
+        </formalpara>
+       </listitem>
+       <listitem>
+        <formalpara id="b1dla46h">
+         <title>Use SSL:</title>
+         <para> Select Use SSL to enable a secure connection between Evolution and the server</para>
+        </formalpara>
+       </listitem>
+       <listitem>
+        <formalpara id="b1dla666">
+         <title>Refresh:</title>
+         <para>Set the time to automatically refresh the Google address book.</para>
+        </formalpara>
+       </listitem>
+      </itemizedlist>
+     </listitem>
+     <listitem id="b1dla994">
+      <para>Click OK.</para>
+     </listitem>
+    </orderedlist>
+   </section>
   </section>
-
+  
   <section id="contact-search">
    <title>Searching for Contacts</title>
    <formalpara id="b131mz65">
@@ -3662,7 +3908,7 @@
       <para>Select the calendar from the side bar at the left.</para>
      </listitem>
      <listitem id="b13xyc0b">
-      <para>Right click on the calendar.</para>
+      <para>Right-click on the calendar.</para>
      </listitem>
      <listitem id="b13xyc3r">
       <para>Select Properties to open Calendar Properties dialog box.</para>
@@ -3688,7 +3934,7 @@
     </orderedlist>
     <para>To mark your calendar content for offline use, click Copy calendar contents locally for offline operations.</para>
     <para>Or</para>
-    <para>Right click on the calendar at the left and select Mark Calendar for offline use. For more information on working offline refer <link linkend="usage-mail-getnsend-offline">Working Offline</link>.</para>
+    <para>Right-click on the calendar at the left and select Mark Calendar for offline use. For more information on working offline refer <link linkend="usage-mail-getnsend-offline">Working Offline</link>.</para>
     <tip>
      <para>To export or share or to store a calendar locally in iCal format, right click on the calendar in the calendar view at the left and select Save to Disk.</para>
     </tip>
@@ -3729,7 +3975,7 @@
       <para>Set the time to automatically refresh the calendar.</para>
      </listitem>
      <listitem id="b1a4ak4r">
-      <para>Select Use SSL to enable SSL for communication between Evolution and the Google server.</para>
+      <para>Select Use SSL to enable a secure connection between Evolution and the Google server.</para>
      </listitem>
      <listitem id="b1a4amec">
       <para>If you want to set a color label for the calendar, click the Color tab, select the desired color, then click OK.</para>
@@ -5637,7 +5883,7 @@
      <listitem id="buw5x0p">
       <para>Type the name of your mail server, your user name, and select whether to use SSL.</para>
       <note>
-       <para>Select SSL for a highly secured connection between your client and server. Contact your administrator for further details.</para>
+       <para>Select Use SSL to enable a secure connection between Evolution and the server.</para>
       </note>
      </listitem>
      <listitem id="bsthkyr">
@@ -6314,13 +6560,6 @@
     <para>Enable this option to have filters based on mailing list headers (like list ID) so that in addition to the basic headers, the headers that correspond to mailing-lists are also fetched. Mailing list headers will have the informations such as the mailinglist-ID, owner of the mailing list, and so on with which you can create mailing list filters.</para>
    </formalpara>
    <para>This is the default Header preference that comes with Evolution. When this option is chosen, Evolution will download a basic set of headers (as described above) along with a set of headers that are needed for client-side filters based on mailing lists. If you do not have any filters on Evolution, it is recommended to switch to the "Basic Headers Only" option.</para>
-   <formalpara id="b15g0l0t">
-    <title>Custom Headers:</title>
-    <para>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.</para>
-   </formalpara>
-   <note>
-    <para>This option may not be needed if you have chosen to download ALL Headers.</para>
-   </note>
    <para>To set the IMAP Mail headers:</para>
    <orderedlist>
     <listitem id="b15fy0yh">
@@ -6475,7 +6714,7 @@
     <para>To enable Junk plugins:</para>
     <orderedlist>
      <listitem id="b17rdxkm">
-      <para>Select Edit &gt; Plugins </para>
+      <para>Select Edit &gt; Plugins.</para>
      </listitem>
      <listitem id="b17rdxz8">
       <para>Select the junk plugins you want. You can select either Bogofilter or SpamAssassin, or you can select both.</para>
@@ -6685,6 +6924,130 @@
    </section>
   </section>
 
+  <section id="b15m55rz">
+   <title>Network Preferences</title>
+   <para>This interface lets you configure your network proxy settings.</para>
+   <mediaobject id="b15m5vi1"><imageobject><imagedata format="PNG" fileref="figures/network_pref.png"/></imageobject></mediaobject>
+   <para>Use the following four options to configure the proxy settings:</para>
+   <formalpara id="b15m5zr2">
+    <title>Use system defaults:</title>
+    <para>Select this option to use the system wide proxy settings configured through Control Center &gt; Network Proxies in GNOME. When this option is selected, Evolution uses the proxy settings in the /system/http_proxy and /system/proxy/gconf keys.</para>
+   </formalpara>
+   <important>
+    <para>If these keys do not reflect the settings configured through Control Center &gt; Network Proxies, Evolution does not work with the proxy and you must either update these gconf keys or choose Manual proxy configuration.</para>
+   </important>
+   <formalpara id="b15m65gt">
+    <title>Direct connection to the Internet:</title>
+    <para> Select this option to connect directly to the internet.</para>
+   </formalpara>
+   <formalpara id="b15m65i4">
+    <title>Manual proxy configuration:</title>
+    <para>This option helps you costomize proxy settings regardless of the desktop you use. Specify hosts and ports for HTTP and optionally for other protocols. In the No Proxy Domain field, specify that comma-separated domain names do not go through the configured proxy server. You can specify patterns like *.example.com or .example.com in the No Proxy Domain list. Specify a username and password, and if the proxy server requires authentication, select Use Authentication to enable the username and password fields. The customized proxy settings are as follows:</para>
+   </formalpara>
+   <informaltable>
+    <tgroup cols="2">
+     <colspec colwidth="2.688*" colname="1" colnum="1"/>
+     <colspec colwidth="2.688*" colname="2" colnum="2"/>
+     <thead valign="top">
+      <row id="b15ot8mi">
+       <entry colname="1">
+        <para>Proxy Configuration Settings</para>
+       </entry>
+       <entry colname="2">
+        <para>Description</para>
+       </entry>
+      </row>
+     </thead>
+     <tbody valign="top">
+      <row id="b15ot8mj">
+       <entry colname="1">
+        <para>HTTP Proxy</para>
+       </entry>
+       <entry colname="2">
+        <para>The machine name to proxy HTTP through.</para>
+       </entry>
+      </row>
+      <row id="b15ot8mk">
+       <entry colname="1">
+        <para>Port</para>
+       </entry>
+       <entry colname="2">
+        <para>The port for the machine defined by the HTTP Proxy field that you proxy through.</para>
+       </entry>
+      </row>
+      <row id="b15ot9cv">
+       <entry colname="1">
+        <para>Secure HTTP Proxy</para>
+       </entry>
+       <entry colname="2">
+        <para>The machine name to proxy secure HTTP through.</para>
+       </entry>
+      </row>
+      <row id="b15ot9e8">
+       <entry colname="1">
+        <para>Port</para>
+       </entry>
+       <entry colname="2">
+        <para>The port for the machine defined by the Secure HTTP Proxy port field.</para>
+       </entry>
+      </row>
+      <row id="b15ot9f9">
+       <entry colname="1">
+        <para>SOCKS Host</para>
+       </entry>
+       <entry colname="2">
+        <para>The machine name to proxy SOCKS through.</para>
+       </entry>
+      </row>
+      <row id="b15ot9g7">
+       <entry colname="1">
+        <para>Port</para>
+       </entry>
+       <entry colname="2">
+        <para>The port for the machine defined by the SOCKS host.</para>
+       </entry>
+      </row>
+      <row id="b15ot9h3">
+       <entry colname="1">
+        <para>No proxy domain</para>
+       </entry>
+       <entry colname="2">
+        <para>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 (using an initial wildcard like *.example.com), IP host addresses (both IPv4 and IPv6) and network addresses with a netmask similar to 192.168.0.0/24.</para>
+       </entry>
+      </row>
+      <row id="b15ot9hy">
+       <entry colname="1">
+        <para>Use authentication</para>
+       </entry>
+       <entry colname="2">
+        <para>If this option is enabled, it uses authentication to connect via the proxy server.</para>
+       </entry>
+      </row>
+      <row id="b15ot9j3">
+       <entry colname="1">
+        <para>Username</para>
+       </entry>
+       <entry colname="2">
+        <para>Username used to authenticate when performing an HTTP proxying.</para>
+       </entry>
+      </row>
+      <row id="b15ot9ln">
+       <entry colname="1">
+        <para>Password</para>
+       </entry>
+       <entry colname="2">
+        <para>Password used to authenticate when performing an HTTP proxying.</para>
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+   <formalpara id="b15m65j9">
+    <title>Automatic proxy configuration URL:</title>
+    <para>Specify the automatic proxy configuration URL for Evolution to use in the autoconfig script to configure the proxy.</para>
+   </formalpara>
+  </section>
+  
   <section id="bshoty0">
    <title>Certificates</title>
    <para>Evolution allows you to add certificates for yourself as well as for contacts. This allows you to communicate with others securely over an encrypted connection, or sign a message confirming your identity to the contact. These settings only apply to S/MIME encryption.</para>
@@ -7000,7 +7363,7 @@
    </formalpara>
    <formalpara id="b17sa9q1">
     <title>Creating a New Email Message:</title>
-    <para>Click File &gt; New &gt; Mail Message or Shift+Ctrl+M.</para>
+    <para>Select File &gt; New &gt; Mail Message or Shift+Ctrl+M.</para>
    </formalpara>
    <formalpara id="b17saa12">
     <title>Creating a New Appointment:</title>
diff --git a/help/C/figures/Screenshot-Evolution -mailer-Preferences.png b/help/C/figures/Screenshot-Evolution-mailer-Preferences.png
index 63d88f626f..63d88f626f 100755
--- a/help/C/figures/Screenshot-Evolution -mailer-Preferences.png
+++ b/help/C/figures/Screenshot-Evolution-mailer-Preferences.png
diff --git a/help/C/figures/evo_customheader.png b/help/C/figures/evo_customheader.png
new file mode 100644
index 0000000000..670574cb05
--- /dev/null
+++ b/help/C/figures/evo_customheader.png
diff --git a/help/C/figures/evo_googlecontacts.png b/help/C/figures/evo_googlecontacts.png
new file mode 100644
index 0000000000..b0ea78de9b
--- /dev/null
+++ b/help/C/figures/evo_googlecontacts.png
diff --git a/help/C/figures/evo_mailnotification.png b/help/C/figures/evo_mailnotification.png
new file mode 100644
index 0000000000..cda8c7a4bc
--- /dev/null
+++ b/help/C/figures/evo_mailnotification.png
diff --git a/help/C/figures/mailer_preferences.png b/help/C/figures/mailer_preferences.png
index 6bbd2b3c73..52c952b8c8 100644
--- a/help/C/figures/mailer_preferences.png
+++ b/help/C/figures/mailer_preferences.png
diff --git a/help/C/figures/network_pref.png b/help/C/figures/network_pref.png
new file mode 100644
index 0000000000..d2ee717924
--- /dev/null
+++ b/help/C/figures/network_pref.png
diff --git a/help/ChangeLog b/help/ChangeLog
index ea58942c57..ca1d2cdaa0 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,47 @@
+2008-09-29  Petr Kovar  <pknbe@volny.cz>
+
+	* cs.po: Updated Czech translation of manual by Jiri Eischmann.
+
+2008-09-23  Claude Paroz  <claude@2xlibre.net>
+
+	* fr/fr.po: Updated French translation.
+
+2008-09-20  Claude Paroz  <claude@2xlibre.net>
+
+	* fr/figures/*: One new figure added and one obsolete removed.
+
+2008-09-19  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #552911
+
+	* Makefile.am:
+	* C/figures/Screenshot-Evolution -mailer-Preferences.png:
+	* de/figures/Screenshot-Evolution -mailer-Preferences.png:
+	Do not use spaces in file names.
+
+2008-09-18  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es/figures/*.png: Added new screenshots.
+
+2008-09-17  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es/es.po: Updated Spanish translation
+	* es/figures/*.png: Added new screenshots.
+
+2008-09-16  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es/es.po: Updated Spanish translation
+
+2008-09-16  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es/es.po: Updated Spanish translation
+
+2008-09-16  Bharath Acharya  <abharath@novell.com>
+
+	Patch from PC Radhika <pradhika@novell.com>
+
+	* C/evolution.xml: Updated doc changes for 2.24
+
 2008-08-22  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* es/es.po: Updated Spanish translation
diff --git a/help/Makefile.am b/help/Makefile.am
index 86c763dcb8..508dd0d526 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -121,7 +121,7 @@ DOC_FIGURES =  \
 	figures/quick_reference.png		\
 	figures/replymsg.png 			\
 	figures/schedule.png 			\
-	figures/Screenshot-Evolution -mailer-Preferences.png 	\
+	figures/Screenshot-Evolution-mailer-Preferences.png 	\
 	figures/Screenshot-Free-Busy.png 	\
 	figures/stock_search.png 		\
 	figures/sub-others-folder.png 		\
diff --git a/help/cs/cs.po b/help/cs/cs.po
index c9931060a7..4cd6ed293f 100644
--- a/help/cs/cs.po
+++ b/help/cs/cs.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution documentation\n"
-"POT-Creation-Date: 2008-06-02 14:10+0000\n"
-"PO-Revision-Date: 2008-06-14 22:08+0100\n"
+"POT-Creation-Date: 2008-09-29 12:25+0000\n"
+"PO-Revision-Date: 2008-09-21 14:52+0100\n"
 "Last-Translator: Jiří Eischmann <jiri@eischmann.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,512 +16,752 @@ 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:233(None)
-msgid "@@image: 'figures/evo_identity_a.png'; md5=51fef803bd3083b0b2c2583221d1c151"
-msgstr "@@image: 'figures/evo_identity_a.png'; md5=51fef803bd3083b0b2c2583221d1c151"
+#: C/evolution.xml:230(None)
+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.
-#: C/evolution.xml:263(None)
-msgid "@@image: 'figures/evo_receive_setup_a.png'; md5=5add6d290b2df212516dda2463930759"
-msgstr "@@image: 'figures/evo_receive_setup_a.png'; md5=5add6d290b2df212516dda2463930759"
+#: C/evolution.xml:260(None)
+msgid ""
+"@@image: 'figures/evo_receive_setup_a.png'; "
+"md5=5add6d290b2df212516dda2463930759"
+msgstr ""
+"@@image: 'figures/evo_receive_setup_a.png'; "
+"md5=5add6d290b2df212516dda2463930759"
 
 #. 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:424(None)
-msgid "@@image: 'figures/evo_gwreceive_a.png'; md5=ef64e581e652d0f03e4e6dd4a3b6d5a2"
-msgstr "@@image: 'figures/evo_gwreceive_a.png'; md5=ef64e581e652d0f03e4e6dd4a3b6d5a2"
+#: C/evolution.xml:418(None)
+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:434(None)
-msgid "@@image: 'figures/evo_mereceive_a.png'; md5=c3c759f902c2584ee218dc40d6e46806"
-msgstr "@@image: 'figures/evo_mereceive_a.png'; md5=c3c759f902c2584ee218dc40d6e46806"
+#: C/evolution.xml:428(None)
+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.
-#: C/evolution.xml:475(None)
-msgid "@@image: 'figures/evo_imapreceive_a.png'; md5=5948a0fbc61dc3b0efa0e4229f1fbf29"
-msgstr "@@image: 'figures/evo_imapreceive_a.png'; md5=5948a0fbc61dc3b0efa0e4229f1fbf29"
+#: C/evolution.xml:469(None)
+msgid ""
+"@@image: 'figures/evo_imapreceive_a.png'; "
+"md5=5948a0fbc61dc3b0efa0e4229f1fbf29"
+msgstr ""
+"@@image: 'figures/evo_imapreceive_a.png'; "
+"md5=5948a0fbc61dc3b0efa0e4229f1fbf29"
 
 #. 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:518(None)
-msgid "@@image: 'figures/evo_popreceive_a.png'; md5=a635f0e8d9bb4f0bcda34221c258f273"
-msgstr "@@image: 'figures/evo_popreceive_a.png'; md5=a635f0e8d9bb4f0bcda34221c258f273"
+#: C/evolution.xml:512(None)
+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:539(None)
-msgid "@@image: 'figures/evo_usereceive_a.png'; md5=3c14cafdde81fca95d480851aee9db0f"
-msgstr "@@image: 'figures/evo_usereceive_a.png'; md5=3c14cafdde81fca95d480851aee9db0f"
+#: C/evolution.xml:534(None)
+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:586(None)
-msgid "@@image: 'figures/evo_mhreceive_a.png'; md5=c7b97b4a2e9b9cf1c550244cca15a189"
-msgstr "@@image: 'figures/evo_mhreceive_a.png'; md5=c7b97b4a2e9b9cf1c550244cca15a189"
+#: C/evolution.xml:584(None)
+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.
-#: C/evolution.xml:606(None)
-msgid "@@image: 'figures/evo_maildirreceive_a.png'; md5=bdd9dfc00800338dc906e2fd12b07f62"
-msgstr "@@image: 'figures/evo_maildirreceive_a.png'; md5=bdd9dfc00800338dc906e2fd12b07f62"
+#: C/evolution.xml:605(None)
+msgid ""
+"@@image: 'figures/evo_maildirreceive_a.png'; "
+"md5=bdd9dfc00800338dc906e2fd12b07f62"
+msgstr ""
+"@@image: 'figures/evo_maildirreceive_a.png'; "
+"md5=bdd9dfc00800338dc906e2fd12b07f62"
 
 #. 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:627(None)
-#: C/evolution.xml:649(None)
-msgid "@@image: 'figures/evo_mboxreceive_a.png'; md5=a04753f7615eab6ac349f50caa39a7a8"
-msgstr "@@image: 'figures/evo_mboxreceive_a.png'; md5=a04753f7615eab6ac349f50caa39a7a8"
+#: C/evolution.xml:627(None) C/evolution.xml:650(None)
+msgid ""
+"@@image: 'figures/evo_mboxreceive_a.png'; "
+"md5=a04753f7615eab6ac349f50caa39a7a8"
+msgstr ""
+"@@image: 'figures/evo_mboxreceive_a.png'; "
+"md5=a04753f7615eab6ac349f50caa39a7a8"
 
 #. 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:677(None)
-msgid "@@image: 'figures/evo_send_setup_a.png'; md5=82760a1733ccb49ffa8424d265278b42"
-msgstr "@@image: 'figures/evo_send_setup_a.png'; md5=82760a1733ccb49ffa8424d265278b42"
+#: 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"
 
 #. 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:724(None)
-msgid "@@image: 'figures/evo_timezone_a.png'; md5=4ee80aae45be18c238c25329ab5ce59a"
-msgstr "@@image: 'figures/evo_timezone_a.png'; md5=4ee80aae45be18c238c25329ab5ce59a"
+#: C/evolution.xml:725(None)
+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.
-#: C/evolution.xml:751(None)
-msgid "@@image: 'figures/evo_mail_callout_a.png'; md5=4fa6dda9663d554197736dd2feb79575"
-msgstr "@@image: 'figures/evo_mail_callout_a.png'; md5=4fa6dda9663d554197736dd2feb79575"
+#: C/evolution.xml:753(None)
+msgid ""
+"@@image: 'figures/evo_mail_callout_a.png'; "
+"md5=4fa6dda9663d554197736dd2feb79575"
+msgstr ""
+"@@image: 'figures/evo_mail_callout_a.png'; "
+"md5=4fa6dda9663d554197736dd2feb79575"
 
 #. 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:926(None)
+#: 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.
-#: C/evolution.xml:944(None)
-msgid "@@image: 'figures/evo_cal_callout_a.png'; md5=6de000ad9c7b3fe42ed1996cad46432f"
-msgstr "@@image: 'figures/evo_cal_callout_a.png'; md5=6de000ad9c7b3fe42ed1996cad46432f"
+#: C/evolution.xml:946(None)
+msgid ""
+"@@image: 'figures/evo_cal_callout_a.png'; "
+"md5=6de000ad9c7b3fe42ed1996cad46432f"
+msgstr ""
+"@@image: 'figures/evo_cal_callout_a.png'; "
+"md5=6de000ad9c7b3fe42ed1996cad46432f"
 
 #. 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:964(None)
-msgid "@@image: 'figures/contacts_mainwindow_a.png'; md5=41335f17f056cb0b06e3df4900d08865"
-msgstr "@@image: 'figures/contacts_mainwindow_a.png'; md5=41335f17f056cb0b06e3df4900d08865"
+#: C/evolution.xml:966(None)
+msgid ""
+"@@image: 'figures/contacts_mainwindow_a.png'; "
+"md5=41335f17f056cb0b06e3df4900d08865"
+msgstr ""
+"@@image: 'figures/contacts_mainwindow_a.png'; "
+"md5=41335f17f056cb0b06e3df4900d08865"
 
 #. 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:978(None)
+#: 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.
-#: C/evolution.xml:981(None)
-msgid "@@image: 'figures/evo_backup_warning.png'; md5=80e1ce9a9be3f660bdfbae7dd7b9488b"
-msgstr "@@image: 'figures/evo_backup_warning.png'; md5=80e1ce9a9be3f660bdfbae7dd7b9488b"
+#: C/evolution.xml:983(None)
+msgid ""
+"@@image: 'figures/evo_backup_warning.png'; "
+"md5=80e1ce9a9be3f660bdfbae7dd7b9488b"
+msgstr ""
+"@@image: 'figures/evo_backup_warning.png'; "
+"md5=80e1ce9a9be3f660bdfbae7dd7b9488b"
 
 #. 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:989(None)
-msgid "@@image: 'figures/evo_backup_prgsbar.png'; md5=046642d35e096154508269063d672b07"
-msgstr "@@image: 'figures/evo_backup_prgsbar.png'; md5=046642d35e096154508269063d672b07"
+#: C/evolution.xml:991(None)
+msgid ""
+"@@image: 'figures/evo_backup_prgsbar.png'; "
+"md5=046642d35e096154508269063d672b07"
+msgstr ""
+"@@image: 'figures/evo_backup_prgsbar.png'; "
+"md5=046642d35e096154508269063d672b07"
 
 #. 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:1007(None)
-msgid "@@image: 'figures/evo_restore.png'; md5=95ef78344a50e05dbf01da9633dcd71f"
-msgstr "@@image: 'figures/evo_restore.png'; md5=95ef78344a50e05dbf01da9633dcd71f"
+#: C/evolution.xml:1009(None)
+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:1017(None)
-msgid "@@image: 'figures/evo_crash_recovery.png'; md5=6bfa921910f94e5845f893a6308169a6"
-msgstr "@@image: 'figures/evo_crash_recovery.png'; md5=6bfa921910f94e5845f893a6308169a6"
+#: C/evolution.xml:1181(None)
+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.
-#: C/evolution.xml:1177(None)
-msgid "@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
-msgstr "@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
+#: C/evolution.xml:1183(None)
+msgid ""
+"@@image: 'figures/evo_mailnotification.png'; "
+"md5=3ec09c3f9b49aee5be6f5fc2df69350d"
+msgstr ""
+"@@image: 'figures/evo_mailnotification.png'; "
+"md5=3ec09c3f9b49aee5be6f5fc2df69350d"
 
 #. 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:1194(None)
+#: 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:1209(None)
-msgid "@@image: 'figures/collap_head_a.png'; md5=82c5d5ae3f5499f17bdb08eebfe9c557"
-msgstr "@@image: 'figures/collap_head_a.png'; md5=82c5d5ae3f5499f17bdb08eebfe9c557"
+#: C/evolution.xml:1273(None)
+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:1379(None)
-msgid "@@image: 'figures/evo_newmess_a.png'; md5=3bd7f656fa4d7fa3d5b337241e56f575"
-msgstr "@@image: 'figures/evo_newmess_a.png'; md5=3bd7f656fa4d7fa3d5b337241e56f575"
+#: C/evolution.xml:1448(None)
+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:1467(None)
-msgid "@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb"
-msgstr "@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb"
+#: C/evolution.xml:1506(None)
+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.
-#: C/evolution.xml:1521(None)
-msgid "@@image: 'figures/attach_reminder_a.png.png'; md5=66e32d56d961c67ff24d8b1c4ac6c9eb"
-msgstr "@@image: 'figures/attach_reminder_a.png.png'; md5=66e32d56d961c67ff24d8b1c4ac6c9eb"
+#: C/evolution.xml:1514(None)
+msgid ""
+"@@image: 'figures/evo_custom_header.png'; "
+"md5=10dfa4db26e3354551653fffb9ec23de"
+msgstr ""
+"@@image: 'figures/evo_custom_header.png'; "
+"md5=10dfa4db26e3354551653fffb9ec23de"
 
 #. 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:1534(None)
-msgid "@@image: 'figures/evo_attachreminder_plugin.png'; md5=25f7db7cd7d310110847354c62702ecf"
-msgstr "@@image: 'figures/evo_attachreminder_plugin.png'; md5=25f7db7cd7d310110847354c62702ecf"
+#: C/evolution.xml:1560(None)
+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.
-#: C/evolution.xml:1862(None)
-msgid "@@image: 'figures/evo_account_editor_a.png'; md5=39b83104a4e6ecb9473cbb84121e6be3"
-msgstr "@@image: 'figures/evo_account_editor_a.png'; md5=39b83104a4e6ecb9473cbb84121e6be3"
+#: C/evolution.xml:1614(None)
+msgid ""
+"@@image: 'figures/attach_reminder_a.png'; "
+"md5=66e32d56d961c67ff24d8b1c4ac6c9eb"
+msgstr ""
+"@@image: 'figures/attach_reminder_a.png'; "
+"md5=66e32d56d961c67ff24d8b1c4ac6c9eb"
 
 #. 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:1902(None)
-msgid "@@image: 'figures/account_editor_a.png'; md5=cd9c4e71a53f8f03424c1432d7d46e30"
-msgstr "@@image: 'figures/account_editor_a.png'; md5=cd9c4e71a53f8f03424c1432d7d46e30"
+#: C/evolution.xml:1627(None)
+msgid ""
+"@@image: 'figures/evo_attachreminder_plugin.png'; "
+"md5=25f7db7cd7d310110847354c62702ecf"
+msgstr ""
+"@@image: 'figures/evo_attachreminder_plugin.png'; "
+"md5=25f7db7cd7d310110847354c62702ecf"
 
 #. 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:2335(None)
-msgid "@@image: 'figures/evo_import_asst_a.png'; md5=e86638d0b3a01478fd4f12e33781a8a0"
-msgstr "@@image: 'figures/evo_import_asst_a.png'; md5=e86638d0b3a01478fd4f12e33781a8a0"
+#: C/evolution.xml:1955(None)
+msgid ""
+"@@image: 'figures/evo_account_editor_a.png'; "
+"md5=39b83104a4e6ecb9473cbb84121e6be3"
+msgstr ""
+"@@image: 'figures/evo_account_editor_a.png'; "
+"md5=39b83104a4e6ecb9473cbb84121e6be3"
 
 #. 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:2361(None)
-msgid "@@image: 'figures/mail-threaded.png'; md5=ab1b9eb0f0735f4fcc4c51ead5ce1ff2"
-msgstr "@@image: 'figures/mail-threaded.png'; md5=ab1b9eb0f0735f4fcc4c51ead5ce1ff2"
+#: C/evolution.xml:1995(None)
+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.
+#: C/evolution.xml:2537(None)
+msgid ""
+"@@image: 'figures/evo_import_asst_a.png'; "
+"md5=e86638d0b3a01478fd4f12e33781a8a0"
+msgstr ""
+"@@image: 'figures/evo_import_asst_a.png'; "
+"md5=e86638d0b3a01478fd4f12e33781a8a0"
+
+#. 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"
 
 #. 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:2512(None)
-msgid "@@image: 'figures/evo_flag_follow_up_a.png'; md5=6a4790a789cf4b3b8b73cb43aa8d065b"
-msgstr "@@image: 'figures/evo_flag_follow_up_a.png'; md5=6a4790a789cf4b3b8b73cb43aa8d065b"
+#: C/evolution.xml:2715(None)
+msgid ""
+"@@image: 'figures/evo_flag_follow_up_a.png'; "
+"md5=6a4790a789cf4b3b8b73cb43aa8d065b"
+msgstr ""
+"@@image: 'figures/evo_flag_follow_up_a.png'; "
+"md5=6a4790a789cf4b3b8b73cb43aa8d065b"
 
 #. 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:2529(None)
-msgid "@@image: 'figures/evo_select_folder.png'; md5=7b99ef6be9990bc1c1d869512ae2f617"
-msgstr "@@image: 'figures/evo_select_folder.png'; md5=7b99ef6be9990bc1c1d869512ae2f617"
+#: C/evolution.xml:2732(None)
+msgid ""
+"@@image: 'figures/evo_select_folder.png'; "
+"md5=7b99ef6be9990bc1c1d869512ae2f617"
+msgstr ""
+"@@image: 'figures/evo_select_folder.png'; "
+"md5=7b99ef6be9990bc1c1d869512ae2f617"
 
 #. 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:2532(None)
-msgid "@@image: 'figures/evo_message_filters_a.png'; md5=3b7067638063c6aad2c316db838d2273"
-msgstr "@@image: 'figures/evo_message_filters_a.png'; md5=3b7067638063c6aad2c316db838d2273"
+#: C/evolution.xml:2735(None)
+msgid ""
+"@@image: 'figures/evo_message_filters_a.png'; "
+"md5=3b7067638063c6aad2c316db838d2273"
+msgstr ""
+"@@image: 'figures/evo_message_filters_a.png'; "
+"md5=3b7067638063c6aad2c316db838d2273"
 
 #. 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:2695(None)
-msgid "@@image: 'figures/evo_adv_search_a.png'; md5=676d35d686745650c9bcfa832763362c"
-msgstr "@@image: 'figures/evo_adv_search_a.png'; md5=676d35d686745650c9bcfa832763362c"
+#: 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"
 
 #. 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:2725(None)
-msgid "@@image: 'figures/evo_edit_search.png'; md5=2ce150b3eb63cc4ec0f0292e13167be8"
-msgstr "@@image: 'figures/evo_edit_search.png'; md5=2ce150b3eb63cc4ec0f0292e13167be8"
+#: C/evolution.xml:2928(None)
+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:2731(None)
-msgid "@@image: 'figures/evo_edit_rule_a.png'; md5=0ae423517b27dfd34cfcb54550335fbb"
-msgstr "@@image: 'figures/evo_edit_rule_a.png'; md5=0ae423517b27dfd34cfcb54550335fbb"
+#: 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"
 
 #. 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:2758(None)
-msgid "@@image: 'figures/filter-new-fig.png'; md5=75a2b8ccfe0f7a4982859827c867d578"
-msgstr "@@image: 'figures/filter-new-fig.png'; md5=75a2b8ccfe0f7a4982859827c867d578"
+#: C/evolution.xml:2961(None)
+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:3006(None)
+#: 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.
-#: C/evolution.xml:3097(None)
-msgid "@@image: 'figures/evo_select_add_folder.png'; md5=01d57d01ff1650d91c1d73de1f4301ab"
-msgstr "@@image: 'figures/evo_select_add_folder.png'; md5=01d57d01ff1650d91c1d73de1f4301ab"
+#: C/evolution.xml:3300(None)
+msgid ""
+"@@image: 'figures/evo_select_add_folder.png'; "
+"md5=01d57d01ff1650d91c1d73de1f4301ab"
+msgstr ""
+"@@image: 'figures/evo_select_add_folder.png'; "
+"md5=01d57d01ff1650d91c1d73de1f4301ab"
 
 #. 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:3190(None)
-msgid "@@image: 'figures/evo_contacteditor_a.png'; md5=4f188bd5d34a9fea7d91fdf5fb943f28"
-msgstr "@@image: 'figures/evo_contacteditor_a.png'; md5=4f188bd5d34a9fea7d91fdf5fb943f28"
+#: C/evolution.xml:3393(None)
+msgid ""
+"@@image: 'figures/evo_contacteditor_a.png'; "
+"md5=4f188bd5d34a9fea7d91fdf5fb943f28"
+msgstr ""
+"@@image: 'figures/evo_contacteditor_a.png'; "
+"md5=4f188bd5d34a9fea7d91fdf5fb943f28"
 
 #. 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:3231(None)
-msgid "@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252"
-msgstr "@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252"
+#: C/evolution.xml:3431(None)
+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.
-#: C/evolution.xml:3486(None)
-msgid "@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77"
-msgstr "@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77"
+#: C/evolution.xml:3452(None)
+msgid ""
+"@@image: 'figures/evo_googlecontacts.png'; "
+"md5=2357233124d1191cdbb2279f6f998207"
+msgstr ""
+"@@image: 'figures/evo_googlecontacts.png'; "
+"md5=2357233124d1191cdbb2279f6f998207"
+
+#. 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"
 
 #. 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:3641(None)
+#: C/evolution.xml:3899(None)
 msgid "@@image: 'figures/evo_cal_a.png'; md5=08a60dd21a8c52bace4a9d1d606b3ff5"
 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:3664(None)
-msgid "@@image: 'figures/evo_cal_prop_a.png'; md5=f28511f098847b4fc9278ba6c54c9c3d"
-msgstr "@@image: 'figures/evo_cal_prop_a.png'; md5=f28511f098847b4fc9278ba6c54c9c3d"
+#: 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"
 
 #. 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:3696(None)
-msgid "@@image: 'figures/google_cal_view.png'; md5=6574c207d4b219a80da96982ee650ce2"
-msgstr "@@image: 'figures/google_cal_view.png'; md5=6574c207d4b219a80da96982ee650ce2"
+#: C/evolution.xml:3954(None)
+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.
-#: C/evolution.xml:3794(None)
-msgid "@@image: 'figures/evo_calender_appointmnt.png'; md5=730ed74addbca4b0638f03cbcde99e71"
-msgstr "@@image: 'figures/evo_calender_appointmnt.png'; md5=730ed74addbca4b0638f03cbcde99e71"
+#: C/evolution.xml:4053(None)
+msgid ""
+"@@image: 'figures/evo_calender_appointmnt.png'; "
+"md5=730ed74addbca4b0638f03cbcde99e71"
+msgstr ""
+"@@image: 'figures/evo_calender_appointmnt.png'; "
+"md5=730ed74addbca4b0638f03cbcde99e71"
 
 #. 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:3861(None)
-msgid "@@image: 'figures/evo_allday_a.png'; md5=3641b70c5110bb275d553c00d559636f"
-msgstr "@@image: 'figures/evo_allday_a.png'; md5=3641b70c5110bb275d553c00d559636f"
+#: C/evolution.xml:4121(None)
+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.
-#: C/evolution.xml:4055(None)
-#: C/evolution.xml:5373(None)
-#: C/evolution.xml:5757(None)
+#: C/evolution.xml:4317(None) C/evolution.xml:5592(None)
+#: C/evolution.xml:5978(None)
 msgid "@@image: 'figures/free_busy.png'; md5=e9401be3e2c00fa9389a81aa438bc67d"
 msgstr "@@image: 'figures/free_busy.png'; md5=e9401be3e2c00fa9389a81aa438bc67d"
 
 #. 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:4151(None)
-#: C/evolution.xml:4463(None)
-#: C/evolution.xml:4701(None)
-msgid "@@image: 'figures/evo_cal_advsearch.png'; md5=a99f9f9f5c13ba8cf237b7a79a5af7f1"
-msgstr "@@image: 'figures/evo_cal_advsearch.png'; md5=a99f9f9f5c13ba8cf237b7a79a5af7f1"
+#: C/evolution.xml:4413(None) C/evolution.xml:4727(None)
+#: C/evolution.xml:4965(None)
+msgid ""
+"@@image: 'figures/evo_cal_advsearch.png'; "
+"md5=a99f9f9f5c13ba8cf237b7a79a5af7f1"
+msgstr ""
+"@@image: 'figures/evo_cal_advsearch.png'; "
+"md5=a99f9f9f5c13ba8cf237b7a79a5af7f1"
 
 #. 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:4612(None)
+#: 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:5008(None)
-msgid "@@image: 'figures/exchng-identity.png'; md5=51fef803bd3083b0b2c2583221d1c151"
-msgstr "@@image: 'figures/exchng-identity.png'; md5=51fef803bd3083b0b2c2583221d1c151"
+#: C/evolution.xml:5272(None)
+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:5018(None)
-msgid "@@image: 'figures/exchng-rec-mails.png'; md5=29dcaf684be7ea3554afe4f96885bc4e"
-msgstr "@@image: 'figures/exchng-rec-mails.png'; md5=29dcaf684be7ea3554afe4f96885bc4e"
+#: C/evolution.xml:5277(None)
+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.
-#: C/evolution.xml:5038(None)
-msgid "@@image: 'figures/exchng-rec-options.png'; md5=c3c759f902c2584ee218dc40d6e46806"
-msgstr "@@image: 'figures/exchng-rec-options.png'; md5=c3c759f902c2584ee218dc40d6e46806"
+#: C/evolution.xml:5284(None)
+msgid ""
+"@@image: 'figures/exchng-rec-options.png'; "
+"md5=c3c759f902c2584ee218dc40d6e46806"
+msgstr ""
+"@@image: 'figures/exchng-rec-options.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.
-#: C/evolution.xml:5061(None)
-msgid "@@image: 'figures/exchg-identity.png'; md5=3733884734da6765870c652f1651bbd2"
-msgstr "@@image: 'figures/exchg-identity.png'; md5=3733884734da6765870c652f1651bbd2"
+#: C/evolution.xml:5298(None)
+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:5083(None)
-msgid "@@image: 'figures/exchng-rec-mail.png'; md5=fe7f5e7b758b0306998ec477abf790f3"
-msgstr "@@image: 'figures/exchng-rec-mail.png'; md5=fe7f5e7b758b0306998ec477abf790f3"
+#: C/evolution.xml:5306(None)
+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.
-#: C/evolution.xml:5100(None)
-msgid "@@image: 'figures/exchng-rec-option.png'; md5=6c0f84b7541a044e900d9d7c5fc4a49b"
-msgstr "@@image: 'figures/exchng-rec-option.png'; md5=6c0f84b7541a044e900d9d7c5fc4a49b"
+#: C/evolution.xml:5314(None)
+msgid ""
+"@@image: 'figures/exchng-rec-option.png'; "
+"md5=6c0f84b7541a044e900d9d7c5fc4a49b"
+msgstr ""
+"@@image: 'figures/exchng-rec-option.png'; "
+"md5=6c0f84b7541a044e900d9d7c5fc4a49b"
 
 #. 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:5132(None)
-#: C/evolution.xml:5365(None)
-msgid "@@image: 'figures/exchng-settings.png'; md5=7e82c0934afd2de5fca76c164d6342f4"
-msgstr "@@image: 'figures/exchng-settings.png'; md5=7e82c0934afd2de5fca76c164d6342f4"
+#: 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"
 
 #. 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:5174(None)
-msgid "@@image: 'figures/evo_send_option_a.png'; md5=c1cca904625d1a7de13c851cd15235f6"
-msgstr "@@image: 'figures/evo_send_option_a.png'; md5=c1cca904625d1a7de13c851cd15235f6"
+#: C/evolution.xml:5389(None)
+msgid ""
+"@@image: 'figures/evo_send_option_a.png'; "
+"md5=c1cca904625d1a7de13c851cd15235f6"
+msgstr ""
+"@@image: 'figures/evo_send_option_a.png'; "
+"md5=c1cca904625d1a7de13c851cd15235f6"
 
 #. 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:5250(None)
+#: C/evolution.xml:5469(None)
 msgid "@@image: 'figures/delgt-add.png'; md5=9bf1f22c67551ad910cd3749f216c2b7"
 msgstr "@@image: 'figures/delgt-add.png'; md5=9bf1f22c67551ad910cd3749f216c2b7"
 
 #. 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:5259(None)
-msgid "@@image: 'figures/evo_delegate_permission_a.png'; md5=05df38ad69b20f9bd7c1e14044ca10fd"
-msgstr "@@image: 'figures/evo_delegate_permission_a.png'; md5=05df38ad69b20f9bd7c1e14044ca10fd"
+#: C/evolution.xml:5478(None)
+msgid ""
+"@@image: 'figures/evo_delegate_permission_a.png'; "
+"md5=05df38ad69b20f9bd7c1e14044ca10fd"
+msgstr ""
+"@@image: 'figures/evo_delegate_permission_a.png'; "
+"md5=05df38ad69b20f9bd7c1e14044ca10fd"
 
 #. 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:5294(None)
-msgid "@@image: 'figures/sub-others-folder.png'; md5=5e385ee9524f93b65b307f83e1888138"
-msgstr "@@image: 'figures/sub-others-folder.png'; md5=5e385ee9524f93b65b307f83e1888138"
+#: C/evolution.xml:5513(None)
+msgid ""
+"@@image: 'figures/sub-others-folder.png'; "
+"md5=5e385ee9524f93b65b307f83e1888138"
+msgstr ""
+"@@image: 'figures/sub-others-folder.png'; "
+"md5=5e385ee9524f93b65b307f83e1888138"
 
 #. 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:5324(None)
-msgid "@@image: 'figures/sub-pub-fold.png'; md5=e8e8b7d0b6ae8214ca1ef51dac06a1f7"
-msgstr "@@image: 'figures/sub-pub-fold.png'; md5=e8e8b7d0b6ae8214ca1ef51dac06a1f7"
+#: C/evolution.xml:5543(None)
+msgid ""
+"@@image: 'figures/sub-pub-fold.png'; md5=e8e8b7d0b6ae8214ca1ef51dac06a1f7"
+msgstr ""
+"@@image: 'figures/sub-pub-fold.png'; md5=e8e8b7d0b6ae8214ca1ef51dac06a1f7"
 
 #. 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:5653(None)
-msgid "@@image: 'figures/evo_identityedit_a.png'; md5=78418c3f6214b7494c323df12bc6921f"
-msgstr "@@image: 'figures/evo_identityedit_a.png'; md5=78418c3f6214b7494c323df12bc6921f"
+#: C/evolution.xml:5872(None)
+msgid ""
+"@@image: 'figures/evo_identityedit_a.png'; "
+"md5=78418c3f6214b7494c323df12bc6921f"
+msgstr ""
+"@@image: 'figures/evo_identityedit_a.png'; "
+"md5=78418c3f6214b7494c323df12bc6921f"
 
 #. 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:5661(None)
-msgid "@@image: 'figures/evo_gwreceiveedit_a.png'; md5=3f5fc5b802eba3ef1a68e6ff675577b0"
-msgstr "@@image: 'figures/evo_gwreceiveedit_a.png'; md5=3f5fc5b802eba3ef1a68e6ff675577b0"
+#: C/evolution.xml:5880(None)
+msgid ""
+"@@image: 'figures/evo_gwreceiveedit_a.png'; "
+"md5=3f5fc5b802eba3ef1a68e6ff675577b0"
+msgstr ""
+"@@image: 'figures/evo_gwreceiveedit_a.png'; "
+"md5=3f5fc5b802eba3ef1a68e6ff675577b0"
 
 #. 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:5673(None)
-msgid "@@image: 'figures/evo_gwreceiveoptedit_a.png'; md5=1c9e818bb39bb288511cf1cebdd83569"
-msgstr "@@image: 'figures/evo_gwreceiveoptedit_a.png'; md5=1c9e818bb39bb288511cf1cebdd83569"
+#: C/evolution.xml:5893(None)
+msgid ""
+"@@image: 'figures/evo_gwreceiveoptedit_a.png'; "
+"md5=1c9e818bb39bb288511cf1cebdd83569"
+msgstr ""
+"@@image: 'figures/evo_gwreceiveoptedit_a.png'; "
+"md5=1c9e818bb39bb288511cf1cebdd83569"
 
 #. 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:5718(None)
-msgid "@@image: 'figures/evo_rmdrnotes_a.png'; md5=ae24ed3554b8359af96ef2374ccd261a"
-msgstr "@@image: 'figures/evo_rmdrnotes_a.png'; md5=ae24ed3554b8359af96ef2374ccd261a"
+#: C/evolution.xml:5939(None)
+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:5750(None)
-msgid "@@image: 'figures/evo_shd_memo_a.png'; md5=dd7069c9f52641dd13101c1dd935feb8"
-msgstr "@@image: 'figures/evo_shd_memo_a.png'; md5=dd7069c9f52641dd13101c1dd935feb8"
+#: C/evolution.xml:5971(None)
+msgid ""
+"@@image: 'figures/evo_shd_memo_a.png'; md5=dd7069c9f52641dd13101c1dd935feb8"
+msgstr ""
+"@@image: 'figures/evo_shd_memo_a.png'; md5=dd7069c9f52641dd13101c1dd935feb8"
 
 #. 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:5820(None)
-msgid "@@image: 'figures/evo_gwstatustrack.png'; md5=d4eb84e2d55870af1408c430ce8c0e66"
-msgstr "@@image: 'figures/evo_gwstatustrack.png'; md5=d4eb84e2d55870af1408c430ce8c0e66"
+#: C/evolution.xml:6042(None)
+msgid ""
+"@@image: 'figures/evo_gwstatustrack.png'; "
+"md5=d4eb84e2d55870af1408c430ce8c0e66"
+msgstr ""
+"@@image: 'figures/evo_gwstatustrack.png'; "
+"md5=d4eb84e2d55870af1408c430ce8c0e66"
 
 #. 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:5875(None)
-msgid "@@image: 'figures/evo_sendstatus_a.png'; md5=36ca2211056c859eb776124bfc364705"
-msgstr "@@image: 'figures/evo_sendstatus_a.png'; md5=36ca2211056c859eb776124bfc364705"
+#: C/evolution.xml:6097(None)
+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:5933(None)
-msgid "@@image: 'figures/evo_calstatus_a.png'; md5=99fb98faa3e644f6433c078ba71a0353"
-msgstr "@@image: 'figures/evo_calstatus_a.png'; md5=99fb98faa3e644f6433c078ba71a0353"
+#: C/evolution.xml:6155(None)
+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:6074(None)
-msgid "@@image: 'figures/evo_proxyadd_a.png'; md5=51357617967f0610eb95dab5814540ad"
-msgstr "@@image: 'figures/evo_proxyadd_a.png'; md5=51357617967f0610eb95dab5814540ad"
+#: C/evolution.xml:6296(None)
+msgid ""
+"@@image: 'figures/evo_proxyadd_a.png'; md5=51357617967f0610eb95dab5814540ad"
+msgstr ""
+"@@image: 'figures/evo_proxyadd_a.png'; md5=51357617967f0610eb95dab5814540ad"
 
 #. 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:6096(None)
-msgid "@@image: 'figures/proxy-login.png'; md5=7adee93cffbeea4636df9bb1a8923b07"
-msgstr "@@image: 'figures/proxy-login.png'; md5=7adee93cffbeea4636df9bb1a8923b07"
+#: C/evolution.xml:6319(None)
+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.
-#: C/evolution.xml:6105(None)
+#: C/evolution.xml:6328(None)
 msgid "@@image: 'figures/proxy-cal.png'; md5=8e1f3438047198a963e7642d5ff9cac6"
 msgstr "@@image: 'figures/proxy-cal.png'; md5=8e1f3438047198a963e7642d5ff9cac6"
 
 #. 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:6265(None)
-msgid "@@image: 'figures/mailer_preferences.png'; md5=4141df4bf4b2dc4e82a0bad514714194"
-msgstr "@@image: 'figures/mailer_preferences.png'; md5=4141df4bf4b2dc4e82a0bad514714194"
+#: C/evolution.xml:6471(None)
+msgid ""
+"@@image: 'figures/mailer_preferences.png'; "
+"md5=ad0be84fb36edefd01851653b69b65bb"
+msgstr ""
+"@@image: 'figures/mailer_preferences.png'; "
+"md5=ad0be84fb36edefd01851653b69b65bb"
 
 #. 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:6374(None)
-msgid "@@image: 'figures/evo_imapheader_a.png'; md5=b11aa6167ce03769ce3084d32f4b4459"
-msgstr "@@image: 'figures/evo_imapheader_a.png'; md5=b11aa6167ce03769ce3084d32f4b4459"
+#: C/evolution.xml:6573(None)
+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:6469(None)
-msgid "@@image: 'figures/evo_labels_a.png'; md5=847d1bebd5d64b9f63e14d6d88f741de"
-msgstr "@@image: 'figures/evo_labels_a.png'; md5=847d1bebd5d64b9f63e14d6d88f741de"
+#: C/evolution.xml:6668(None)
+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:6495(None)
-msgid "@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
-msgstr "@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
+#: C/evolution.xml:6694(None)
+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:6540(None)
+#: 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"
 
 #. 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:6883(None)
-msgid "@@image: 'figures/evo_debuglogs_a.png'; md5=07f28e4574670558cf11897915b2ce7e"
-msgstr "@@image: 'figures/evo_debuglogs_a.png'; md5=07f28e4574670558cf11897915b2ce7e"
+#: C/evolution.xml:7207(None)
+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:7035(None)
-msgid "@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
-msgstr "@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
+#: C/evolution.xml:7359(None)
+msgid ""
+"@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
+msgstr ""
+"@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
 
-#: C/evolution.xml:15(title)
-#: C/evolution.xml:7425(para)
-msgid "Evolution 2.22 User Guide"
-msgstr "Uživatelská příručka k Evolution 2.22"
-
-#: C/evolution.xml:20(firstname)
-#: C/evolution.xml:22(corpauthor)
-#: C/evolution.xml:38(para)
-#: C/evolution.xml:46(para)
-#: C/evolution.xml:54(para)
+#: C/evolution.xml:15(title) C/evolution.xml:7749(para)
+msgid "Evolution 2.24 User Guide"
+msgstr "Uživatelská příručka k Evolution 2.24"
+
+#: C/evolution.xml:20(firstname) C/evolution.xml:22(corpauthor)
+#: C/evolution.xml:38(para) C/evolution.xml:46(para) C/evolution.xml:54(para)
 #: C/evolution.xml:62(para)
 msgid "Novell, Inc"
 msgstr "Novell, Inc"
@@ -534,18 +774,15 @@ msgstr "Uživatelská příručka ke groupware a e-mailovému klientu Evolution
 msgid "2002-2008"
 msgstr "2002-2008"
 
-#: C/evolution.xml:34(revnumber)
-#: C/evolution.xml:77(productnumber)
-msgid "2.22"
-msgstr "2.22"
+#: C/evolution.xml:34(revnumber) C/evolution.xml:77(productnumber)
+msgid "2.24"
+msgstr "2.24"
 
 #: C/evolution.xml:35(date)
 msgid "March 2008"
 msgstr "Březen 2008"
 
-#: C/evolution.xml:37(para)
-#: C/evolution.xml:45(para)
-#: C/evolution.xml:61(para)
+#: C/evolution.xml:37(para) C/evolution.xml:45(para) C/evolution.xml:61(para)
 msgid "Radhika PC"
 msgstr "Radhika PC"
 
@@ -578,16 +815,19 @@ msgid "October 5, 2006"
 msgstr "5.října 2006"
 
 #: C/evolution.xml:67(releaseinfo)
-msgid "This manual describes version 2.22 of Evolution"
-msgstr "Tento manuál popisuje verzi 2.22 aplikace Evolution"
+msgid "This manual describes version 2.24 of Evolution"
+msgstr "Tento manuál popisuje verzi 2.24 aplikace Evolution"
 
 #: C/evolution.xml:71(para)
-msgid "A user's guide to Evolution which explains how to use its mail, calendar, addressbook, and task list features."
-msgstr "Uživatelská příručka aplikace Evolution, která vysvětluje, jak používat její funkce pro elekronickou poštu, kalendář, adresář a seznam úkolů."
+msgid ""
+"A user's guide to Evolution which explains how to use its mail, calendar, "
+"addressbook, and task list features."
+msgstr ""
+"Uživatelská příručka aplikace Evolution, která vysvětluje, jak používat její "
+"funkce pro elekronickou poštu, kalendář, adresář a seznam úkolů."
 
-#: C/evolution.xml:76(productname)
-#: C/evolution.xml:5557(para)
-#: C/evolution.xml:7234(glossterm)
+#: C/evolution.xml:76(productname) C/evolution.xml:5776(para)
+#: C/evolution.xml:7558(glossterm)
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -604,9382 +844,13711 @@ msgid "About This Guide"
 msgstr "O této příručce"
 
 #: C/evolution.xml:85(para)
-msgid "This guide describes how to use and manage <trademark>Evolution</trademark> 2.22 client software. This guide is intended for users and is divided into the following sections:"
-msgstr "Tato příručka popisuje, jak používat a spravovat klientský software <trademark>Evolution</trademark> 2.22. Je určená pro uživatele a rozdělená do následujících sekcí:"
+msgid ""
+"This guide describes how to use and manage <trademark>Evolution</trademark> "
+"2.24 client software. This guide is intended for users and is divided into "
+"the following sections:"
+msgstr ""
+"Tato příručka popisuje, jak používat a spravovat klientský software "
+"<trademark>Evolution</trademark> 2.24. Je určená pro uživatele a rozdělená "
+"do následujících sekcí:"
 
-#: C/evolution.xml:88(link)
-#: C/evolution.xml:152(title)
+#: C/evolution.xml:88(link) C/evolution.xml:149(title)
 msgid "Getting Started"
 msgstr "Začínáme"
 
-#: C/evolution.xml:91(link)
-#: C/evolution.xml:1110(title)
-msgid "Sending and Receiving E-Mail"
+#: C/evolution.xml:91(link) C/evolution.xml:1107(title)
+msgid "Sending and Receiving Email"
 msgstr "Posílání a přijímání e-mailů"
 
-#: C/evolution.xml:94(link)
-#: C/evolution.xml:2238(title)
-msgid "Organizing Your E-Mail"
+#: C/evolution.xml:94(link) C/evolution.xml:2440(title)
+msgid "Organizing Your Email"
 msgstr "Organizování pošty"
 
-#: C/evolution.xml:97(link)
-#: C/evolution.xml:3130(title)
+#: C/evolution.xml:97(link) C/evolution.xml:3334(title)
 msgid "Evolution Contacts: the Address Book"
 msgstr "Kontakty v Evolutionu: adresář"
 
-#: C/evolution.xml:100(link)
-#: C/evolution.xml:3542(title)
+#: C/evolution.xml:100(link) C/evolution.xml:3800(title)
 msgid "Evolution Calendar"
 msgstr "Kalendář v Evolutionu"
 
-#: C/evolution.xml:103(link)
-#: C/evolution.xml:4829(title)
+#: C/evolution.xml:103(link) C/evolution.xml:5093(title)
 msgid "Connecting to Exchange Servers"
 msgstr "Spojení s Exchange servery"
 
-#: C/evolution.xml:106(link)
-#: C/evolution.xml:5429(title)
+#: C/evolution.xml:106(link) C/evolution.xml:5648(title)
 msgid "Connecting to GroupWise"
 msgstr "Spojení s GroupWise"
 
-#: C/evolution.xml:109(link)
-#: C/evolution.xml:6219(title)
-msgid "Connecting to Hula"
-msgstr "Spojení s Hula"
-
-#: C/evolution.xml:112(link)
-#: C/evolution.xml:6236(title)
+#: C/evolution.xml:109(link) C/evolution.xml:6442(title)
 msgid "Advanced Configuration"
 msgstr "Pokročilá konfigurace"
 
-#: C/evolution.xml:115(link)
-#: C/evolution.xml:6897(title)
+#: C/evolution.xml:112(link) C/evolution.xml:7221(title)
 msgid "Synchronizing Your Handheld Device"
 msgstr "Synchronizace s přenosným zařízením"
 
-#: C/evolution.xml:118(link)
-#: C/evolution.xml:6954(title)
+#: C/evolution.xml:115(link) C/evolution.xml:7278(title)
 msgid "Migration from Outlook to Evolution"
 msgstr "Přechod z Outlooku na Evolution"
 
-#: C/evolution.xml:121(link)
-#: C/evolution.xml:7016(title)
+#: C/evolution.xml:118(link) C/evolution.xml:7340(title)
 msgid "Quick Reference"
 msgstr "Stručná příručka"
 
-#: C/evolution.xml:124(link)
-#: C/evolution.xml:7130(title)
+#: C/evolution.xml:121(link) C/evolution.xml:7454(title)
 msgid "Known Bugs and Limitations"
 msgstr "Známé chyby a omezení"
 
-#: C/evolution.xml:127(link)
-#: C/evolution.xml:7136(title)
+#: C/evolution.xml:124(link) C/evolution.xml:7460(title)
 msgid "Authors"
 msgstr "Autoři"
 
-#: C/evolution.xml:130(link)
-#: C/evolution.xml:7195(title)
+#: C/evolution.xml:127(link) C/evolution.xml:7519(title)
 msgid "Glossary"
 msgstr "Rejstřík"
 
-#: C/evolution.xml:134(title)
+#: C/evolution.xml:131(title)
 msgid "Additional Documentation:"
 msgstr "Další dokumentace:"
 
-#: C/evolution.xml:135(para)
+#: C/evolution.xml:132(para)
 msgid "You can find additional help in three places:"
 msgstr "Můžete najít další pomoc na třech místech:"
 
-#: C/evolution.xml:139(para)
-msgid "For information about command line options, open a terminal window and type <command>evolution --help</command>."
-msgstr "Pokud chcete zjistit informace o volbách pro příkazovou řádku, otevřete okno terminálu a napište <command>evolution --help</command>."
+#: C/evolution.xml:136(para)
+msgid ""
+"Evolution has a number of command line options that you can use. For "
+"information about command line options, open a terminal window and type "
+"<command>evolution --help</command>."
+msgstr ""
+"Evolution má celou řadu voleb pro příkazovou řádku, které můžete použít. "
+"Pokud chcete zjistit informace o volbách pro příkazovou řádku, otevřete okno "
+"terminálu a napište <command>evolution --help</command>."
 
-#: C/evolution.xml:142(para)
+#: C/evolution.xml:139(para)
 msgid "In the Evolution interface, click Help &gt; Contents."
 msgstr "V rozhraní Evolutionu klikněte na Nápověda &gt; Obsah."
 
-#: C/evolution.xml:146(title)
+#: C/evolution.xml:143(title)
 msgid "Documentation Conventions:"
 msgstr "Konvence dokumentace:"
 
-#: C/evolution.xml:147(para)
-msgid "In Novell documentation, a greater-than symbol (&gt;) is used to separate actions within a step and items in a cross-reference path. A trademark symbol (<trademark class=\"registered\"/>, <trademark/>, etc.) denotes a Novell trademark. An asterisk (*) denotes a third-party trademark."
-msgstr "V dokumentaci Novellu je symbol větší než (&gt;) používán pro oddělení akcí do kroků a položek napříč návodem. Symbol  (<trademark class=\"registered\"/>, <trademark/>, atd.) označuje obchodní známku Novellu. A hvězdička (*) označuje obchodní známky třetích stran."
-
-#: C/evolution.xml:153(para)
-msgid "<trademark>Evolution</trademark> is a <link linkend=\"groupware\">groupware</link> application that helps you work in a group by handling e-mail, address, memos, tasks, and one or more calendars. This makes the tasks of storing, organizing, and retrieving your personal information easy, so you can work and communicate more effectively with others."
-msgstr "Evolution je <link linkend=\"groupware\">groupware</link> aplikace, která vám pomáhá pracovat v týmu tak, že obsluhuje e-maily, adresy, poznámky, úkoly a jeden nebo více kalendářů. To zjednodušuje úlohy uložení, organizace a získání vašich osobních informací tak, že můžete pracovat a s ostatními komunikovat efektivněji."
+#: C/evolution.xml:144(para)
+msgid ""
+"In Novell documentation, a greater-than symbol (&gt;) is used to separate "
+"actions within a step and items in a cross-reference path. A trademark "
+"symbol (<trademark class=\"registered\"/>, <trademark/>, etc.) denotes a "
+"Novell trademark. An asterisk (*) denotes a third-party trademark."
+msgstr ""
+"V dokumentaci Novellu je symbol větší než (&gt;) používán pro oddělení akcí "
+"do kroků a položek napříč návodem. Symbol  (<trademark class=\"registered\"/"
+">, <trademark/>, atd.) označuje obchodní známku Novellu. A hvězdička (*) "
+"označuje obchodní známky třetích stran."
 
-#: C/evolution.xml:156(link)
-#: C/evolution.xml:164(title)
+#: C/evolution.xml:150(para)
+msgid ""
+"<trademark>Evolution</trademark> is a <link linkend=\"groupware\">groupware</"
+"link> application that helps you work in a group by handling email, address, "
+"memos, tasks, and one or more calendars. This makes the tasks of storing, "
+"organizing, and retrieving your personal information easy, so you can work "
+"and communicate more effectively with others."
+msgstr ""
+"<trademark>Evolution</trademark> je <link linkend=\"groupware\">groupware</"
+"link> aplikace, která vám pomáhá pracovat v týmu tak, že obsluhuje e-maily, "
+"adresy, poznámky, úkoly a jeden nebo více kalendářů. To zjednodušuje úlohy "
+"uložení, organizace a získání vašich osobních informací tak, že můžete "
+"pracovat a s ostatními komunikovat efektivněji."
+
+#: C/evolution.xml:153(link) C/evolution.xml:161(title)
 msgid "Starting Evolution for the First Time"
 msgstr "Začínáme poprvé s Evolutionem"
 
-#: C/evolution.xml:159(link)
-#: C/evolution.xml:749(title)
+#: C/evolution.xml:156(link) C/evolution.xml:751(title)
 msgid "Using Evolution: An Overview"
 msgstr "Používání Evolutionu: Přehled"
 
-#: C/evolution.xml:167(para)
+#: C/evolution.xml:164(para)
 msgid "Start the Evolution client."
 msgstr "Spuštění klienta aplikace Evolution."
 
-#: C/evolution.xml:175(para)
+#: C/evolution.xml:172(para)
 msgid "GNOME:"
 msgstr "GNOME:"
 
-#: C/evolution.xml:178(para)
+#: C/evolution.xml:175(para)
 msgid "Click Applications &gt; Office &gt; Evolution."
 msgstr "Klikněte na Aplikace &gt; Kancelář &gt; Evolution."
 
-#: C/evolution.xml:183(para)
+#: C/evolution.xml:180(para)
 msgid "KDE:"
 msgstr "KDE:"
 
-#: C/evolution.xml:186(para)
+#: C/evolution.xml:183(para)
 msgid "Click the K menu &gt; Office &gt; More Programs &gt; Evolution."
 msgstr "Klikněte na K menu &gt; Kancelář &gt; Více programů &gt; Evolution."
 
-#: C/evolution.xml:191(para)
+#: C/evolution.xml:188(para)
 msgid "Command Line:"
 msgstr "Příkazová řádka:"
 
-#: C/evolution.xml:194(para)
+#: C/evolution.xml:191(para)
 msgid "Enter <command>evolution</command>."
 msgstr "Spusťte příkaz <command>evolution</command>."
 
-#: C/evolution.xml:204(title)
+#: C/evolution.xml:201(title)
 msgid "Using the First-Run Assistant"
 msgstr "Asistent při prvním spuštění"
 
-#: C/evolution.xml:205(para)
-msgid "The first time you run Evolution, it creates a directory <emphasis>.evolution</emphasis> in your home directory, where it stores all of its local data. Then, it opens a First-Run Assistant to help you set up e-mail accounts and import data from other applications."
-msgstr "Když poprvé spustíte Evolution, vytvoří adresář <emphasis>.evolution</emphasis> ve vašem domovském adresáři, kde bude ukládat všechna lokální data. Potom spustí Asistenta při prvním spuštění, který vám pomůže nastavit e-mailové účty a importovat data z ostatních aplikací."
+#: C/evolution.xml:202(para)
+msgid ""
+"The first time you run Evolution, it creates a directory <emphasis>."
+"evolution</emphasis> in your home directory, where it stores all of its "
+"local data. Then, it opens a First-Run Assistant to help you set up email "
+"accounts and import data from other applications."
+msgstr ""
+"Když poprvé spustíte Evolution, vytvoří adresář <emphasis>.evolution</"
+"emphasis> ve vašem domovském adresáři, kde bude ukládat všechna lokální "
+"data. Potom spustí Asistenta při prvním spuštění, který vám pomůže nastavit "
+"e-mailové účty a importovat data z ostatních aplikací."
 
-#: C/evolution.xml:206(para)
+#: C/evolution.xml:203(para)
 msgid "Using the first-run assistant takes two to five minutes."
 msgstr "Práce s asistentem při prvním spuštění zabere od dvou do pěti minut."
 
-#: C/evolution.xml:207(para)
-msgid "Later on, if you want to change this account, or if you want to create a new one, click Edit &gt; Preferences, then click Mail Accounts. Select the account you want to change, then click Edit. Alternately, add a new account by clicking Add. See <link linkend=\"config-prefs-mail\">Mail Preferences</link> for details."
-msgstr "Později, pokud budete chtít změnit tento účet nebo pokud budete chtít vytvořit nový, kliknete na Upravit &gt; Nastavení a potom kliknete na Účty e-mailů. Vyberete účet, který chcete změnit, a kliknete na Upravit. Případně přidáte nový účet kliknutím na Přidat. Více v <link linkend=\"config-prefs-mail\">Nastavení pošty</link>."
+#: C/evolution.xml:204(para)
+msgid ""
+"Later on, if you want to change this account, or if you want to create a new "
+"one, click Edit &gt; Preferences, then click Mail Accounts. Select the "
+"account you want to change, then click Edit. Alternately, add a new account "
+"by clicking Add. See <link linkend=\"config-prefs-mail\">Mail Preferences</"
+"link> for details."
+msgstr ""
+"Později, pokud budete chtít změnit tento účet nebo pokud budete chtít "
+"vytvořit nový, kliknete na Upravit &gt; Nastavení a potom kliknete na Účty e-"
+"mailů. Vyberete účet, který chcete změnit, a kliknete na Upravit. Případně "
+"přidáte nový účet kliknutím na Přidat. Více v <link linkend=\"config-prefs-"
+"mail\">Nastavení pošty</link>."
 
-#: C/evolution.xml:208(para)
-msgid "The First-Run Assistant helps you provide the information Evolution needs to get started."
-msgstr "Asistent při prvním spuštění vám pomůže poskytnout informace, které Evolution při startu potřebuje."
+#: C/evolution.xml:205(para)
+msgid ""
+"The First-Run Assistant helps you provide the information Evolution needs to "
+"get started."
+msgstr ""
+"Asistent při prvním spuštění vám pomůže poskytnout informace, které "
+"Evolution při startu potřebuje."
 
-#: C/evolution.xml:211(link)
-#: C/evolution.xml:231(title)
+#: C/evolution.xml:208(link) C/evolution.xml:228(title)
 msgid "Defining Your Identity"
 msgstr "Určení vaší identity"
 
-#: C/evolution.xml:214(link)
-#: C/evolution.xml:261(title)
+#: C/evolution.xml:211(link) C/evolution.xml:258(title)
 msgid "Receiving Mail"
 msgstr "Přijímání pošty"
 
-#: C/evolution.xml:217(link)
-#: C/evolution.xml:359(title)
+#: C/evolution.xml:214(link) C/evolution.xml:353(title)
 msgid "Receiving Mail Options"
 msgstr "Možnosti přijímání pošty"
 
-#: C/evolution.xml:220(link)
-#: C/evolution.xml:658(title)
+#: C/evolution.xml:217(link) C/evolution.xml:659(title)
 msgid "Sending Mail"
 msgstr "Posílání pošty"
 
-#: C/evolution.xml:223(link)
-#: C/evolution.xml:712(title)
+#: C/evolution.xml:220(link) C/evolution.xml:713(title)
 msgid "Account Management"
 msgstr "Správa účtu"
 
-#: C/evolution.xml:226(link)
-#: C/evolution.xml:718(title)
+#: C/evolution.xml:223(link) C/evolution.xml:719(title)
 msgid "Time Zone"
 msgstr "Časová zóna"
 
-#: C/evolution.xml:232(para)
+#: C/evolution.xml:229(para)
 msgid "The Identity window is the first step in the assistant."
 msgstr "Okno s identitou je prvním krokem v asistentovi."
 
-#: C/evolution.xml:234(para)
-msgid "Here, you enter some basic personal information. You can define multiple identities later by clicking Edit &gt; Preferences, then clicking Mail Accounts."
-msgstr "Zde můžete zadat základní osobní informace. Později můžete definovat více identit kliknutím na Upravit &gt; Nastavení a potom na Účty e-mailu."
+#: C/evolution.xml:231(para)
+msgid ""
+"Here, you enter some basic personal information. You can define multiple "
+"identities later by clicking Edit &gt; Preferences, then clicking Mail "
+"Accounts."
+msgstr ""
+"Zde můžete zadat základní osobní informace. Později můžete definovat více "
+"identit kliknutím na Upravit &gt; Nastavení a potom na Účty e-mailu."
+
+#: C/evolution.xml:232(para)
+msgid ""
+"When the First-Run Assistant starts, the Welcome page is displayed. Click "
+"Forward to proceed to the Identity window."
+msgstr ""
+"V okamžiku, kdy se Asistent při prvním spuštění zapne, zobrazí se úvodní "
+"stránka. Klikněte na Vpřed a přesunete se na okno s identitou."
 
 #: C/evolution.xml:235(para)
-msgid "When the First-Run Assistant starts, the Welcome page is displayed. Click Forward to proceed to the Identity window."
-msgstr "V okamžiku, kdy se Asistent při prvním spuštění zapne, zobrazí se úvodní stránka. Klikněte na Vpřed a přesunete se na okno s identitou."
-
-#: C/evolution.xml:238(para)
 msgid "Type your full name in the Full Name field."
 msgstr "Napište své celé jméno do pole Celé jméno."
 
-#: C/evolution.xml:241(para)
-msgid "Type your e-mail address in the E-Mail Address field."
+#: C/evolution.xml:238(para)
+msgid "Type your email address in the Email Address field."
 msgstr "Napište svou e-mailovou adresu do pole E-mailová adresa."
 
-#: C/evolution.xml:244(para)
+#: C/evolution.xml:241(para)
 msgid "(Optional) Select if this account is your default account."
 msgstr "(Volitelně) Vyberte, zda je tento účet vašim výchozím účtem."
 
-#: C/evolution.xml:247(para)
+#: C/evolution.xml:244(para)
 msgid "(Optional) Type a reply to address in the Reply-To field."
-msgstr "(Volitelně) Napište adresu, na kterou mají chodit odpovědi, do pole Odpovědět-komu."
+msgstr ""
+"(Volitelně) Napište adresu, na kterou mají chodit odpovědi, do pole "
+"Odpovědět-komu."
 
-#: C/evolution.xml:248(para)
-msgid "Use this field if you want replies to messages sent to a different address."
-msgstr "Toto pole použijte, pokud chcete si chcete nechat zasílat odpovědi na odeslané zprávy na jinou adresu."
+#: C/evolution.xml:245(para)
+msgid ""
+"Use this field if you want replies to messages sent to a different address."
+msgstr ""
+"Toto pole použijte, pokud chcete si chcete nechat zasílat odpovědi na "
+"odeslané zprávy na jinou adresu."
 
-#: C/evolution.xml:251(para)
+#: C/evolution.xml:248(para)
 msgid "(Optional) Type your organization name in the Organization field."
 msgstr "(Volitelně) Napište jméno vaší organizace do pole Organizace."
 
-#: C/evolution.xml:252(para)
-msgid "This is the company where you work, or the organization you represent when you send e-mail."
-msgstr "To je společnost, ve které pracujete, nebo organizace, kterou reprezentujete, když posíláte e-mail."
-
-#: C/evolution.xml:255(para)
-#: C/evolution.xml:345(para)
-#: C/evolution.xml:423(para)
-#: C/evolution.xml:466(para)
-#: C/evolution.xml:510(para)
-#: C/evolution.xml:531(para)
-#: C/evolution.xml:554(para)
-#: C/evolution.xml:568(para)
-#: C/evolution.xml:585(para)
-#: C/evolution.xml:605(para)
-#: C/evolution.xml:626(para)
-#: C/evolution.xml:648(para)
-#: C/evolution.xml:704(para)
-#: C/evolution.xml:2305(para)
-#: C/evolution.xml:2327(para)
+#: C/evolution.xml:249(para)
+msgid ""
+"This is the company where you work, or the organization you represent when "
+"you send email."
+msgstr ""
+"To je společnost, ve které pracujete, nebo organizace, kterou "
+"reprezentujete, když posíláte e-mail."
+
+#: C/evolution.xml:252(para) C/evolution.xml:339(para)
+#: C/evolution.xml:417(para) C/evolution.xml:460(para)
+#: C/evolution.xml:504(para) C/evolution.xml:526(para)
+#: C/evolution.xml:550(para) C/evolution.xml:565(para)
+#: C/evolution.xml:583(para) C/evolution.xml:604(para)
+#: C/evolution.xml:626(para) C/evolution.xml:649(para)
+#: C/evolution.xml:705(para) C/evolution.xml:2507(para)
+#: C/evolution.xml:2529(para)
 msgid "Click Forward."
 msgstr "Klikněte na Vpřed."
 
-#: C/evolution.xml:262(para)
-msgid "The Receiving E-mail option lets you determine where you get your e-mail."
-msgstr "Volba přijmu e-mailů vás nechá rozchodnout, kde dostanete vaše e-maily."
+#: C/evolution.xml:259(para)
+msgid "The Receiving Email option lets you determine where you get your email."
+msgstr ""
+"Volba přijmu e-mailů vás nechá rozchodnout, kde dostanete vaše e-maily."
 
-#: C/evolution.xml:264(para)
-msgid "You need to specify the type of server you want to receive mail with. If you are unsure about the type of server to choose, ask your system administrator or ISP."
-msgstr "Musíte specifikovat typ serveru, z kterého chcete získávat e-maily. Pokud si nejste jistí typem serveru, zeptejte se vašeho administrátora nebo ISP."
+#: C/evolution.xml:261(para)
+msgid ""
+"You need to specify the type of server you want to receive mail with. If you "
+"are unsure about the type of server to choose, ask your system administrator "
+"or ISP."
+msgstr ""
+"Musíte specifikovat typ serveru, z kterého chcete získávat e-maily. Pokud si "
+"nejste jistí typem serveru, zeptejte se vašeho administrátora nebo ISP."
 
-#: C/evolution.xml:267(para)
+#: C/evolution.xml:264(para)
 msgid "Select a server type in the Server Type list."
 msgstr "Vyberte typ serveru seznamu Typ serveru."
 
-#: C/evolution.xml:268(para)
+#: C/evolution.xml:265(para)
 msgid "The following is a list of server types that are available:"
 msgstr "Následující je seznam typů serveru, které jsou k dispozici:"
 
-#: C/evolution.xml:270(title)
+#: C/evolution.xml:267(title)
 msgid "Novell GroupWise:"
 msgstr "Novell GroupWise:"
 
-#: C/evolution.xml:271(para)
-msgid "Select this option if you connect to Novell <trademark class=\"registered\">GroupWise</trademark>. Novell GroupWise keeps e-mail, calendar, and contact information on the server. For configuration instructions, see <link linkend=\"bstfw13\">Remote Configuration Options</link>."
-msgstr "Vyberte tuto volbu, pokud jste připojení do Novell <trademark class=\"registered\">GroupWise</trademark>. Novell GroupWise uchovává vaši poštu, kalendář a kontakty na serveru. Více instrukcí o nastavení zjistíte na <link linkend=\"bstfw13\">Možnosti vzdálené konfigurace</link>."
+#: C/evolution.xml:268(para)
+msgid ""
+"Select this option if you connect to Novell <trademark class=\"registered"
+"\">GroupWise</trademark>. Novell GroupWise keeps email, calendar, and "
+"contact information on the server. For configuration instructions, see <link "
+"linkend=\"bstfw13\">Remote Configuration Options</link>."
+msgstr ""
+"Vyberte tuto volbu, pokud jste připojení do Novell <trademark class="
+"\"registered\">GroupWise</trademark>. Novell GroupWise uchovává vaši poštu, "
+"kalendář a kontakty na serveru. Více instrukcí o nastavení zjistíte na <link "
+"linkend=\"bstfw13\">Možnosti vzdálené konfigurace</link>."
 
-#: C/evolution.xml:274(title)
+#: C/evolution.xml:271(title)
 msgid "Microsoft Exchange:"
 msgstr "Microsoft Exchange:"
 
-#: C/evolution.xml:275(para)
-msgid "Available only if you have installed the Connector for Microsoft* Exchange. It allows you to connect to a Microsoft Exchange 2000 or 2003 server, which stores e-mail, calendar, and contact information on the server. For configuration instructions, see <link linkend=\"bstfw13\">Remote Configuration Options</link>."
-msgstr "K dispozici pouze, pokud máte nainstalovaný Connector pro Microsoft* Exchange. Umožňuje vám se připojit k serverům Microsoft Exchange 2000 a 2003, které na serveru uchovávají vaši poštu, kalendář a kontakty. Více instrukcí k nastavení zjistíte na <link linkend=\"bstfw13\">Možnosti vzdálené konfigurace</link>."
-
-#: C/evolution.xml:278(title)
+#: C/evolution.xml:272(para)
+msgid ""
+"Available only if you have installed the Connector for Microsoft* Exchange. "
+"It allows you to connect to a Microsoft Exchange 2000 or 2003 server, which "
+"stores email, calendar, and contact information on the server. For "
+"configuration instructions, see <link linkend=\"bstfw13\">Remote "
+"Configuration Options</link>."
+msgstr ""
+"K dispozici pouze, pokud máte nainstalovaný Connector pro Microsoft* "
+"Exchange. Umožňuje vám se připojit k serverům Microsoft Exchange 2000 a "
+"2003, které na serveru uchovávají vaši poštu, kalendář a kontakty. Více "
+"instrukcí k nastavení zjistíte na <link linkend=\"bstfw13\">Možnosti "
+"vzdálené konfigurace</link>."
+
+#: C/evolution.xml:275(title)
 msgid "IMAP:"
 msgstr "IMAP:"
 
-#: C/evolution.xml:279(para)
-msgid "Keeps the e-mail on your server so you can access your e-mail from multiple systems. For configuration instructions, see <link linkend=\"bstfw13\">Remote Configuration Options</link>."
-msgstr "Ponechává vaši poštu na serveru, takže k ní můžete přistupovat z více míst. Více instrukcí k nastavení zjistíte na <link linkend=\"bstfw13\">Možnosti vzdálené konfigurace</link>."
+#: C/evolution.xml:276(para)
+msgid ""
+"Keeps the email on your server so you can access your email from multiple "
+"systems. For configuration instructions, see <link linkend=\"bstfw13"
+"\">Remote Configuration Options</link>."
+msgstr ""
+"Ponechává vaši poštu na serveru, takže k ní můžete přistupovat z více míst. "
+"Více instrukcí k nastavení zjistíte na <link linkend=\"bstfw13\">Možnosti "
+"vzdálené konfigurace</link>."
 
-#: C/evolution.xml:282(title)
+#: C/evolution.xml:279(title)
 msgid "POP:"
 msgstr "POP:"
 
-#: C/evolution.xml:283(para)
-msgid "Downloads your e-mail to your hard disk for permanent storage, freeing up space on the e-mail server. For configuration instructions, see <link linkend=\"bstfw13\">Remote Configuration Options</link>."
-msgstr "Stahuje vaši poštu a uloží na harddisk, uvolňuje místo na poštovním serveru. Více instrukcí k nastavení zjistíte na <link linkend=\"bstfw13\">Možnosti vzdálené konfigurace</link>."
-
-#: C/evolution.xml:286(title)
-msgid "Hula:"
-msgstr "Hula:"
-
-#: C/evolution.xml:287(para)
-msgid "Select this option if you want Hula account. Evolution provide you connectivity to <trademark class=\"registered\">Hula</trademark> servers through IMAP and calendaring support through CalDAV. For more information refer <link linkend=\"b1012tkg\">Connecting to Hula</link>"
-msgstr "Vyberte tuto možnost, pokud chcete účet Hula. Evolution poskytuje připojení k serverům <trademark class=\"registered\">Hula</trademark> pomocí IMAPu a podporuje kalendář pomocí CalDAV. Více informací se dozvíte na <link linkend=\"b1012tkg\">Připojení k Hula</link>"
+#: C/evolution.xml:280(para)
+msgid ""
+"Downloads your email to your hard disk for permanent storage, freeing up "
+"space on the email server. For configuration instructions, see <link linkend="
+"\"bstfw13\">Remote Configuration Options</link>."
+msgstr ""
+"Stahuje vaši poštu na harddisk k trvalému uložení, uvolňuje místo na "
+"poštovním serveru. Více instrukcí k nastavení zjistíte na <link linkend="
+"\"bstfw13\">Možnosti vzdálené konfigurace</link>."
 
-#: C/evolution.xml:290(title)
+#: C/evolution.xml:283(title)
 msgid "USENET News:"
 msgstr "Diskusní skupiny USENET:"
 
-#: C/evolution.xml:291(para)
-msgid "Connects to the news server and downloads a list of available news digests. For configuration instructions, see <link linkend=\"bstfw13\">Remote Configuration Options</link>."
-msgstr "Připojí se na server diskusních skupin a stáhne seznam dostupných výběrů diskusí. Více instrukcí k nastavení zjistíte na <link linkend=\"bstfw13\">Možnosti vzdálené konfigurace</link>."
+#: C/evolution.xml:284(para)
+msgid ""
+"Connects to the news server and downloads a list of available news digests. "
+"For configuration instructions, see <link linkend=\"bstfw13\">Remote "
+"Configuration Options</link>."
+msgstr ""
+"Připojí se na server diskusních skupin a stáhne seznam dostupných výběrů "
+"diskusí. Více instrukcí k nastavení zjistíte na <link linkend=\"bstfw13"
+"\">Možnosti vzdálené konfigurace</link>."
 
-#: C/evolution.xml:294(title)
+#: C/evolution.xml:287(title)
 msgid "Local Delivery:"
 msgstr "Místní doručení:"
 
-#: C/evolution.xml:295(para)
-msgid "Choose this option if you want to move e-mail from the spool (the location where mail waits for delivery) and store it in your home directory. You need to provide the path to the mail spool you want to use. If you want to leave e-mail in your system's spool files, choose the Standard Unix Mbox Spool option instead. For configuration instructions, see <link linkend=\"bstgbqn\">Local Configuration Options</link>."
-msgstr "Zvolte tuto možnost, pokud chcete přesunout poštu ze složky schránky (místa, kde pošta čeká na doručení) a uložit je ve vašem domovském adresáři. Musíte zadat cestu ke složce, kterou chcete použít. Pokud poštu chcete ponechat ve vašich systémových souborech poštovních schránky, zvolte místo toho Standardní Unixový soubor. Více instrukcí k nastavení se dozvíte na <link linkend=\"bstgbqn\">Možnosti místní konfigurace</link>."
-
-#: C/evolution.xml:298(title)
+#: C/evolution.xml:288(para)
+msgid ""
+"Choose this option if you want to move email from the spool (the location "
+"where mail waits for delivery) and store it in your home directory. You need "
+"to provide the path to the mail spool you want to use. If you want to leave "
+"email in your system's spool files, choose the Standard Unix Mbox Spool "
+"option instead. For configuration instructions, see <link linkend=\"bstgbqn"
+"\">Local Configuration Options</link>."
+msgstr ""
+"Zvolte tuto možnost, pokud chcete přesunout poštu ze složky schránky (místa, "
+"kde pošta čeká na doručení) a uložit je ve vašem domovském adresáři. Musíte "
+"zadat cestu ke složce, kterou chcete použít. Pokud poštu chcete ponechat ve "
+"vašich systémových souborech poštovních schránky, zvolte místo toho možnost "
+"Standardní Unixový soubor. Více instrukcí k nastavení se dozvíte na <link "
+"linkend=\"bstgbqn\">Možnosti místní konfigurace</link>."
+
+#: C/evolution.xml:291(title)
 msgid "MH Format Mail Directories:"
 msgstr "Adresáře pošty ve formátu MH:"
 
-#: C/evolution.xml:299(para)
-msgid "If you download your e-mail using mh or another MH-style program, you should use this option. You need to provide the path to the mail directory you want to use. For configuration instructions, see <link linkend=\"bstgbqn\">Local Configuration Options</link>."
-msgstr "Pokud stahujete poštu pomocí mh nebo jiného podobného programu, měli byste použít tuto volbu. Musíte zadat cestu k adresáři pošty, který chcete použít. Více instrukcí k nastavení se dozvíte na <link linkend=\"bstgbqn\">Možnosti místní konfigurace</link>."
+#: C/evolution.xml:292(para)
+msgid ""
+"If you download your email using mh or another MH-style program, you should "
+"use this option. You need to provide the path to the mail directory you want "
+"to use. For configuration instructions, see <link linkend=\"bstgbqn\">Local "
+"Configuration Options</link>."
+msgstr ""
+"Pokud stahujete poštu pomocí mh nebo jiného MH programu, měli byste použít "
+"tuto volbu. Musíte zadat cestu k adresáři pošty, který chcete použít. Více "
+"instrukcí k nastavení se dozvíte na <link linkend=\"bstgbqn\">Možnosti "
+"místní konfigurace</link>."
 
-#: C/evolution.xml:302(title)
+#: C/evolution.xml:295(title)
 msgid "Maildir Format Mail Directories:"
 msgstr "Adresáře pošty ve formátu Maildir:"
 
-#: C/evolution.xml:303(para)
-msgid "If you download your e-mail using Qmail or another maildir-style program, you should use this option. You need to provide the path to the mail directory you want to use. For configuration instructions, see <link linkend=\"bstgbqn\">Local Configuration Options</link>."
-msgstr "Pokud stahujete poštu pomocí Qmail nebo jiného programu pro maildir, měli byste použít tuto volbu. Musíte zadat cestu k adresáři pošty, který chcete použít. Více instrukcí k nastavení se dozvíte na <link linkend=\"bstgbqn\">Možnosti místní konfigurace</link>."
+#: C/evolution.xml:296(para)
+msgid ""
+"If you download your email using Qmail or another maildir-style program, you "
+"should use this option. You need to provide the path to the mail directory "
+"you want to use. For configuration instructions, see <link linkend=\"bstgbqn"
+"\">Local Configuration Options</link>."
+msgstr ""
+"Pokud stahujete poštu pomocí Qmail nebo jiného programu pro maildir, měli "
+"byste použít tuto volbu. Musíte zadat cestu k adresáři pošty, který chcete "
+"použít. Více instrukcí k nastavení se dozvíte na <link linkend=\"bstgbqn"
+"\">Možnosti místní konfigurace</link>."
 
-#: C/evolution.xml:306(title)
+#: C/evolution.xml:299(title)
 msgid "Standard Unix mbox spool file:"
 msgstr "Standardní Unixový soubor mbox:"
 
-#: C/evolution.xml:307(para)
-msgid "If you want to read and store e-mail in the mail spool file on your local system, choose this option. You need to provide the path to the mail spool file you want to use. For configuration instructions, see <link linkend=\"bstgbqn\">Local Configuration Options</link>."
-msgstr "Pokud chcete číst a uchovávat poštu v souboru uloženém ve vašem systému, zvolte tuto možnost. Musíte zadat cestu k adresáři pošty, který chcete použít. Více instrukcí k nastavení se dozvíte na <link linkend=\"bstgbqn\">Možnosti místní konfigurace</link>."
+#: C/evolution.xml:300(para)
+msgid ""
+"If you want to read and store email in the mail spool file on your local "
+"system, choose this option. You need to provide the path to the mail spool "
+"file you want to use. For configuration instructions, see <link linkend="
+"\"bstgbqn\">Local Configuration Options</link>."
+msgstr ""
+"Pokud chcete číst a uchovávat poštu v souboru uloženém ve vašem systému, "
+"zvolte tuto možnost. Musíte zadat cestu k adresáři pošty, který chcete "
+"použít. Více instrukcí k nastavení se dozvíte na <link linkend=\"bstgbqn"
+"\">Možnosti místní konfigurace</link>."
 
-#: C/evolution.xml:310(title)
+#: C/evolution.xml:303(title)
 msgid "Standard Unix mbox spool directory:"
 msgstr "Standardní Unixový adresář mbox:"
 
-#: C/evolution.xml:311(para)
-msgid "If you want to read and store e-mail in the mail spool directory on your local system, choose this option. You need to provide the path to the mail spool directory you want to use. For configuration instructions, see <link linkend=\"bstgbqn\">Local Configuration Options</link>."
-msgstr "Pokud chcete číst a uchovávat poštu v adresáři ve vašem systému, zvolte tuto možnost. Musíte zadat cestu k adresáři pošty, který chcete použít. Více instrukcí k nastavení se dozvíte na <link linkend=\"bstgbqn\">Možnosti místní konfigurace</link>."
+#: C/evolution.xml:304(para)
+msgid ""
+"If you want to read and store email in the mail spool directory on your "
+"local system, choose this option. You need to provide the path to the mail "
+"spool directory you want to use. For configuration instructions, see <link "
+"linkend=\"bstgbqn\">Local Configuration Options</link>."
+msgstr ""
+"Pokud chcete číst a uchovávat poštu v adresáři ve vašem systému, zvolte tuto "
+"možnost. Musíte zadat cestu k adresáři pošty, který chcete použít. Více "
+"instrukcí k nastavení se dozvíte na <link linkend=\"bstgbqn\">Možnosti "
+"místní konfigurace</link>."
 
-#: C/evolution.xml:314(title)
-#: C/evolution.xml:5265(title)
+#: C/evolution.xml:307(title) C/evolution.xml:5484(title)
 msgid "None:"
 msgstr "Žádný:"
 
-#: C/evolution.xml:315(para)
-msgid "Select this if you do not plan to check e-mail with this account. If you select this, there are no configuration options."
-msgstr "Toto zvolte, pokud neplánujete kontrolovat s tímto účtem poštu. Pokud zvolíte toto, nejsou k dispozici žádné možnosti konfigurace."
+#: C/evolution.xml:308(para)
+msgid ""
+"Select this if you do not plan to check email with this account. If you "
+"select this, there are no configuration options."
+msgstr ""
+"Toto zvolte, pokud neplánujete kontrolovat s tímto účtem poštu. Pokud "
+"zvolíte toto, nejsou k dispozici žádné možnosti konfigurace."
 
-#: C/evolution.xml:321(title)
+#: C/evolution.xml:314(title)
 msgid "Remote Configuration Options"
 msgstr "Možnosti vzdálené konfigurace"
 
-#: C/evolution.xml:322(para)
-msgid "If you selected Novell GroupWise, IMAP, POP, or USENET News as your server, you need to specify additional information."
-msgstr "Pokud jste vybrali Novell GroupWise, IMAP, POP nebo Diskusní skupiny USENET jako váš server, musíte doplnit další informace."
+#: C/evolution.xml:315(para)
+msgid ""
+"If you selected Novell GroupWise, IMAP, POP, or USENET News as your server, "
+"you need to specify additional information."
+msgstr ""
+"Pokud jste vybrali Novell GroupWise, IMAP, POP nebo Diskusní skupiny USENET "
+"jako váš server, musíte doplnit další informace."
 
-#: C/evolution.xml:325(para)
-msgid "Type the server name of your e-mail server in the Server field."
+#: C/evolution.xml:318(para) C/evolution.xml:681(para)
+msgid "Type the server name of your email server in the Server field."
 msgstr "Napište jméno vašeho poštovního serveru do pole Server."
 
-#: C/evolution.xml:326(para)
-msgid "If you don't know the Server, contact your administrator."
-msgstr "Pokud neznáte jméno serveru, kontaktujte svého administrátora."
+#: C/evolution.xml:319(para) C/evolution.xml:682(para)
+msgid ""
+"If you are unsure what your Server address is, contact your system "
+"administrator."
+msgstr ""
+"Pokud si nejste jistí, jaká je adresa vašeho serveru, kontaktujte svého "
+"administrátora."
+
+#: C/evolution.xml:322(para) C/evolution.xml:694(para)
+msgid "Type your username in the Username field."
+msgstr "Napište vaše uživatelské jméno do pole Jméno uživatele."
 
-#: C/evolution.xml:329(para)
-msgid "Type your username for the account in the Username field."
-msgstr "Napište uživatelské jméno do pole Uživatelské jméno."
+#: C/evolution.xml:325(para) C/evolution.xml:702(para)
+msgid "Select if you want to use a secure connection (SSL or TLS)."
+msgstr "Vyberte, pokud chcete používat zabezpečené připojení (SSL nebo TLS)."
 
-#: C/evolution.xml:332(para)
-msgid "Select to use a secure (SSL) connection."
-msgstr "Vyberte použití zabezpečeného připojení (SSL)."
+#: C/evolution.xml:326(para)
+msgid "You should enable this option if your server supports it."
+msgstr ""
 
-#: C/evolution.xml:333(para)
-msgid "If your server supports secure connections, you should enable this security option. If you are unsure if your server supports a secure connection, contact your system administrator."
-msgstr "Pokud váš server podporuje zabezpečená připojení, měli byste tuto volbu aktivovat. Pokud si nejste jistí, zda váš server tuto možnost podporuje, kontaktujte svého administrátora."
+#: C/evolution.xml:327(para) C/evolution.xml:333(para)
+msgid ""
+"Free webmail providers usually supply information about which of these "
+"options can be used. If you are in an organizational environment, you may "
+"want to contact your system administrator for more information."
+msgstr ""
 
-#: C/evolution.xml:336(para)
-#: C/evolution.xml:688(para)
+#: C/evolution.xml:330(para) C/evolution.xml:689(para)
+#: C/evolution.xml:5313(para)
 msgid "Select your authentication type in the Authentication list."
 msgstr "Zvolte druh autentizace v seznamu Autentizace."
 
-#: C/evolution.xml:337(para)
-#: C/evolution.xml:689(para)
-#: C/evolution.xml:722(para)
-#: C/evolution.xml:1928(para)
-#: C/evolution.xml:2051(para)
-#: C/evolution.xml:2059(para)
-#: C/evolution.xml:2219(para)
-#: C/evolution.xml:2996(para)
-#: C/evolution.xml:3001(para)
-#: C/evolution.xml:3429(para)
-#: C/evolution.xml:3444(para)
-#: C/evolution.xml:3452(para)
-#: C/evolution.xml:3785(para)
-#: C/evolution.xml:3787(para)
-#: C/evolution.xml:3789(para)
-#: C/evolution.xml:3808(para)
-#: C/evolution.xml:3819(para)
-#: C/evolution.xml:3824(para)
-#: C/evolution.xml:3844(para)
-#: C/evolution.xml:3852(para)
-#: C/evolution.xml:3983(para)
-#: C/evolution.xml:3993(para)
-#: C/evolution.xml:4001(para)
-#: C/evolution.xml:4006(para)
-#: C/evolution.xml:4351(para)
-#: C/evolution.xml:4370(para)
-#: C/evolution.xml:4402(para)
-#: C/evolution.xml:4415(para)
-#: C/evolution.xml:4636(para)
-#: C/evolution.xml:6119(para)
-#: C/evolution.xml:6801(para)
-#: C/evolution.xml:6867(para)
+#: C/evolution.xml:331(para) C/evolution.xml:690(para)
+#: C/evolution.xml:723(para) C/evolution.xml:2021(para)
+#: C/evolution.xml:2246(para) C/evolution.xml:2254(para)
+#: C/evolution.xml:2421(para) C/evolution.xml:3199(para)
+#: C/evolution.xml:3204(para) C/evolution.xml:3687(para)
+#: C/evolution.xml:3702(para) C/evolution.xml:3710(para)
+#: C/evolution.xml:4043(para) C/evolution.xml:4045(para)
+#: C/evolution.xml:4047(para) C/evolution.xml:4067(para)
+#: C/evolution.xml:4078(para) C/evolution.xml:4083(para)
+#: C/evolution.xml:4104(para) C/evolution.xml:4112(para)
+#: C/evolution.xml:4228(para) C/evolution.xml:4239(para)
+#: C/evolution.xml:4244(para) C/evolution.xml:4255(para)
+#: C/evolution.xml:4263(para) C/evolution.xml:4268(para)
+#: C/evolution.xml:4614(para) C/evolution.xml:4633(para)
+#: C/evolution.xml:4665(para) C/evolution.xml:4678(para)
+#: C/evolution.xml:4900(para) C/evolution.xml:6342(para)
+#: C/evolution.xml:7125(para) C/evolution.xml:7191(para)
 msgid "or"
 msgstr "nebo"
 
-#: C/evolution.xml:338(para)
-#: C/evolution.xml:690(para)
-msgid "Click Check for Supported Types to have Evolution check for supported types. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work."
-msgstr "Klikněte na Zjistit podporované typy a Evolution zjistí, který typ je podporován. Některé servery neoznamují, které autentizační mechanismy podporují, takže kliknutí na toto tlačítko nezaručuje, že dostupné mechanismy opravdu fungují."
-
-#: C/evolution.xml:339(para)
-msgid "If you are unsure what authentication type you need, contact your system administrator."
-msgstr "Pokud si nejste jistí, který druh autentizace potřebujete, kontaktujte svého administrátora."
+#: C/evolution.xml:332(para) C/evolution.xml:691(para)
+msgid ""
+"Click Check for Supported Types to have Evolution check for supported types. "
+"Some servers do not announce the authentication mechanisms they support, so "
+"clicking this button is not a guarantee that available mechanisms actually "
+"work."
+msgstr ""
+"Klikněte na Zjistit podporované typy a Evolution zjistí, který typ je "
+"podporován. Některé servery neoznamují, které autentizační mechanismy "
+"podporují, takže kliknutí na toto tlačítko nezaručuje, že dostupné "
+"mechanismy opravdu fungují."
 
-#: C/evolution.xml:342(para)
-#: C/evolution.xml:696(para)
+#: C/evolution.xml:336(para) C/evolution.xml:697(para)
 msgid "Select if you want Evolution to remember your password."
 msgstr "Zvolte, pokud chcete, aby si Evolution pamatoval vaše heslo."
 
-#: C/evolution.xml:348(para)
-msgid "(Conditional) If you chose Microsoft Exchange as the server type, provide your username in the Username field and your Outlook Web Access (OWA) URL in the OWA URL field. The URL and the usernames should use the Outlook format.If the mailbox path is different from the username, the OWA path should also include mailbox path, for example http://<varname>server name</varname>/exchange/<varname>mail box path</varname>."
-msgstr "(Podmíněné) Pokud zvolíte Microsoft Exchange jako typ serveru, zadejte vaše uživatelské jméno do pole Uživatelské jméno a vaše Outlook Web Access (OWA) URL do pole OWA URL. URL a uživatelská jména by měly používat formát Outlooku. Pokud je cesta k poštovní schránce jiná než uživatelské jméno, OWA by mělo obsahovat i cestu k poštovní schránce, např. http://<varname>jmeno serveru</varname>/exchange/<varname>cesta k postovni schrance</varname>."
-
-#: C/evolution.xml:349(para)
-msgid "When you have finished, continue with <link linkend=\"more-mail-options\">Receiving Mail Options</link>."
-msgstr "Pokud jste hotovi, pokračujte na <link linkend=\"more-mail-options\">Možnosti příjmu pošty</link>."
+#: C/evolution.xml:342(para)
+msgid ""
+"(Conditional) If you chose Microsoft Exchange as the server type, provide "
+"your username in the Username field and your Outlook Web Access (OWA) URL in "
+"the OWA URL field. The URL and the usernames should use the Outlook format. "
+"If the mailbox path is different from the username, the OWA path should also "
+"include mailbox path, for example http://<varname>server name</varname>/"
+"exchange/<varname>mail box path</varname>."
+msgstr ""
+"(Podmíněné) Pokud zvolíte Microsoft Exchange jako typ serveru, zadejte vaše "
+"uživatelské jméno do pole Uživatelské jméno a vaše Outlook Web Access (OWA) "
+"URL do pole OWA URL. URL a uživatelská jména by měly používat formát "
+"Outlooku. Pokud je cesta k poštovní schránce jiná než uživatelské jméno, OWA "
+"by mělo obsahovat i cestu k poštovní schránce, např. http://<varname>jmeno "
+"serveru</varname>/exchange/<varname>cesta k postovni schrance</varname>."
+
+#: C/evolution.xml:343(para)
+msgid ""
+"When you have finished, continue with <link linkend=\"more-mail-options"
+"\">Receiving Mail Options</link>."
+msgstr ""
+"Pokud jste hotovi, pokračujte na <link linkend=\"more-mail-options"
+"\">Možnosti příjmu pošty</link>."
 
-#: C/evolution.xml:353(title)
+#: C/evolution.xml:347(title)
 msgid "Local Configuration Options"
 msgstr "Možnosti místní konfigurace"
 
-#: C/evolution.xml:354(para)
-msgid "If you selected Local Delivery, MH-Format Mail Directories, Maildir-Format Mail Directories, or Standard Unix mbox spool file and Standard Unix mbox spool directory, you must specify the path to the local files in the path field. Continue with<link linkend=\"more-mail-options\">Receiving Mail Options</link> ."
-msgstr "Pokud jste vybrali Místní doručení, Adresáře pošty ve formátu MH, Standardní Unixový soubor mbox nebo Standardní Unixový adresář mbox, musíte zadat cestu k lokálním souborům do pole cesty. Pokračujte na <link linkend=\"more-mail-options\">Možnosti přijímání pošty</link>."
+#: C/evolution.xml:348(para)
+msgid ""
+"If you selected Local Delivery, MH-Format Mail Directories, Maildir-Format "
+"Mail Directories, Standard Unix mbox spool file or Standard Unix mbox spool "
+"directory, you must specify the path to the local files in the path field. "
+"Continue with<link linkend=\"more-mail-options\">Receiving Mail Options</"
+"link>."
+msgstr ""
+"Pokud jste vybrali Místní doručení, Adresáře pošty ve formátu MH, Standardní "
+"Unixový soubor mbox nebo Standardní Unixový adresář mbox, musíte zadat cestu "
+"k lokálním souborům do pole cesty. Pokračujte na <link linkend=\"more-mail-"
+"options\">Možnosti přijímání pošty</link>."
 
-#: C/evolution.xml:360(para)
-msgid "After you have selected a mail delivery mechanism, you can set some preferences for its behavior."
-msgstr "Poté, co nastavíte mechanismus doručení pošty, můžete nastavit jeho chování."
+#: C/evolution.xml:354(para)
+msgid ""
+"After you have selected a mail delivery mechanism, you can set some "
+"preferences for its behavior."
+msgstr ""
+"Poté, co nastavíte mechanismus doručení pošty, můžete nastavit jeho chování."
 
-#: C/evolution.xml:363(link)
-#: C/evolution.xml:392(title)
+#: C/evolution.xml:357(link) C/evolution.xml:386(title)
 msgid "Novell GroupWise Receiving Options"
 msgstr "Možnosti přijímání Novell GroupWise"
 
-#: C/evolution.xml:366(link)
-#: C/evolution.xml:432(title)
+#: C/evolution.xml:360(link) C/evolution.xml:426(title)
 msgid "Microsoft Exchange Receiving Options"
 msgstr "Možnosti přijímání Microsoft Exchange"
 
-#: C/evolution.xml:369(link)
-#: C/evolution.xml:473(title)
+#: C/evolution.xml:363(link) C/evolution.xml:467(title)
 msgid "IMAP Receiving Options"
 msgstr "Možnosti přijímání IMAPu"
 
-#: C/evolution.xml:372(link)
-#: C/evolution.xml:517(title)
+#: C/evolution.xml:366(link) C/evolution.xml:511(title)
 msgid "POP Receiving Options"
 msgstr "Možnosti přijímání POP"
 
-#: C/evolution.xml:375(link)
-#: C/evolution.xml:538(title)
+#: C/evolution.xml:369(link) C/evolution.xml:533(title)
 msgid "USENET News Receiving Options"
 msgstr "Možnosti přijímání Diskusních skupin USENET"
 
-#: C/evolution.xml:378(link)
-#: C/evolution.xml:561(title)
+#: C/evolution.xml:372(link) C/evolution.xml:557(title)
 msgid "Local Delivery Receiving Options"
 msgstr "Možnosti přijímání Místního doručení"
 
-#: C/evolution.xml:381(link)
-#: C/evolution.xml:575(title)
+#: C/evolution.xml:375(link) C/evolution.xml:572(title)
 msgid "MH-Format Mail Directories Receiving Options"
 msgstr "Možnosti přijímání Adresářů pošty ve formátu MH"
 
-#: C/evolution.xml:384(link)
-#: C/evolution.xml:594(title)
+#: C/evolution.xml:378(link) C/evolution.xml:592(title)
 msgid "Maildir-Format Mail Directories Receiving Options"
 msgstr "Možnosti přijímání Adresářů pošty ve formátu maildir"
 
-#: C/evolution.xml:387(link)
-#: C/evolution.xml:614(title)
+#: C/evolution.xml:381(link) C/evolution.xml:613(title)
 msgid "Standard Unix mbox spool file Receiving Options"
 msgstr "Možnosti přijímání Standardního Unixového souboru mbox"
 
-#: C/evolution.xml:393(para)
-msgid "If you select Novell GroupWise as your receiving server type, you need to specify the following options:"
-msgstr "Pokud zvolíte Novell GroupWise jako typ serveru, z kterého budete přijímat poštu, musíte zadat následující volby:"
+#: C/evolution.xml:387(para)
+msgid ""
+"If you select Novell GroupWise as your receiving server type, you need to "
+"specify the following options:"
+msgstr ""
+"Pokud zvolíte Novell GroupWise jako typ serveru, z kterého budete přijímat "
+"poštu, musíte zadat následující volby:"
 
-#: C/evolution.xml:396(para)
-#: C/evolution.xml:437(para)
-#: C/evolution.xml:478(para)
+#: C/evolution.xml:390(para) C/evolution.xml:431(para)
+#: C/evolution.xml:472(para) C/evolution.xml:516(para)
+#: C/evolution.xml:538(para) C/evolution.xml:561(para)
+#: C/evolution.xml:576(para) C/evolution.xml:596(para)
+#: 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 "Zvolte, zda chcete, aby Evolution automaticky kontroloval novou poštu."
 
-#: C/evolution.xml:397(para)
-#: C/evolution.xml:438(para)
-#: C/evolution.xml:479(para)
-#: C/evolution.xml:5672(para)
-msgid "If you select this option, you need to specify how often Evolution should check for new messages."
-msgstr "Pokud zvolíte tuto možnost, musíte zadat, jak často má Evolution kontrolovat nové zprávy."
-
-#: C/evolution.xml:400(para)
-#: C/evolution.xml:441(para)
-#: C/evolution.xml:5677(para)
+#: C/evolution.xml:391(para) C/evolution.xml:432(para)
+#: C/evolution.xml:473(para) C/evolution.xml:517(para)
+#: C/evolution.xml:539(para) C/evolution.xml:562(para)
+#: C/evolution.xml:577(para) C/evolution.xml:597(para)
+#: C/evolution.xml:617(para) C/evolution.xml:640(para)
+#: C/evolution.xml:5892(para)
+msgid ""
+"If you select this option, you need to specify how often Evolution should "
+"check for new messages."
+msgstr ""
+"Pokud zvolíte tuto možnost, musíte zadat, jak často má Evolution kontrolovat "
+"nové zprávy."
+
+#: 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 "Zvolte, pokud chcete, aby se nové zprávy kontrolovaly ve všech složkách."
-
-#: C/evolution.xml:403(para)
-#: C/evolution.xml:5680(para)
-msgid "Select if you want to apply filters to new messages in the Inbox on the server."
-msgstr "Zvolte, pokud chcete aplikovat filtry na nové zprávy v Příchozích na serveru."
-
-#: C/evolution.xml:404(para)
-#: C/evolution.xml:495(para)
-#: C/evolution.xml:602(para)
-#: C/evolution.xml:5681(para)
-msgid "For additional information on filtering, see <link linkend=\"usage-mail-org-filters-new\">Creating New Filter Rules</link>."
-msgstr "Více informací o filtrování na <link linkend=\"usage-mail-org-filters-new\">Vytvoření nových pravidel filtrování</link>."
-
-#: C/evolution.xml:407(para)
-#: C/evolution.xml:498(para)
-#: C/evolution.xml:5684(para)
+msgstr ""
+"Zvolte, pokud chcete, aby se nové zprávy kontrolovaly ve všech složkách."
+
+#: C/evolution.xml:397(para) C/evolution.xml:453(para)
+#: C/evolution.xml:488(para) C/evolution.xml:600(para)
+#: C/evolution.xml:620(para) C/evolution.xml:643(para)
+#: C/evolution.xml:5900(para)
+msgid ""
+"Select Apply filters to new messages in inbox on this server if you want to "
+"apply filters."
+msgstr ""
+"Vyberte Použít filtry na nové zprávy v Příchozích na tomto serveru, pokud "
+"chcete filtry použít."
+
+#: C/evolution.xml:398(para) C/evolution.xml:489(para)
+#: C/evolution.xml:601(para) C/evolution.xml:5901(para)
+msgid ""
+"For additional information on filtering, see <link linkend=\"usage-mail-org-"
+"filters-new\">Creating New Filter Rules</link>."
+msgstr ""
+"Více informací o filtrování na <link linkend=\"usage-mail-org-filters-new"
+"\">Vytvoření nových pravidel filtrování</link>."
+
+#: C/evolution.xml:401(para) C/evolution.xml:456(para)
+#: C/evolution.xml:492(para) C/evolution.xml:5904(para)
 msgid "Select if you want to check new messages for junk content."
 msgstr "Zvolte, pokud chcete kontrolovat nevyžádanou poštu v nových zprávách."
 
-#: C/evolution.xml:408(para)
-msgid "For additional information on junk content, see <link linkend=\"usage-mail-organize-spam\">Stopping Junk Mail (Spam)</link> and <link linkend=\"mail-prefs-junk\">Junk </link>."
-msgstr "Více informací o nevyžádané poště se dozvíte v  <link linkend=\"usage-mail-organize-spam\">Zastavení nevyžádané pošty (spamu)</link> a <link linkend=\"mail-prefs-junk\">Nastavení nevyžádané pošty</link>."
+#: C/evolution.xml:402(para) C/evolution.xml:457(para)
+#: C/evolution.xml:493(para)
+msgid ""
+"For additional information on junk content, see <link linkend=\"usage-mail-"
+"organize-spam\">Stopping Junk Mail (Spam)</link> and <link linkend=\"mail-"
+"prefs-junk\">Junk</link>."
+msgstr ""
+"Více informací o nevyžádané poště se dozvíte v  <link linkend=\"usage-mail-"
+"organize-spam\">Zastavení nevyžádané pošty (spamu)</link> a <link linkend="
+"\"mail-prefs-junk\">Nevyžádaná pošta</link>."
 
-#: C/evolution.xml:411(para)
-#: C/evolution.xml:5688(para)
+#: 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 "Zvolte, pokud chcete kontrolovat nevyžádanou poštu pouze ve složce Příchozí."
-
-#: C/evolution.xml:414(para)
-#: C/evolution.xml:505(para)
-msgid "Select if you want to automatically synchronize remote mail locally."
-msgstr "Zvolte, pokud chcete automaticky synchronizovat vzdálenou poštu lokálně."
-
-#: C/evolution.xml:415(para)
-#: C/evolution.xml:506(para)
-msgid "Evolution, by default downloads only the header information such as From, Subject, and Date. The body of the message and the attachments are downloaded only when you click the message. Thus you can save time and network usage. This is useful when you don't read all the messages you receive."
-msgstr "Evolution ve výchozím nastavení stahuje informace v hlavičce jako Od, Předmět, Datum. Tělo zprávy a přílohy jsou staženy pouze, když kliknete na zprávu. Takže můžete šetřit čas a zatížení sítě. Toto je užitečné, když nečtete všechny právy, které dostanete."
-
-#: C/evolution.xml:416(para)
-#: C/evolution.xml:507(para)
-msgid "If you check this option, evolution fetches the headers as well as the body of the message simultaneously. In this case, the time taken to open a message is comparatively less. In addition to that, you can download the mails for reading them offline, when you have checked this option."
-msgstr "Pokud zatrhnete tuto volbu, Evolution bude stahovat jak hlavičky tak tělo zprávy zároveň. V tomto případě zabere otevření zprávy méně času. K tomu můžete stahovat e-maily pro off-line čtení v případě, že zatrhnete tuto volbu."
-
-#: C/evolution.xml:419(para)
-msgid "Type your Post Office Agent SOAP port in the Post Office Agent SOAP Port field."
-msgstr "Napište váš port SOAP pro Post Office Agent do pole Port SOAP pro Post Office."
-
-#: C/evolution.xml:420(para)
-#: C/evolution.xml:5699(para)
-msgid "If you are unsure what your Post Office Agent SOAP port is, contact your system administrator."
-msgstr "Pokud si nejste jistí, jaký je váš port SOAP pro Post Office Agent, kontaktujte svého administrátora."
-
-#: C/evolution.xml:428(para)
-#: C/evolution.xml:469(para)
-#: C/evolution.xml:513(para)
-#: C/evolution.xml:534(para)
-#: C/evolution.xml:557(para)
-#: C/evolution.xml:571(para)
-#: C/evolution.xml:590(para)
-#: C/evolution.xml:610(para)
-#: C/evolution.xml:631(para)
-#: C/evolution.xml:653(para)
-msgid "When you have finished, continue with <link linkend=\"third-step\">Sending Mail</link>."
-msgstr "Když jste hotoví, pokračujte na <link linkend=\"third-step\">Odesílání pošty</link>."
-
-#: C/evolution.xml:433(para)
-msgid "If you select Microsoft Exchange as your receiving server type, you need to specify the following options:"
-msgstr "Pokud vyberete Microsoft Exchange jako typ serveru, z kterého přijímate poštu, musíte zadat následující volby:"
-
-#: C/evolution.xml:444(para)
-msgid "Specify the Global Catalog server name in the Global Catalog Server Name field."
-msgstr "Zadejte název serveru Global Catalog do pole Název serveru Global Catalog. "
-
-#: C/evolution.xml:445(para)
-msgid "The Global Catalog Server contains the user information for users. If you are unsure what your Global Catalog server name is, contact your system administrator."
-msgstr "Server Global Catalog obsahuje uživatelské informace pro uživatele. Pokud si nejste jistí, co je název serveru Global Catalog, kontaktujte svého administrátora."
-
-#: C/evolution.xml:448(para)
-msgid "Select if you want to limit the number of Global Address Lists (GAL)."
-msgstr "Zvolte, pokud chcete omezit počet globálních seznamů adres (GAL)."
+msgstr ""
+"Zvolte, pokud chcete kontrolovat nevyžádanou poštu pouze ve složce Příchozí."
 
-#: C/evolution.xml:449(para)
-msgid "The GAL contains a list of all e-mail addresses. If you select this option, you need to specify the maximum number of responses."
-msgstr "GAL obsahuje seznam všech e-mailových adres. Pokud zvolíte tuto volbu, musíte zadat maximální počet odpovědí."
+#: C/evolution.xml:408(para) C/evolution.xml:450(para)
+#: C/evolution.xml:499(para)
+msgid ""
+"Select Automatically synchronize remote mail locally to download the "
+"messages to your local system."
+msgstr ""
+"Vyberte Automaticky synchronizovat vzdálenou poštu lokálně, abyste stáhli "
+"zprávy do vašeho lokálního systému."
 
-#: C/evolution.xml:452(para)
-msgid "Select if you want to use a password expire warning time period."
-msgstr "Zvolte, pokud chcete použít Dobu varování na vypršení hesla."
+#: C/evolution.xml:409(para) C/evolution.xml:500(para)
+msgid ""
+"Evolution, by default downloads only the header information such as From, "
+"Subject, and Date. The body of the message and the attachments are "
+"downloaded only when you click the message. Thus you can save time and "
+"network usage. This is useful when you don't read all the messages you "
+"receive."
+msgstr ""
+"Evolution ve výchozím nastavení stahuje informace v hlavičce jako Od, "
+"Předmět, Datum. Tělo zprávy a přílohy jsou staženy pouze, když kliknete na "
+"zprávu. Takže můžete šetřit čas a zatížení sítě. Toto je užitečné, když "
+"nečtete všechny právy, které dostanete."
+
+#: C/evolution.xml:410(para) C/evolution.xml:501(para)
+msgid ""
+"If you check this option, evolution fetches the headers as well as the body "
+"of the message simultaneously. In this case, the time taken to open a "
+"message is comparatively less. In addition to that, you can download the "
+"mail for reading them offline, when you have checked this option."
+msgstr ""
+"Pokud zatrhnete tuto volbu, Evolution bude stahovat jak hlavičky tak tělo "
+"zprávy zároveň. V tomto případě zabere otevření zprávy méně času. K tomu "
+"můžete stahovat e-maily pro off-line čtení v případě, že zatrhnete tuto "
+"volbu."
+
+#: C/evolution.xml:413(para)
+msgid ""
+"Type your Post Office Agent SOAP port in the Post Office Agent SOAP Port "
+"field."
+msgstr ""
+"Napište váš port SOAP pro Post Office Agent do pole Port SOAP pro Post "
+"Office."
 
-#: C/evolution.xml:453(para)
-msgid "If you select this option, you need to specify how often Evolution should send the password expire message."
-msgstr "Pokud zvolíte tuto možnost, musíte zadat, jak často má Evolution posílat zprávu o vypršení platnosti hesla."
+#: C/evolution.xml:414(para) C/evolution.xml:5919(para)
+msgid ""
+"If you are unsure what your Post Office Agent SOAP port is, contact your "
+"system administrator."
+msgstr ""
+"Pokud si nejste jistí, jaký je váš port SOAP pro Post Office Agent, "
+"kontaktujte svého administrátora."
 
-#: C/evolution.xml:456(para)
-msgid "Select automatically synchronize remote mail locally to download the messages to your local system."
-msgstr "Vyberte automaticky synchronizovat vzdálenou poštu lokálně, abyste stáhli zprávy do vašeho lokálního systému."
+#: C/evolution.xml:422(para) C/evolution.xml:463(para)
+#: C/evolution.xml:507(para) C/evolution.xml:529(para)
+#: C/evolution.xml:553(para) C/evolution.xml:568(para)
+#: C/evolution.xml:588(para) C/evolution.xml:609(para)
+#: C/evolution.xml:631(para) C/evolution.xml:654(para)
+msgid ""
+"When you have finished, continue with <link linkend=\"third-step\">Sending "
+"Mail</link>."
+msgstr ""
+"Když jste hotoví, pokračujte na <link linkend=\"third-step\">Odesílání "
+"pošty</link>."
 
-#: C/evolution.xml:459(para)
-msgid "Select apply filters to new messages in inbox on this server to apply filters."
-msgstr "Vyberte použít filtry na nové zprávy v Příchozích na tomto serveru. "
+#: C/evolution.xml:427(para)
+msgid ""
+"If you select Microsoft Exchange as your receiving server type, you need to "
+"specify the following options:"
+msgstr ""
+"Pokud vyberete Microsoft Exchange jako typ serveru, z kterého přijímate "
+"poštu, musíte zadat následující volby:"
 
-#: C/evolution.xml:462(para)
-msgid "Select check new messages for junk contents to filter new messages for spam messages."
-msgstr "Zvolením \"kontrolovat nevyžádanou poštu v nových zprávách\" vyfiltrujete z nových zpráv spam."
+#: C/evolution.xml:438(para)
+msgid ""
+"Specify the Global Catalog server name in the Global Catalog Server Name "
+"field."
+msgstr ""
+"Zadejte název serveru Global Catalog do pole Název serveru Global Catalog. "
 
-#: C/evolution.xml:463(para)
-msgid "For more information refer <link linkend=\"usage-mail-organize-spam\">Stopping Junk Mail (Spam)</link>"
-msgstr "Více informací získáte na <link linkend=\"usage-mail-organize-spam\">Boj proti spamu</link>"
+#: C/evolution.xml:439(para)
+msgid ""
+"The Global Catalog Server contains the user information for users. If you "
+"are unsure what your Global Catalog server name is, contact your system "
+"administrator."
+msgstr ""
+"Server Global Catalog obsahuje uživatelské informace pro uživatele. Pokud si "
+"nejste jistí, co je název serveru Global Catalog, kontaktujte svého "
+"administrátora."
 
-#: C/evolution.xml:474(para)
-msgid "If you select IMAP as your receiving server type, you need to specify the following options:"
-msgstr "Pokud zvolíte IMAP jako typ serveru pro příjem zpráv, musíte zadat následující volby:"
+#: C/evolution.xml:442(para)
+msgid "Select if you want to limit the number of Global Address Lists (GAL)."
+msgstr "Zvolte, pokud chcete omezit počet globálních seznamů adres (GAL)."
 
-#: C/evolution.xml:482(para)
-msgid "Select if you want Evolution to use custom commands to connect to Evolution."
-msgstr "Zvolte, pokud chcete, aby Evolution používal vlastní příkazy pro připojení k Evolutionu."
+#: C/evolution.xml:443(para)
+msgid ""
+"The GAL contains a list of all email addresses. If you select this option, "
+"you need to specify the maximum number of responses."
+msgstr ""
+"GAL obsahuje seznam všech e-mailových adres. Pokud zvolíte tuto volbu, "
+"musíte zadat maximální počet odpovědí."
 
-#: C/evolution.xml:483(para)
-msgid "If you select this option, specify the custom command you want Evolution to use."
-msgstr "Pokud vyberete tuto volbu, zadejte vlastní příkazy, které má Evolution používat."
+#: C/evolution.xml:446(para)
+msgid "Select if you want to use a password expire warning time period."
+msgstr "Zvolte, pokud chcete použít Dobu varování na vypršení hesla."
 
-#: C/evolution.xml:486(para)
-msgid "Select if you want Evolution to show only subscribed folders."
-msgstr "Zvolte, pokud chcete, aby Evolution ukazoval pouze přihlášené složky."
+#: C/evolution.xml:447(para)
+msgid ""
+"If you select this option, you need to specify how often Evolution should "
+"send the password expire message."
+msgstr ""
+"Pokud zvolíte tuto možnost, musíte zadat, jak často má Evolution posílat "
+"zprávu o vypršení platnosti hesla."
+
+#: C/evolution.xml:468(para)
+msgid ""
+"If you select IMAP as your receiving server type, you need to specify the "
+"following options:"
+msgstr ""
+"Pokud zvolíte IMAP jako typ serveru pro příjem zpráv, musíte zadat "
+"následující volby:"
 
-#: C/evolution.xml:487(para)
-msgid "Subscribed folders are folders that you have chosen to receive mail from by subscribing to them."
-msgstr "Přihlášené složky jsou ty složky, které jste vybrali pro příjem pošty tak, že jste se k nim přihlásili."
+#: C/evolution.xml:476(para)
+msgid ""
+"Select if you want Evolution to use custom commands to connect to the IMAP "
+"server."
+msgstr ""
+"Zvolte, pokud chcete, aby Evolution používal vlastní příkazy pro připojení k "
+"IMAP serveru."
 
-#: C/evolution.xml:490(para)
-msgid "Select if you want Evolution to override server-supplied folder namespaces."
-msgstr "Zvolte, pokud chcete, aby Evolution přepsal serverem nabízené názvy složek."
+#: C/evolution.xml:477(para)
+msgid ""
+"If you select this option, specify the custom command you want Evolution to "
+"use."
+msgstr ""
+"Pokud vyberete tuto volbu, zadejte vlastní příkazy, které má Evolution "
+"používat."
 
-#: C/evolution.xml:491(para)
-msgid "By choosing this option you can rename the folders that the server provides. If you select this option, you need to specify the namespace to use."
-msgstr "Vybráním této možnosti můžete přejmenovat složky, které nabízí server. Pokud vyberete tuto možnost, musíte zadat názvy, které chcete použít."
+#: C/evolution.xml:480(para)
+msgid "Select if you want Evolution to show only subscribed folders."
+msgstr "Zvolte, pokud chcete, aby Evolution ukazoval pouze přihlášené složky."
 
-#: C/evolution.xml:494(para)
-#: C/evolution.xml:601(para)
-#: C/evolution.xml:620(para)
-#: C/evolution.xml:642(para)
-msgid "Select if you want to apply filters to new messages in the Inbox."
-msgstr "Zvolte, pokud chcete použít filtry na nové zprávy ve složce Příchozí."
+#: C/evolution.xml:481(para)
+msgid ""
+"Subscribed folders are folders that you have chosen to receive mail from by "
+"subscribing to them."
+msgstr ""
+"Přihlášené složky jsou ty složky, které jste vybrali pro příjem pošty tak, "
+"že jste se k nim přihlásili."
 
-#: C/evolution.xml:499(para)
-#: C/evolution.xml:5685(para)
-msgid "For additional information on junk content, see <link linkend=\"mail-prefs-junk\">Junk Mail Preferences</link>."
-msgstr "Více informací o nevyžádané poště se dozvíte v <link linkend=\"mail-prefs-junk\">Nastavení nevyžádané pošty</link>."
+#: C/evolution.xml:484(para)
+msgid ""
+"Select if you want Evolution to override server-supplied folder namespaces."
+msgstr ""
+"Zvolte, pokud chcete, aby Evolution přepsal serverem nabízené názvy složek."
+
+#: C/evolution.xml:485(para)
+msgid ""
+"By choosing this option you can rename the folders that the server provides. "
+"If you select this option, you need to specify the namespace to use."
+msgstr ""
+"Vybráním této možnosti můžete přejmenovat složky, které nabízí server. Pokud "
+"vyberete tuto možnost, musíte zadat názvy, které chcete použít."
 
-#: C/evolution.xml:502(para)
+#: C/evolution.xml:496(para)
 msgid "Select if you want to check for junk messages in the Inbox folder."
 msgstr "Zvolte, pokud chcete kontrolovat nevyžádanou poštu ve složce Příchozí."
 
-#: C/evolution.xml:519(para)
-msgid "If you select POP as your receiving server type, you need to specify the following options:"
-msgstr "Pokud zvolíte POP jako typ serveru pro příjem pošty, musíte zadat následující volby:"
+#: C/evolution.xml:513(para)
+msgid ""
+"If you select POP as your receiving server type, you need to specify the "
+"following options:"
+msgstr ""
+"Pokud zvolíte POP jako typ serveru pro příjem pošty, musíte zadat "
+"následující volby:"
 
-#: C/evolution.xml:522(para)
-#: C/evolution.xml:543(para)
-#: C/evolution.xml:565(para)
-#: C/evolution.xml:579(para)
-#: C/evolution.xml:598(para)
-#: C/evolution.xml:617(para)
-#: C/evolution.xml:639(para)
-msgid "Select if you want Evolution to automatically check for new mail.If you select this option, you need to specify how often Evolution should check for new messages."
-msgstr "Zvolte, pokud chcete, aby Evolution automaticky kontroloval novou poštu. Pokud zvolíte tuto volbu, musíte zadat, jak často má Evolution nové zprávy kontrolovat."
-
-#: C/evolution.xml:525(para)
+#: C/evolution.xml:520(para)
 msgid "Select if you want to leave messages on the server."
 msgstr "Zvolte, pokud chcete ponechat zprávy na serveru."
 
-#: C/evolution.xml:528(para)
-msgid "Select if you want to disable support for all POP3 extensions (support for POP3)."
-msgstr "Zvolte, pokud chcete vypnout podporu pro všechna rozšíření POP3 (podporu pro POP3)."
+#: C/evolution.xml:523(para)
+msgid "Select if you want to disable support for all POP3 extensions."
+msgstr "Zvolte, pokud chcete vypnout podporu pro všechna rozšíření POP3."
 
-#: C/evolution.xml:540(para)
-msgid "If you select USENET News as your receiving server type, you need to specify the following options:"
-msgstr "Pokud vyberete Diskusní skupiny USENET jako typ serveru pro příjem, musíte zadat následující volby:"
+#: C/evolution.xml:535(para)
+msgid ""
+"If you select USENET News as your receiving server type, you need to specify "
+"the following options:"
+msgstr ""
+"Pokud vyberete Diskusní skupiny USENET jako typ serveru pro příjem, musíte "
+"zadat následující volby:"
 
-#: C/evolution.xml:546(para)
+#: C/evolution.xml:542(para)
 msgid "Select if you want to show folders in short notation."
 msgstr "Zvolte, pokud chcete zobrazit složky ve zkráceném zápisu."
 
-#: C/evolution.xml:547(para)
+#: C/evolution.xml:543(para)
 msgid "For example, comp.os.linux would appear as c.o.linux."
 msgstr "Například comp.os.linux by se zobrazilo jako c.o.linux."
 
-#: C/evolution.xml:550(para)
-msgid "Select if you want to show relative folder names in the subscription dialog box."
-msgstr "Zvolte, pokud chcete zobrazit názvy příbuzných složek v dialogovém boxu pro přihlášení."
+#: C/evolution.xml:546(para)
+msgid ""
+"Select if you want to show relative folder names in the subscription dialog "
+"box."
+msgstr ""
+"Zvolte, pokud chcete zobrazit názvy příbuzných složek v dialogovém boxu pro "
+"přihlášení."
 
-#: C/evolution.xml:551(para)
-msgid "If you select to show relative folder names in the subscription page, only the name of the folder is displayed. For example the folder evolution.mail would appear as evolution."
-msgstr "Pokud vyberete zobrazit názvy příbuzných složek na přihlašovací stránce, bude zobrazen pouze název složky. Například složka evolution.mail se zobrazí jako evolution."
+#: C/evolution.xml:547(para)
+msgid ""
+"If you select to show relative folder names in the subscription page, only "
+"the name of the folder is displayed. For example the folder evolution.mail "
+"would appear as evolution."
+msgstr ""
+"Pokud vyberete zobrazit názvy příbuzných složek na přihlašovací stránce, "
+"bude zobrazen pouze název složky. Například složka evolution.mail se zobrazí "
+"jako evolution."
 
-#: C/evolution.xml:562(para)
-msgid "If you select Local Delivery as your receiving server type, you need to specify the following options:"
-msgstr "Pokud zvolíte Místní doručení jako typ serveru pro příjem, musíte zadat následující volby:"
+#: C/evolution.xml:558(para)
+msgid ""
+"If you select Local Delivery as your receiving server type, you need to "
+"specify the following options:"
+msgstr ""
+"Pokud zvolíte Místní doručení jako typ serveru pro příjem, musíte zadat "
+"následující volby:"
 
-#: C/evolution.xml:576(para)
-msgid "If you select MH-Format Mail Directories as your receiving server type, you need to specify the following options:"
-msgstr "Pokud zvolíte Adresáře pošty ve formátu MH jako typ serveru pro příjem, musíte zadat následující volby:"
+#: C/evolution.xml:573(para)
+msgid ""
+"If you select MH-Format Mail Directories as your receiving server type, you "
+"need to specify the following options:"
+msgstr ""
+"Pokud zvolíte Adresáře pošty ve formátu MH jako typ serveru pro příjem, "
+"musíte zadat následující volby:"
 
-#: C/evolution.xml:582(para)
-msgid "Select if you want to use the <emphasis>.folders</emphasis> summary file."
-msgstr "Zvolte, pokud chcete použít souhrnný soubor <emphasis>.folders</emphasis>"
+#: C/evolution.xml:580(para)
+msgid ""
+"Select if you want to use the <emphasis>.folders</emphasis> summary file."
+msgstr ""
+"Zvolte, pokud chcete použít souhrnný soubor <emphasis>.folders</emphasis>"
 
-#: C/evolution.xml:595(para)
-msgid "If you select Maildir-Format Mail Directories as your receiving server type, you need to specify the following options:"
-msgstr "Pokud zvolíte Adresáře pošty ve formátu maildir jako typ serveru pro příjem, musíte zadat následující volby:"
+#: C/evolution.xml:593(para)
+msgid ""
+"If you select Maildir-Format Mail Directories as your receiving server type, "
+"you need to specify the following options:"
+msgstr ""
+"Pokud zvolíte Adresáře pošty ve formátu maildir jako typ serveru pro příjem, "
+"musíte zadat následující volby:"
 
-#: C/evolution.xml:623(para)
-#: C/evolution.xml:645(para)
-msgid "Select if you want to store status headers in Elm, Pine, and Mutt formats."
-msgstr "Zvolte, pokud chcete zvolit hlavičky stavu ve formátech Elm, Pine nebo Mutt."
+#: 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."
+msgstr ""
+"Zvolte, pokud chcete zvolit hlavičky stavu ve formátech Elm, Pine nebo Mutt."
 
 #: C/evolution.xml:635(title)
 msgid "Standard Unix mbox spool directory Receiving Options"
 msgstr "Možnosti příjmu Standardního Unixového sdíleného adresáře mbox"
 
 #: C/evolution.xml:636(para)
-msgid "If you select Standard Unix mbox Spool directory as your receiving server type, you need to specify the following options:"
-msgstr "Pokud zvolíte Standardní Unixový sdílený adresář mbox jako typ serveru pro příjem, musíte zadat následující volby:"
+msgid ""
+"If you select Standard Unix mbox Spool directory as your receiving server "
+"type, you need to specify the following options:"
+msgstr ""
+"Pokud zvolíte Standardní Unixový sdílený adresář mbox jako typ serveru pro "
+"příjem, musíte zadat následující volby:"
 
-#: C/evolution.xml:659(para)
-msgid "Now that you have entered information about how you plan to get mail, Evolution needs to know about how you want to send it."
-msgstr "Nyní, když jste vložili informace o tom, jak hodláte získávat e-maily, Evolution potřebuje znát, jak je chcete posílat."
+#: C/evolution.xml:660(para)
+msgid ""
+"Now that you have entered information about how you plan to get mail, "
+"Evolution needs to know about how you want to send it."
+msgstr ""
+"Nyní, když jste vložili informace o tom, jak hodláte získávat e-maily, "
+"Evolution potřebuje znát, jak je chcete posílat."
 
-#: C/evolution.xml:662(para)
+#: C/evolution.xml:663(para)
 msgid "Select a server type from the Server Type list."
 msgstr "Vyberte typ serveru ze seznamu Typ Serveru."
 
-#: C/evolution.xml:663(para)
+#: C/evolution.xml:664(para)
 msgid "The following server types are available:"
 msgstr "K dispozici jsou následující typy serverů:"
 
-#: C/evolution.xml:665(title)
+#: C/evolution.xml:666(title)
 msgid "Sendmail:"
 msgstr "Sendmail:"
 
-#: C/evolution.xml:666(para)
-msgid "Uses the Sendmail program to send mail from your system. Sendmail is more flexible, but is not as easy to configure, so you should select this option only if you know how to set up a Sendmail service."
-msgstr "Pro posílání pošty z vašeho systému používá program Sendmail. Sendmail je flexibilnější, ale není tak jednoduše nastavitelný, takže byste měli vybrat tuto volbu, pouze pokud víte, jak službu Sendmail nastavit."
+#: C/evolution.xml:667(para)
+msgid ""
+"Uses the Sendmail program to send mail from your system. Sendmail is more "
+"flexible, but is not as easy to configure, so you should select this option "
+"only if you know how to set up a Sendmail service."
+msgstr ""
+"Pro posílání pošty z vašeho systému používá program Sendmail. Sendmail je "
+"flexibilnější, ale není tak jednoduše nastavitelný, takže byste měli vybrat "
+"tuto volbu, pouze pokud víte, jak službu Sendmail nastavit."
 
-#: C/evolution.xml:669(title)
+#: C/evolution.xml:670(title)
 msgid "SMTP:"
 msgstr "SMTP:"
 
-#: C/evolution.xml:670(para)
-msgid "Sends mail using an outbound mail server. This is the most common choice for sending mail. If you choose SMTP, there are additional configuration options. See <link linkend=\"bsthwzo\">SMTP Configuration</link> for more information."
-msgstr "Posílá poštu pomocí odchozího mail serveru. Toto je nejpoužívanější možnost posílání pošty. Pokud vyberete SMTP, narazíte na další možnosti nastavení. Více informací naleznete v <link linkend=\"bsthwzo\">Nastavení SMTP</link>."
+#: C/evolution.xml:671(para)
+msgid ""
+"Sends mail using an outbound mail server. This is the most common choice for "
+"sending mail. If you choose SMTP, there are additional configuration "
+"options. See <link linkend=\"bsthwzo\">SMTP Configuration</link> for more "
+"information."
+msgstr ""
+"Posílá poštu pomocí odchozího mail serveru. Toto je nejpoužívanější možnost "
+"posílání pošty. Pokud vyberete SMTP, narazíte na další možnosti nastavení. "
+"Více informací naleznete v <link linkend=\"bsthwzo\">Nastavení SMTP</link>."
 
-#: C/evolution.xml:676(title)
+#: C/evolution.xml:677(title)
 msgid "SMTP Configuration"
 msgstr "Nastavení SMTP"
 
-#: C/evolution.xml:680(para)
-msgid "Type the Server address in the Server field."
-msgstr "Napište adresu serveru do pole Server."
-
-#: C/evolution.xml:681(para)
-msgid "If you are unsure what your Server address is, contact your system administrator."
-msgstr "Pokud si nejste jistí, jaká je adresa vašeho serveru, kontaktujte svého administrátora."
-
-#: C/evolution.xml:684(para)
+#: C/evolution.xml:685(para)
 msgid "Select if your server requires authentication."
 msgstr "Vyberte, pokud váš server vyžaduje autentizaci."
 
-#: C/evolution.xml:685(para)
-msgid "If you selected that your server requires authentication, you need to provide the following information:"
-msgstr "Pokud jste vybrali, že váš server vyžaduje autentizaci, musíte poskytnout následující informace:"
-
-#: C/evolution.xml:693(para)
-msgid "Type your username in the Username field."
-msgstr "Napište vaše uživatelské jméno do pole Jméno uživatele."
-
-#: C/evolution.xml:701(para)
-msgid "Select if you use a secure connection (SSL)."
-msgstr "Vyberte, pokud chcete používat zabezpečené připojení (SSL)."
+#: C/evolution.xml:686(para)
+msgid ""
+"If you selected that your server requires authentication, you need to "
+"provide the following information:"
+msgstr ""
+"Pokud jste vybrali, že váš server vyžaduje autentizaci, musíte poskytnout "
+"následující informace:"
 
-#: C/evolution.xml:707(para)
+#: C/evolution.xml:708(para)
 msgid "Continue with <link linkend=\"bsti1ty\">Account Management</link>."
 msgstr "Pokračujte na <link linkend=\"bsti1ty\">Správu účtu</link>."
 
-#: C/evolution.xml:713(para)
-msgid "Now that you have finished the e-mail configuration process you need to give the account a name. The name can be any name you prefer. Type your account name on the Name field, then click Forward."
-msgstr "Nyní, když jste dokončili proces nastavení e-mailu, musíte zadat jméno účtu. Jménem může být cokoliv, co chcete. Napište vaše jméno účtu do pole Jméno a klikněte na Vpřed. "
-
 #: C/evolution.xml:714(para)
-msgid "Continue with <link linkend=\"step-three-b\">Time Zone</link><link linkend=\"step-three-b\"/>."
-msgstr "Pokračujte na <link linkend=\"step-three-b\">Časové pásmo</link><link linkend=\"step-three-b\"/>."
+msgid ""
+"Now that you have finished the email configuration process you need to give "
+"the account a name. The name can be any name you prefer. Type your account "
+"name on the Name field, then click Forward."
+msgstr ""
+"Nyní, když jste dokončili proces nastavení e-mailu, musíte zadat jméno účtu. "
+"Jménem může být cokoliv, co chcete. Napište vaše jméno účtu do pole Jméno a "
+"klikněte na Vpřed. "
 
-#: C/evolution.xml:721(para)
+#: C/evolution.xml:715(para)
+msgid ""
+"Continue with <link linkend=\"step-three-b\">Time Zone</link><link linkend="
+"\"step-three-b\"/>."
+msgstr ""
+"Pokračujte na <link linkend=\"step-three-b\">Časové pásmo</link><link "
+"linkend=\"step-three-b\"/>."
+
+#: C/evolution.xml:722(para)
 msgid "Select your time zone on the map."
 msgstr "Vyberte na mapě vaše časové pásmo."
 
-#: C/evolution.xml:723(para)
+#: C/evolution.xml:724(para)
 msgid "Select from the time zone drop-down list."
 msgstr "Vyberte z rozbalovacího seznamu časových pásem."
 
-#: C/evolution.xml:728(para)
+#: C/evolution.xml:729(para)
 msgid "Click OK, then click Apply."
 msgstr "Klikněte na OK a potom na Použít."
 
-#: C/evolution.xml:729(para)
+#: C/evolution.xml:730(para)
 msgid "Evolution opens with your new account created."
 msgstr "Evolution se otevře s vašim nových účtem."
 
-#: C/evolution.xml:732(para)
-msgid "If you want to import e-mail from another e-mail client, continue with <link linkend=\"fourth-step\">Importing Mail (Optional)</link>. If not, skip to <link linkend=\"ui-intro\">Using Evolution: An Overview</link>."
-msgstr "Pokud chcete importovat poštu z jiného poštovního klienta, pokračujte na <link linkend=\"fourth-step\">Import pošty (volitelné)</link>. Pokud ne, přeskočte na <link linkend=\"ui-intro\">Používání Evolutionu: Přehled</link>."
+#: C/evolution.xml:733(para)
+msgid ""
+"If you want to import email from another email client, continue with <link "
+"linkend=\"fourth-step\">Importing Mail (Optional)</link>. If not, skip to "
+"<link linkend=\"ui-intro\">Using Evolution: An Overview</link>."
+msgstr ""
+"Pokud chcete importovat poštu z jiného poštovního klienta, pokračujte na "
+"<link linkend=\"fourth-step\">Import pošty (volitelné)</link>. Pokud ne, "
+"přeskočte na <link linkend=\"ui-intro\">Používání Evolutionu: Přehled</link>."
 
-#: C/evolution.xml:736(title)
+#: C/evolution.xml:737(title)
 msgid "Importing Mail (Optional)"
 msgstr "Import pošty (volitelné)"
 
-#: C/evolution.xml:737(para)
-msgid "After selecting your time zone, if Evolution finds e-mail or address files from another application, it offers to import them. For a full description of the import feature, see <link linkend=\"importing-mail\">Importing Single Files</link>."
-msgstr "Poté, co vyberete časové pásmo, nabídne vám Evolution import souborů pošty nebo adres z jiné aplikace, pokud je nalezne. Úplný popis funkce importu naleznete v <link linkend=\"importing-mail\">Importu jednotlivých souborů</link>."
-
 #: C/evolution.xml:738(para)
-msgid "Microsoft Outlook* and versions of Outlook Express after version 4 use proprietary formats that Evolution cannot read or import. To import information, you might want to use the Export tool under Windows*. See the instructions in <link linkend=\"outlook-migration-mail\">Migrating Local Outlook Mail Folders</link>."
-msgstr "Microsoft Outlook* a Outlook Express 4 a novější používají proprietární formáty, které Evolution nemůže číst a importovat. Pro import informací, možná budete potřebovat nástroj Exportu pod Windows*. Instrukce naleznete v <link linkend=\"outlook-migration-mail\">Migraci lokálních poštovních složek Outlooku</link>."
+msgid ""
+"After selecting your time zone, if Evolution finds email or address files "
+"from another application, it offers to import them. For a full description "
+"of the import feature, see <link linkend=\"importing-mail\">Importing Single "
+"Files</link>."
+msgstr ""
+"Poté, co vyberete časové pásmo, nabídne vám Evolution import souborů pošty "
+"nebo adres z jiné aplikace, pokud je nalezne. Úplný popis funkce importu "
+"naleznete v <link linkend=\"importing-mail\">Importu jednotlivých souborů</"
+"link>."
 
-#: C/evolution.xml:739(para)
-msgid "Before importing e-mail from Netscape*, make sure you have selected File &gt; Compact All Folders. If you don't, Evolution will import and undelete the messages in your Trash folders."
-msgstr "Před importem pošty z Netscape* se ujistěte, že jste vybrali Soubor &gt; Provést údržbu všech složek. Pokud ne, Evolution importuje a obnoví smazané zprávy ve vaší složce Koše."
+#: C/evolution.xml:739(para) C/evolution.xml:2538(para)
+msgid ""
+"Microsoft Outlook* and versions of Outlook Express after version 4 use "
+"proprietary formats that Evolution cannot read or import."
+msgstr ""
 
-#: C/evolution.xml:741(para)
-msgid "Evolution uses standard file types for e-mail and calendar information, so you can copy those files from your <command>~/.evolution</command> directory. The file formats used are <command>mbox</command> for e-mail and iCal for calendar information."
-msgstr "Evolution používá standardní typy souborů pro poštu a kalendář, takže můžete tyto soubory kopírovat z vašeho adresáře <command>~/.evolution</command>. Použité formáty souborů jsou mbox pro poštu a iCal pro kalendář."
+#: C/evolution.xml:740(para)
+msgid ""
+"To import information, you might want to use the Export tool under Windows*. "
+"See the instructions in <link linkend=\"outlook-migration-mail\">Migrating "
+"Local Outlook Mail Folders</link>."
+msgstr ""
+"Abyste informace importovali, budete možná potřebovat nástroj Exportu pod "
+"Windows*. Instrukce naleznete v <link linkend=\"outlook-migration-mail"
+"\">Migraci lokálních poštovních složek Outlooku</link>."
 
-#: C/evolution.xml:742(para)
-msgid "Contacts files are stored in a database, but can be saved as a standard vCard*. To export contact data, open your contacts tool and select the contacts you want to export (press Ctrl+A to select them all). Click File &gt; Save Contact as VCard."
-msgstr "Soubory kontaktů jsou uloženy v databázi, ale mohou být uloženy jako standardní vCard*. Pro export dat kontaktů, otevřete váš nástroj kontaktů a vyberte kontakty, které chcete exportovat (pro výběr všech stiskněte Ctrl+A). Klikněte na Soubor &gt; Uložit kontakt jako VCard."
+#: C/evolution.xml:741(para) C/evolution.xml:2543(para)
+msgid ""
+"Before importing email from Netscape*, Mozilla and Netscape users need to "
+"click File &gt; Compact &gt; All Folders from within the Netscape or Mozilla "
+"mail tool. Otherwise, Evolution imports and undeletes the messages in your "
+"Trash folders."
+msgstr ""
+"Před importováním pošty z Netscape*, musí uživatelé Mozilly a Netscape "
+"kliknout na Soubor &gt; Provést údržbu služeb &gt; Všechny složky v "
+"poštovním nástroji Netscapu a Mozilly. Jinak Evolution importuje a obnoví "
+"všechny zprávy ze složky Koš."
 
-#: C/evolution.xml:750(para)
-msgid "Now that the first-run configuration has finished, you're ready to begin using Evolution. Here's a quick explanation of what's happening in your main Evolution window."
-msgstr "Nyní, když je nastavení po prvním spuštění dokončeno, můžete začít Evolution používat. Zde je rychlé vysvětlení toho, co se děje v hlavním okně Evolutionu."
+#: C/evolution.xml:743(para)
+msgid ""
+"Evolution uses standard file types for email and calendar information, so "
+"you can copy those files from your <command>~/.evolution</command> "
+"directory. The file formats used are <command>mbox</command> for email and "
+"iCal for calendar information."
+msgstr ""
+"Evolution používá standardní typy souborů pro poštu a kalendář, takže můžete "
+"tyto soubory kopírovat z vašeho adresáře <command>~/.evolution</command>. "
+"Použité formáty souborů jsou <command>mbox</command> pro poštu a iCal pro "
+"kalendář."
+
+#: C/evolution.xml:744(para)
+msgid ""
+"Contacts files are stored in a database, but can be saved as a standard "
+"vCard*. To export an addressbook, click File &gt; Save Address Book As VCard"
+"\". If you want to export only one contact, click File &gt; Save Contact as "
+"VCard."
+msgstr ""
+"Soubory kontaktů jsou uloženy v databázi, ale mohou být uloženy jako "
+"standardní vCard*. Abyste exportovali data kontaktů, otevřete váš nástroj "
+"kontaktů a vyberte kontakty, které chcete exportovat (pro výběr všech "
+"stiskněte Ctrl+A). Klikněte na Soubor &gt; Uložit kontakt jako VCard."
 
-#: C/evolution.xml:753(title)
+#: C/evolution.xml:752(para)
+msgid ""
+"Now that the first-run configuration has finished, you're ready to begin "
+"using Evolution. Here's a quick explanation of what's happening in your main "
+"Evolution window."
+msgstr ""
+"Nyní, když je nastavení po prvním spuštění dokončeno, můžete začít Evolution "
+"používat. Zde je rychlé vysvětlení toho, co se děje v hlavním okně "
+"Evolutionu."
+
+#: C/evolution.xml:755(title)
 msgid "Menu Bar:"
 msgstr "Lišta nabídky:"
 
-#: C/evolution.xml:754(para)
-msgid "The menu bar gives you access to most Evolution features. For additional information, see <link linkend=\"usage-mainwindow-menubar\">The Menu Bar</link>."
-msgstr "Lišta nabídky vám zpřístupňuje většinu funkcí Evolutionu. Více informací v <link linkend=\"usage-mainwindow-menubar\">Panelu nabídky</link>."
+#: C/evolution.xml:756(para)
+msgid ""
+"The menu bar gives you access to most Evolution features. For additional "
+"information, see <link linkend=\"usage-mainwindow-menubar\">The Menu Bar</"
+"link>."
+msgstr ""
+"Lišta nabídky vám zpřístupňuje většinu funkcí Evolutionu. Více informací v "
+"<link linkend=\"usage-mainwindow-menubar\">Panelu nabídky</link>."
 
-#: C/evolution.xml:757(title)
+#: C/evolution.xml:759(title)
 msgid "Folder List:"
 msgstr "Seznam složek:"
 
-#: C/evolution.xml:758(para)
-msgid "The folder list gives you a list of the available folders for each account. To see the contents of a folder, click the folder name and the contents are displayed in the e-mail list."
-msgstr "Seznam složek je seznam všech dostupných složek v jednotlivých účtech. Pokud chcete vidět obsah složky, klikněte na jméno složky a obsah se zobrazí v seznamu e-mailů."
+#: C/evolution.xml:760(para)
+msgid ""
+"The folder list gives you a list of the available folders for each account. "
+"To see the contents of a folder, click the folder name and the contents are "
+"displayed in the message list."
+msgstr ""
+"Seznam složek vám dává seznam všech dostupných složek v jednotlivých účtech. "
+"Pokud chcete vidět obsah složky, klikněte na jméno složky a obsah se zobrazí "
+"v seznamu zpráv."
 
-#: C/evolution.xml:761(title)
+#: C/evolution.xml:763(title)
 msgid "Toolbar:"
 msgstr "Lišta nástrojů:"
 
-#: C/evolution.xml:762(para)
-msgid "The toolbar gives you fast and easy access to the frequently used features in each component."
-msgstr "Lišta nástrojů vám umožňuje rychlý přístup k často používaným funkcím jednotlivých komponent."
+#: C/evolution.xml:764(para)
+msgid ""
+"The toolbar gives you fast and easy access to the frequently used features "
+"in each component."
+msgstr ""
+"Lišta nástrojů vám umožňuje rychlý přístup k často používaným funkcím "
+"jednotlivých komponent."
 
-#: C/evolution.xml:765(title)
+#: C/evolution.xml:767(title)
 msgid "Search Tool:"
 msgstr "Nástroj hledání:"
 
-#: C/evolution.xml:766(para)
-msgid "The search tool lets you search your e-mail, contacts, calendar, and tasks to easily find what you're looking for."
-msgstr "Nástroj hledání vám umožňuje prohledávat vaše e-maily, kontakty, kalendář a úkoly tak, že jednoduše naleznete, co hledáte."
+#: C/evolution.xml:768(para)
+msgid ""
+"The search tool lets you search your email, contacts, calendar, and tasks to "
+"easily find what you're looking for."
+msgstr ""
+"Nástroj hledání vám umožňuje prohledávat vaše e-maily, kontakty, kalendář a "
+"úkoly tak, že jednoduše naleznete, co hledáte."
 
-#: C/evolution.xml:769(title)
-#: C/evolution.xml:928(title)
+#: C/evolution.xml:771(title) C/evolution.xml:930(title)
 msgid "Message List:"
 msgstr "Seznam zpráv:"
 
-#: C/evolution.xml:770(para)
-msgid "The message list displays a list of e-mail that you have received. To view an e-mail in the preview pane, click the e-mail in the e-mail list."
-msgstr "Seznam zpráv zobrazuje seznam e-mailů, které jste dostali. Pro zobrazení e-mailu v panelu náhledu, klikněte na e-mail v seznamu e-mailů."
+#: C/evolution.xml:772(para)
+msgid ""
+"The message list displays a list of email that you have received. To view an "
+"email in the preview pane, click the email in the message list."
+msgstr ""
+"Seznam zpráv zobrazuje seznam e-mailů, které jste dostali. Pro zobrazení e-"
+"mailu v panelu náhledu, klikněte na e-mail v seznamu zpráv."
 
-#: C/evolution.xml:773(title)
+#: C/evolution.xml:775(title)
 msgid "Side bar:"
 msgstr "Boční panel:"
 
-#: C/evolution.xml:774(para)
-msgid "The side bar lets you switch between folders and between Evolution tools. At the bottom of the side bar is the switcher that let you switch Evolution tools, and above that is a list of all the available folders for the current tool.For additional information, see <link linkend=\"usage-mainwindow-shortcutbar\">The Side Bar</link>."
-msgstr "Boční panel vám umožňuje přepínat mezi složkami a mezi nástroji Evolutionu. V dolní části bočního panelu je přepínač, který vám umožňuje přepínat mezi nástroji Evolutionu, nad ním je seznam všech dostupných složek aktuálního nástroje. Další informace naleznete v <link linkend=\"usage-mainwindow-shortcutbar\">Bočním panelu</link>."
-
-#: C/evolution.xml:777(title)
+#: C/evolution.xml:776(para)
+msgid ""
+"The side bar lets you switch between folders and between Evolution tools. At "
+"the bottom of the side bar is the switcher that let you switch Evolution "
+"tools, and above that is a list of all the available folders for the current "
+"tool. For additional information, see <link linkend=\"usage-mainwindow-"
+"shortcutbar\">The Side Bar</link>."
+msgstr ""
+"Boční panel vám umožňuje přepínat mezi složkami a mezi nástroji Evolutionu. "
+"V dolní části bočního panelu je přepínač, který vám umožňuje přepínat mezi "
+"nástroji Evolutionu, nad ním je seznam všech dostupných složek aktuálního "
+"nástroje. Další informace naleznete v <link linkend=\"usage-mainwindow-"
+"shortcutbar\">Bočním panelu</link>."
+
+#: C/evolution.xml:779(title)
 msgid "Switcher:"
 msgstr "Přepínač:"
 
-#: C/evolution.xml:778(para)
-msgid "The switcher at the bottom of the side bar lets you switch between the Evolution tools - mail, contacts, Calendars, Memos and Tasks."
-msgstr "Přepínač v dolní části bočního panelu vám umožňuje přepínat mezi nástroji Evolutionu - Poštou, Kontakty, Kalendáři, Poznámkami a Úkoly."
+#: C/evolution.xml:780(para)
+msgid ""
+"The switcher at the bottom of the side bar lets you switch between the "
+"Evolution tools - Mail, Contacts, Calendars, Memos and Tasks."
+msgstr ""
+"Přepínač v dolní části bočního panelu vám umožňuje přepínat mezi nástroji "
+"Evolutionu - Poštou, Kontakty, Kalendáři, Poznámkami a Úkoly."
 
-#: C/evolution.xml:781(title)
+#: C/evolution.xml:783(title)
 msgid "Status Bar:"
 msgstr "Stavový řádek:"
 
-#: C/evolution.xml:782(para)
-msgid "The status bar periodically displays a message, or tells you the progress of a task. This most often happens when you're checking or sending e-mail. These progress queues are shown in the previous figure. The Online/Offline indicator is here, too, in the lower left of the window."
-msgstr "Stavový řádek pravidelně ukazuje zprávu nebo vám ukazuje průběh úlohy. To se nejčastěji stává, když kontrolujete nebo odesíláte poštu. Tyto průběhy jsou zobrazeny na předchozím obrázku. Indikátor online/offline režimu je zde také, v levé dolní části okna."
+#: C/evolution.xml:784(para)
+msgid ""
+"The status bar periodically displays a message, or tells you the progress of "
+"a task. This most often happens when you're checking or sending email. These "
+"progress queues are shown in the previous figure. The Online/Offline "
+"indicator is here, too, in the lower left of the window."
+msgstr ""
+"Stavový řádek pravidelně ukazuje zprávu nebo vám ukazuje průběh úlohy. To se "
+"nejčastěji stává, když kontrolujete nebo odesíláte poštu. Tyto průběhy jsou "
+"zobrazeny na předchozím obrázku. Indikátor online/offline režimu je zde "
+"také, v levé dolní části okna."
 
-#: C/evolution.xml:785(title)
-#: C/evolution.xml:932(title)
+#: C/evolution.xml:787(title) C/evolution.xml:934(title)
 msgid "Preview Pane:"
 msgstr "Panel náhledu:"
 
-#: C/evolution.xml:786(para)
-msgid "The preview pane displays the contents of the e-mail that is selected in the e-mail list."
-msgstr "Panel náhledu ukazuje obsah e-mailu, který je vybrán v seznamu e-mailů."
+#: C/evolution.xml:788(para)
+msgid ""
+"The preview pane displays the contents of the email that is selected in the "
+"message list."
+msgstr "Panel náhledu ukazuje obsah e-mailu, který je vybrán v seznamu zpráv."
 
-#: C/evolution.xml:790(title)
+#: C/evolution.xml:792(title)
 msgid "The Menu Bar"
 msgstr "Lišta nabídky"
 
-#: C/evolution.xml:791(para)
-msgid "The menu bar's contents always provide all the possible actions for any given view of your data. If you're looking at your Inbox, most of the menu items relate to e-mail. Some content relates to other components of Evolution and some, especially in the File menu, relates to the application as a whole."
-msgstr "Obsah lišty nabídky vždy nabízí všechny možné akce pro aktuální zobrazení dat. Pokud se díváte na složku Příchozí, většina z položek v nabídce bude patřit poště. Některá položka může příslušet jiné komponentě Evolutionu anebo, zvláště nabídka Soubor, celé aplikaci."
+#: C/evolution.xml:793(para)
+msgid ""
+"The menu bar's contents always provide all the possible actions for any "
+"given view of your data. If you're looking at your Inbox, most of the menu "
+"items relate to email. Some content relates to other components of Evolution "
+"and some, especially in the File menu, relates to the application as a whole."
+msgstr ""
+"Obsah lišty nabídky vždy nabízí všechny možné akce pro aktuální zobrazení "
+"dat. Pokud se díváte na složku Příchozí, většina z položek v nabídce bude "
+"patřit poště. Některá položka může příslušet jiné komponentě Evolutionu "
+"anebo, zvláště nabídka Soubor, celé aplikaci."
 
-#: C/evolution.xml:793(title)
+#: C/evolution.xml:795(title)
 msgid "File:"
 msgstr "Soubor:"
 
-#: C/evolution.xml:794(para)
-msgid "Anything related to a file or to the operations of the application is listed in this menu, such as creating things, saving them to disk, printing them, and quitting the program itself."
-msgstr "Všechno náležející k souboru nebo operace aplikace jsou uvedené v této nabídce, jako tvoření věcí, jejich ukládání na disk, tisk, ukončení programu."
+#: C/evolution.xml:796(para)
+msgid ""
+"Anything related to a file or to the operations of the application is listed "
+"in this menu, such as creating things, saving them to disk, printing them, "
+"and quitting the program itself."
+msgstr ""
+"Všechno náležející k souboru nebo operace aplikace jsou uvedené v této "
+"nabídce, jako tvoření věcí, jejich ukládání na disk, tisk, ukončení programu."
 
-#: C/evolution.xml:797(title)
+#: C/evolution.xml:799(title)
 msgid "Edit:"
 msgstr "Upravit:"
 
-#: C/evolution.xml:798(para)
-msgid "Holds useful tools that help you edit text and move it around. Lets you access the settings and configuration options in the Edit menu."
-msgstr "Obsahuje užitečné nástroje, které vám pomáhají upravovat text nebo ho přesouvat. Umožňuje vám přístup k nastavení."
+#: C/evolution.xml:800(para)
+msgid ""
+"Holds useful tools that help you edit text and move it around. Lets you "
+"access the settings and configuration options in the Edit menu."
+msgstr ""
+"Obsahuje užitečné nástroje, které vám pomáhají upravovat text nebo ho "
+"přesouvat. Umožňuje vám přístup k nastavení."
 
-#: C/evolution.xml:801(title)
+#: C/evolution.xml:803(title)
 msgid "View:"
 msgstr "Zobrazit:"
 
-#: C/evolution.xml:802(para)
-msgid "Lets you decide how Evolution should look. Some of the features control the appearance of Evolution as a whole, and others the way a particular kind of information appears."
-msgstr "Umožňuje vám se rozhodovat, jak má Evolution vypadat. Některé z funkcí kontrolují vzhled Evolutionu jako celku a jiné zase způsob, jak se zobrazují jednotlivé informace."
+#: C/evolution.xml:804(para)
+msgid ""
+"Lets you decide how Evolution should look. Some of the features control the "
+"appearance of Evolution as a whole, and others the way a particular kind of "
+"information appears."
+msgstr ""
+"Umožňuje vám se rozhodovat, jak má Evolution vypadat. Některé z funkcí "
+"kontrolují vzhled Evolutionu jako celku a jiné zase způsob, jak se zobrazují "
+"jednotlivé informace."
 
-#: C/evolution.xml:805(title)
+#: C/evolution.xml:807(title)
 msgid "Folder:"
 msgstr "Složka:"
 
-#: C/evolution.xml:806(para)
-msgid "Holds actions that can be performed on folders. You can find things like copy, rename, delete, and so on."
-msgstr "Obsahuje akce, které mohou být použity na složky. Najdete zde věci jako kopírování, přejmenování, vymazání atd."
+#: C/evolution.xml:808(para)
+msgid ""
+"Holds actions that can be performed on folders. You can find things like "
+"copy, rename, delete, and so on."
+msgstr ""
+"Obsahuje akce, které mohou být použity na složky. Najdete zde věci jako "
+"kopírování, přejmenování, vymazání atd."
 
-#: C/evolution.xml:809(title)
+#: C/evolution.xml:811(title)
 msgid "Message:"
 msgstr "Zpráva:"
 
-#: C/evolution.xml:810(para)
-msgid "Holds actions that can be applied to a message. If there is only one target for the action, such as replying to a message, you can normally find it in the Message menu."
-msgstr "Obsahuje akce, které mohou být použity na zprávy. Pokud je pouze jeden cíl pro akci jako odpověď na zprávu, můžete ji normálně najít v nabídce Zpráva."
+#: C/evolution.xml:812(para)
+msgid ""
+"Holds actions that can be applied to a message. If there is only one target "
+"for the action, such as replying to a message, you can normally find it in "
+"the Message menu."
+msgstr ""
+"Obsahuje akce, které mohou být použity na zprávy. Pokud je pouze jeden cíl "
+"pro akci jako odpověď na zprávu, můžete ji normálně najít v nabídce Zpráva."
 
-#: C/evolution.xml:813(title)
+#: C/evolution.xml:815(title)
 msgid "Search:"
 msgstr "Hledat:"
 
-#: C/evolution.xml:814(para)
-msgid "Lets you search for messages, or for phrases within a message. You can also see previous searches you have made. In addition to the Search menu, there is a text entry box in the toolbar that you can use to search for messages. You can also create a search folder from a search."
-msgstr "Umožňuje vám vyhledávat zprávy nebo fráze ve zprávách. Taktéž se můžete podívat na předchozí vyhledávání, které jste provedli. Kromě nabídky Hledat, je zde ještě pole pro vložení textu v liště nástrojů, které můžete používat pro hledání zpráv. Taktéž si můžete z hledání vytvořit složku hledání."
+#: C/evolution.xml:816(para)
+msgid ""
+"Lets you search for messages, or for phrases within a message. You can also "
+"see previous searches you have made. In addition to the Search menu, there "
+"is a text entry box in the toolbar that you can use to search for messages. "
+"You can also create a search folder from a search."
+msgstr ""
+"Umožňuje vám vyhledávat zprávy nebo fráze ve zprávách. Taktéž se můžete "
+"podívat na předchozí vyhledávání, které jste provedli. Kromě nabídky Hledat, "
+"je zde ještě pole pro vložení textu v liště nástrojů, které můžete používat "
+"pro hledání zpráv. Taktéž si můžete z hledání vytvořit složku hledání."
 
-#: C/evolution.xml:817(title)
+#: C/evolution.xml:819(title)
 msgid "Help:"
 msgstr "Nápověda:"
 
-#: C/evolution.xml:818(para)
+#: C/evolution.xml:820(para)
 msgid "Opens the Evolution Help files."
 msgstr "Otevírá soubory s nápovědou k Evolutionu."
 
-#: C/evolution.xml:823(title)
+#: C/evolution.xml:825(title)
 msgid "The Sidebar"
 msgstr "Boční panel"
 
-#: C/evolution.xml:824(para)
-msgid "Sidebar is the vertical panel on the left side of the Evolution main window. At the bottom of the sidebar is the Switcher, that lets you switch between the Evolution tools like Mail, Memo,Tasks and Contacts. Above the Switcher you can see a list of folders for the current Evolution tool."
-msgstr "Boční panel je vertikální panel v levé části hlavního okna Evolutionu. Ve spodní části panelu je Přepínač, který vám umožňuje přepínat mezi nástroji Evolutionu jako jsou Pošta, Poznámky, Úkoly a Kontakty. Nad nimi je seznam složek aktuálního nástroje Evolutionu."
-
-#: C/evolution.xml:825(para)
-msgid "The folder list organizes your e-mail, calendars, contact lists, and task lists in a tree, similar to a <link linkend=\"filetree\">file tree</link>. Most people find one to four folders at the base of the tree, depending on the tool and their system configuration. Each Evolution tool has at least one folder, called On This Computer, for local information. For example, the folder list for the e-mail tool shows any remote e-mail storage you have set up, plus local folders and search folders, which are discussed in <link linkend=\"usage-mail-organize-vfolders\">Using Search Folders</link>."
-msgstr "Seznam složek organizuje vaši poštu, kalendáře, seznamy kontaktů a seznamy poznámek do stromu podobného <link linkend=\"filetree\">stromu souborů</link>. Většina lidí nalezne od jedné do čtyř složek v základu stromu v závislosti na nástroji a nastavení vašeho systému. Každý nástroj Evolutionu má aspoň jednu složku pro lokální informace zvanou V tomto počítači. Např. seznam složek pro poštovní nástroj ukazuje všechny vzdálené e-mailové úložiště, které jste nastavili plus místní složky a složky hledání, kterým se věnuje <link linkend=\"usage-mail-organize-vfolders\">Používání složek hledání</link>."
-
 #: C/evolution.xml:826(para)
-msgid "If you get large amounts of e-mail, you might want more folders than just your Inbox. You can create multiple calendar, task, or contacts folders."
-msgstr "Pokud dostáváte velké množství e-mailů, možná budete chtít více složek než jen složku Příchozí. Můžete vytvořit více složek kalendáře, úkolů nebo kontaktů."
+msgid ""
+"Sidebar is the vertical panel on the left side of the Evolution main window. "
+"At the bottom of the sidebar is the Switcher, that lets you switch between "
+"the Evolution tools like Mail, Memo,Tasks and Contacts. Above the Switcher "
+"you can see a list of folders for the current Evolution tool."
+msgstr ""
+"Boční panel je vertikální panel v levé části hlavního okna Evolutionu. Ve "
+"spodní části panelu je Přepínač, který vám umožňuje přepínat mezi nástroji "
+"Evolutionu jako jsou Pošta, Poznámky, Úkoly a Kontakty. Nad nimi je seznam "
+"složek aktuálního nástroje Evolutionu."
 
 #: C/evolution.xml:827(para)
+msgid ""
+"The folder list organizes your email, calendars, address books, task lists "
+"and memo lists in a tree, similar to a <link linkend=\"filetree\">file tree</"
+"link>. Most people find one to four folders at the base of the tree, "
+"depending on the tool and their system configuration. Each Evolution tool "
+"has at least one folder, called On This Computer, for local information. For "
+"example, the folder list for the email tool shows any remote email storage "
+"you have set up, plus local folders and search folders, which are discussed "
+"in <link linkend=\"usage-mail-organize-vfolders\">Using Search Folders</"
+"link>."
+msgstr ""
+"Seznam složek organizuje vaši poštu, kalendáře, seznamy kontaktů a seznamy "
+"poznámek do stromu podobného <link linkend=\"filetree\">stromu souborů</"
+"link>. Většina lidí nalezne od jedné do čtyř složek v základu stromu v "
+"závislosti na nástroji a nastavení vašeho systému. Každý nástroj Evolutionu "
+"má aspoň jednu složku pro lokální informace zvanou V tomto počítači. Např. "
+"seznam složek pro poštovní nástroj ukazuje všechny vzdálené e-mailové "
+"úložiště, které jste nastavili plus místní složky a složky hledání, kterým "
+"se věnuje <link linkend=\"usage-mail-organize-vfolders\">Používání složek "
+"hledání</link>."
+
+#: C/evolution.xml:828(para)
+msgid ""
+"If you get large amounts of email, you might want more folders than just "
+"your Inbox. You can create multiple calendar, task, or contacts folders."
+msgstr ""
+"Pokud dostáváte velké množství e-mailů, možná budete chtít více složek než "
+"jen složku Příchozí. Můžete vytvořit více složek kalendáře, úkolů nebo "
+"kontaktů."
+
+#: C/evolution.xml:829(para)
 msgid "To create a new folder:"
 msgstr "Vytvořit novou složku:"
 
-#: C/evolution.xml:830(para)
+#: C/evolution.xml:832(para)
 msgid "Click Folder &gt; New."
 msgstr "Klikněte na Složku &gt; Nový."
 
-#: C/evolution.xml:833(para)
+#: C/evolution.xml:835(para)
 msgid "Type the name of the folder in the Folder Name field."
 msgstr "Napište jméno složky do pole Název složky."
 
-#: C/evolution.xml:836(para)
+#: C/evolution.xml:838(para)
 msgid "Select the location of the new folder."
 msgstr "Vyberte umístění nové složky."
 
-#: C/evolution.xml:839(para)
-#: C/evolution.xml:1242(para)
-#: C/evolution.xml:1265(para)
-#: C/evolution.xml:1277(para)
-#: C/evolution.xml:1512(para)
-#: C/evolution.xml:1794(para)
-#: C/evolution.xml:1896(para)
-#: C/evolution.xml:1912(para)
-#: C/evolution.xml:2128(para)
-#: C/evolution.xml:2166(para)
-#: C/evolution.xml:2226(para)
-#: C/evolution.xml:2705(para)
-#: C/evolution.xml:2738(para)
-#: C/evolution.xml:2934(para)
-#: C/evolution.xml:2976(para)
-#: C/evolution.xml:3109(para)
-#: C/evolution.xml:3206(para)
-#: C/evolution.xml:3221(para)
-#: C/evolution.xml:3499(para)
-#: C/evolution.xml:4095(para)
-#: C/evolution.xml:4161(para)
-#: C/evolution.xml:4283(para)
-#: C/evolution.xml:4325(para)
-#: C/evolution.xml:4656(para)
-#: C/evolution.xml:4711(para)
-#: C/evolution.xml:5282(para)
-#: C/evolution.xml:5304(para)
-#: C/evolution.xml:5328(para)
-#: C/evolution.xml:5362(para)
-#: C/evolution.xml:5838(para)
-#: C/evolution.xml:5865(para)
-#: C/evolution.xml:5885(para)
-#: C/evolution.xml:5900(para)
-#: C/evolution.xml:5923(para)
-#: C/evolution.xml:5949(para)
-#: C/evolution.xml:6103(para)
-#: C/evolution.xml:6181(para)
-#: C/evolution.xml:6211(para)
-#: C/evolution.xml:6773(para)
-#: C/evolution.xml:6871(para)
-#: C/evolution.xml:7006(para)
+#: C/evolution.xml:841(para) C/evolution.xml:1308(para)
+#: C/evolution.xml:1334(para) C/evolution.xml:1346(para)
+#: C/evolution.xml:1521(para) C/evolution.xml:1605(para)
+#: C/evolution.xml:1887(para) C/evolution.xml:1989(para)
+#: C/evolution.xml:2005(para) C/evolution.xml:2323(para)
+#: C/evolution.xml:2362(para) C/evolution.xml:2428(para)
+#: C/evolution.xml:2908(para) C/evolution.xml:2941(para)
+#: C/evolution.xml:3137(para) C/evolution.xml:3179(para)
+#: C/evolution.xml:3312(para) C/evolution.xml:3406(para)
+#: C/evolution.xml:3421(para) C/evolution.xml:3439(para)
+#: C/evolution.xml:3497(para) C/evolution.xml:3543(para)
+#: C/evolution.xml:3757(para) C/evolution.xml:3761(para)
+#: C/evolution.xml:3988(para) C/evolution.xml:4357(para)
+#: C/evolution.xml:4423(para) C/evolution.xml:4545(para)
+#: C/evolution.xml:4588(para) C/evolution.xml:4920(para)
+#: C/evolution.xml:4975(para) C/evolution.xml:5426(para)
+#: C/evolution.xml:5501(para) C/evolution.xml:5523(para)
+#: C/evolution.xml:5547(para) C/evolution.xml:5581(para)
+#: C/evolution.xml:5925(para) C/evolution.xml:6060(para)
+#: C/evolution.xml:6087(para) C/evolution.xml:6107(para)
+#: C/evolution.xml:6122(para) C/evolution.xml:6145(para)
+#: C/evolution.xml:6171(para) C/evolution.xml:6303(para)
+#: C/evolution.xml:6326(para) C/evolution.xml:6404(para)
+#: C/evolution.xml:6434(para) C/evolution.xml:7097(para)
+#: C/evolution.xml:7195(para) C/evolution.xml:7330(para)
 msgid "Click OK."
 msgstr "Klikněte na OK."
 
-#: C/evolution.xml:844(title)
+#: C/evolution.xml:846(title)
 msgid "Changing Switcher Appearance:"
 msgstr "Změna vzhledu přepínače:"
 
-#: C/evolution.xml:845(para)
-msgid "To change the appearance of your switcher click <emphasis>View &gt; Switcher Appearance</emphasis> from the Menu bar. Under Switcher Appearance you can select:"
-msgstr "Chcete-li změnit vzhled přepínače, klikněte na <emphasis>Zobrazit &gt; Vzhled přepínače</emphasis>"
+#: C/evolution.xml:847(para)
+msgid ""
+"To change the appearance of your switcher click <emphasis>View &gt; Switcher "
+"Appearance</emphasis> from the Menu bar. Under Switcher Appearance you can "
+"select:"
+msgstr ""
+"Chcete-li změnit vzhled přepínače, klikněte na <emphasis>Zobrazit &gt; "
+"Vzhled přepínače</emphasis>"
 
-#: C/evolution.xml:847(title)
+#: C/evolution.xml:849(title)
 msgid "Icons and Text:"
 msgstr "Ikony a text:"
 
-#: C/evolution.xml:848(para)
+#: C/evolution.xml:850(para)
 msgid "Displays buttons with the label and the icon corresponding to it."
 msgstr "Zobrazí tlačítka s popisem a tomu odpovídající ikonou."
 
-#: C/evolution.xml:851(title)
+#: C/evolution.xml:853(title)
 msgid "Icons Only:"
 msgstr "Jen ikony:"
 
-#: C/evolution.xml:852(para)
+#: C/evolution.xml:854(para)
 msgid "Shows only the icons."
 msgstr "Zobrazí pouze ikony."
 
-#: C/evolution.xml:855(title)
+#: C/evolution.xml:857(title)
 msgid "Texts Only:"
 msgstr "Jen text:"
 
-#: C/evolution.xml:856(para)
+#: C/evolution.xml:858(para)
 msgid "Displays buttons with the label, not the icons."
 msgstr "Zobrazí tlačítka s popisky bez ikon."
 
-#: C/evolution.xml:859(title)
+#: C/evolution.xml:861(title)
 msgid "Toolbar Style:"
 msgstr "Styl lišty nástrojů:"
 
-#: C/evolution.xml:860(para)
+#: C/evolution.xml:862(para)
 msgid "Shows buttons using the desktop toolbar settings."
 msgstr "Zobrazí tlačítka využívající nastavení systémové lišty nástrojů."
 
-#: C/evolution.xml:863(title)
+#: C/evolution.xml:865(title)
 msgid "Hide Buttons:"
 msgstr "Skrýt tlačítka:"
 
-#: C/evolution.xml:864(para)
+#: C/evolution.xml:866(para)
 msgid "This option hides all the shortcut buttons of switcher."
 msgstr "Tato volba schová všechny tlačítka přepínače."
 
-#: C/evolution.xml:869(title)
+#: C/evolution.xml:871(title)
 msgid "Folder Management"
 msgstr "Správa složek"
 
-#: C/evolution.xml:870(para)
-msgid "Right-click a folder or subfolder to display a menu with the following options:"
-msgstr "Klikněte pravým tlačítkem na složku nebo podsložku a zobrazí se vám nabídka s následujícími možnostmi:"
+#: C/evolution.xml:872(para)
+msgid ""
+"Right-click a folder or subfolder to display a menu with the following "
+"options:"
+msgstr ""
+"Klikněte pravým tlačítkem na složku nebo podsložku a zobrazí se vám nabídka "
+"s následujícími možnostmi:"
 
-#: C/evolution.xml:872(title)
+#: C/evolution.xml:874(title)
 msgid "Copy:"
 msgstr "Kopírovat:"
 
-#: C/evolution.xml:873(para)
-msgid "Copies the folder to a different location. When you select this item, Evolution offers a choice of locations to copy the folder to."
-msgstr "Zkopíruje složku do jiného umístění. Když vyberete tuto položku, Evolution vám nabídne výběr umístění, kde složku zkopírovat."
+#: C/evolution.xml:875(para)
+msgid ""
+"Copies the folder to a different location. When you select this item, "
+"Evolution offers a choice of locations to copy the folder to."
+msgstr ""
+"Zkopíruje složku do jiného umístění. Když vyberete tuto položku, Evolution "
+"vám nabídne výběr umístění, kde složku zkopírovat."
 
-#: C/evolution.xml:876(title)
+#: C/evolution.xml:878(title)
 msgid "Move:"
 msgstr "Přesunout:"
 
-#: C/evolution.xml:877(para)
+#: C/evolution.xml:879(para)
 msgid "Moves the folder to another location."
 msgstr "Přesune složku do jiného umístění."
 
-#: C/evolution.xml:880(title)
+#: C/evolution.xml:882(title)
 msgid "Mark Messages As Read:"
 msgstr "Označit zprávy jako přečtené:"
 
-#: C/evolution.xml:881(para)
+#: C/evolution.xml:883(para)
 msgid "Marks all the messages in the folder as read."
 msgstr "Označí všechny zprávy ve složce jako přečtené."
 
-#: C/evolution.xml:884(title)
+#: C/evolution.xml:886(title)
 msgid "New Folder:"
 msgstr "Nová složka:"
 
-#: C/evolution.xml:885(para)
+#: C/evolution.xml:887(para)
 msgid "Creates another folder in the same location."
 msgstr "Vytvoří další složku se stejným umístěním."
 
-#: C/evolution.xml:888(title)
-#: C/evolution.xml:2864(title)
+#: C/evolution.xml:890(title) C/evolution.xml:3067(title)
 msgid "Delete:"
 msgstr "Odstranit:"
 
-#: C/evolution.xml:889(para)
+#: C/evolution.xml:891(para)
 msgid "Deletes the folder and all its contents."
 msgstr "Odstraní adresář a celý jeho obsah."
 
-#: C/evolution.xml:892(title)
+#: C/evolution.xml:894(title)
 msgid "Rename:"
 msgstr "Přejmenovat:"
 
-#: C/evolution.xml:893(para)
+#: C/evolution.xml:895(para)
 msgid "Lets you change the name of the folder."
 msgstr "Umožní vám změnit jméno složky."
 
-#: C/evolution.xml:896(title)
+#: C/evolution.xml:898(title)
 msgid "Disable:"
 msgstr "Zakázat:"
 
-#: C/evolution.xml:897(para)
+#: C/evolution.xml:899(para)
 msgid "Disables the account."
 msgstr "Zakáže účet."
 
-#: C/evolution.xml:900(title)
+#: C/evolution.xml:902(title)
 msgid "Properties:"
 msgstr "Vlastnosti:"
 
-#: C/evolution.xml:901(para)
-msgid "Checks the number of total and unread messages in a folder, and, for remote folders, lets you select whether to copy the folder to your local system for offline operation."
-msgstr "Kontroluje počet všech zpráv a nepřečtených zpráv ve složce a ve vzdálených složkách vám umožňuje vybrat, zda kopírovat složku do lokálního systému pro offline operace."
-
 #: C/evolution.xml:903(para)
-msgid "You can also rearrange folders and messages by dragging and dropping them."
+msgid ""
+"Checks the number of total and unread messages in a folder, and, for remote "
+"folders, lets you select whether to copy the folder to your local system for "
+"offline operation."
+msgstr ""
+"Kontroluje počet všech zpráv a nepřečtených zpráv ve složce a ve vzdálených "
+"složkách vám umožňuje vybrat, zda kopírovat složku do lokálního systému pro "
+"offline operace."
+
+#: C/evolution.xml:905(para)
+msgid ""
+"You can also rearrange folders and messages by dragging and dropping them."
 msgstr "Můžete také složky a zprávy přeskupovat uchopením a přesunutím. "
 
-#: C/evolution.xml:904(para)
-msgid "Any time new e-mail arrives in a e-mail folder, that folder label is displayed in bold text, along with the number of new messages in that folder."
-msgstr "Kdykoliv přijde do složky nová pošta, popis složky se zobrazí tučně s počtem novým zpráv ve složce."
+#: C/evolution.xml:906(para)
+msgid ""
+"Any time new email arrives in a email folder, that folder label is displayed "
+"in bold text, along with the number of new messages in that folder."
+msgstr ""
+"Kdykoliv přijde do složky nová pošta, popis složky se zobrazí tučně s počtem "
+"novým zpráv ve složce."
 
-#: C/evolution.xml:909(title)
-msgid "E-Mail"
-msgstr "E-Mail"
+#: C/evolution.xml:911(title)
+msgid "Email"
+msgstr "E-mail"
 
-#: C/evolution.xml:910(para)
-msgid "Evolution e-mail is like other e-mail programs in several ways:"
-msgstr "E-mailový klient Evolution je jako jiné e-mailové programy v několika směrech:"
+#: C/evolution.xml:912(para)
+msgid "Evolution email is like other email programs in several ways:"
+msgstr ""
+"E-mailový klient Evolution je jako jiné e-mailové programy v několika "
+"směrech:"
 
-#: C/evolution.xml:913(para)
-msgid "It can send and receive e-mail in HTML or as plain text, and makes it easy to send and receive multiple file attachments."
-msgstr "Může posílat a přijímat e-maily v HTML nebo prostém textu a zjednodušuje posílání a přijímaní přílohy o více souborech."
+#: C/evolution.xml:915(para)
+msgid ""
+"It can send and receive email in HTML or as plain text, and makes it easy to "
+"send and receive multiple file attachments."
+msgstr ""
+"Může posílat a přijímat e-maily v HTML nebo prostém textu a zjednodušuje "
+"posílání a přijímaní přílohy o více souborech."
 
-#: C/evolution.xml:916(para)
-msgid "It supports multiple e-mail sources, including <link linkend=\"imap\">IMAP</link>, <link linkend=\"pop\">POP3</link>, and local mbox or mh spools and files created by other e-mail programs."
-msgstr "Podporuje různé e-mailové zdroje včetně <link linkend=\"imap\">IMAPu</link>, <link linkend=\"pop\">POP3</link>, místního mboxu nebo adresářů a souborů mh vytvořených jinými programy."
+#: C/evolution.xml:918(para)
+msgid ""
+"It supports multiple email sources, including <link linkend=\"imap\">IMAP</"
+"link>, <link linkend=\"pop\">POP3</link>, and local mbox or mh spools and "
+"files created by other email programs."
+msgstr ""
+"Podporuje různé e-mailové zdroje včetně <link linkend=\"imap\">IMAPu</link>, "
+"<link linkend=\"pop\">POP3</link>, místního mboxu nebo adresářů a souborů mh "
+"vytvořených jinými programy."
 
-#: C/evolution.xml:919(para)
-msgid "It can sort and organize your e-mail in a wide variety of ways with folders, searches, and filters."
-msgstr "Může třídit a organizovat vaši poštu mnoha způsoby za pomoci složek, vyhledávání a filtrů."
+#: C/evolution.xml:921(para)
+msgid ""
+"It can sort and organize your email in a wide variety of ways with folders, "
+"searches, and filters."
+msgstr ""
+"Může třídit a organizovat vaši poštu mnoha způsoby za pomoci složek, "
+"vyhledávání a filtrů."
 
-#: C/evolution.xml:922(para)
+#: C/evolution.xml:924(para)
 msgid "It lets you guard your privacy with encryption."
 msgstr "Umožňuje vám hlídat si vlastní soukromí pomocí šifrování."
 
-#: C/evolution.xml:925(para)
-msgid "However, Evolution has some important differences from other e-mail programs. First, It is built to handle very large amounts of e-mail. The <link linkend=\"usage-mail-organize-spam\">junk e-mail</link>, message <link linkend=\"usage-mail-organize-filters\">filtering</link> and <link linkend=\"usage-mail-organize-search\">searching</link> functions were built for speed and efficiency. There's also the <link linkend=\"usage-mail-organize-vfolders\">search folder</link>, an advanced organizational feature not found in some e-mail clients. If you get a lot of e-mail, or if you keep every message you get in case you need to refer to it later, you'll find this feature especially useful. Here's a quick explanation of what's happening in your main Evolution e-mail window."
-msgstr "Nicméně se Evolution v některých důležitých věcech od ostatních e-mailových programů liší. Zaprvé je vytvořen tak, aby pracoval s velkým množstvím e-mailů. Funkce <link linkend=\"usage-mail-organize-spam\">nevyžádané pošty</link>, <link linkend=\"usage-mail-organize-filters\">filtrování</link> zpráv a <link linkend=\"usage-mail-organize-search\">vyhledávání</link> vytvořeny pro rychlou a efektivní práci. V některých jiných klientech také nenajdete <link linkend=\"usage-mail-organize-vfolders\">složky hledání</link> a pokročilé organizační funkce. Pokud dostáváte hodně e-mailů nebo si ponecháváte všechny zprávy, které dostanete, pro případ, že na ně budete chtít později odkázat, budou se vám tyto funkce obzvláště hodit. Zde je rychlé vysvětlení toho, co se děje v hlavním okně e-mailu Evolutionu."
-
-#: C/evolution.xml:929(para)
-msgid "The message list displays all the messages that you have. This includes all your read and unread messages, and e-mail that is flagged to be deleted."
-msgstr "Seznam zpráv zobrazuje všechny zprávy, které máte. To znamená všechny vaše přečtené a nepřečtené zprávy a poštu označenou pro smazání."
-
-#: C/evolution.xml:933(para)
-msgid "This is where your e-mail is displayed."
-msgstr "Zde jsou vaše e-maily zobrazovány."
+#: C/evolution.xml:927(para)
+msgid ""
+"However, Evolution has some important differences from other email programs. "
+"First, It is built to handle very large amounts of email. The <link linkend="
+"\"usage-mail-organize-spam\">junk email</link>, message <link linkend="
+"\"usage-mail-organize-filters\">filtering</link> and <link linkend=\"usage-"
+"mail-organize-search\">searching</link> functions were built for speed and "
+"efficiency. There's also the <link linkend=\"usage-mail-organize-vfolders"
+"\">search folder</link>, an advanced organizational feature not found in "
+"some email clients. If you get a lot of email, or if you keep every message "
+"you get in case you need to refer to it later, you will find this feature "
+"especially useful. Here's a quick explanation of what's happening in your "
+"main Evolution email window."
+msgstr ""
+"Nicméně se Evolution v některých důležitých věcech od ostatních e-mailových "
+"programů liší. Zaprvé je vytvořen tak, aby pracoval s velkým množstvím e-"
+"mailů. Funkce <link linkend=\"usage-mail-organize-spam\">nevyžádané pošty</"
+"link>, <link linkend=\"usage-mail-organize-filters\">filtrování</link> zpráv "
+"a <link linkend=\"usage-mail-organize-search\">vyhledávání</link> vytvořeny "
+"pro rychlou a efektivní práci. V některých jiných klientech také nenajdete "
+"<link linkend=\"usage-mail-organize-vfolders\">složky hledání</link> a "
+"pokročilé organizační funkce. Pokud dostáváte hodně e-mailů nebo si "
+"ponecháváte všechny zprávy, které dostanete, pro případ, že na ně budete "
+"chtít později odkázat, budou se vám tyto funkce obzvláště hodit. Zde je "
+"rychlé vysvětlení toho, co se děje v hlavním okně e-mailu Evolutionu."
+
+#: C/evolution.xml:931(para)
+msgid ""
+"The message list displays all the messages that you have. This includes all "
+"your read and unread messages, and email that is flagged to be deleted."
+msgstr ""
+"Seznam zpráv zobrazuje všechny zprávy, které máte. To znamená všechny vaše "
+"přečtené a nepřečtené zprávy a poštu označenou pro smazání."
 
 #: C/evolution.xml:935(para)
-msgid "If you find the preview pane too small, you can resize the pane, enlarge the whole window, or double-click the message in the message list to have it open in a new window. To change the size of a pane, drag the divider between the two panes."
-msgstr "Pokud vám přijde panel náhledů příliš malý, můžete změnit velikost panelu, zvětšit celé okno nebo poklikat na zprávu v seznamu zpráv, která se poté otevře v novém okně. Velikost panelu změníte tak, že táhnete dělící lištu mezi dvěma panely."
-
-#: C/evolution.xml:936(para)
-msgid "As with folders, you can right-click messages in the message list and get a menu of possible actions, including moving or deleting them, creating filters or search folders based on them, and marking them as junk mail."
-msgstr "Stejně jako u složek můžete kliknout pravým tlačítkem na zprávy v seznamu práv a dostanete nabídku možných akcí, včetně přesouvání nebo ostranění, vytváření filtrů nebo složek hledání a označování zpráv jako nevyžádanou poštu."
+msgid ""
+"The preview pane displays the message that is currently chosen in the "
+"message list."
+msgstr "Panel náhledu ukazuje zprávu, která je vybrána v seznamu zpráv."
 
 #: C/evolution.xml:937(para)
-msgid "Most of the e-mail-related actions you want to perform are listed in the Message Menu and Folder Menu in the menu bar. The most frequently used ones, like Reply and Forward, also appear as buttons in the toolbar. Most of them are also located in the right-click menu and as keyboard shortcuts."
-msgstr "Většina akcí týkajících se pošty, které chcete provádět, je v nabídce Zpráva a Složka v liště nabídky. Ty nejpoužívanější jako Odpovědět a Přeposlat se nachází také jako tlačítka liště nástrojů. Většina z nich je také umístěná v nabídce pravého kliknutí a jako klávesové zkratky."
+msgid ""
+"If you find the preview pane too small, you can resize the pane, enlarge the "
+"whole window, or double-click the message in the message list to have it "
+"open in a new window. To change the size of a pane, drag the divider between "
+"the two panes."
+msgstr ""
+"Pokud vám přijde panel náhledů příliš malý, můžete změnit velikost panelu, "
+"zvětšit celé okno nebo poklikat na zprávu v seznamu zpráv, která se poté "
+"otevře v novém okně. Velikost panelu změníte tak, že táhnete dělící lištu "
+"mezi dvěma panely."
 
 #: C/evolution.xml:938(para)
-msgid "For an in-depth guide to the e-mail capabilities of Evolution, read <link linkend=\"usage-mail\">Sending and Receiving E-Mail</link>."
-msgstr "Hlubšího průvodce poštovními schopnostmi Evolutionu naleznete v <link linkend=\"usage-mail\">Posílání a přijímání e-mailů</link>."
+msgid ""
+"As with folders, you can right-click messages in the message list and get a "
+"menu of possible actions, including moving or deleting them, creating "
+"filters or search folders based on them, and marking them as junk mail."
+msgstr ""
+"Stejně jako u složek můžete kliknout pravým tlačítkem na zprávy v seznamu "
+"práv a dostanete nabídku možných akcí, včetně přesouvání nebo ostranění, "
+"vytváření filtrů nebo složek hledání a označování zpráv jako nevyžádanou "
+"poštu."
+
+#: C/evolution.xml:939(para)
+msgid ""
+"Most of the email-related actions you want to perform are listed in the "
+"Message Menu and Folder Menu in the menu bar. The most frequently used ones, "
+"like Reply and Forward, also appear as buttons in the toolbar. Most of them "
+"are also located in the right-click menu and as keyboard shortcuts."
+msgstr ""
+"Většina akcí týkajících se pošty, které chcete provádět, je v nabídce Zpráva "
+"a Složka v liště nabídky. Ty nejpoužívanější jako Odpovědět a Přeposlat se "
+"nachází také jako tlačítka liště nástrojů. Většina z nich je také umístěná v "
+"kontextové nabídce a jako klávesové zkratky."
 
-#: C/evolution.xml:942(title)
+#: C/evolution.xml:940(para)
+msgid ""
+"For an in-depth guide to the email capabilities of Evolution, read <link "
+"linkend=\"usage-mail\">Sending and Receiving Email</link>."
+msgstr ""
+"Hlubšího průvodce poštovními schopnostmi Evolutionu naleznete v <link "
+"linkend=\"usage-mail\">Posílání a přijímání e-mailů</link>."
+
+#: C/evolution.xml:944(title)
 msgid "The Calendar"
 msgstr "Kalendář"
 
-#: C/evolution.xml:943(para)
-msgid "To begin using the calendar, click Calendar in the switcher. By default, the calendar shows today's schedule on a ruled background. At the left bottom, there is a monthly calendar you can use to switch days. At the upper right, there is a Task list, where you can keep a list of tasks separate from your calendar appointments. Below that, there is a Memo list."
-msgstr "Chcete-li začít používat kalendář, klikněte na Kalendář v přepínači. Implicitně kalendář zobrazuje rozvrh pro dnešní den na linkovaném pozadí. Vlevo dole je kalendář, kde můžete přepínat mezi dny. Vpravo nahoře je Seznam úkolů, kde můžete uchovávat seznam úkolů odděleně od událostí v kalendáři. Pod ním je Seznam poznámek."
-
-#: C/evolution.xml:946(title)
+#: C/evolution.xml:945(para)
+msgid ""
+"To begin using the calendar, click Calendar in the switcher. By default, the "
+"calendar shows today's schedule on a ruled background. At the left bottom, "
+"there is a monthly calendar you can use to switch days. At the upper right, "
+"there is a Task list, where you can keep a list of tasks separate from your "
+"calendar appointments. Below that, there is a Memo list."
+msgstr ""
+"Chcete-li začít používat kalendář, klikněte na Kalendář v přepínači. "
+"Implicitně kalendář zobrazuje rozvrh pro dnešní den na linkovaném pozadí. "
+"Vlevo dole je kalendář, kde můžete přepínat mezi dny. Vpravo nahoře je "
+"Seznam úkolů, kde můžete uchovávat seznam úkolů odděleně od událostí v "
+"kalendáři. Pod ním je Seznam poznámek."
+
+#: C/evolution.xml:948(title)
 msgid "Appointment List:"
 msgstr "Seznam událostí:"
 
-#: C/evolution.xml:947(para)
+#: C/evolution.xml:949(para)
 msgid "The appointment list displays all your scheduled appointments."
 msgstr "Seznam události zobrazuje všechny události ve vašem rozvrhu."
 
-#: C/evolution.xml:950(title)
+#: C/evolution.xml:952(title)
 msgid "Month Pane:"
 msgstr "Měsíční panel:"
 
-#: C/evolution.xml:951(para)
-msgid "The month pane is a small view of a calendar month. To display additional months, drag the column border to the right. You can also select a range of days in the month pane to display a custom range of days in the appointment list."
-msgstr "Měsíční panel je malý náhled kalendářního měsíce. Chcete-li zobrazit další měsíce, táhněte okraj sloupce doprava. Můžete také vybrat rozsah dnů v měsíčním panelu pro zobrazení vlastního rozsahu dnů v seznamu událostí."
+#: C/evolution.xml:953(para)
+msgid ""
+"The month pane is a small view of a calendar month. To display additional "
+"months, drag the column border to the right. You can also select a range of "
+"days in the month pane to display a custom range of days in the appointment "
+"list."
+msgstr ""
+"Měsíční panel je malý náhled kalendářního měsíce. Chcete-li zobrazit další "
+"měsíce, táhněte okraj sloupce doprava. Můžete také vybrat rozsah dnů v "
+"měsíčním panelu pro zobrazení vlastního rozsahu dnů v seznamu událostí."
 
-#: C/evolution.xml:954(title)
+#: C/evolution.xml:956(title)
 msgid "Task List:"
 msgstr "Seznam úkolů:"
 
-#: C/evolution.xml:955(para)
-msgid "Tasks are distinct from appointments because they generally don't have times associated with them. You can see a larger view of your task list by clicking Tasks in the switcher."
-msgstr "Úkoly jsou odlišné od událostí, protože zpravidla nemají přidělený čas. Pokud kliknete na Úkoly v přepínači, můžete vidět větší náhled seznamu úkolů."
-
 #: C/evolution.xml:957(para)
-msgid "For more information about the calendar, see <link linkend=\"usage-calendar\">Evolution Calendar</link>."
-msgstr "Více informací o kalendáři naleznete v <link linkend=\"usage-calendar\">Kalendáři Evolution</link>"
+msgid ""
+"Tasks are distinct from appointments because they generally don't have times "
+"associated with them. You can use the list in a larger window by clicking "
+"the Tasks button in the side bar."
+msgstr ""
+"Úkoly jsou odlišné od událostí, protože zpravidla nemají přidělený čas. "
+"Kliknutím na Úkoly v bočním panelu můžete mít seznam ve větším okně."
+
+#: C/evolution.xml:959(para)
+msgid ""
+"For more information about the calendar, see <link linkend=\"usage-calendar"
+"\">Evolution Calendar</link>."
+msgstr ""
+"Více informací o kalendáři naleznete v <link linkend=\"usage-calendar"
+"\">Kalendáři Evolution</link>"
 
-#: C/evolution.xml:961(title)
+#: C/evolution.xml:963(title)
 msgid "The Contacts"
 msgstr "Kontakty"
 
-#: C/evolution.xml:962(para)
-msgid "The Evolution contacts can handle all of the functions of an address book or phone book. However, it is easier to update Evolution than it is to change an actual paper book, in part because Evolution can synchronize with Palm OS* devices and use <link linkend=\"ldap\">LDAP</link> directories on a network."
-msgstr "Kontakty Evolution umí zacházet se všemi funkcemi adresáře a telefonního seznamu. Nicméně je jednodušší aktualizovat Evolution než měnit opravdový papírový blok, protože Evolution umí synchronizaci se zařízeními s Palm OS* a umí používat adresáře <link linkend=\"ldap\">LDAP</link> v síti."
-
-#: C/evolution.xml:963(para)
-msgid "To use the contacts tool, click Contacts in the switcher. By default, the display shows all your contacts in alphabetical order, in a minicard view. You can select other views from the View menu, and adjust the width of the columns by clicking and dragging the gray column dividers."
-msgstr "Chcete-li používat nástroj kontaktů, klikněte na Kontakty v přepínači. Implicitně jsou kontakty zobrazeny v abecedním pořadí v zobrazení minikart. Můžete vybrat jiná zobrazení z nabídky Zobrazit a upravit šířku sloupce kliknutím na šedé rozdělující lišty a táhnutím."
+#: C/evolution.xml:964(para)
+msgid ""
+"The Evolution contacts can handle all of the functions of an address book or "
+"phone book. However, it is easier to update Evolution than it is to change "
+"an actual paper book, in part because Evolution can synchronize with Palm "
+"OS* devices and use <link linkend=\"ldap\">LDAP</link> directories on a "
+"network."
+msgstr ""
+"Kontakty Evolution umí zacházet se všemi funkcemi adresáře a telefonního "
+"seznamu. Nicméně je jednodušší aktualizovat Evolution než měnit opravdový "
+"papírový blok, protože Evolution umí synchronizaci se zařízeními s Palm OS* "
+"a umí používat adresáře <link linkend=\"ldap\">LDAP</link> v síti."
 
 #: C/evolution.xml:965(para)
-msgid "Another advantage of the Evolution contacts is its integration with the rest of the application. For example, you can right-click an e-mail address in Evolution mail to instantly create a contact entry."
-msgstr "Další výhodou kontaktů Evolutionu je jejich integrace se zbytkem aplikací. Např. můžete kliknout pravým tlačítkem na e-mailovou adresu v poště Evolutionu a můžete ihned vytvořit záznam v kontaktech."
+msgid ""
+"To use the contacts tool, click Contacts in the switcher. By default, the "
+"display shows all your contacts in alphabetical order, in a minicard view. "
+"You can select other views from the View menu, and adjust the width of the "
+"columns by clicking and dragging the gray column dividers."
+msgstr ""
+"Chcete-li používat nástroj kontaktů, klikněte na Kontakty v přepínači. "
+"Implicitně jsou kontakty zobrazeny v abecedním pořadí v zobrazení minikart. "
+"Můžete vybrat jiná zobrazení z nabídky Zobrazit a upravit šířku sloupce "
+"kliknutím na šedé rozdělující lišty a táhnutím."
+
+#: C/evolution.xml:967(para)
+msgid ""
+"Another advantage of the Evolution contacts is its integration with the rest "
+"of the application. For example, you can right-click an email address in "
+"Evolution mail to instantly create a contact entry."
+msgstr ""
+"Další výhodou kontaktů Evolutionu je jejich integrace se zbytkem aplikací. "
+"Např. můžete kliknout pravým tlačítkem na e-mailovou adresu v poště "
+"Evolutionu a ihned vytvořit záznam v kontaktech."
 
-#: C/evolution.xml:966(emphasis)
+#: C/evolution.xml:968(emphasis)
 msgid "Contact List"
 msgstr "Seznam kontaktů"
 
-#: C/evolution.xml:967(para)
-msgid "The largest section of the contacts display shows a list of individual contacts. You can also search the contacts in the same way that you search e-mail folders, using the search tool on the right side of the toolbar."
-msgstr "Největší část kontaktů zobrazuje seznam jednotlivé kontakty. Můžete také vyhledávat kontakty stejným způsobem jako e-maily, pomocí vyhledávacího nástroje v pravé části lišty nástrojů. "
+#: C/evolution.xml:969(para)
+msgid ""
+"The largest section of the contacts display shows a list of individual "
+"contacts. You can also search the contacts in the same way that you search "
+"email folders, using the search tool on the right side of the toolbar."
+msgstr ""
+"Největší část kontaktů zobrazuje seznam jednotlivé kontakty. Můžete také "
+"vyhledávat kontakty stejným způsobem jako e-maily, pomocí vyhledávacího "
+"nástroje v pravé části lišty nástrojů. "
 
-#: C/evolution.xml:968(para)
-msgid "For detailed instructions on how to use the address book, read <link linkend=\"usage-contact\">Evolution Contacts: the Address Book</link>."
-msgstr "Detailnější informace o tom, jak používat adresář naleznete v <link linkend=\"usage-contact\">Kontakty Evolution: adresář</link> "
+#: C/evolution.xml:970(para)
+msgid ""
+"For detailed instructions on how to use the address book, read <link linkend="
+"\"usage-contact\">Evolution Contacts: the Address Book</link>."
+msgstr ""
+"Detailnější informace o tom, jak používat adresář naleznete v <link linkend="
+"\"usage-contact\">Kontakty Evolution: adresář</link> "
 
-#: C/evolution.xml:973(title)
+#: C/evolution.xml:975(title)
 msgid "Backing Up And Restoring Evolution"
 msgstr "Zálohování a obnova Evolutionu"
 
-#: C/evolution.xml:974(para)
-msgid "With the Backup and Restore plug-in enabled, you can successfully back up Evolution to your machine and restore it whenever it is required. The backup saves your Evolution gconf settings, mail, contacts, tasks, memos, and calendars and creates an archive."
-msgstr "Se zapnutým zásuvným modulem zálohování a obnovy můžete úspěšně zálohovat Evolution do svého počítače a obnovit jej, kdekoliv chcete. Zálohování uloží nastavení gconf, e-maily, kontakty, úkoly, poznámky a kalendáře a vytvoří archiv."
-
-#: C/evolution.xml:977(para)
-msgid "Select File &gt; Backup Settings to select the folder where you want to save the backup."
-msgstr "Vyberte Soubor &gt; Zálohovat nastavení a vyberte složku, kde se má záloha uložit."
+#: C/evolution.xml:976(para)
+msgid ""
+"With the Backup and Restore plug-in enabled, you can successfully back up "
+"Evolution to your machine and restore it whenever it is required. The backup "
+"saves your Evolution gconf settings, mail, contacts, tasks, memos, and "
+"calendars and creates an archive."
+msgstr ""
+"Se zapnutým zásuvným modulem zálohování a obnovy můžete úspěšně zálohovat "
+"Evolution do svého počítače a obnovit jej, kdekoliv chcete. Zálohování uloží "
+"nastavení gconf, e-maily, kontakty, úkoly, poznámky a kalendáře a vytvoří "
+"archiv."
 
 #: C/evolution.xml:979(para)
+msgid ""
+"Select File &gt; Backup Settings to select the folder where you want to save "
+"the backup."
+msgstr ""
+"Vyberte Soubor &gt; Zálohovat nastavení a vyberte složku, kde se má záloha "
+"uložit."
+
+#: C/evolution.xml:981(para)
 msgid "Evolution is always backed up as evolution-backup.tar.gz."
 msgstr "Evolution se vždy zálohuje do evolution-backup.tar.gz."
 
-#: C/evolution.xml:980(para)
-msgid "Before the backup process starts, it asks you to close Evolution and displays a warning as shown below:"
-msgstr "Před tím, než začne zálohovací proces, požádá vás, abyste zavřeli Evolution a zobrazí varování ukázané níže:"
+#: C/evolution.xml:982(para)
+msgid ""
+"Before the backup process starts, it asks you to close Evolution and "
+"displays a warning as shown below:"
+msgstr ""
+"Před tím, než začne zálohovací proces, požádá vás, abyste zavřeli Evolution "
+"a zobrazí varování ukázané níže:"
 
-#: C/evolution.xml:985(para)
-msgid "Select Restart Evolution after backup to restart Evolution immediately after the backup process."
-msgstr "Vyberte Restartovat Evolution po záloze a Evolution se restartuje okamžitě po skončení zálohovacího procesu."
+#: C/evolution.xml:987(para)
+msgid ""
+"Select Restart Evolution after backup to restart Evolution immediately after "
+"the backup process."
+msgstr ""
+"Vyberte Restartovat Evolution po záloze a Evolution se restartuje okamžitě "
+"po skončení zálohovacího procesu."
 
-#: C/evolution.xml:988(para)
+#: C/evolution.xml:990(para)
 msgid "Click Yes to close Evolution and start the backup."
 msgstr "Klikněte na Ano pro ukončení Evolutionu a započetí zálohování."
 
-#: C/evolution.xml:990(para)
-#: C/evolution.xml:1008(para)
+#: C/evolution.xml:992(para) C/evolution.xml:1010(para)
 msgid "Evolution will auto-restart after the process."
 msgstr "Evolution se znovu zapne po skončení procesu."
 
-#: C/evolution.xml:995(title)
+#: C/evolution.xml:997(title)
 msgid "Restoring Evolution"
 msgstr "Obnova Evolutionu"
 
-#: C/evolution.xml:996(para)
+#: C/evolution.xml:998(para)
 msgid "This feature restores your settings from the archive."
 msgstr "Tato funkce obnovuje vaše nastavení z archivu."
 
-#: C/evolution.xml:999(para)
-msgid "Select File &gt; Restore Settings to open the available evolution.tar.gz files"
-msgstr "vyberte Soubor &gt Obnovit nastavení a otevřete dostupné soubory evolution.tar.gz"
+#: C/evolution.xml:1001(para)
+msgid ""
+"Select File &gt; Restore Settings to open the available evolution.tar.gz "
+"files."
+msgstr ""
+"vyberte Soubor &gt Obnovit nastavení a otevřete dostupné soubory evolution."
+"tar.gz"
 
-#: C/evolution.xml:1002(para)
+#: C/evolution.xml:1004(para)
 msgid "Select the evolution.tar.gz and click Save."
 msgstr "Vyberte evolution.tar.gz a klikněte na Uložit."
 
-#: C/evolution.xml:1003(para)
-msgid "Before the process starts, a pop-up window appears and asks you to close Evolution. Close all the windows and then click Restore in the pop-up window."
-msgstr "Před tím, než začne proces, vyskočí okno a požádá vás, abyste ukončili Evolution. Zavřete okna a klikněte na ve vyskočeném okně na Obnovit."
-
 #: C/evolution.xml:1005(para)
-msgid "If you are creating your first account via the Startup Wizard, you can use the option to restore from the archive if it is available locally."
-msgstr "Pokud vytváříte svůj první účet pomocí Spouštěcího průvodce, máte možnost obnovy z archivu, pokud je lokálně dostupný."
-
-#: C/evolution.xml:1015(title)
-msgid "Crash Recovery"
-msgstr "Zotavení po pádu"
-
-#: C/evolution.xml:1016(para)
-msgid "Evolution displays a crash detection message when you restart it after a crash."
-msgstr "Evolution zobrazí zprávu o detekci pádu, když ho po pádu restartujete."
+msgid ""
+"Before the process starts, a pop-up window appears and asks you to close "
+"Evolution. Close all the windows and then click Restore in the pop-up window."
+msgstr ""
+"Před tím, než začne proces, vyskočí okno a požádá vás, abyste ukončili "
+"Evolution. Zavřete okna a klikněte na ve vyskočeném okně na Obnovit."
 
-#: C/evolution.xml:1018(para)
-msgid "Click Ignore to restore the preview pane displayed when Evolution crashed. If you click Recover, Evolution opens with all preview panes hidden."
-msgstr "Klikněte na Ignorovat, pokud chcete obnovit panel náhledu, který byl zobrazený, když Evolution spadl. Pokud kliknete na Obnovit, Evolution se otevře se všemi panely náhledu skrytými. "
+#: C/evolution.xml:1007(para)
+msgid ""
+"If you are creating your first account via the Startup Wizard, you can use "
+"the option to restore from the archive if it is available locally."
+msgstr ""
+"Pokud vytváříte svůj první účet pomocí Spouštěcího průvodce, máte možnost "
+"obnovy z archivu, pokud je lokálně dostupný."
 
-#: C/evolution.xml:1021(title)
+#: C/evolution.xml:1017(title)
 msgid "Command Line Options"
 msgstr "Volby pro příkazovou řádku"
 
-#: C/evolution.xml:1022(para)
-msgid "Evolution has a number of command line options that you can use. You can find the full list by entering the command <command>man evolution</command> or <command>evolution --help</command>. The most important command line options are:"
-msgstr "Evolution má pro příkazovou řádku velké množství voleb, které můžete použít. Kompletní seznam získáte příkazem <command>man evolution</command> nebo <command>evolution --help</command>. Nejdůležitějšími volbami pro příkazovou řádku jsou:"
+#: C/evolution.xml:1018(para)
+msgid ""
+"Evolution has a number of command line options that you can use. For more "
+"information about command line options, open a terminal window and type "
+"<command>evolution --help</command>."
+msgstr ""
+"Evolution má celou řadu voleb pro příkazovou řádku, které můžete použít. "
+"Pokud chcete zjistit informace o volbách pro příkazovou řádku, otevřete okno "
+"terminálu a napište <command>evolution --help</command>."
+
+#: C/evolution.xml:1019(para)
+msgid "The most important command line options are:"
+msgstr ""
 
-#: C/evolution.xml:1030(para)
+#: C/evolution.xml:1027(para)
 msgid "Command"
 msgstr "Příkaz"
 
-#: C/evolution.xml:1033(para)
-#: C/evolution.xml:1699(para)
+#: C/evolution.xml:1030(para) C/evolution.xml:1792(para)
+#: C/evolution.xml:6957(para)
 msgid "Description"
 msgstr "Popis"
 
-#: C/evolution.xml:1040(para)
+#: C/evolution.xml:1037(para)
 msgid "evolution --offline"
 msgstr "evolution --offline"
 
-#: C/evolution.xml:1043(para)
+#: C/evolution.xml:1040(para)
 msgid "Starts Evolution in offline mode."
 msgstr "Zapne Evolution v režimu off-line."
 
-#: C/evolution.xml:1048(para)
+#: C/evolution.xml:1045(para)
 msgid "evolution --disable-preview"
 msgstr "evolution --disable-preview"
 
-#: C/evolution.xml:1051(para)
+#: C/evolution.xml:1048(para)
 msgid "Disables all the preview panes when you launch Evolution."
 msgstr "Zakáže všechny panely náhledu, když spouštíte Evolution."
 
-#: C/evolution.xml:1052(para)
-msgid "It lets Evolution not to open the last crashed message, task or contact when you restart Evolution. Thus, it provides a way to avoid system crash caused by previewing message, task or contact."
-msgstr "Umožňuje Evolutionu neotevírat poslední rozbitou zprávu, úkol nebo kontakt, když restartujete Evolution. Tedy nabízí způsob, jak se vyhnout pádu systému způsobeného zobrazením zprávy, úkolu nebo kontaktu."
+#: C/evolution.xml:1049(para)
+msgid ""
+"It lets Evolution not to open the last crashed message, task or contact when "
+"you restart Evolution. Thus, it provides a way to avoid system crash caused "
+"by previewing message, task or contact."
+msgstr ""
+"Umožňuje Evolutionu neotevírat poslední rozbitou zprávu, úkol nebo kontakt, "
+"když restartujete Evolution. Tedy nabízí způsob, jak se vyhnout pádu systému "
+"způsobeného zobrazením zprávy, úkolu nebo kontaktu."
 
-#: C/evolution.xml:1057(para)
+#: C/evolution.xml:1054(para)
 msgid "evolution mailto:<varname>joe@somewhere.net</varname>"
 msgstr "evolution mailto:<varname>joe@somewhere.net</varname>"
 
-#: C/evolution.xml:1060(para)
-msgid "Starts Evolution and begins composing a message to the e-mail address listed."
+#: C/evolution.xml:1057(para)
+msgid ""
+"Starts Evolution and begins composing a message to the email address listed."
 msgstr "Zapne Evolution a začne tvořit zprávu pro uvedenou e-mailovou adresu."
 
-#: C/evolution.xml:1065(para)
+#: C/evolution.xml:1062(para)
 msgid "evolution -c mail"
 msgstr "evolution -c mail"
 
-#: C/evolution.xml:1068(para)
+#: C/evolution.xml:1065(para)
 msgid "Starts Evolution in mail mode."
 msgstr "Zapne Evolution v režimu pošty."
 
-#: C/evolution.xml:1073(para)
+#: C/evolution.xml:1070(para)
 msgid "evolution -c calendar"
 msgstr "evolution -c calendar"
 
-#: C/evolution.xml:1076(para)
+#: C/evolution.xml:1073(para)
 msgid "Starts Evolution in calendar mode."
 msgstr "Zapne Evolution v režimu kalendáře."
 
-#: C/evolution.xml:1081(para)
+#: C/evolution.xml:1078(para)
 msgid "evolution -c contacts"
 msgstr "evolution -c contacts"
 
-#: C/evolution.xml:1084(para)
+#: C/evolution.xml:1081(para)
 msgid "Starts Evolution in contacts mode."
 msgstr "Zapne Evolution v režimu kontaktů."
 
-#: C/evolution.xml:1089(para)
+#: C/evolution.xml:1086(para)
 msgid "evolution --force-shutdown"
 msgstr "evolution --force-shutdown"
 
-#: C/evolution.xml:1092(para)
+#: C/evolution.xml:1089(para)
 msgid "Forces every part of Evolution to shut down immediately."
 msgstr "Přinutí každou část Evolutionu, aby se okamžitě ukončila."
 
-#: C/evolution.xml:1097(para)
+#: C/evolution.xml:1094(para)
 msgid "evolution <quote>%s</quote>"
 msgstr "evolution <quote>%s</quote>"
 
-#: C/evolution.xml:1100(para)
-msgid "Makes Evolution your default e-mail handler for your Web browser and in the GNOME* Control Center."
-msgstr "Udělá z Evolutionu výchozího poštovního klienta v Ovládacím centru GNOME* a pro váš prohlížeč."
-
-#: C/evolution.xml:1111(para)
-msgid "This section, and <link linkend=\"usage-mail-organize\">Organizing Your E-Mail</link>, provide you with an in-depth guide to the capabilities of <trademark>Evolution</trademark> as a mail client. For information about how to customize your mail account, see <link linkend=\"config-prefs-mail\">Mail Preferences</link>."
-msgstr "Tato sekce a <link linkend=\"usage-mail-organize\">Organizování pošty</link> vám nabízí hlubšího průvodce schopnostmi <trademark>Evolutionu</trademark> jako poštovního klienta. Více informací o tom, jak si přizpůsobit svůj poštovní účet se dozvíte v <link linkend=\"config-prefs-mail\">Nastavení pošty</link>."
+#: C/evolution.xml:1097(para)
+msgid ""
+"Makes Evolution your default email handler for your Web browser and in the "
+"GNOME* Control Center."
+msgstr ""
+"Udělá z Evolutionu výchozího poštovního klienta v Ovládacím centru GNOME* a "
+"pro váš prohlížeč."
 
-#: C/evolution.xml:1114(link)
-#: C/evolution.xml:1131(title)
+#: C/evolution.xml:1108(para)
+msgid ""
+"This section, and <link linkend=\"usage-mail-organize\">Organizing Your "
+"Email</link>, provide you with an in-depth guide to the capabilities of "
+"<trademark>Evolution</trademark> as a mail client. For information about how "
+"to customize your mail account, see <link linkend=\"config-prefs-mail\">Mail "
+"Preferences</link>."
+msgstr ""
+"Tato sekce a <link linkend=\"usage-mail-organize\">Organizování pošty</link> "
+"vám nabízí hlubšího průvodce schopnostmi <trademark>Evolutionu</trademark> "
+"jako poštovního klienta. Více informací o tom, jak si přizpůsobit svůj "
+"poštovní účet se dozvíte v <link linkend=\"config-prefs-mail\">Nastavení "
+"pošty</link>."
+
+#: C/evolution.xml:1111(link) C/evolution.xml:1131(title)
 msgid "Reading Mail"
 msgstr "Čtení pošty"
 
-#: C/evolution.xml:1117(link)
-#: C/evolution.xml:1375(title)
-msgid "Composing New E-Mail Messages"
+#: C/evolution.xml:1114(link) C/evolution.xml:1444(title)
+msgid "Composing New Email Messages"
 msgstr "Vytváření novým e-mailových zpráv"
 
-#: C/evolution.xml:1120(link)
-#: C/evolution.xml:1970(title)
+#: C/evolution.xml:1117(link) C/evolution.xml:2064(title)
+msgid "Templates"
+msgstr ""
+
+#: C/evolution.xml:1120(link) C/evolution.xml:2165(title)
 msgid "Sending Invitations by Mail"
 msgstr "Posílání pozvánek poštou"
 
-#: C/evolution.xml:1123(link)
-#: C/evolution.xml:1993(title)
+#: C/evolution.xml:1123(link) C/evolution.xml:2188(title)
 msgid "IMAP Subscriptions Manager"
 msgstr "Správce příhlášených IMAP."
 
-#: C/evolution.xml:1126(link)
-#: C/evolution.xml:2017(title)
+#: C/evolution.xml:1126(link) C/evolution.xml:2212(title)
 msgid "Encryption"
 msgstr "Šifrování"
 
 #: C/evolution.xml:1132(para)
-msgid "If you are not already viewing mail, switch to the mail tool by clicking the Mail shortcut button, or press Ctrl+1. To read a message, select it in the message list; if you'd like to see it in its own window, either double-click it, press Enter, or press Ctrl+O."
-msgstr "Pokud zrovna neprohlížíte poštu, přepněte do nástroje pošty kliknutím na tlačítko Pošta nebo stiskněte Ctrl+1. Chcete-li číst zprávu, vyberte ji ze seznamu zpráv; chcete-li ji zobrazit v novém okně, buď na ni poklikejte, stiskněte Enter nebo Ctrl+O."
+msgid ""
+"If you are not already viewing mail, switch to the mail tool by clicking the "
+"Mail shortcut button, or press Ctrl+1. To read a message, select it in the "
+"message list; if you'd like to see it in its own window, either double-click "
+"it, press Enter, or press Ctrl+O."
+msgstr ""
+"Pokud zrovna neprohlížíte poštu, přepněte do nástroje pošty kliknutím na "
+"tlačítko Pošta nebo stiskněte Ctrl+1. Chcete-li číst zprávu, vyberte ji ze "
+"seznamu zpráv; chcete-li ji zobrazit v novém okně, buď na ni poklikejte, "
+"stiskněte Enter nebo Ctrl+O."
 
 #: C/evolution.xml:1134(para)
-msgid "To read mail with the keyboard, you can click the Spacebar to page down and press Backspace to page up while reading an e-mail. Ensure that you use the keys when message list is enabled."
-msgstr "Chcete-li číst poštu pomocí klávesnice, můžete během čtení e-mailu mačkat Mezerník pro posouvání dolů a Backspace pro posouvání nahorů. Ujistěte se, že tyto klávesy používáte, když je seznam zpráv aktivní."
+msgid ""
+"To read mail with the keyboard, you can click the Spacebar to page down and "
+"press Backspace to page up while reading an email. Ensure that you use the "
+"keys when the message list is enabled."
+msgstr ""
+"Chcete-li číst poštu pomocí klávesnice, můžete během čtení e-mailu mačkat "
+"Mezerník pro posouvání dolů a Backspace pro posouvání nahorů. Ujistěte se, "
+"že tyto klávesy používáte, když je seznam zpráv aktivní."
 
 #: C/evolution.xml:1135(para)
-msgid "Navigate the message list by using the arrow keys on the keyboard. To go to the next and previous unread messages, press the period (.) or comma (,) keys. On most keyboards, these keys are also marked with the &gt; and &lt; symbols, which is a convenient way to remember that they move you forward and backward in your message list. You can also use the right square bracket (]) for the next unread message, and the left square bracket ([) for the previous unread message."
-msgstr "Pohybujte se seznamem zpráv pomocí šipek na klávesnici. Pro přechod na další nebo předchozí zprávu stiskněte klávesu(.) nebo (,). Na většině klávesnicích jsou tyto klávesy označeny symboly &gt; a &lt;, což představuje pohodlný způsob, jak si zapamatovat, že vás posunou dopředu nebo dozadu v seznamu zpráv. Taktéž můžete použít pravou hranatou závorku (]) pro další nepřečtenou zprávu a levou hranatou závorku ([) pro předchozí nepřečtenou zprávu."
+msgid ""
+"Navigate the message list by using the arrow keys on the keyboard. To go to "
+"the next and previous unread messages, press the period (.) or comma (,) "
+"keys. On some keyboards, these keys are also marked with the &gt; and &lt; "
+"symbols, which is a convenient way to remember that they move you forward "
+"and backward in your message list. You can also use the right square bracket "
+"(]) for the next unread message, and the left square bracket ([) for the "
+"previous unread message."
+msgstr ""
+"Pohybujte se seznamem zpráv pomocí šipek na klávesnici. Pro přechod na další "
+"nebo předchozí zprávu stiskněte klávesy tečka (.) nebo čárka (,). Na "
+"některých klávesnicích jsou tyto klávesy označeny symboly &gt; a &lt;, což "
+"představuje pohodlný způsob, jak si zapamatovat, že vás posunou dopředu nebo "
+"dozadu v seznamu zpráv. Taktéž můžete použít pravou hranatou závorku (]) pro "
+"další nepřečtenou zprávu a levou hranatou závorku ([) pro předchozí "
+"nepřečtenou zprávu."
 
 #: C/evolution.xml:1139(title)
 msgid "Magic Spacebar For Reading Mail"
 msgstr "Magický mezerník pro čtení pošty"
 
 #: C/evolution.xml:1140(para)
-msgid "With Magic Spacebar, you can easily read the unread messages in all the mail folders. You can read mail, scroll through mail and switch folders by using the Spacebar on your keyboard."
-msgstr "S Magickým mezerníkem můžete jednoduše číst nepřečtené zprávy ve všech složkách pošty. Můžete číst poštu, posouvat se v poště a přepínat mezi složkami pomocí mezerníku na vaší klávesnici."
+msgid ""
+"With Magic Spacebar, you can easily read the unread messages in all the mail "
+"folders. You can read mail, scroll through mail and switch folders by using "
+"the Spacebar on your keyboard."
+msgstr ""
+"S Magickým mezerníkem můžete jednoduše číst nepřečtené zprávy ve všech "
+"složkách pošty. Můžete číst poštu, posouvat se v poště a přepínat mezi "
+"složkami pomocí mezerníku na vaší klávesnici."
 
 #: C/evolution.xml:1141(para)
 msgid "To enable Magic Spacebar:"
 msgstr "Pro povolení Magického mezerníku:"
 
-#: C/evolution.xml:1144(para)
-msgid "Click Edit &gt; Preferences &gt; Mail Preferences and select the Enable Magic Spacebar check box."
-msgstr "Klikněte na Upravit &gt; Nastavení &gt; Účty e-mailu a zaškrtněte Povolit Magický mezerník."
+#: C/evolution.xml:1144(para) C/evolution.xml:1301(para)
+#: C/evolution.xml:2311(para) C/evolution.xml:2350(para)
+#: C/evolution.xml:2411(para) C/evolution.xml:5293(para)
+#: C/evolution.xml:5566(para) C/evolution.xml:5849(para)
+#: C/evolution.xml:5865(para) C/evolution.xml:6283(para)
+msgid "Select Edit &gt; Preferences, then select Mail Accounts."
+msgstr "Klikněte na Upravit &gt; Nastavení, potom vyberte Účty e-mailu."
 
 #: C/evolution.xml:1147(para)
-msgid "When you are in the Mail view, the Spacebar has the following behavior:"
-msgstr "Když jste na náhledu pošty, mezerník má následující chování:"
+msgid "Select the Enable Magic Spacebar check box."
+msgstr "Zatrhněte rámeček Zapnout magický mezerník."
 
 #: C/evolution.xml:1150(para)
-msgid "When you press the Spacebar for the first time, it takes you to the next unread message."
-msgstr "Když stisknete mezerník poprvé, přesune vás na následující nepřečtenou zprávu."
+msgid "When you are in the Mail view, the Spacebar has the following behavior:"
+msgstr "Když jste na náhledu pošty, mezerník má následující chování:"
 
 #: C/evolution.xml:1153(para)
-msgid "If the message is more than one screen long, the apacebar works as Page Down key."
-msgstr "Pokud se zpráva nevejde celá do náhledu, mezerník funguje jako posuvník."
+msgid ""
+"When you press the Spacebar for the first time, it takes you to the next "
+"unread message."
+msgstr ""
+"Když stisknete mezerník poprvé, přesune vás na následující nepřečtenou "
+"zprávu."
 
 #: C/evolution.xml:1156(para)
-msgid "If you press the Spacebar after you reach the bottom of the page, it takes you to the next unread message."
-msgstr "Pokud stisknete mezerník poté, co jste se dostali na konec stránky, vezme vás na další nepřečtenou zprávu."
+msgid ""
+"If the message is more than one screen long, the Spacebar works as Page Down "
+"key."
+msgstr ""
+"Pokud se zpráva nevejde celá do náhledu, mezerník funguje jako posuvník."
 
 #: C/evolution.xml:1159(para)
-msgid "If there are no more unread messages in the mailbox, pressing the Spacebar takes you to the next unread message in the next folder."
-msgstr "Pokud se v poštovní schránce nenachází žádné další nepřečtené právy, stisknutí mezerníku vás přenese na nepřečtenou zprávu v další složce."
+msgid ""
+"If you press the Spacebar after you reach the bottom of the page, it takes "
+"you to the next unread message."
+msgstr ""
+"Pokud stisknete mezerník poté, co jste se dostali na konec stránky, vezme "
+"vás na další nepřečtenou zprávu."
 
 #: C/evolution.xml:1162(para)
-msgid "If new messages arrive in a number of folders, the Spacebar toggles between those folders. This feature allows you to switch to the next unread message in a different folder without clicking the folder."
-msgstr "Pokud nové zprávy přicházejí do více složek, mezerník bude přepínat mezi těmito složkami. Tato funkce vám umožňuje přeskočit na další nepřečtenou zprávu v jiné složce, aniž byste klikali na složku."
+msgid ""
+"If there are no more unread messages in the mailbox, pressing the Spacebar "
+"takes you to the next unread message in the next folder."
+msgstr ""
+"Pokud se v poštovní schránce nenachází žádné další nepřečtené právy, "
+"stisknutí mezerníku vás přenese na nepřečtenou zprávu v další složce."
 
-#: C/evolution.xml:1168(title)
+#: C/evolution.xml:1165(para)
+msgid ""
+"If new messages arrive in a number of folders, the Spacebar toggles between "
+"those folders. This feature allows you to switch to the next unread message "
+"in a different folder without clicking the folder."
+msgstr ""
+"Pokud nové zprávy přicházejí do více složek, mezerník bude přepínat mezi "
+"těmito složkami. Tato funkce vám umožňuje přeskočit na další nepřečtenou "
+"zprávu v jiné složce, aniž byste klikali na složku."
+
+#: C/evolution.xml:1171(title)
 msgid "Checking for New Mail"
 msgstr "Kontrola nové pošty"
 
-#: C/evolution.xml:1169(para)
-msgid "To check your mail, click Send/Receive in the toolbar. If you haven't created any mail accounts yet, the setup assistant asks you for the information it needs to check your e-mail. For information on creating mail accounts, see <link linkend=\"usage-mainwindow-starting\">Starting Evolution for the First Time</link>."
-msgstr "Chcete-li zkontrolovat poštu, klikněte na Odeslat/přijmout v liště nástrojů. Pokud jste dosud žádný poštovní účet nevytvořili, asistent nastavení vás požádá o informace, které potřebuje k tomu, aby mohl poštu zkontrolovat. Více informací o vytváření poštovních účtů naleznete v <link linkend=\"usage-mainwindow-starting\">Začínáme poprvé s Evolutionem</link>."
-
-#: C/evolution.xml:1170(para)
-msgid "If this is your first time checking mail, or you haven't asked Evolution to store your password, you are prompted for the password. Enter your password to download your e-mail."
-msgstr "Pokud je to vaše první kontrola pošty nebo jste ještě Evolution nepožádali o uložení hesla, budete vyzváni, abyste zadali heslo. Po vložení hesla se pošta stáhne."
+#: C/evolution.xml:1172(para)
+msgid ""
+"To check your mail, click Send/Receive in the toolbar. If you haven't "
+"created any mail accounts yet, the setup assistant asks you for the "
+"information it needs to check your email. For information on creating mail "
+"accounts, see <link linkend=\"usage-mainwindow-starting\">Starting Evolution "
+"for the First Time</link>."
+msgstr ""
+"Chcete-li zkontrolovat poštu, klikněte na Odeslat/přijmout v liště nástrojů. "
+"Pokud jste dosud žádný poštovní účet nevytvořili, asistent nastavení vás "
+"požádá o informace, které potřebuje k tomu, aby mohl poštu zkontrolovat. "
+"Více informací o vytváření poštovních účtů naleznete v <link linkend=\"usage-"
+"mainwindow-starting\">Začínáme poprvé s Evolutionem</link>."
+
+#: C/evolution.xml:1173(para)
+msgid ""
+"If this is your first time checking mail, or you haven't asked Evolution to "
+"store your password, you are prompted for the password. Enter your password "
+"to download your email."
+msgstr ""
+"Pokud je to vaše první kontrola pošty nebo jste ještě Evolution nepožádali o "
+"uložení hesla, budete vyzváni, abyste zadali heslo. Chcete-li poštu "
+"stáhnout, zadejte vaše heslo."
 
-#: C/evolution.xml:1171(para)
-msgid "If you get an error message instead of mail, you probably need to check your network settings. To learn how to do that, see <link linkend=\"mail-prefs-headers\">Mail Header Preferences</link>, or ask your system administrator."
-msgstr "Pokud místo pošty dostanete chybovou hlášku, budete muset pravděpodobně zkontrolovat nastavení vaší sítě. Jak to udělat, se dozvíte v <link linkend=\"mail-prefs-headers\">Nastavení hlavičky e-mailu</link>"
+#: C/evolution.xml:1174(para)
+msgid ""
+"If you get an error message instead of mail, you probably need to check your "
+"network settings. To learn how to do that, see <link linkend=\"mail-prefs-"
+"headers\">Mail Header Preferences</link>, or ask your system administrator."
+msgstr ""
+"Pokud místo pošty dostanete chybovou hlášku, budete muset pravděpodobně "
+"zkontrolovat nastavení vaší sítě. Jak to udělat, se dozvíte v <link linkend="
+"\"mail-prefs-headers\">Nastavení hlavičky e-mailu</link>"
 
-#: C/evolution.xml:1175(title)
+#: C/evolution.xml:1178(title)
 msgid "New Mail Notification"
 msgstr "Upozornění na novou poštu"
 
-#: C/evolution.xml:1176(para)
-msgid "Evolution notifies you of new e-mail. When you receive a new mail in your inbox, a blinking icon appears on the Switcher."
-msgstr "Evolution vás upozorní na nové příchozí e-maily. Když dostanete do Příchozích novou zprávu, na přepínači se objeví blikající ikona."
+#: C/evolution.xml:1179(para)
+msgid ""
+"Evolution can notify you of new messages. When you receive a new message in "
+"your inbox, a blinking icon appears on the Switcher."
+msgstr ""
+"Evolution vás upozorní na nové příchozí e-maily. Když dostanete do "
+"Příchozích novou zprávu, na přepínači se objeví blikající ikona."
+
+#: C/evolution.xml:1180(para)
+msgid ""
+"You can also view a blinking icon<inlinegraphic format=\"PNG\" fileref="
+"\"figures/evo_blink.png\"/> in the notification area that disappears when "
+"you open the new message. Mouse over the icon to view the notification "
+"message."
+msgstr ""
+"Také můžete vidět blikající ikonu <inlinegraphic format=\"PNG\" fileref="
+"\"figures/evo_blink.png\"/> v oznamovací oblasti, která zmizí, když nový e-"
+"mail otevřete. Oznamovací zprávu můžete vidět tak, že podržíte myš nad "
+"ikonou."
+
+#: C/evolution.xml:1182(para)
+msgid ""
+"To enable this feature, select Edit &gt; Plugins, then select the Mail "
+"Notification check box. You can configure the plugin by specifing the "
+"following in the Plugin Manager."
+msgstr ""
 
-#: C/evolution.xml:1178(para)
-msgid "You can also view a blinking icon <inlinegraphic format=\"PNG\" fileref=\"figures/evo_blink.png\"/> in the notification area that disappears when you open the new e-mail. Mouse over the <inlinegraphic format=\"PNG\" fileref=\"figures/evo_blink.png\"/> icon to view the notification message."
-msgstr "Také můžete vidět blikající ikonu <inlinegraphic format=\"PNG\" fileref=\"figures/evo_blink.png\"/> v oznamovací oblasti, která zmizí, když nový e-mail otevřete. Oznamovací zprávu můžete vidět tak, že podržíte myš nad <inlinegraphic format=\"PNG\" fileref=\"figures/evo_blink.png\"/>."
+#: C/evolution.xml:1185(title)
+msgid "Notify new messages for Inbox only:"
+msgstr ""
 
-#: C/evolution.xml:1182(title)
+#: C/evolution.xml:1186(para)
+msgid ""
+"Select this option to restrict the mail notification to Inbox. With this "
+"option enabled, you are notified of each new message arrival in the Inbox."
+msgstr ""
+
+#: C/evolution.xml:1189(title)
+msgid "Generate D-Bus message:"
+msgstr ""
+
+#: C/evolution.xml:1190(para)
+msgid ""
+"D-Bus is a fast, lightweight message bus system that allows applications to "
+"communicate with each other. Select this option to generate a D-Bus message "
+"on the session bus whenever a new message arrives."
+msgstr ""
+
+#: C/evolution.xml:1193(title)
+msgid "Show icon in the notification area:"
+msgstr ""
+
+#: C/evolution.xml:1194(para)
+msgid ""
+"Select this option to display a new mail icon in the notification area when "
+"a new message arrives. You have two options to select from:"
+msgstr ""
+
+#: C/evolution.xml:1199(title)
+msgid "Blinking icon in the notification area:"
+msgstr ""
+
+#: C/evolution.xml:1200(para)
+msgid ""
+"Select this option to make the new mail icon blink in the notification area "
+"on arrival of a new message."
+msgstr ""
+
+#: C/evolution.xml:1205(title)
+msgid "Popup message together with the icon:"
+msgstr ""
+
+#: C/evolution.xml:1206(para)
+msgid ""
+"Select this option to make the new message pop up along with the new mail "
+"icon."
+msgstr ""
+
+#: C/evolution.xml:1211(title)
+msgid "Play sound when new messages arrive:"
+msgstr ""
+
+#: C/evolution.xml:1212(para)
+msgid "You have two options to select from:"
+msgstr ""
+
+#: C/evolution.xml:1217(title) C/evolution.xml:3109(title)
+msgid "Beep:"
+msgstr "Pípnout:"
+
+#: C/evolution.xml:1218(para)
+msgid ""
+"Select this option to play a beep sound on the arrival of a new message."
+msgstr ""
+
+#: C/evolution.xml:1223(title)
+msgid "Play sound file:"
+msgstr "Přehrát zvukový soubor:"
+
+#: C/evolution.xml:1224(para)
+msgid ""
+"Select this option to play a sound file of your choice on the arrival of a "
+"new message."
+msgstr ""
+
+#: C/evolution.xml:1228(para)
+msgid "To specify the sound file you want to play:"
+msgstr "Abyste vybrali zvukový soubor, který chcete přehrát:"
+
+#: C/evolution.xml:1231(para)
+msgid "Click None to open the Select Sound File browser window."
+msgstr "Klikněte na Žádný, abyste otevřeli okno pro výběr zvukového souboru."
+
+#: C/evolution.xml:1234(para)
+msgid "Browse to find the sound file of your choice."
+msgstr ""
+
+#: C/evolution.xml:1237(para)
+msgid "Click Open to select the sound file."
+msgstr "Kliknutím na Otevřít zvukový soubor vyberete."
+
+#: C/evolution.xml:1240(para)
+msgid "Click Play to confirm the selection."
+msgstr ""
+
+#: C/evolution.xml:1246(title)
 msgid "Vertical View Versus Classical View"
 msgstr "Svislé vs. klasické zobrazení"
 
-#: C/evolution.xml:1183(para)
-msgid "Evolution provides you vertical view in addition to the classical view. In the vertical view, message preview pane is located at the right side of the message list when compared to the Classical view where the message preview pane is placed below the message list. Vertical View enables you to use the extra width of the wide screen monitors."
-msgstr "Evolution vám nabízí kromě klasického zobrazení také svislé. Ve svislém zobrazení je panel náhledu zpráv umístěn napravo seznamu zpráv, zatímco v klasickém zobrazení je panel náhledu zpráv umístěn pod seznamem zpráv. Svislé zobrazení vám umožňuje využít šířku na širokoúhlých monitorech."
+#: C/evolution.xml:1247(para)
+msgid ""
+"Evolution provides you vertical view in addition to the classical view. In "
+"the vertical view, message preview pane is located at the right side of the "
+"message list when compared to the Classical view where the message preview "
+"pane is placed below the message list. Vertical View enables you to use the "
+"extra width of the wide screen monitors."
+msgstr ""
+"Evolution vám nabízí kromě klasického zobrazení také svislé. Ve svislém "
+"zobrazení je panel náhledu zpráv umístěn napravo seznamu zpráv, zatímco v "
+"klasickém zobrazení je panel náhledu zpráv umístěn pod seznamem zpráv. "
+"Svislé zobrazení vám umožňuje využít šířku na širokoúhlých monitorech."
 
-#: C/evolution.xml:1185(title)
+#: C/evolution.xml:1249(title)
 msgid "Vertical View:"
 msgstr "Svislé zobrazení:"
 
-#: C/evolution.xml:1186(para)
+#: C/evolution.xml:1250(para)
 msgid "To switch to vertical view"
 msgstr "Pro přepnutí do svislého zobrazení"
 
-#: C/evolution.xml:1190(para)
+#: C/evolution.xml:1254(para)
 msgid "Click View &gt; Preview &gt; Vertical View"
 msgstr "Klikněte na Zobrazit &gt; Náhled &gt; Svislé zobrazení"
 
-#: C/evolution.xml:1193(para)
-msgid "In Vertical view, default message list contains a double line compressed headers, which enables you to consume the extra width in the preview column.The compressed columns have Sender Name and Email, Attachment Icon, Date and Subject in the second line."
-msgstr "Ve svislém zobrazení výchozí seznam zpráv obsahuje hlavičky zhuštěné do dvou řádků, což vám umožňuje použít zbylou šířku na sloupec s náhledem. Zhuštěné sloupce obsahují jméno odesílatele, e-mail, ikonu přílohy, datum a předmět na druhém řádku."
+#: C/evolution.xml:1257(para)
+msgid ""
+"In Vertical view, default message list contains a double line compressed "
+"headers, which enables you to consume the extra width in the preview column. "
+"The compressed columns have Sender Name and Email, Attachment Icon, Date and "
+"Subject in the second line."
+msgstr ""
+"Ve svislém zobrazení výchozí seznam zpráv obsahuje hlavičky zhuštěné do dvou "
+"řádků, což vám umožňuje použít zbylou šířku na sloupec s náhledem. Zhuštěné "
+"sloupce obsahují jméno odesílatele, e-mail, ikonu přílohy, datum a předmět "
+"na druhém řádku."
 
-#: C/evolution.xml:1196(title)
+#: C/evolution.xml:1260(title)
 msgid "Classical View:"
 msgstr "Klasické zobrazení:"
 
-#: C/evolution.xml:1197(para)
+#: C/evolution.xml:1261(para)
 msgid "To switch to classical view,"
 msgstr "Pro přepnutí do klasického zobrazení"
 
-#: C/evolution.xml:1201(para)
+#: C/evolution.xml:1265(para)
 msgid "Click View &gt; Preview &gt; Classical View"
 msgstr "Klikněte na Zobrazit &gt; Náhled &gt; Klasické zobrazení"
 
-#: C/evolution.xml:1207(title)
+#: C/evolution.xml:1271(title)
 msgid "Collapsible Message Headers"
 msgstr "Zasouvací hlavičky zprávy"
 
-#: C/evolution.xml:1208(para)
-msgid "Evolution compresses the TO, CC, BCC headers of received mail and shows only limited addresses. You can set the limit of the number of addresses to be displayed in the preview pane."
-msgstr "Evolution komprimuje hlavičky Komu, Kopie, Skrytá kopie přijatých e-mailů a zobrazuje pouze omezený počet adres. Můžete nastavit limit na počet adres zobrazených v panelu náhledu."
+#: C/evolution.xml:1272(para)
+msgid ""
+"Evolution compresses the TO, CC, BCC headers of received mail and shows only "
+"limited addresses. You can set the limit of the number of addresses to be "
+"displayed in the preview pane."
+msgstr ""
+"Evolution komprimuje hlavičky Komu, Kopie, Skrytá kopie přijatých e-mailů a "
+"zobrazuje pouze omezený počet adres. Můžete nastavit limit na počet adres "
+"zobrazených v panelu náhledu."
 
-#: C/evolution.xml:1210(para)
-msgid "Use the following procedure to set the limit of addresses to be displayed:"
+#: C/evolution.xml:1274(para)
+msgid ""
+"Use the following procedure to set the limit of addresses to be displayed:"
 msgstr "Použijte následující postup pro nastavení limitu zobrazených adres:"
 
-#: C/evolution.xml:1213(para)
-msgid "Click Edit &gt; Preferences"
-msgstr "Klikněte na Upravit &gt; Nastavení"
+#: C/evolution.xml:1277(para) C/evolution.xml:1959(para)
+#: C/evolution.xml:2387(para) C/evolution.xml:5268(para)
+#: C/evolution.xml:5462(para) C/evolution.xml:6566(para)
+msgid "Select Edit &gt; Preferences."
+msgstr ""
 
-#: C/evolution.xml:1216(para)
-msgid "Select Mail Preferences"
-msgstr "Vyberte Nastavení pošty"
+#: C/evolution.xml:1280(para)
+msgid "Select Mail Preferences."
+msgstr "Vyberte Nastavení pošty."
 
-#: C/evolution.xml:1219(para)
-msgid "Check <guilabel>Shrink To/CC/Bcc headers to column</guilabel> to limit the address"
-msgstr "Zatrhněte <guilabel>Zmenšit To/Cc/Bcc hlavičky na</guilabel> pro omezení adres"
+#: C/evolution.xml:1283(para)
+msgid ""
+"Check <guilabel>Shrink To/CC/Bcc headers to column</guilabel> to limit the "
+"address."
+msgstr ""
+"Zatrhněte <guilabel>Zmenšit hlavičky Komu/Kopie/Skrytá kopie do sloupce</"
+"guilabel> pro omezení adres."
 
-#: C/evolution.xml:1222(para)
+#: C/evolution.xml:1286(para)
 msgid "Enter the limit in the field."
 msgstr "Vložte do pole limit."
 
-#: C/evolution.xml:1225(para)
-msgid "You can expand the message headers by click the <inlinegraphic format=\"PNG\" fileref=\"figures/plus.png\"/> icon or the <guilabel>...</guilabel> in the message preview pane. To collapse click <inlinegraphic format=\"PNG\" fileref=\"figures/minus.png\"/> icon in the preview pane."
-msgstr "Rozbalit hlavičky můžete kliknutím na ikonu <inlinegraphic format=\"PNG\" fileref=\"figures/plus.png\"/> nebo na <guilabel>...</guilabel> v panelu náhledu zprávy. Pro opětovné sbalení klikněte na ikonu <inlinegraphic format=\"PNG\" fileref=\"figures/minus.png\"/> v panelu náhledu."
+#: C/evolution.xml:1289(para)
+msgid ""
+"You can expand the message headers by clicking the <inlinegraphic format="
+"\"PNG\" fileref=\"figures/plus.png\"/> icon or the <guilabel>...</guilabel> "
+"in the message preview pane. To collapse click <inlinegraphic format=\"PNG\" "
+"fileref=\"figures/minus.png\"/> icon in the preview pane."
+msgstr ""
+"Rozbalit hlavičky můžete kliknutím na ikonu <inlinegraphic format=\"PNG\" "
+"fileref=\"figures/plus.png\"/> nebo na <guilabel>...</guilabel> v panelu "
+"náhledu zprávy. Pro sbalení klikněte na ikonu <inlinegraphic format=\"PNG\" "
+"fileref=\"figures/minus.png\"/> v panelu náhledu."
 
-#: C/evolution.xml:1229(title)
+#: C/evolution.xml:1293(title)
 msgid "Sharing Mailboxes with Other Mail Programs"
 msgstr "Sdílení poštovních schránek s jinými poštovními programy"
 
-#: C/evolution.xml:1230(para)
-msgid "If you want to use Evolution and another e-mail client, such as Mutt, at the same time, use the following procedure:"
-msgstr "Chcete-li zároveň používat Evolution a jiné e-mailového klienta, jako je např. Mutt, použijte následující postup:"
+#: C/evolution.xml:1294(para)
+msgid ""
+"If you want to use Evolution and another email client, such as Mutt, at the "
+"same time, use the following procedure:"
+msgstr ""
+"Chcete-li zároveň používat Evolution a jiné e-mailového klienta, jako je "
+"např. Mutt, použijte následující postup:"
 
-#: C/evolution.xml:1233(para)
+#: C/evolution.xml:1297(para)
 msgid "Download your mail in the other application as you would normally."
 msgstr "Stáhni poštu do druhé aplikace jako normálně."
 
-#: C/evolution.xml:1236(para)
-msgid "In Evolution, click Edit &gt; Preferences, then click Mail Accounts. Select the account you want to use to share mail and click Edit. Instead of Edit, you might want to create a new account just for this source of mail by clicking New."
-msgstr "V Evolutionu klikněte na Upravit &gt; Nastavení, potom klikněte na Účty e-mailu. Vyberte účet, který chcete použít pro sdílenou poštu a klikněte na Upravit. Možná budete chtít místo úpravy vytvořit nový účet, potom klikněte na Přidat."
+#: C/evolution.xml:1300(para)
+msgid "In Evolution:"
+msgstr "V Evolutionu:"
 
-#: C/evolution.xml:1239(para)
-msgid "Under the Receiving Mail tab, select the type of mail file that your other mail application uses, then specify the full path to that location. A typical choice would be mbox files, with the path /home/<varname>username</varname>/Mail/."
-msgstr "Pod kartou Příjem pošty vyberte vyberte typ souboru pošty, který používá druhá aplikace, potom zadejte celou cestu k umístění. Typická volba je soubor mbox s cestou  /home/<varname>uzivatel</varname>/Mail/."
+#: C/evolution.xml:1302(para)
+msgid ""
+"Select the account you want to use to share mail and click Edit. Instead of "
+"Edit, you might want to create a new account just for this source of mail by "
+"clicking New."
+msgstr ""
+"Vyberte účet, který chcete použít pro sdílenou poštu a klikněte na Upravit. "
+"Možná budete chtít místo úpravy vytvořit nový účet, potom klikněte na Přidat."
 
-#: C/evolution.xml:1245(para)
-msgid "You can only use one mail client at a time. The mail files are locked by the mail program that is currently using them, so the mail files can't be accessed by any other mail program."
-msgstr "Můžete používat pouze jednoho klienta najednou. Soubory pošty jsou zamčeny programem, který je zrovna používá, takže nejsou přístupné pro jiného klienta."
+#: C/evolution.xml:1305(para)
+msgid ""
+"Under the Receiving Mail tab, select the type of mail file that your other "
+"mail application uses, then specify the full path to that location. A "
+"typical choice would be mbox files, with the path /home/<varname>username</"
+"varname>/Mail/."
+msgstr ""
+"Pod kartou Příjem pošty vyberte vyberte typ souboru pošty, který používá "
+"druhá aplikace, potom zadejte celou cestu k umístění. Typická volba je "
+"soubor mbox s cestou  /home/<varname>uzivatel</varname>/Mail/."
 
-#: C/evolution.xml:1249(title)
+#: C/evolution.xml:1311(para)
+msgid ""
+"You can only use one mail client at a time. The mail files are locked by the "
+"mail program that is currently using them, so the mail files can't be "
+"accessed by any other mail program."
+msgstr ""
+"Můžete používat pouze jednoho klienta najednou. Soubory pošty jsou zamčeny "
+"programem, který je zrovna používá, takže nejsou přístupné pro jiného "
+"klienta."
+
+#: C/evolution.xml:1315(title)
 msgid "Working with Attachments and HTML Mail"
 msgstr "Práce s přílohami a HTML e-maily"
 
-#: C/evolution.xml:1250(para)
-msgid "If someone sends you an <link linkend=\"attachment\">attachment</link>, Evolution displays a file icon at the end of the message to which it is attached. Text, including HTML formatting and embedded images appears as part of the message, rather than as a separate attachment. Attachments are also listed under the address list. To view the attachments, click the arrow to expand the attachment window. To open an attachment, double-click it. Click the Save All button to save all the attachments."
-msgstr "Pokud vám někdo pošle <link linkend=\"attachment\">přílohu</link>, Evolution zobrazí ikonu souboru na konci zprávy, ke které je připojena. Text, včetně HTML formátování a vložených obrázků, se zobrazuje jako část zprávy, ne jako oddělená příloha. Přílohy jsou také uvedené pod seznamem adres. Pro zobrazení příloh klikněte na šipku, která rozbalí okno s přílohami. Přílohu otevřete tak, že na ni dvakrát poklikáte. Chcete-li uložit všechny přílohy, klikněte na tlačítko Uložit vše."
-
-#: C/evolution.xml:1253(title)
+#: C/evolution.xml:1316(para)
+msgid ""
+"If someone sends you an <link linkend=\"attachment\">attachment</link>, "
+"Evolution displays a file icon at the end of the message to which it is "
+"attached. Text, including HTML formatting and embedded images appears as "
+"part of the message, rather than as a separate attachment. Attachments are "
+"also listed under the address list. To view the attachments, click the arrow "
+"to expand the attachment window. To open an attachment, double-click it. "
+"Click the Save All button to save all the attachments."
+msgstr ""
+"Pokud vám někdo pošle <link linkend=\"attachment\">přílohu</link>, Evolution "
+"zobrazí ikonu souboru na konci zprávy, ke které je připojena. Text, včetně "
+"HTML formátování a vložených obrázků, se zobrazuje jako část zprávy, ne jako "
+"oddělená příloha. Přílohy jsou také uvedené pod seznamem adres. Pro "
+"zobrazení příloh klikněte na šipku, která rozbalí okno s přílohami. Přílohu "
+"otevřete tak, že na ni dvakrát poklikáte. Chcete-li uložit všechny přílohy, "
+"klikněte na tlačítko Uložit vše."
+
+#: C/evolution.xml:1319(title)
 msgid "Saving or Opening Attachments"
 msgstr "Ukládání a otevírání příloh"
 
-#: C/evolution.xml:1254(para)
-msgid "If you get an e-mail message with an attachment, Evolution can help you save the attachment or open it with the appropriate applications."
-msgstr "Pokud dostanete e-mailovou zprávu s přílohou, Evolution vám umí pomoci přílohu uložit nebo otevřít v odpovídající aplikaci."
+#: C/evolution.xml:1320(para)
+msgid ""
+"If you get an email message with an attachment, Evolution can help you save "
+"the attachment or open it with the appropriate applications."
+msgstr ""
+"Pokud dostanete e-mailovou zprávu s přílohou, Evolution vám umí pomoci "
+"přílohu uložit nebo otevřít v odpovídající aplikaci."
 
-#: C/evolution.xml:1255(para)
-msgid "Evolution shows a right-arrow icon, the number of attachments, and a Save or Save All button to save all the attachments. Click the right-arrow icon to show the attachment bar."
-msgstr "Evolution zobrazuje ikonu šipky, počet příloh a tlačítko Uložit nebo Uložit vše pro uložení všech příloh. Klikněte na ikonu šipky pro zobrazení lišty příloh."
+#: C/evolution.xml:1321(para)
+msgid ""
+"Evolution shows a right-arrow icon, the number of attachments, and a Save or "
+"Save All button to save all the attachments. Click the right-arrow icon to "
+"show the attachment bar."
+msgstr ""
+"Evolution zobrazuje ikonu šipky, počet příloh a tlačítko Uložit nebo Uložit "
+"vše pro uložení všech příloh. Klikněte na ikonu šipky pro zobrazení lišty "
+"příloh."
 
-#: C/evolution.xml:1256(para)
+#: C/evolution.xml:1322(para)
 msgid "To save an attachment to disk:"
 msgstr "Pro uložení přílohy na disk:"
 
-#: C/evolution.xml:1259(para)
-msgid "Click the down-arrow on the attachment icon, or right-click the attachment icon in the attachment bar, then click Save As."
-msgstr "Klikněte na šipku směřující dolů na ikoně přílohy nebo klikněte pravým tlačítkem na ikonu přílohy v liště příloh, potom klikněte na Uložit jako."
+#: C/evolution.xml:1325(para) C/evolution.xml:1340(para)
+msgid ""
+"Click the down-arrow on the attachment icon or right-click the attachment "
+"icon in the attachment bar."
+msgstr ""
+"Klikněte na šipku směřující dolů na ikoně přílohy nebo klikněte pravým "
+"tlačítkem na ikonu přílohy v liště příloh."
+
+#: C/evolution.xml:1328(para)
+msgid "Click Save As."
+msgstr "Klikněte na Uložit jako."
 
-#: C/evolution.xml:1262(para)
+#: C/evolution.xml:1331(para)
 msgid "Select a location and name for the file."
 msgstr "Vyberte umístění a jméno pro soubor."
 
-#: C/evolution.xml:1268(para)
+#: C/evolution.xml:1337(para)
 msgid "To open an attachment using another application:"
 msgstr "Pro otevření přílohy pomocí jiné aplikace:"
 
-#: C/evolution.xml:1271(para)
-msgid "Click the down-arrow on the attachment icon or right-click the attachment icon in the attachment bar."
-msgstr "Klikněte na šipku směřující dolů na ikoně přílohy nebo klikněte pravým tlačítkem na ikonu přílohy v liště příloh."
-
-#: C/evolution.xml:1274(para)
+#: C/evolution.xml:1343(para)
 msgid "Select the application to open the attachment."
 msgstr "Vyberte, v které aplikaci přílohu otevřít."
 
-#: C/evolution.xml:1280(para)
-msgid "The options available for an attachment vary depending on the type of attachment and the applications your system has installed. For example, attached word processor files can be opened in OpenOffice.org or another word processor, and compressed archive files can be opened in the File Roller application."
-msgstr "Dostupné možnosti pro přílohu závisí na typu přílohy a aplikacích, které jsou ve vašem systému nainstalované. Např. přiložený soubory textového procesoru mohou být otevřeny v OpenOffice.org nebo jiném textovém procesoru a soubory komprimovaných archivů mohou být otevřeny v aplikaci File Roller."
-
-#: C/evolution.xml:1284(title)
+#: C/evolution.xml:1349(para)
+msgid ""
+"The options available for an attachment vary depending on the type of "
+"attachment and the applications your system has installed. For example, "
+"attached word processor files can be opened in OpenOffice.org or another "
+"word processor, and compressed archive files can be opened in the File "
+"Roller application."
+msgstr ""
+"Dostupné možnosti pro přílohu závisí na typu přílohy a aplikacích, které "
+"jsou ve vašem systému nainstalované. Např. přiložený soubory textového "
+"procesoru mohou být otevřeny v OpenOffice.org nebo jiném textovém procesoru "
+"a soubory komprimovaných archivů mohou být otevřeny v aplikaci File Roller."
+
+#: C/evolution.xml:1353(title)
 msgid "Inline Images in HTML Mail"
 msgstr "Vložené obrázky do pošty v HTML."
 
-#: C/evolution.xml:1285(para)
-msgid "When someone sends you HTML mail that includes an image in the body of the message (for example, the welcome message in your Inbox), Evolution displays the image inside the message. You can create messages like this by using the Insert Image tool in the message composer. Alternately, just drag an image into the message composition area."
-msgstr "Když vám někdo pošle poštu v HTML, která obsahuje obrázky v těle zprávy (např. uvítací zpráva ve složce Příchozí), Evolution zobrazí obrázky uvnitř zprávy. Můžete tvořit takovéto zprávy pomocí nástroje Vložit obrázek v editoru zpráv. Nebo jen přetáhněte obrázek do prostoru pro vytváření zprávy."
-
-#: C/evolution.xml:1286(para)
-msgid "Some images are links in a message, rather than being part of the message. Evolution can download those images from the Internet, but does not do so unless you request it. This is because remotely Servered images can be slow to load and display, and can even be used by spammers to track who reads the e-mail. Not automatically loading images helps protect your privacy."
-msgstr "Některé obrázky jsou ve zprávě pouze linkovány místo, aby byly přímo její součastí. Evolution umí tyto obrázky stáhnout z internetu, ale dělá to, pouze pokud ho k tomu vyzvete. To je proto, že vzdálené obrázky se mohou dlouho stahovat a zobrazovat a mohou být dokonce použity spammery k vysledování toho, kdo e-maily čte. Tím, že obrázky automaticky nenačítá, pomáhá chránit vaše soukromí."
-
-#: C/evolution.xml:1287(para)
+#: C/evolution.xml:1354(para)
+msgid ""
+"When someone sends you HTML mail that includes an image in the body of the "
+"message (for example, the welcome message in your Inbox), Evolution displays "
+"the image inside the message. You can create messages like this by using the "
+"Insert Image tool in the message composer. Alternately, just drag an image "
+"into the message composition area."
+msgstr ""
+"Když vám někdo pošle poštu v HTML, která obsahuje obrázky v těle zprávy "
+"(např. uvítací zpráva ve složce Příchozí), Evolution zobrazí obrázky uvnitř "
+"zprávy. Můžete tvořit takovéto zprávy pomocí nástroje Vložit obrázek v "
+"editoru zpráv. Nebo jen přetáhněte obrázek do prostoru pro vytváření zprávy."
+
+#: C/evolution.xml:1355(para)
+msgid ""
+"Some images are links in a message, rather than being part of the message. "
+"Evolution can download those images from the Internet, but does not do so "
+"unless you request it. This is because remotely servered images can be slow "
+"to load and display, and can even be used by spammers to track who reads the "
+"email. Not automatically loading images helps protect your privacy."
+msgstr ""
+"Některé obrázky jsou ve zprávě pouze linkovány místo, aby byly přímo její "
+"součastí. Evolution umí tyto obrázky stáhnout z internetu, ale dělá to, "
+"pouze pokud ho k tomu vyzvete. To je proto, že vzdálené obrázky se mohou "
+"dlouho stahovat a zobrazovat a mohou být dokonce použity spammery k "
+"vysledování toho, kdo e-maily čte. Tím, že obrázky automaticky nenačítá, "
+"pomáhá chránit vaše soukromí."
+
+#: C/evolution.xml:1356(para)
 msgid "To load the images for one message:"
 msgstr "Načíst obrázky pro jednu zprávu:"
 
-#: C/evolution.xml:1290(para)
+#: C/evolution.xml:1359(para)
 msgid "Click View &gt; Load Images."
 msgstr "Klikněte na Zobrazit &gt; Načíst obrázky."
 
-#: C/evolution.xml:1293(para)
+#: C/evolution.xml:1362(para)
 msgid "To set the default action for loading images:"
 msgstr "Nastavit výchozí akci pro načítání obrázků:"
 
-#: C/evolution.xml:1296(para)
-msgid "Click Edit &gt; Preferences, then click Mail Preferences."
+#: C/evolution.xml:1365(para)
+msgid "Select Edit &gt; Preferences, then select Mail Preferences."
 msgstr "Klikněte na Upravit &gt; Nastavení, potom na Nastavení pošty."
 
-#: C/evolution.xml:1299(para)
+#: C/evolution.xml:1368(para)
 msgid "Click the HTML Mail tab."
 msgstr "Klikněte na kartu Pošta v HTML."
 
-#: C/evolution.xml:1302(para)
-msgid "Select one of the items: Never Load Images Off the Net, Load Images in Mail From Contacts, or Always Load Images Off the Net."
-msgstr "Vyberte jednu z položek: Nikdy nenačítat obrázky z internetu, Načítat obrázky ve zprávách od kontaktů, Vždy načítat obrázky z internetu."
-
-#: C/evolution.xml:1305(para)
-#: C/evolution.xml:1353(para)
-#: C/evolution.xml:1779(para)
-#: C/evolution.xml:1813(para)
-#: C/evolution.xml:1836(para)
-#: C/evolution.xml:2131(para)
-#: C/evolution.xml:2169(para)
-#: C/evolution.xml:2200(para)
-#: C/evolution.xml:2229(para)
+#: C/evolution.xml:1371(para)
+msgid ""
+"Select one of the items: Never Load Images Off the Net, Load Images in Mail "
+"From Contacts, or Always Load Images Off the Net."
+msgstr ""
+"Vyberte jednu z položek: Nikdy nenačítat obrázky z internetu, Načítat "
+"obrázky ve zprávách od kontaktů, Vždy načítat obrázky z internetu."
+
+#: C/evolution.xml:1374(para) C/evolution.xml:1422(para)
+#: C/evolution.xml:1637(para) C/evolution.xml:1872(para)
+#: C/evolution.xml:1906(para) C/evolution.xml:1929(para)
+#: C/evolution.xml:2326(para) C/evolution.xml:2365(para)
+#: C/evolution.xml:2399(para) C/evolution.xml:2431(para)
+#: C/evolution.xml:5926(para) C/evolution.xml:6304(para)
 msgid "Click Close."
 msgstr "Klikněte na zavřít."
 
-#: C/evolution.xml:1308(para)
+#: C/evolution.xml:1377(para)
 msgid "To set your proxy in KDE:"
 msgstr "Nastavení proxy v KDE:"
 
-#: C/evolution.xml:1311(para)
+#: C/evolution.xml:1380(para)
 msgid "Click the menu icon &gt; System &gt; Configuration &gt; Yast."
-msgstr "Klikněte na ikonu nabídky &gt; Systém &gt; Nastavení &gt; Yast. (pouze rodinu distrubucí SUSE)"
+msgstr ""
+"Klikněte na ikonu nabídky &gt; Systém &gt; Nastavení &gt; Yast. (pouze "
+"rodinu distrubucí SUSE)"
 
-#: C/evolution.xml:1314(para)
-#: C/evolution.xml:1329(para)
+#: C/evolution.xml:1383(para) C/evolution.xml:1398(para)
 msgid "Click Network Services, then click Proxy."
 msgstr "Klikněte na Síťové služby a potom na Proxy."
 
-#: C/evolution.xml:1317(para)
-#: C/evolution.xml:1332(para)
-msgid "Specify your proxy settings (if you don't know your proxy settings, contact your ISP or system administrator)."
-msgstr "Zadejte nastavení vaší proxy (pokud neznáte nastavení vaší proxy, kontaktujte svého ISP nebo systémového administrátora)."
+#: C/evolution.xml:1386(para) C/evolution.xml:1401(para)
+msgid ""
+"Specify your proxy settings (if you don't know your proxy settings, contact "
+"your ISP or system administrator)."
+msgstr ""
+"Zadejte nastavení vaší proxy (pokud neznáte nastavení vaší proxy, "
+"kontaktujte svého ISP nebo systémového administrátora)."
 
-#: C/evolution.xml:1320(para)
-#: C/evolution.xml:1335(para)
+#: C/evolution.xml:1389(para) C/evolution.xml:1404(para)
 msgid "Click Finish, then click Close."
 msgstr "Klikněte na Dokončit a potom na Zavřít."
 
-#: C/evolution.xml:1323(para)
+#: C/evolution.xml:1392(para)
 msgid "To set your proxy in GNOME:"
 msgstr "Nastavení proxy v GNOME:"
 
-#: C/evolution.xml:1326(para)
-msgid "Click System &gt; Administrative Settings (enter your root password if needed)."
-msgstr "Klikněte na Systém &gt; Administrátorská nastavení (vložte administrátorské heslo, pokud je potřeba)."
+#: C/evolution.xml:1395(para)
+msgid ""
+"Click System &gt; Administrative Settings (enter your root password if "
+"needed)."
+msgstr ""
+"Klikněte na Systém &gt; Administrátorská nastavení (vložte administrátorské "
+"heslo, pokud je potřeba)."
 
-#: C/evolution.xml:1342(title)
+#: C/evolution.xml:1411(title)
 msgid "Using Evolution for News"
 msgstr "Používání Evolutionu pro diskuse"
 
-#: C/evolution.xml:1343(para)
-msgid "USENET newsgroups are similar to mail, so it is often convenient to read news and mail side by side. You can add a news source, called an NNTP server, the same way you would add <link linkend=\"bse54o0\">new e-mail account</link>, selecting USENET News as the source type. The news server appear as a remote mail server, and each news group works like an IMAP folder. When you click Send/Receive, Evolution also checks for news messages."
-msgstr "Diskusní skupiny USENET jsou podobné e-mailu, často je pohodlné číst diskusi a poštu bok po boku. Můžete si přidat zdroj diskuse zvaný NNTP server, stejným způsobem, jako byste  přidávali <link linkend=\"bse54o0\">nový e-mailový účet</link>, pouze vyberete jako zdroj Diskusní skupiny USENET. Server diskusí se objeví jako vzdálený poštovní server a každá diskusní skupina funguje jako složka IMAP. Když kliknete na Odeslat/přijmout, Evolution taktéž zkontroluje zprávy z diskusí."
-
-#: C/evolution.xml:1344(para)
-msgid "When you create a news group account, you are not subscribed to any groups. To subscribe to a news group:"
-msgstr "Když vytvoříte účet pro diskusní skupinu, nejste k žádné skupině přihlášeni. Pro přihlášení do diskusní skupiny:"
+#: C/evolution.xml:1412(para)
+msgid ""
+"USENET newsgroups are similar to mail, so it is often convenient to read "
+"news and mail side by side. You can add a news source, called an NNTP "
+"server, the same way you would add <link linkend=\"bse54o0\">new email "
+"account</link>, selecting USENET News as the Server type. The news server "
+"appear as a remote mail server, and each newsgroup works like an IMAP "
+"folder. When you click Send/Receive, Evolution also checks for news messages."
+msgstr ""
+"Diskusní skupiny USENET jsou podobné e-mailu, často je pohodlné číst diskusi "
+"a poštu bok po boku. Můžete si přidat zdroj diskuse zvaný NNTP server, "
+"stejným způsobem, jako byste  přidávali <link linkend=\"bse54o0\">nový e-"
+"mailový účet</link> tak, že jako Typ serveru vyberete Diskusní skupiny "
+"USENET. Server diskusí se objeví jako vzdálený poštovní server a každá "
+"diskusní skupina funguje jako složka IMAP. Když kliknete na Odeslat/"
+"přijmout, Evolution taktéž zkontroluje zprávy z diskusí."
+
+#: C/evolution.xml:1413(para)
+msgid ""
+"When you create a newsgroup account, you are not subscribed to any groups. "
+"To subscribe to a newsgroup:"
+msgstr ""
+"Když vytvoříte účet pro diskusní skupinu, nejste k žádné skupině přihlášeni. "
+"Pro přihlášení do diskusní skupiny:"
 
-#: C/evolution.xml:1347(para)
-#: C/evolution.xml:5317(para)
+#: C/evolution.xml:1416(para) C/evolution.xml:5536(para)
 msgid "Click Folder &gt; Subscriptions."
 msgstr "Klikněte na Složka &gt; Příhlášení."
 
-#: C/evolution.xml:1350(para)
-msgid "Select your NNTP account, select the groups you want to subscribe to, then click Subscribe."
-msgstr "Vyberte váš NNTP účet, vyberte skupiny, do kterých se chcete přihlásit a klikněte na Přihlásit."
+#: C/evolution.xml:1419(para)
+msgid ""
+"Select your NNTP account, select the groups you want to subscribe to, then "
+"click Subscribe."
+msgstr ""
+"Vyberte váš NNTP účet, vyberte skupiny, do kterých se chcete přihlásit a "
+"klikněte na Přihlásit."
 
-#: C/evolution.xml:1359(title)
+#: C/evolution.xml:1428(title)
 msgid "Deleting Mail"
 msgstr "Mazání pošty"
 
-#: C/evolution.xml:1360(para)
-msgid "Evolution allows you to delete unwanted messages. To delete a message, select it and press the Delete key, or click the delete tool in the toolbar, press Ctrl+D, or right-click the message, then click Delete."
-msgstr "Evolution vám umožňuje odstranit nepotřebné zprávy. Chcete-li odstranit zprávu, vyberte ji a stiskněte klávesu Delete nebo klikněte na tlačítko Odstranit v liště nástrojů, stikněte Ctrl+D, nebo klikněte pravým tlačítkem na zprávu a vyberte Odstranit."
-
-#: C/evolution.xml:1361(para)
-msgid "When you press Delete or click the Trash folder, your mail is not actually deleted, but is marked for deletion. Your e-mail is recoverable until you have expunged your mail. When you expunge a folder, you remove all the mail that you have marked for deletion.To show deleted messages, uncheck Hide Deleted Messages option from the View menu. You can view the messages striken off for later deletion. You can also find deleted messages in your Trash folder."
-msgstr "Když stisknete Delete nebo kliknete na složku Koše, e-mail není opravdu smazaný, ale označený pro odstranění. E-mail je obnovitelný, dokud e-mail nevyčistíte. Když vyčistíte složku, odstraníte všechny zprávy, které byly označeny pro odstranění. Chcete-li zobrazit odstraněné zprávy, odškrtněte volbu Skrýt odstraněné zprávy v nabídce Zobrazit. Můžete podívat na zprávy vyškrtnuté pro pozdější odstranění. Také můžete nalézt odstraněné zprávy ve složce Koš."
+#: C/evolution.xml:1429(para)
+msgid ""
+"Evolution allows you to delete unwanted messages. To delete a message, "
+"select it and press the Delete key, or click the delete tool in the toolbar, "
+"press Ctrl+D, or right-click the message, then click Delete."
+msgstr ""
+"Evolution vám umožňuje odstranit nepotřebné zprávy. Chcete-li odstranit "
+"zprávu, vyberte ji a stiskněte klávesu Delete nebo klikněte na tlačítko "
+"Odstranit v liště nástrojů, stikněte Ctrl+D, nebo klikněte pravým tlačítkem "
+"na zprávu a vyberte Odstranit."
 
-#: C/evolution.xml:1362(para)
-msgid "To permanently erase all the deleted messages in a folder, click Folder &gt; Expunge or press Ctrl+E."
-msgstr "Pro trvalé vymazání všech odstraněných zpráv ve složce, klikněte na Složka &gt; Vyčistit nebo stiskněte Ctrl+E."
+#: C/evolution.xml:1430(para)
+msgid ""
+"When you press Delete or click the Trash folder, your mail is not actually "
+"deleted, but is marked for deletion. Your email is recoverable until you "
+"have expunged your mail. When you expunge a folder, you remove all the mail "
+"that you have marked for deletion.To show deleted messages, uncheck Hide "
+"Deleted Messages option from the View menu. You can view the messages "
+"striken off for later deletion. You can also find deleted messages in your "
+"Trash folder."
+msgstr ""
+"Když stisknete Delete nebo kliknete na složku Koše, e-mail není opravdu "
+"smazaný, ale označený pro odstranění. E-mail je obnovitelný, dokud e-mail "
+"nevyčistíte. Když vyčistíte složku, odstraníte všechny zprávy, které byly "
+"označeny pro odstranění. Chcete-li zobrazit odstraněné zprávy, odškrtněte "
+"volbu Skrýt odstraněné zprávy v nabídce Zobrazit. Můžete podívat na zprávy "
+"vyškrtnuté pro pozdější odstranění. Také můžete nalézt odstraněné zprávy ve "
+"složce Koš."
+
+#: C/evolution.xml:1431(para)
+msgid ""
+"To permanently erase all the deleted messages in a folder, click Folder &gt; "
+"Expunge or press Ctrl+E."
+msgstr ""
+"Pro trvalé vymazání všech odstraněných zpráv ve složce, klikněte na Složka "
+"&gt; Vyčistit nebo stiskněte Ctrl+E."
 
-#: C/evolution.xml:1363(para)
-msgid "Trash folders in GroupWise, local and IMAP accounts are actually virtual search folders that display all messages you have marked for later deletion. Hence, emptying Trash is nothing but expunging deleted mails from all your folders in the account."
-msgstr "Složky Koše v GroupWise, místních a IMAP účtech jsou ve skutečnosti virtuální složky hledání, které zobrazují všechny zprávy, které jste označili pro pozdější ostranění. Z tohoto důvodu vyprázdnění Koše narozdíl od vyčištění odstraněných e-mailů ze všech složek nic nezpůsobí."
+#: C/evolution.xml:1432(para)
+msgid ""
+"Trash folders in GroupWise, local and IMAP accounts are actually virtual "
+"search folders that display all messages you have marked for later deletion. "
+"Hence, emptying Trash is nothing but expunging deleted mail from all your "
+"folders in the account."
+msgstr ""
+"Složky Koše v GroupWise, místních a IMAP účtech jsou ve skutečnosti "
+"virtuální složky hledání, které zobrazují všechny zprávy, které jste "
+"označili pro pozdější ostranění. Z tohoto důvodu vyprázdnění Koše narozdíl "
+"od vyčištění odstraněných e-mailů ze všech složek nic nezpůsobí."
 
-#: C/evolution.xml:1364(para)
-msgid "However, this is not true for the Trash folder on Exchange servers, which behaves just the same as it does in Outlook. It is a normal folder with actual messages in it. For more information about search folders, see <link linkend=\"usage-mail-organize-vfolders\">Using Search Folders</link>."
-msgstr "Avšak neplatí to pro složku Koš na serveru Exchange, který se chová stejně jako Outlook. Je to normální složka obsahující opravdové zprávy. Více informací o složkách hledání se dozvíte v <link linkend=\"usage-mail-organize-vfolders\">Používání složek hledání</link>"
+#: C/evolution.xml:1433(para)
+msgid ""
+"However, this is not true for the Trash folder on Exchange servers, which "
+"behaves just the same as it does in Outlook. It is a normal folder with "
+"actual messages in it. For more information about search folders, see <link "
+"linkend=\"usage-mail-organize-vfolders\">Using Search Folders</link>."
+msgstr ""
+"Avšak neplatí to pro složku Koš na serveru Exchange, který se chová stejně "
+"jako Outlook. Je to normální složka obsahující opravdové zprávy. Více "
+"informací o složkách hledání se dozvíte v <link linkend=\"usage-mail-"
+"organize-vfolders\">Používání složek hledání</link>"
 
-#: C/evolution.xml:1368(title)
+#: C/evolution.xml:1437(title)
 msgid "Undeleting Messages"
 msgstr "Zrušení odstranění zpráv"
 
-#: C/evolution.xml:1369(para)
-msgid "You can undelete a message that has been deleted but not expunged. To undelete a message, select the message, click Edit &gt; Undelete."
-msgstr "Můžete zrušit odstranění zprávy, která byla odstraněna, ale ne smazána. Pro zrušení odstranění zprávy, vyberte zprávu a klikněte na Upravit &gt; Zrušit odstranění zprávy."
-
-#: C/evolution.xml:1370(para)
-msgid "If you have marked a message for deletion, undeleting it unmarks it, and the message is removed from the Trash folder."
-msgstr "Pokud jste nějakou zprávu označili pro odstranění, zrušení odstranění toto označení zase ruší a zprávy odebere ze složky Koš."
+#: C/evolution.xml:1438(para)
+msgid ""
+"You can undelete a message that has been deleted but not expunged. To "
+"undelete a message, select the message, click Edit &gt; Undelete. Note that "
+"View &gt; Hide Deleted messages in the menubar must be disabled for this."
+msgstr ""
+"Můžete zrušit odstranění zprávy, která byla odstraněna, ale ne smazána. Pro "
+"zrušení odstranění zprávy, vyberte zprávu a klikněte na Upravit &gt; Zrušit "
+"odstranění zprávy. Všimněte si, že volbaZobrazit &gt; Skrýt odstraněné "
+"zprávy  musí být zakázána, abyste toto mohli provést."
 
-#: C/evolution.xml:1376(para)
-msgid "You can start writing a new e-mail message by clicking File &gt; New &gt; Mail Message, by pressing Ctrl+N when in the mailing tool, or by clicking New in the toolbar."
-msgstr "Můžete začít psát zprávu kliknutím na Soubor &gt; Nový &gt; Zpráva, stisknutím Ctrl+N, když se nacházíte v poště nebo kliknutím na Nový v liště nástrojů."
+#: C/evolution.xml:1439(para)
+msgid ""
+"If you have marked a message for deletion, undeleting it unmarks it, and the "
+"message is removed from the Trash folder."
+msgstr ""
+"Pokud jste nějakou zprávu označili pro odstranění, zrušení odstranění toto "
+"označení zase ruší a zprávy odebere ze složky Koš."
 
-#: C/evolution.xml:1377(para)
-msgid "Enter an address in the To field. If you want to enter multiple email addresses, type in the addresses separated by comma. You can also use contact list to send messages to multiple recipients.Enter a subject in the Subject field, and a message in the box at the bottom of the window. After you have written your message, click Send."
-msgstr "Vložte adresu do pole Komu. Pokud chcete vložit více adres, pište adresy oddělené čárkami. Pro poslání zpráv více příjemcům můžete využít také seznam kontaktů. Vložte předmět do pole Předmět a zprávu do čtverce ve spodní části okna. Poté, co máte zprávu napsanou, klikněte na Poslat."
+#: C/evolution.xml:1445(para)
+msgid ""
+"You can start writing a new email message by clicking File &gt; New &gt; "
+"Mail Message, by pressing Ctrl+N when in the mailing tool, or by clicking "
+"New in the toolbar."
+msgstr ""
+"Můžete začít psát zprávu kliknutím na Soubor &gt; Nový &gt; Zpráva, "
+"stisknutím Ctrl+N, když se nacházíte v poště, nebo kliknutím na Nový v liště "
+"nástrojů."
 
-#: C/evolution.xml:1378(para)
+#: C/evolution.xml:1446(para)
+msgid ""
+"Enter an address in the To field. If you want to enter multiple email "
+"addresses, type in the addresses separated by comma. You can also use a "
+"contact list to send messages to multiple recipients. Enter a subject in the "
+"Subject field, and a message in the box at the bottom of the window. After "
+"you have written your message, click Send."
+msgstr ""
+"Vložte adresu do pole Komu. Pokud chcete vložit více adres, pište adresy "
+"oddělené čárkami. Pro poslání zpráv více příjemcům můžete využít také seznam "
+"kontaktů. Vložte předmět do pole Předmět a zprávu do čtverce ve spodní části "
+"okna. Poté, co máte zprávu napsanou, klikněte na Poslat."
+
+#: C/evolution.xml:1447(para)
 msgid "New mail message window look like this:"
 msgstr "Okno nové zprávy vypadá takto:"
 
-#: C/evolution.xml:1380(para)
-#: C/evolution.xml:5962(para)
+#: C/evolution.xml:1449(para) C/evolution.xml:6184(para)
 msgid "This section contains the following topics:"
 msgstr "Tato sekce obsahuje následující témata:"
 
-#: C/evolution.xml:1383(link)
-#: C/evolution.xml:1421(title)
+#: C/evolution.xml:1452(link) C/evolution.xml:1490(title)
 msgid "Unicode, ASCII, and Non-Latin Alphabets"
 msgstr "Unicode, ASCII, abecedy nepoužívající latinku"
 
-#: C/evolution.xml:1386(link)
-#: C/evolution.xml:1433(title)
+#: C/evolution.xml:1455(link) C/evolution.xml:1526(title)
 msgid "Sending Composed Messages Later"
 msgstr "Odeslání vytvořených zpráv později"
 
-#: C/evolution.xml:1389(link)
-#: C/evolution.xml:1449(title)
+#: C/evolution.xml:1458(link) C/evolution.xml:1542(title)
 msgid "Working Offline"
 msgstr "Práce off-line"
 
-#: C/evolution.xml:1392(link)
-#: C/evolution.xml:1502(title)
+#: C/evolution.xml:1461(link) C/evolution.xml:1595(title)
 msgid "Attachments"
 msgstr "Přílohy"
 
-#: C/evolution.xml:1395(link)
-#: C/evolution.xml:1549(title)
-msgid "Specifying Additional Recipients for E-Mail"
+#: C/evolution.xml:1464(link) C/evolution.xml:1642(title)
+msgid "Specifying Additional Recipients for Email"
 msgstr "Zadání dalších příjemců zprávy"
 
-#: C/evolution.xml:1398(link)
-#: C/evolution.xml:1574(title)
+#: C/evolution.xml:1467(link) C/evolution.xml:1667(title)
 msgid "Choosing Recipients Quickly"
 msgstr "Rychlé vybírání příjemců"
 
-#: C/evolution.xml:1401(link)
-#: C/evolution.xml:1582(title)
-msgid "Replying to E-Mail Messages"
-msgstr "Odpovídání na e-maily"
+#: C/evolution.xml:1470(link) C/evolution.xml:1675(title)
+msgid "Replying to Email Messages"
+msgstr "Odpovídání na e-mailové zprávy"
 
-#: C/evolution.xml:1404(link)
-#: C/evolution.xml:1648(title)
+#: C/evolution.xml:1473(link) C/evolution.xml:1741(title)
 msgid "Searching and Replacing with the Composer"
 msgstr "Hledání a nahrazování v Editoru."
 
-#: C/evolution.xml:1407(link)
-#: C/evolution.xml:1670(title)
-msgid "Enhancing Your E-Mail with HTML"
+#: C/evolution.xml:1476(link) C/evolution.xml:1763(title)
+msgid "Enhancing Your Email with HTML"
 msgstr "Vylepšení vašich e-mailů pomocí HTML"
 
-#: C/evolution.xml:1410(link)
-#: C/evolution.xml:1844(title)
+#: C/evolution.xml:1479(link) C/evolution.xml:1937(title)
 msgid "Mail Send Options"
 msgstr "Možnosti pro odeslání pošty"
 
-#: C/evolution.xml:1413(link)
-#: C/evolution.xml:1922(title)
+#: C/evolution.xml:1482(link) C/evolution.xml:2015(title)
 msgid "Forwarding Mail"
 msgstr "Přeposílání pošty"
 
-#: C/evolution.xml:1416(link)
-#: C/evolution.xml:1942(title)
-msgid "Tips for E-Mail Courtesy"
+#: C/evolution.xml:1485(link) C/evolution.xml:2036(title)
+msgid "Tips for Email Courtesy"
 msgstr "Tipy pro e-mailovou etiketu"
 
-#: C/evolution.xml:1422(para)
-msgid "If you want to write in a non-Latin alphabet while using a Latin keyboard, try selecting a different input method in the message composer. Right-click in the message composition area and select an input method from the Input Methods menu, then begin typing. The actual keys vary by language and input style. For example, the Cyrillic input method uses transliterated Latin keyboard combinations to get the Cyrillic alphabet, combining letters where necessary. <quote>Zh</quote> and <quote>ya</quote> produce the appropriate single Cyrillic letters, and the single-quote (') produces a soft sign character."
-msgstr "Pokud chcete psát v abecedě nepoužívající latinku na klávesnici s latinkou, zkuste zvolit jinou vstupní metodu v editoru zpráv. Klikněte pravým tlačítkem do prostoru pro tvorbu zprávy, vyberte metodu vstupu z nabídky Vstupní metody a začněte psát. Skutečné klávesy se liší podle jazyku a zvolené vstupní metody. Např. vstupní metoda cyrilice používá transliterované kombinace klávesnice s latinkou, aby dosáhla abecedy cyrilice. Kombinování písmen je nezbytné. <quote>Zh</quote> a <quote>ya</quote> vytvářejí odpovídající jednotlivé písmena cyrilice a jedna uvozovka (') měkký znak."
-
-#: C/evolution.xml:1423(para)
-msgid "For greater language display capabilities, click Edit &gt; Preferences, then select the character set choices in the Mail Preferences and Composer Preferences sections. If you aren't sure which one to use, select UTF-8, which offers the greatest range of character displays for the greatest range of languages."
-msgstr "Pro větší schopnosti zobrazování jazyků, klikněte na Upravit &gt; Nastavení, potom vyberte znakovou sadu v Nastavení pošty a Nastavení editoru. Pokud si nejste jistí, kterou vybrat, zvolte UTF-8, které nabízí největší rozsah zobrazovaných znaků pro největší rozsah jazyků."
-
-#: C/evolution.xml:1426(title)
+#: C/evolution.xml:1491(para)
+msgid ""
+"If you want to write in a non-Latin alphabet while using a Latin keyboard, "
+"try selecting a different input method in the message composer. Right-click "
+"in the message composition area and select an input method from the Input "
+"Methods menu, then begin typing. The actual keys vary by language and input "
+"style. For example, the Cyrillic input method uses transliterated Latin "
+"keyboard combinations to get the Cyrillic alphabet, combining letters where "
+"necessary. <quote>Zh</quote> and <quote>ya</quote> produce the appropriate "
+"single Cyrillic letters, and the single-quote (') produces a soft sign "
+"character."
+msgstr ""
+"Pokud chcete psát v abecedě nepoužívající latinku na klávesnici s latinkou, "
+"zkuste zvolit jinou vstupní metodu v editoru zpráv. Klikněte pravým "
+"tlačítkem do prostoru pro tvorbu zprávy, vyberte metodu vstupu z nabídky "
+"Vstupní metody a začněte psát. Skutečné klávesy se liší podle jazyku a "
+"zvolené vstupní metody. Např. vstupní metoda cyrilice používá "
+"transliterované kombinace klávesnice s latinkou, aby dosáhla abecedy "
+"cyrilice. Kombinování písmen je nezbytné. <quote>Zh</quote> a <quote>ya</"
+"quote> vytvářejí odpovídající jednotlivé písmena cyrilice a jedna uvozovka "
+"(') měkký znak."
+
+#: C/evolution.xml:1492(para)
+msgid ""
+"For greater language display capabilities, click Edit &gt; Preferences, then "
+"select the character set choices in the Mail Preferences and Composer "
+"Preferences sections. If you aren't sure which one to use, select UTF-8, "
+"which offers the greatest range of character displays for the greatest range "
+"of languages."
+msgstr ""
+"Pro větší schopnosti zobrazování jazyků, klikněte na Upravit &gt; Nastavení, "
+"potom vyberte znakovou sadu v Nastavení pošty a Nastavení editoru. Pokud si "
+"nejste jistí, kterou vybrat, zvolte UTF-8, které nabízí největší rozsah "
+"zobrazovaných znaků pro největší rozsah jazyků."
+
+#: C/evolution.xml:1495(title)
 msgid "Using Character Sets"
 msgstr "Používání znakových sad"
 
-#: C/evolution.xml:1427(para)
-msgid "A character set is a computer's version of an alphabet. In the past, the ASCII character set was used almost universally. However, it contains only 128 characters, meaning it is unable to display characters in Cyrillic, Kanjii, or other non-Latin alphabets. To work around language display problems, programmers developed a variety of methods, so many human languages now have their own specific character sets, and items written in other character sets display incorrectly. Eventually, standards organizations developed the UTF-8 Unicode* character set to provide a single compatible set of codes for everyone."
-msgstr "Znaková sada je počítačová verze abecedy. V minulosti byla téměř všeobecně využívána znaková sada ASCII. Avšak obsahuje pouze 128 znaků, proto není schopná zobrazit znaky v cyrilici, kanjii a jiných abecedách nepoužívajících latinku. Aby se obešly problémy zobrazování jazyků, programátoři vyvinuli různé metody. Tolik lidských jazyků má nyní vlastní znakové sady a položky psané v jiné znakové sadě se zobrazují špatně. Nakonec standardizační organizace vyvinuly znakovou sadu UTF-8 Unicode*, což je jedna znaková sada pro všechny."
+#: C/evolution.xml:1496(para)
+msgid ""
+"A character set is a computer's version of an alphabet. In the past, the "
+"ASCII character set was used almost universally. However, it contains only "
+"128 characters, meaning it is unable to display characters in Cyrillic, "
+"Kanjii, or other non-Latin alphabets. To work around language display "
+"problems, programmers developed a variety of methods, so many human "
+"languages now have their own specific character sets, and items written in "
+"other character sets display incorrectly. Eventually, standards "
+"organizations developed the UTF-8 Unicode* character set to provide a single "
+"compatible set of codes for everyone."
+msgstr ""
+"Znaková sada je počítačová verze abecedy. V minulosti byla téměř všeobecně "
+"využívána znaková sada ASCII. Avšak obsahuje pouze 128 znaků, proto není "
+"schopná zobrazit znaky v cyrilici, kanjii a jiných abecedách nepoužívajících "
+"latinku. Aby se obešly problémy zobrazování jazyků, programátoři vyvinuli "
+"různé metody. Tolik lidských jazyků má nyní vlastní znakové sady a položky "
+"psané v jiné znakové sadě se zobrazují špatně. Nakonec standardizační "
+"organizace vyvinuly znakovou sadu UTF-8 Unicode*, což je jedna znaková sada "
+"pro všechny."
+
+#: C/evolution.xml:1497(para)
+msgid ""
+"Most email messages state in advance which character set they use, so "
+"Evolution usually can display those messages correctly. However, if you find "
+"that messages are displayed as rows of incomprehensible characters, try "
+"selecting a different character set in the mail settings screen. If your "
+"recipients can't read your messages, try selecting a different character set "
+"in the composer options dialog box. For some languages, such as Turkish or "
+"Korean, it might work best for you to select the language-specific character "
+"set. However, the best choice for most users is UTF-8, which offers the "
+"widest range of characters for the widest range of languages."
+msgstr ""
+"Většina e-mailových zpráv oznamuje dopředu, jakou znakovou sadu používají, "
+"takže Evolution tyto zprávy obvykle zobrazí správně. Avšak pokud najdete "
+"zprávy, které obsahují řády nesrozumitelných znaků, zkuste vybrat jinou "
+"znakovou sadu v nabídce. Pokud příjemci nemůžou přečíst vaše zprávy, zkuste "
+"zvolit jinou znakovou sadu v nabídce editoru zprávy. Pro některé jazyky, "
+"jako jsou turečtina a korejština, pravděpodobně nejlépe funguje, když "
+"zvolíte specifickou sadu pro daný jazyk. Nicméně pro většinu uživatel je "
+"nejlepší volbou UTF-8, které nabízí nejširší rozsah znaků pro nejšiřší "
+"rozsah jazyků."
+
+#: C/evolution.xml:1502(title)
+msgid "Custom Header"
+msgstr "Vlastní hlavičky"
+
+#: C/evolution.xml:1503(para)
+msgid "To enable the Custom Header plugin:"
+msgstr "Chcete-li povolit zásuvný modul Vlastní hlavičky:"
+
+#: C/evolution.xml:1504(para) C/evolution.xml:6717(para)
+msgid "Select Edit &gt; Plugins."
+msgstr "Vyberte Upravit &gt; Zásuvné moduly."
+
+#: C/evolution.xml:1505(para)
+msgid ""
+"Then select Custom Header. You can configure custom headers to set "
+"sensitivity and caveats to the outgoing messages."
+msgstr ""
+
+#: C/evolution.xml:1507(para)
+msgid ""
+"In the Plugin Manager, select the Configuration tab to customize your header "
+"fields. You can add, edit, or remove the header fields. For every header "
+"field you add, you can specify the keys and values. The key is used as the "
+"title of the Custom Header. You can enter multiple values for the keys. You "
+"must use a semicolon to separate every value you enter."
+msgstr ""
+
+#: C/evolution.xml:1510(para)
+msgid ""
+"Select New &gt; Mail Message or Shift+Ctrl+M to open a Compose Message "
+"window."
+msgstr ""
+"Abyste otevřeli okno pro vytvoření zprávy, vyberte Soubor &gt; Nová &gt; "
+"Zpráva nebo Shift+Ctrl+M."
+
+#: C/evolution.xml:1513(para)
+msgid ""
+"Select Insert &gt; Custom Header to open the Email Custom Header window."
+msgstr ""
+"Vyberte Vložit &gt; Vlastní hlavička pro otevření okna vlastní hlavičky e-"
+"mailu."
 
-#: C/evolution.xml:1428(para)
-msgid "Most e-mail messages state in advance which character set they use, so Evolution usually knows what to display for a given binary number. However, if you find that messages are displayed as rows of incomprehensible characters, try selecting a different character set in the mail settings screen. If your recipients can't read your messages, try selecting a different character set in the composer options dialog box. For some languages, such as Turkish or Korean, it might work best for you to select the language-specific character set. However, the best choice for most users is UTF-8, which offers the widest range of characters for the widest range of languages."
-msgstr "Většina e-mailových zpráv oznamuje dopředu, jakou znakovou sadu používají, takže Evolution obvykle ví, co má zobrazit pro dané binární číslo. Avšak pokud najdete zprávy, které obsahují řády nesrozumitelných znaků, zkuste vybrat jinou znakovou sadu v nabídce. Pokud příjemci nemůžou přečíst vaše zprávy, zkuste zvolit jinou znakovou sadu v nabídce editoru zprávy. Pro některé jazyky, jako jsou turečtina a korejština, pravděpodobně nejlépe funguje, když zvolíte specifickou sadu pro daný jazyk. Nicméně pro většinu uživatel je nejlepší volbou UTF-8, které nabízí nejširší rozsah znaků pro nejšiřší rozsah jazyků."
+#: C/evolution.xml:1515(para)
+msgid ""
+"In the Email Custom Header window, you can view all the header fields and "
+"values you add."
+msgstr ""
 
-#: C/evolution.xml:1434(para)
-msgid "Evolution normally sends mail as soon as you click Send. However, can save a message to be sent later:"
-msgstr "Evolution normálně posílá poštu ihned, jak kliknete na Poslat. Nicméně umí zprávu uložit a odeslat později:"
+#: C/evolution.xml:1518(para)
+msgid ""
+"Set the values for the header fields by using the respective drop-down list."
+msgstr ""
 
-#: C/evolution.xml:1437(para)
-msgid "If you are offline when you click Send, Evolution adds your message to the Outbox queue. The next time you connect to the Internet and send or receive mail, that message is sent."
-msgstr "Pokud jste off-line a kliknete na Poslat, Evolution přidá vaši zprávu do řady K Odeslání. Příště, až se připojíte k internetu a dáte odeslat nebo přijmout poštu, zpráva bude odeslána."
+#: C/evolution.xml:1527(para)
+msgid ""
+"Evolution normally sends mail as soon as you click Send. However, can save a "
+"message to be sent later:"
+msgstr ""
+"Evolution normálně posílá poštu ihned, jak kliknete na Poslat. Nicméně umí "
+"zprávu uložit a odeslat později:"
 
-#: C/evolution.xml:1440(para)
-msgid "Click File &gt; Save Draft to store your messages in the drafts folder for later revision."
-msgstr "Pokud chcete uložit zprávu pro pozdější revizi,  klikněte na Soubor &gt; Uložit koncept."
+#: C/evolution.xml:1530(para)
+msgid ""
+"If you are offline when you click Send, Evolution adds your message to the "
+"Outbox queue. The next time you connect to the Internet and send or receive "
+"mail, that message is sent."
+msgstr ""
+"Pokud jste off-line a kliknete na Poslat, Evolution přidá vaši zprávu do "
+"řady K Odeslání. Příště, až se připojíte k internetu a dáte odeslat nebo "
+"přijmout poštu, zpráva bude odeslána."
 
-#: C/evolution.xml:1443(para)
-msgid "If you prefer to save your message as a text file, click File &gt; Save As, then specify a filename."
-msgstr "Pokud dáváte přednost uložení zprávy jako textový soubor, klikněte na Soubor &gt; Uložit jako, potom zadejte název souboru."
+#: C/evolution.xml:1533(para)
+msgid ""
+"Click File &gt; Save Draft to store your messages in the drafts folder for "
+"later revision."
+msgstr ""
+"Pokud chcete uložit zprávu pro pozdější revizi,  klikněte na Soubor &gt; "
+"Uložit koncept."
 
-#: C/evolution.xml:1450(para)
-msgid "Offline mode help you communicate with remote mail storage systems like <trademark class=\"registered\">GroupWise</trademark>, IMAP or Exchange, in situations where you are not connected to the network at all times. Evolution keeps a local copy of one or more folders to allow you to compose messages, storing them in your Outbox to be sent the next time you connect."
-msgstr "Režim off-line vám pomáhá komunikovat se vzdálenými systémy pro uložení pošty jako <trademark class=\"registered\">GroupWise</trademark>, IMAP nebo Exchange v situacích, kdy nejste pořád připojení do sítě. Evolution uchovává místní kopii jedné nebo více složek, aby vám umožnil vytvářet zprávy a ukládat je do složky K Odeslání do té doby, než budete on-line. "
+#: C/evolution.xml:1536(para)
+msgid ""
+"If you prefer to save your message as a text file, click File &gt; Save As, "
+"then specify a filename."
+msgstr ""
+"Pokud dáváte přednost uložení zprávy jako textový soubor, klikněte na Soubor "
+"&gt; Uložit jako, potom zadejte název souboru."
 
-#: C/evolution.xml:1451(para)
-msgid "POP mail downloads all messages to your local system, but other connections usually download just the headers, and get the rest only when you want to read the message. Before you go offline, Evolution downloads the unread messages from the folders you have chosen to store."
-msgstr "POP stahuje všechny zprávy do lokálního systému, ale ostatní připojení stahují pouze hlavičky a zbytek, pouze když chcete zprávu číst. Před tím, než jdete do off-line režimu, Evolution stáhne nepřečtené zprávy ze složek, které jste vybrali pro ukládání."
+#: C/evolution.xml:1543(para)
+msgid ""
+"Offline mode helps you communicate with remote mail storage systems like "
+"<trademark class=\"registered\">GroupWise</trademark>, IMAP or Exchange, in "
+"situations where you are not connected to the network at all times. "
+"Evolution keeps a local copy of one or more folders to allow you to compose "
+"messages, storing them in your Outbox to be sent the next time you connect."
+msgstr ""
+"Režim off-line vám pomáhá komunikovat se vzdálenými systémy pro uložení "
+"pošty jako <trademark class=\"registered\">GroupWise</trademark>, IMAP nebo "
+"Exchange v situacích, kdy nejste pořád připojení do sítě. Evolution uchovává "
+"místní kopii jedné nebo více složek, aby vám umožnil vytvářet zprávy a "
+"ukládat je do složky K Odeslání do té doby, než budete připojeni. "
 
-#: C/evolution.xml:1452(para)
+#: C/evolution.xml:1544(para)
+msgid ""
+"POP mail downloads all messages to your local system, but other connections "
+"usually download just the headers, and get the rest only when you want to "
+"read the message. Before you go offline, Evolution downloads the unread "
+"messages from the folders you have chosen to store."
+msgstr ""
+"POP stahuje všechny zprávy do lokálního systému, ale ostatní připojení "
+"stahují pouze hlavičky a zbytek, pouze když chcete zprávu číst. Před tím, "
+"než jdete do off-line režimu, Evolution stáhne nepřečtené zprávy ze složek, "
+"které jste vybrali pro ukládání."
+
+#: C/evolution.xml:1545(para)
 msgid "To mark a folder for offline use,"
 msgstr "Chcete-li zprávu označit pro použití off-line,"
 
-#: C/evolution.xml:1455(para)
+#: C/evolution.xml:1548(para)
 msgid "Right-click the folder, then click Properties."
 msgstr "Klikněte pravým tlačítkem na složku a potom na Vlastnosti."
 
-#: C/evolution.xml:1458(para)
+#: C/evolution.xml:1551(para)
 msgid "Click Copy Folder Content Locally for Offline Operation."
 msgstr "Klikněte na Zkopírovat obsah složky lokálně pro práci při odpojení."
 
-#: C/evolution.xml:1461(para)
-msgid "Your connection status is shown by the small icon in the lower left border of the Evolution main window. When you are online, it displays two connected cables. When you go offline, the cables separate."
-msgstr "Váš stav připojení je zobrazen malou ikonou vlevo dole v hlavním okně Evolutionu. Když jste on-line, zobrazuje dva spojené kabely. Když jste off-line, kabely jsou rozpojené."
+#: C/evolution.xml:1554(para)
+msgid ""
+"Your connection status is shown by the small icon in the lower left border "
+"of the Evolution main window. When you are online, it displays two connected "
+"cables. When you go offline, the cables separate."
+msgstr ""
+"Váš stav připojení je zobrazen malou ikonou vlevo dole v hlavním okně "
+"Evolutionu. Když jste on-line, zobrazuje dva spojené kabely. Když jste off-"
+"line, kabely jsou rozpojené."
 
-#: C/evolution.xml:1462(para)
+#: C/evolution.xml:1555(para)
 msgid "To cache your selected folders and disconnect from the network,"
 msgstr "Chcete-li vybrané složky uložit to cache a odpojit se od sítě,"
 
-#: C/evolution.xml:1465(para)
-msgid "Click File &gt; Work Offline, or click the connection status icon in the lower left of the screen."
-msgstr "Klikněte na Soubor &gt; Pracovat při odpojení, nebo klikněte na ikonu stavu připojení v levém dolním rohu obrazovky."
+#: C/evolution.xml:1558(para)
+msgid ""
+"Click File &gt; Work Offline, or click the connection status icon in the "
+"lower left of the screen."
+msgstr ""
+"Klikněte na Soubor &gt; Pracovat při odpojení, nebo klikněte na ikonu stavu "
+"připojení v levém dolním rohu obrazovky."
 
-#: C/evolution.xml:1466(para)
-msgid "A message pop-ups and asks you whether you want to go offline immediately or cache before you go offline."
-msgstr "Vyskočí zpráva a zeptáv se vás, zda se chcete odpojit okamžitě nebo uložit složky do cache, než se odpojíte."
+#: C/evolution.xml:1559(para)
+msgid ""
+"A message pop-ups and asks you whether you want to go offline immediately or "
+"cache before you go offline."
+msgstr ""
+"Vyskočí zpráva a zeptáv se vás, zda se chcete odpojit okamžitě nebo uložit "
+"složky do cache, než se odpojíte."
 
-#: C/evolution.xml:1471(para)
-msgid "Click Synchronize to download all the messages to the folders marked for offline."
-msgstr "Klikněte na Synchronizovat, pokud chcete stáhnout všechny zprávy do složek, které jste označili pro práci při odpojení."
+#: C/evolution.xml:1564(para)
+msgid ""
+"Click Synchronize to download all the messages to the folders marked for "
+"offline."
+msgstr ""
+"Klikněte na Synchronizovat, pokud chcete stáhnout všechny zprávy do složek, "
+"které jste označili pro práci při odpojení."
 
-#: C/evolution.xml:1472(para)
-#: C/evolution.xml:3678(para)
+#: C/evolution.xml:1565(para) C/evolution.xml:3936(para)
 msgid "Or"
 msgstr "Nebo"
 
-#: C/evolution.xml:1473(para)
-msgid "Click Do not synchronize to go offline immediately, without downloading the messages locally for offline operations."
-msgstr "Klikněte na Nesynchronizovat, pokud se chcete odpojit okamžitě bez stažení zpráv lokálně pro operace při odpojení."
+#: C/evolution.xml:1566(para)
+msgid ""
+"Click Do not synchronize to go offline immediately, without downloading the "
+"messages locally for offline operations."
+msgstr ""
+"Klikněte na Nesynchronizovat, pokud se chcete odpojit okamžitě bez stažení "
+"zpráv lokálně pro operace při odpojení."
 
-#: C/evolution.xml:1474(para)
-msgid "Select Do not show this message again to switch off this popup. The default is to not synchronize while going offline."
-msgstr "Vyberte Přístě tuto zprávu nezobrazovat, chcete-li toto vyskakovací okno vypnout. Implicitně je nastaveno nesynchronizovat před odpojením."
+#: C/evolution.xml:1567(para)
+msgid ""
+"Select Do not show this message again to switch off this popup. The default "
+"is to not synchronize while going offline."
+msgstr ""
+"Vyberte Přístě tuto zprávu nezobrazovat, chcete-li toto vyskakovací okno "
+"vypnout. Implicitně je nastaveno nesynchronizovat před odpojením."
 
-#: C/evolution.xml:1477(para)
+#: C/evolution.xml:1570(para)
 msgid "When you want to reconnect,"
 msgstr "Když se chcete znovu připojit,"
 
-#: C/evolution.xml:1480(para)
+#: C/evolution.xml:1573(para)
 msgid "Click File &gt; Work Online, or click the connection status icon again."
-msgstr "Klikněte na Soubor &gt; Pracovat on-line, nebo klikněte znovu na ikonu stavu připojení."
+msgstr ""
+"Klikněte na Soubor &gt; Pracovat on-line, nebo klikněte znovu na ikonu stavu "
+"připojení."
 
-#: C/evolution.xml:1485(title)
+#: C/evolution.xml:1578(title)
 msgid "Download Messages for Offline Operations"
 msgstr "Stažení zpráv pro operace při odpojení"
 
-#: C/evolution.xml:1486(para)
-msgid "This features prepares you for going offline and for offline operations. It helps you download all the messages locally before you go offline. If otherwise, by default, it goes offline when you click the offline button without downloading the message."
-msgstr "Tato funkce vás připravuje na odpojení a na operace při odpojení. Pomáhá vám stáhnout všechny zprávy lokálně před tím, než se odpojíte. Jinak, když kliknete na tlačítko off-line, odpojíte se implicitně bez stažení zpráv."
+#: C/evolution.xml:1579(para)
+msgid ""
+"This features prepares you for going offline and for offline operations. It "
+"helps you download all the messages locally before you go offline. If "
+"otherwise, by default, it goes offline when you click the offline button "
+"without downloading the message."
+msgstr ""
+"Tato funkce vás připravuje na odpojení a na operace při odpojení. Pomáhá vám "
+"stáhnout všechny zprávy lokálně před tím, než se odpojíte. Jinak, když "
+"kliknete na tlačítko off-line, odpojíte se implicitně bez stažení zpráv."
 
-#: C/evolution.xml:1487(para)
+#: C/evolution.xml:1580(para)
 msgid "To download messages for offline operations,"
 msgstr "Chcete-li stáhnout zprávy pro operace při odpojení,"
 
-#: C/evolution.xml:1490(para)
+#: C/evolution.xml:1583(para)
 msgid "Select File &gt; Download messages for offline."
 msgstr "Vyberte Soubor &gt; Stáhnout zprávy pro využití po odpojení."
 
-#: C/evolution.xml:1496(title)
+#: C/evolution.xml:1589(title)
 msgid "Automatic Network State Handling"
 msgstr "Automatické reakce na stav sítě"
 
-#: C/evolution.xml:1497(para)
-msgid "Evolution automatically understands the network state and acts accordingly. For instance, Evolution switches to offline mode when the network goes down and automatically switches on when the network is up again. Ensure that your system has Network Manager installed on to enable this feature."
-msgstr "Evolution automaticky rozpoznává stav sítě a podle toho reaguje. Např. přepíná do řežimu off-line, když síť spadne a automaticky se vrací zpět, když síť opět funguje. Ujistěte se, že máte nainstalovaný Network Manager, aby tato funkce mohla fungovat."
+#: C/evolution.xml:1590(para)
+msgid ""
+"Evolution automatically understands the network state and acts accordingly. "
+"For instance, Evolution switches to offline mode when the network goes down "
+"and automatically switches on when the network is up again. Ensure that your "
+"system has Network Manager installed on to enable this feature."
+msgstr ""
+"Evolution automaticky rozpoznává stav sítě a podle toho reaguje. Např. "
+"přepíná do řežimu off-line, když síť spadne a automaticky se vrací zpět, "
+"když síť opět funguje. Ujistěte se, že máte nainstalovaný Network Manager, "
+"aby tato funkce mohla fungovat."
 
-#: C/evolution.xml:1503(para)
-msgid "To attach a file to your e-mail:"
-msgstr "Připojení souboru k e-mailu:"
+#: C/evolution.xml:1596(para)
+msgid "To attach a file to your email:"
+msgstr "Chcete-li připojit soubor k e-mailu:"
 
-#: C/evolution.xml:1506(para)
+#: C/evolution.xml:1599(para)
 msgid "Click the Attach icon in the composer toolbar."
 msgstr "Klikněte na ikonu Příloha v liště nástrojů editoru."
 
-#: C/evolution.xml:1509(para)
+#: C/evolution.xml:1602(para)
 msgid "Select the file you want to attach."
 msgstr "Vyberte soubor, který chcete přiložit."
 
-#: C/evolution.xml:1515(para)
-msgid "You can also drag a file into the composer window. If you want to send it as an inline attachment, right-click the attachment and click Properties, then select Automatic Display of Attachments."
-msgstr "Také můžete soubor přetáhnout do okna editoru. Chcete-li jej odeslat jako vloženou přílohu, klikněte pravým tlačítkem na přílohu a klikněte na Vlastnosti, potom vyberte Navrhnout automatické zobrazení přílohy."
+#: C/evolution.xml:1608(para)
+msgid ""
+"You can also drag a file to the attachment bar of the composer window. If "
+"you want to send it as an inline attachment, right-click the attachment and "
+"click Properties, then select Automatic Display of Attachments."
+msgstr ""
+"Také můžete soubor přetáhnout do okna editoru. Chcete-li jej odeslat jako "
+"vloženou přílohu, klikněte pravým tlačítkem na přílohu a klikněte na "
+"Vlastnosti, potom vyberte Navrhnout automatické zobrazení přílohy."
 
-#: C/evolution.xml:1516(para)
-msgid "When you send the message, a copy of the attached file goes with it. Be aware that large attachments can take a long time to send and receive."
-msgstr "Když odešlete zprávu, kopie přiloženého souboru jde s ní. Uvědomte si, že odesílání a přijímání velkých příloh může zabrat mnoho času."
+#: C/evolution.xml:1609(para)
+msgid ""
+"When you send the message, a copy of the attached file goes with it. Be "
+"aware that large attachments can take a long time to send and receive."
+msgstr ""
+"Když odešlete zprávu, kopie přiloženého souboru jde s ní. Uvědomte si, že "
+"odesílání a přijímání velkých příloh může zabrat mnoho času."
 
-#: C/evolution.xml:1519(title)
+#: C/evolution.xml:1612(title)
 msgid "Attachment Reminder:"
 msgstr "Připomínka přílohy:"
 
-#: C/evolution.xml:1520(para)
-msgid "Evolution has an Attachment Reminder plugin you can use to remind yourself to attach a file to an e-mail. If it determines that you have not attached the file, it displays the following message:"
-msgstr "Evolution má zásuvný modul připomínající přílohy, které můžete použít, pokud si chcete připomenout, že máte přiložit k e-mailu soubor. Pokud zjistí, že jste soubor nepřiložili, zobrazí se tato zpráva:"
+#: C/evolution.xml:1613(para)
+msgid ""
+"Evolution has an Attachment Reminder plugin you can use to remind yourself "
+"to attach a file to an email. If it determines that you have not attached "
+"the file, it displays the following message:"
+msgstr ""
+"Evolution má zásuvný modul připomínající přílohy, které můžete použít, pokud "
+"si chcete připomenout, že máte přiložit k e-mailu soubor. Pokud zjistí, že "
+"jste soubor nepřiložili, zobrazí se tato zpráva:"
 
-#: C/evolution.xml:1524(para)
-msgid "Click Continue Editing to attach the missing file, or click Send to send the message without any attachment."
-msgstr "Klikněte na Pokračovat v editaci, pokud chcete připojit chybějící soubor, nebo klikněte na Odeslat, pokud chcete zprávu odeslat bez přílohy."
+#: C/evolution.xml:1617(para)
+msgid ""
+"Click Continue Editing to attach the missing file, or click Send to send the "
+"message without any attachment."
+msgstr ""
+"Klikněte na Pokračovat v editaci, pokud chcete připojit chybějící soubor, "
+"nebo klikněte na Odeslat, pokud chcete zprávu odeslat bez přílohy."
 
-#: C/evolution.xml:1527(para)
+#: C/evolution.xml:1620(para)
 msgid "To enable the Attachment Reminder:"
 msgstr "Chcete-li zapnout Přípomínku přílohy:"
 
-#: C/evolution.xml:1530(para)
+#: C/evolution.xml:1623(para)
 msgid "Select Edit &gt; Plugins &gt; Attachment Reminder."
 msgstr "Vyberte Upravit &gt; Zásuvné moduly &gt; Připomínka přílohy."
 
-#: C/evolution.xml:1533(para)
-msgid "Click Configuration, then make sure that Remind Missing Attachments is selected."
-msgstr "Klikněte na Nastavení a ujistěte se, že je zašktnuto Připomenout chybějící přílohy."
-
-#: C/evolution.xml:1537(para)
-msgid "Select keywords such as <quote>Attach</quote> or <quote>Attachment</quote> and click Add."
-msgstr "Vyberte klíčová slova jako <quote>Attach</quote> nebo <quote>Příloha</quote> a klikněte na Přidat. "
-
-#: C/evolution.xml:1538(para)
-msgid "Based on the keywords you have added here, it searches every mail you are sending. If it finds the keywords such as <quote>attach</quote> in your mail and there is no actual attached file, you are reminded of missing attachments."
-msgstr "Na základě klíčových slov, které jste zde přidali, prohledává každý e-mail, který odesíláte. Pokud nalezne v e-mailu klíčové slovo jako např. <quote>příloha</quote> a žádný přiložený soubor, budete upozorněn na chybějící přílohu."
+#: C/evolution.xml:1626(para)
+msgid ""
+"Click Configuration, then make sure that Remind Missing Attachments is "
+"selected."
+msgstr ""
+"Klikněte na Nastavení a ujistěte se, že je zašktnuto Připomenout chybějící "
+"přílohy."
 
-#: C/evolution.xml:1541(para)
-msgid "To edit any of the existing keywords, select the keyword, click Edit, then modify the word as desired."
-msgstr "Chcete-li editovat kterékoliv z existujících klíčových slov, vyberte ho, klikněte na Upravit a změňte ho."
+#: C/evolution.xml:1630(para)
+msgid ""
+"Select keywords such as <quote>Attach</quote> or <quote>Attachment</quote> "
+"and click Add."
+msgstr ""
+"Vyberte klíčová slova jako <quote>Attach</quote> nebo <quote>Příloha</quote> "
+"a klikněte na Přidat. "
 
-#: C/evolution.xml:1544(para)
-msgid "When you have finished making your selections, click Close to exit the Plugin Manager."
-msgstr "Jste-li hotovi s výběrem, zavřete Správce zasuvných modulů kliknutím na Zavřít."
+#: C/evolution.xml:1631(para)
+msgid ""
+"Based on the keywords you have added here, it searches every mail you are "
+"sending. If it finds the keywords such as <quote>attach</quote> in your mail "
+"and there is no actual attached file, you are reminded of missing "
+"attachments."
+msgstr ""
+"Na základě klíčových slov, které jste zde přidali, prohledává každý e-mail, "
+"který odesíláte. Pokud nalezne v e-mailu klíčové slovo jako např. "
+"<quote>příloha</quote> a žádný přiložený soubor, budete upozorněn na "
+"chybějící přílohu."
 
-#: C/evolution.xml:1550(para)
-msgid "<trademark>Evolution</trademark>, like most e-mail programs, recognizes three types of addressee: primary recipients, secondary recipients, and hidden (blind) recipients. The simplest way to direct a message is to put the e-mail address or addresses in the To: field, which denotes primary recipients. Use the Cc: field to send a message to secondary recipients."
-msgstr "<trademark>Evolution</trademark>, stejně jako většina ostatních e-mailových klientů, rozpoznává tři druhy adresátů: hlavní příjemci, vedlejší příjemci a skrytí (neviditelní) příjemci. Nejjednodušší způsob, jak směrovat zprávu je vložit e-mailovou adresu nebo adresáta do pole Komu:, které udává hlavní příjemce. Použijte pole Kopie, chcete-li zprávu poslat vedlejšímu příjemci."
+#: C/evolution.xml:1634(para)
+msgid ""
+"To edit any of the existing keywords, select the keyword, click Edit, then "
+"modify the word as desired."
+msgstr ""
+"Chcete-li editovat kterékoliv z existujících klíčových slov, vyberte ho, "
+"klikněte na Upravit a změňte ho."
 
-#: C/evolution.xml:1551(para)
-msgid "Addresses on the Bcc: list are hidden from the other recipients of the message. You can use it to send mail to large groups of people, especially if they don't know each other or if privacy is a concern. If your Bcc: field is absent, click View &gt; Bcc Field."
-msgstr "Adresáti v seznamu Skrytá kopie: jsou skrytí před ostatními příjemci zprávy. Můžete ji použít pro posílání pošty velké skupině lidi, zvláště pokud se navzájem neznají nebo jde o soukromí. Pokud pole Skrytá kopie chybí, klikněte na Zobrazit &gt; Skrytá kopie."
+#: C/evolution.xml:1643(para)
+msgid ""
+"<trademark>Evolution</trademark>, like most email programs, recognizes three "
+"types of addresses: primary recipients, secondary recipients, and hidden "
+"(blind) recipients. The simplest way to direct a message is to put the email "
+"address or addresses in the To: field, which denotes primary recipients. Use "
+"the Cc: field to send a message to secondary recipients."
+msgstr ""
+"<trademark>Evolution</trademark>, stejně jako většina ostatních e-mailových "
+"klientů, rozpoznává tři druhy adresátů: hlavní příjemci, vedlejší příjemci a "
+"skrytí (neviditelní) příjemci. Nejjednodušší způsob, jak směrovat zprávu, je "
+"vložit e-mailovou adresu nebo adresy do pole Komu:, které udává hlavní "
+"příjemce. Použijte pole Kopie, chcete-li zprávu poslat vedlejšímu příjemci."
+
+#: C/evolution.xml:1644(para)
+msgid ""
+"Addresses on the Bcc: list are hidden from the other recipients of the "
+"message. You can use it to send mail to large groups of people, especially "
+"if they don't know each other or if privacy is a concern. If your Bcc: field "
+"is absent, click View &gt; Bcc Field."
+msgstr ""
+"Adresáti v seznamu Skrytá kopie: jsou skrytí před ostatními příjemci zprávy. "
+"Můžete ji použít pro posílání pošty velké skupině lidi, zvláště pokud se "
+"navzájem neznají nebo jde o soukromí. Pokud pole Skrytá kopie chybí, "
+"klikněte na Zobrazit &gt; Skrytá kopie."
 
-#: C/evolution.xml:1552(para)
-msgid "If you frequently write e-mail to the same groups of people, you can create address lists in the contacts tool, and then send them mail as though they have a single address. To learn how to do that, see <link linkend=\"usage-contact-organize-group-list\">Creating a List of Contacts</link>."
-msgstr "Pokud často píšete e-mail stejné skupině lidí, můžete si vytvořit seznam adres v nástroji kontaktů a potom jim posílat e-mail, jakoby měli jednu adresu. Jak to udělat se dozvíte v <link linkend=\"usage-contact-organize-group-list\">Vytvoření seznamu kontaktů</link>."
+#: C/evolution.xml:1645(para)
+msgid ""
+"If you frequently write email to the same groups of people, you can create "
+"address lists in the contacts tool, and then send them mail as though they "
+"have a single address. To learn how to do that, see <link linkend=\"usage-"
+"contact-organize-group-list\">Creating a List of Contacts</link>."
+msgstr ""
+"Pokud často píšete e-mail stejné skupině lidí, můžete si vytvořit seznam "
+"adres v nástroji kontaktů a potom jim posílat e-mail, jakoby měli jednu "
+"adresu. Jak to udělat se dozvíte v <link linkend=\"usage-contact-organize-"
+"group-list\">Vytvoření seznamu kontaktů</link>."
 
-#: C/evolution.xml:1553(para)
-msgid "Evolution has the ability to let you specify the Reply-To in an e-mail. Using this, you can set up a special Reply-To for an e-mail.To do this:"
-msgstr "Evolution vám umožňuje zadat v e-mailu Odpovědět-komu. Díky použití této funkci můžete nastavit e-mailu speciální Odpovědět-komu. Uděláte to takto: "
+#: C/evolution.xml:1646(para)
+msgid ""
+"Evolution has the ability to let you specify the Reply-To in an email. Using "
+"this, you can set up a special Reply-To for an email. To do this:"
+msgstr ""
+"Evolution vám umožňuje zadat v e-mailu Odpovědět-komu. Díky použití této "
+"funkce můžete nastavit e-mailu speciální Odpovědět-komu. Uděláte to takto: "
 
-#: C/evolution.xml:1556(para)
+#: C/evolution.xml:1649(para)
 msgid "Open a compose window."
 msgstr "Otevřete okno editoru."
 
-#: C/evolution.xml:1559(para)
+#: C/evolution.xml:1652(para)
 msgid "Open the Reply-To field by clicking View &gt; Reply To."
-msgstr "Otevřete pole Odpovědět-komu kliknutím na Zobrazit &gt; Odpovědět-komu."
+msgstr ""
+"Otevřete pole Odpovědět-komu kliknutím na Zobrazit &gt; Odpovědět-komu."
 
-#: C/evolution.xml:1562(para)
-msgid "Specify the address you want as the Reply-To address in the new Reply-To field."
-msgstr "Zadejte do nového pole Odpovědět-komu adresu, kterou chcete jako adresu pro odpovědi."
+#: C/evolution.xml:1655(para)
+msgid ""
+"Specify the address you want as the Reply-To address in the new Reply-To "
+"field."
+msgstr ""
+"Zadejte do nového pole Odpovědět-komu adresu, kterou chcete jako adresu pro "
+"odpovědi."
 
-#: C/evolution.xml:1565(para)
+#: C/evolution.xml:1658(para)
 msgid "Complete the rest of your message."
 msgstr "Dokončete zbytek zprávy"
 
-#: C/evolution.xml:1568(para)
+#: C/evolution.xml:1661(para) C/evolution.xml:2029(para)
+#: C/evolution.xml:2137(para) C/evolution.xml:2344(para)
+#: C/evolution.xml:5446(para)
 msgid "Click Send."
 msgstr "Klikněte na Poslat."
 
-#: C/evolution.xml:1575(para)
-msgid "Address auto completion is by default enabled in Evolution when you create contacts.Evolution makes it easy for you to quickly fill in the address field without having to remember the email address of recipients. You can type nicknames or other portions of address data in the address field and Evolution will display a drop-down list of possible address completions from your contacts. If you type a name or nickname that can go with more than one card, Evolution opens a dialog box to ask you which person you meant."
-msgstr "Automatické dokončování adres je v Evolutionu implicitně zapnuto, když vytvoříte kontakty.  Evolution vám usnadňuje rychlé vyplňování adres, aniž byste si museli pamatovat e-mailové adresy příjemců. Můžete psát přezdívky nebo části dat adresy do pole pro adresu a Evolution zobrazí rozbalovací seznam možných adres z vašich kontaktů. Pokud napíšete jméno nebo přezdívku, která odpovídá více než jedné kartě, Evolution otevře dialog, kde se vám zeptá, kterou osobu jste měli na mysli."
-
-#: C/evolution.xml:1576(para)
-msgid "If Evolution does not complete addresses automatically, click Edit &gt; Preferences, then click Autocompletion. There, select the groups of contacts you want to use for address autocompletion in the mailer."
-msgstr "Pokud Evolution nedoplňuje adresy automaticky, klikněte na Upravit &gt; Nastavení, potom na Automatické dokončování. Zde vyberte skupinu kontaktů, kterou chcete pro automatické dokončování používat."
+#: C/evolution.xml:1668(para)
+msgid ""
+"Address auto completion is by default enabled in Evolution when you create "
+"contacts. Evolution makes it easy for you to quickly fill in the address "
+"field without having to remember the email address of recipients. You can "
+"type nicknames or other portions of address data in the address field and "
+"Evolution will display a drop-down list of possible address completions from "
+"your contacts. If you type a name or nickname that can go with more than one "
+"card, Evolution opens a dialog box to ask you which person you meant."
+msgstr ""
+"Automatické dokončování adres je v Evolutionu implicitně zapnuto, když "
+"vytvoříte kontakty.  Evolution vám usnadňuje rychlé vyplňování adres, aniž "
+"byste si museli pamatovat e-mailové adresy příjemců. Můžete psát přezdívky "
+"nebo části dat adresy do pole pro adresu a Evolution zobrazí rozbalovací "
+"seznam možných adres z vašich kontaktů. Pokud napíšete jméno nebo přezdívku, "
+"která odpovídá více než jedné kartě, Evolution otevře dialog, kde se vám "
+"zeptá, kterou osobu jste měli na mysli."
+
+#: C/evolution.xml:1669(para)
+msgid ""
+"If Evolution does not complete addresses automatically, click Edit &gt; "
+"Preferences, then click Autocompletion. There, select the address book you "
+"want to use for address autocompletion in the mailer."
+msgstr ""
+"Pokud Evolution nedoplňuje adresy automaticky, klikněte na Upravit &gt; "
+"Nastavení, potom na Automatické dokončování. Zde vyberte skupinu kontaktů, "
+"kterou chcete pro automatické dokončování používat."
 
-#: C/evolution.xml:1577(para)
-msgid "Alternately, you can click the To:, Cc:, or Bcc: buttons to get a list of the e-mail addresses in your contacts. Select addresses and click the arrows to move them into the appropriate address columns."
-msgstr "Obdobně můžete kliknout na tlačítka Komu:, Kopie:, Skrytá kopie: a získáte seznam e-mailových adres ve vašich kontaktech. Vyberte adresy a klikněte na šipku pro přidání do příslušného sloupce adres."
+#: C/evolution.xml:1670(para)
+msgid ""
+"Alternately, you can click the To:, Cc:, or Bcc: buttons to get a list of "
+"the email addresses in your contacts. Select addresses and click the arrows "
+"to move them into the appropriate address columns."
+msgstr ""
+"Obdobně můžete kliknout na tlačítka Komu:, Kopie:, Skrytá kopie: a získáte "
+"seznam e-mailových adres ve vašich kontaktech. Vyberte adresy a klikněte na "
+"šipky pro přidání do příslušného sloupce adres."
 
-#: C/evolution.xml:1578(para)
-msgid "For more information about using e-mail with the contact manager and the calendar, see <link linkend=\"contact-automation-basic\">Send Me a Card: Adding New Cards Quickly</link> and <link linkend=\"usage-calendar-apts\">Scheduling With the Evolution Calendar</link>."
-msgstr "Více informací o používání e-mailu spolu se správcem kontaktů a kalendářem naleznete v <link linkend=\"contact-automation-basic\">Pošli mi kartu: Rychlé přidávání nových karet</link>"
+#: C/evolution.xml:1671(para)
+msgid ""
+"For more information about using email with the contact manager and the "
+"calendar, see <link linkend=\"contact-automation-basic\">Send Me a Card: "
+"Adding New Cards Quickly</link> and <link linkend=\"usage-calendar-apts"
+"\">Scheduling With the Evolution Calendar</link>."
+msgstr ""
+"Více informací o používání e-mailu spolu se správcem kontaktů a kalendářem "
+"naleznete v <link linkend=\"contact-automation-basic\">Pošli mi kartu: "
+"Rychlé přidávání nových karet</link> a <link linkend=\"usage-calendar-apts"
+"\">Plánování s Kalendářem Evolution</link>."
 
-#: C/evolution.xml:1583(para)
-msgid "To reply to a message, click the message to reply to in the e-mail list and click Reply, or right-click within the message and select Reply to Sender. This opens the message composer. The To: and Subject: fields are already filled, although you can alter them if you prefer. In addition, the full text of the old message is inserted into the new message, either in grey with a blue line on one side (for HTML display) or with the &gt; character before each line (in plain text mode), to indicate that it is part of the previous message."
-msgstr "Chcete-li odpovědět na zprávu, klikněte na zprávu, na kterou chcete reagovat, a potom na Odpovědět nebo klikněte pravým tlačítkem ve zprávě a vyberte Odpovědět odesílateli. Tohle otevře editor zpráv. Pole Komu: a Předmět: jsou již vyplněny, můžete je avšak změnit, pokud chcete. Navíc je celý text původní zprávy vložen do zprávy nové. Je buď šedý s modrou čárou na straně (pro HTML) nebo se znakem &gt; na začátku každého řádku (v režimu prostého textu), což signalizuje, že se jedná o původní zprávu."
+#: C/evolution.xml:1676(para)
+msgid ""
+"To reply to a message, click the message to reply to in the message list and "
+"click the Reply button in the toolbar, or right-click within the message and "
+"select Reply to Sender. This opens the message composer. The To: and "
+"Subject: fields are already filled, although you can alter them if you "
+"prefer. In addition, the full text of the old message is inserted into the "
+"new message, either in grey with a blue line on one side (for HTML display) "
+"or with the &gt; character before each line (in plain text mode), to "
+"indicate that it is part of the previous message."
+msgstr ""
+"Chcete-li odpovědět na zprávu, klikněte na zprávu, na kterou chcete "
+"reagovat, a potom na Odpovědět v liště nástrojů nebo klikněte pravým "
+"tlačítkem ve zprávě a vyberte Odpovědět odesílateli. Tohle otevře editor "
+"zpráv. Pole Komu: a Předmět: jsou již vyplněny, můžete je avšak změnit, "
+"pokud chcete. Navíc je celý text původní zprávy vložen do zprávy nové. Je "
+"buď šedý s modrou čárou na straně (pro HTML) nebo se znakem &gt; na začátku "
+"každého řádku (v režimu prostého textu), což signalizuje, že se jedná o "
+"původní zprávu."
 
-#: C/evolution.xml:1584(para)
-msgid "If you're reading a message with several recipients, you can use Reply to All instead of Reply. If there are large numbers of people in the Cc: or To: fields, this can save substantial amounts of time."
-msgstr "Pokud čtete zprávu s několika příjemci, můžete použít Odpovědět všem místo Odpovědět. Pokud je v polích Kopie: a Komu: velké množství lidí, tohle vám ušetří značné množství času."
+#: C/evolution.xml:1677(para)
+msgid ""
+"If you're reading a message with several recipients, you can use Reply to "
+"All instead of Reply. If there are large numbers of people in the Cc: or To: "
+"fields, this can save substantial amounts of time."
+msgstr ""
+"Pokud čtete zprávu s několika příjemci, můžete použít Odpovědět všem místo "
+"Odpovědět. Pokud je v polích Kopie: a Komu: velké množství lidí, tohle vám "
+"ušetří značné množství času."
 
-#: C/evolution.xml:1587(title)
+#: C/evolution.xml:1680(title)
 msgid "Using the Reply To All Feature"
 msgstr "Používání funkce Odpovědět všem"
 
-#: C/evolution.xml:1588(para)
-msgid "Susan sends an e-mail to a client and sends copies to Tim and to an internal company mailing list of co-workers. If Tim wants to make a comment for all of them to read, he uses Reply to All, but if he just wants to tell Susan that he agrees with her, he uses Reply. His reply does not reach anyone that Susan put on her Bcc list, because that list is not shared with anyone."
-msgstr "Susan posílá e-mail klientovi a kopii Timovi a do interního seznamu firemní pošty spolupracovníků. Pokud chce Tim napsat komentář pro všechny z nich, použije Odpovědět všem. ale pokud chce Susan pouze říct, že s ní souhlasí, použije Odpovědět. Jeho odpověď nedojde nikomu, koho Susan vložila na seznam skryté kopie, protože tento seznam není nikomu k dispozici. "
+#: C/evolution.xml:1681(para)
+msgid ""
+"Susan sends an email to a client and sends copies to Tim and to an internal "
+"company mailing list of co-workers. If Tim wants to make a comment for all "
+"of them to read, he uses Reply to All, but if he just wants to tell Susan "
+"that he agrees with her, he uses Reply. His reply does not reach anyone that "
+"Susan put on her Bcc list, because that list is not shared with anyone."
+msgstr ""
+"Susan posílá e-mail klientovi a kopii Timovi a do interního seznamu firemní "
+"pošty spolupracovníků. Pokud chce Tim napsat komentář pro všechny z nich, "
+"použije Odpovědět všem. ale pokud chce Susan pouze říct, že s ní souhlasí, "
+"použije Odpovědět. Jeho odpověď nedojde nikomu, koho Susan vložila na seznam "
+"skryté kopie, protože tento seznam není nikomu k dispozici. "
 
-#: C/evolution.xml:1589(para)
-msgid "If you subscribe to a mailing list, and want your reply to go just to the list, rather than to the sender, select Reply to List instead of Reply or Reply to All."
-msgstr "Pokud jste se přihlásili do konference a chcete, aby šla odpověď pouze do konference místo odesílateli, vyberte Odpovědět do konference místo Odpovědět všem."
+#: C/evolution.xml:1682(para)
+msgid ""
+"If you subscribe to a mailing list, and want your reply to go just to the "
+"list, rather than to the sender, select Reply to List instead of Reply or "
+"Reply to All."
+msgstr ""
+"Pokud jste se přihlásili do konference a chcete, aby šla odpověď pouze do "
+"konference místo odesílateli, vyberte Odpovědět do konference místo "
+"Odpovědět všem."
 
-#: C/evolution.xml:1593(title)
+#: C/evolution.xml:1686(title)
 msgid "Keyboard shortcuts"
 msgstr "Klávesové zkratky"
 
-#: C/evolution.xml:1601(para)
+#: C/evolution.xml:1694(para)
 msgid "Tools"
 msgstr "Nástroje"
 
-#: C/evolution.xml:1604(para)
+#: C/evolution.xml:1697(para)
 msgid "Shortcuts"
 msgstr "Zkratky"
 
-#: C/evolution.xml:1611(para)
+#: C/evolution.xml:1704(para)
 msgid "Reply to sender"
 msgstr "Odpovědět odesílateli"
 
-#: C/evolution.xml:1614(para)
+#: C/evolution.xml:1707(para)
 msgid "Ctrl+R"
 msgstr "Ctrl+R"
 
-#: C/evolution.xml:1619(para)
+#: C/evolution.xml:1712(para)
 msgid "Reply to List"
 msgstr "Odpovědět do konference"
 
-#: C/evolution.xml:1622(para)
+#: C/evolution.xml:1715(para)
 msgid "Clrl+L"
 msgstr "Clrl+L"
 
-#: C/evolution.xml:1627(para)
+#: C/evolution.xml:1720(para)
 msgid "Reply to All"
 msgstr "Odpovědět všem"
 
-#: C/evolution.xml:1630(para)
+#: C/evolution.xml:1723(para)
 msgid "Shift+Ctrl+R"
 msgstr "Shift+Ctrl+R"
 
-#: C/evolution.xml:1635(para)
+#: C/evolution.xml:1728(para)
 msgid "Forward"
 msgstr "Přeposlat"
 
-#: C/evolution.xml:1638(para)
+#: C/evolution.xml:1731(para)
 msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
-#: C/evolution.xml:1649(para)
-msgid "The message composer makes several text searching features available to you."
+#: C/evolution.xml:1742(para)
+msgid ""
+"The message composer makes several text searching features available to you."
 msgstr "Editor zpráv vám zpřístupňuje několik vyhledávacích funkcí."
 
-#: C/evolution.xml:1651(title)
+#: C/evolution.xml:1744(title)
 msgid "Find:"
 msgstr "Hledat:"
 
-#: C/evolution.xml:1652(para)
+#: C/evolution.xml:1745(para)
 msgid "Enter a word or phrase, and Evolution finds it in your message."
 msgstr "Vložte slovo nebo frázi a Evolution ji najde ve vašich zprávách."
 
-#: C/evolution.xml:1655(title)
+#: C/evolution.xml:1748(title)
 msgid "Find Regex:"
 msgstr "Hledat regulární výraz:"
 
-#: C/evolution.xml:1656(para)
-msgid "You can search for a complex pattern of characters, called a <link linkend=\"regular-expression\">regular expression</link> or <quote>regex</quote> in your composer window. If you're not sure what a regular expression is, you should ignore this feature."
-msgstr "Můžete v editoru zpráv vyhledávat komplexní vzory znaků zvané <link linkend=\"regular-expression\">regulární výrazy</link> nebo <quote>regex</quote>. Pokud si nejste jistí, co regulární výrazy jsou, měli byste tuto funkci ignorovat. "
+#: C/evolution.xml:1749(para)
+msgid ""
+"You can search for a complex pattern of characters, called a <link linkend="
+"\"regular-expression\">regular expression</link> or <quote>regex</quote> in "
+"your composer window. If you're not sure what a regular expression is, you "
+"should ignore this feature."
+msgstr ""
+"Můžete v editoru zpráv vyhledávat komplexní vzory znaků zvané <link linkend="
+"\"regular-expression\">regulární výrazy</link> nebo <quote>regex</quote>. "
+"Pokud si nejste jistí, co regulární výrazy jsou, měli byste tuto funkci "
+"ignorovat. "
 
-#: C/evolution.xml:1659(title)
+#: C/evolution.xml:1752(title)
 msgid "Find Again:"
 msgstr "Hledat další:"
 
-#: C/evolution.xml:1660(para)
+#: C/evolution.xml:1753(para)
 msgid "Select this item to repeat the last search you performed."
-msgstr "Vyberte tuto položku, chcete-li opakovat poslední vyhledávání, které jste provedli."
+msgstr ""
+"Vyberte tuto položku, chcete-li opakovat poslední vyhledávání, které jste "
+"provedli."
 
-#: C/evolution.xml:1663(title)
+#: C/evolution.xml:1756(title)
 msgid "Replace:"
 msgstr "Nahradit:"
 
-#: C/evolution.xml:1664(para)
+#: C/evolution.xml:1757(para)
 msgid "Find a word or phrase, and replace it with something else."
 msgstr "Nalezněte slovo nebo frázi a nahraďte ji něčím jiným."
 
-#: C/evolution.xml:1666(para)
-msgid "For all of these menu items, you can choose whether to search backwards in the document from the point where your cursor is. You can also determine whether the search is to be case sensitive in determining a match."
-msgstr "Pro všechny tyto položky můžete zvolit, zda hledat v dokumentu z bodu, kde se nachází kurzor, pozpátku. Můžete také určit, zda má vyhledávání rozlišovat velikost písmen."
-
-#: C/evolution.xml:1671(para)
-msgid "Normally, you can't set text styles or insert pictures in e-mail. However, most newer e-mail programs can display images and text styles in addition to basic alignment and paragraph formatting. They do this with <link linkend=\"html\">HTML</link>, just like Web pages do."
-msgstr "Běžně nemůžete nastavit formátování textu nebo vkládat do e-mailu obrázky. Nicméně většina novějších e-mailových programů umí navíc k základnímu zarovnání a formátování odstavců zobrazovat také obrázky a formátování textů. Dělají to s <link linkend=\"html\">HTML</link> stejně jako webové stránky."
+#: C/evolution.xml:1759(para)
+msgid ""
+"For all of these menu items, you can choose whether to search backwards in "
+"the document from the point where your cursor is. You can also determine "
+"whether the search is to be case sensitive in determining a match."
+msgstr ""
+"Pro všechny tyto položky můžete zvolit, zda hledat v dokumentu z bodu, kde "
+"se nachází kurzor, pozpátku. Můžete také určit, zda má vyhledávání "
+"rozlišovat velikost písmen."
 
-#: C/evolution.xml:1672(para)
-msgid "Some people do not have HTML-capable mail clients, or prefer not to receive HTML-enhanced mail because it is slower to download and display. Because of this, Evolution sends plain text unless you explicitly ask for HTML."
-msgstr "Někteří lidé nemají e-mailové klienty schopné zobrazovat HTML nebo dávají přednost nepřijímání e-mailů vylepšených pomocí HTML, protože se pomaleji stahují a zobrazují. Kvůli tomu Evolution posílá prostý text, pokud si explicitně neřeknete o HTML."
+#: C/evolution.xml:1764(para)
+msgid ""
+"Normally, you can't set text styles or insert pictures in email. However, "
+"most newer email programs can display images and text styles in addition to "
+"basic alignment and paragraph formatting. They do this with <link linkend="
+"\"html\">HTML</link>, just like Web pages do."
+msgstr ""
+"Běžně nemůžete nastavit formátování textu nebo vkládat do e-mailu obrázky. "
+"Nicméně většina novějších e-mailových programů umí navíc k základnímu "
+"zarovnání a formátování odstavců zobrazovat také obrázky a formátování "
+"textů. Dělají to s <link linkend=\"html\">HTML</link> stejně jako webové "
+"stránky."
+
+#: C/evolution.xml:1765(para)
+msgid ""
+"Some people do not have HTML-capable mail clients, or prefer not to receive "
+"HTML-enhanced mail because it is slower to download and display. Because of "
+"this, Evolution sends plain text unless you explicitly ask for HTML."
+msgstr ""
+"Někteří lidé nemají e-mailové klienty schopné zobrazovat HTML nebo dávají "
+"přednost nepřijímání e-mailů vylepšených pomocí HTML, protože se pomaleji "
+"stahují a zobrazují. Kvůli tomu Evolution posílá prostý text, pokud si "
+"explicitně neřeknete o HTML."
 
-#: C/evolution.xml:1675(title)
+#: C/evolution.xml:1768(title)
 msgid "Basic HTML Formatting"
 msgstr "Základní HTML formátování"
 
-#: C/evolution.xml:1676(para)
-msgid "You can change the format of an e-mail message from plain text to HTML by choosing Format HTML."
-msgstr "Můžete změnit formátování e-mailové zprávy z prostého textu na HTML zvolením Formát HTML."
+#: C/evolution.xml:1769(para)
+msgid ""
+"You can change the format of an email message from plain text to HTML by "
+"choosing Format &gt; HTML from the menu bar."
+msgstr ""
+"Můžete změnit formátování e-mailové zprávy z prostého textu na HTML zvolením "
+"Formát &gt; HTML z lišty nástrojů."
 
-#: C/evolution.xml:1677(para)
-msgid "To send all your mail as HTML by default, set your mail format preferences in the mail configuration dialog box. See <link linkend=\"config-prefs-mail-composer\">Composer Preferences</link> for more information."
-msgstr "Chcete-li posílat všechny vaše e-maily implicitně jako HTML,  nastavte formátování zpráv v dialogovém okně nastavení editoru. Více informací v <link linkend=\"config-prefs-mail-composer\">Nastavení editoru</link>."
+#: C/evolution.xml:1770(para)
+msgid ""
+"To send all your mail as HTML by default, set your mail format preferences "
+"in the mail configuration dialog box. See <link linkend=\"config-prefs-mail-"
+"composer\">Composer Preferences</link> for more information."
+msgstr ""
+"Chcete-li posílat všechny vaše e-maily implicitně jako HTML,  nastavte "
+"formátování zpráv v dialogovém okně nastavení editoru. Více informací v "
+"<link linkend=\"config-prefs-mail-composer\">Nastavení editoru</link>."
 
-#: C/evolution.xml:1678(para)
-msgid "HTML formatting tools are located in the toolbar just above the space where you actually compose the message. They also appear in the Insert and Format menus."
-msgstr "Nástroje HTML formátování jsou umístěny v liště nástrojů přímo nad prostorem, kde tvoříte zprávu. Taktéž se jsou v nabídce Vložit a Formát."
+#: C/evolution.xml:1771(para)
+msgid ""
+"HTML formatting tools are located in the toolbar just above the space where "
+"you actually compose the message. They also appear in the Insert and Format "
+"menus."
+msgstr ""
+"Nástroje HTML formátování jsou umístěny v liště nástrojů přímo nad "
+"prostorem, kde tvoříte zprávu. Taktéž se jsou v nabídce Vložit a Formát."
 
-#: C/evolution.xml:1679(para)
-msgid "The icons in the toolbar are explained in <link linkend=\"tooltip\">tool-tips</link>, which appear when you hold your mouse pointer over the buttons. The buttons fall into five categories:"
-msgstr "Ikony v liště nástrojů jsou vysvětleny v <link linkend=\"tooltip\">nástrojových tipech</link>, které se objevují, když podržíte kurzor myši nad tlačítkem. Tlačítka spadají do pěti kategorií:"
+#: C/evolution.xml:1772(para)
+msgid ""
+"The icons in the toolbar are explained in <link linkend=\"tooltip\">tool-"
+"tips</link>, which appear when you hold your mouse pointer over the buttons. "
+"The buttons fall into five categories:"
+msgstr ""
+"Ikony v liště nástrojů jsou vysvětleny v <link linkend=\"tooltip"
+"\">nástrojových tipech</link>, které se objevují, když podržíte kurzor myši "
+"nad tlačítkem. Tlačítka spadají do pěti kategorií:"
 
-#: C/evolution.xml:1681(title)
+#: C/evolution.xml:1774(title)
 msgid "Headers and Lists:"
 msgstr "Záhlaví a seznamy:"
 
-#: C/evolution.xml:1682(para)
-msgid "At the left edge of the toolbar, you can choose Normal for a default text style or Header 1 through Header 6 for varying sizes of header from large (1) to tiny (6). Other styles include preformat, to use the HTML tag for preformatted blocks of text, and three types of bullet points for lists."
-msgstr "Na levé straně lišty nástrojů můžete vybrat Normální pro výchozí formátování textu nebo Header 1 až Header 6 pro různé velikost záhlaví od velkého (1) po malé (6). Ostatní styly obsahují předformátované (použití HTML značek pro předformátované bloky textu) a tři druhy odrážek pro seznamy."
+#: C/evolution.xml:1775(para)
+msgid ""
+"At the left edge of the toolbar, you can choose Normal for a default text "
+"style or Header 1 through Header 6 for varying sizes of header from large "
+"(1) to tiny (6). Other styles include preformat, to use the HTML tag for "
+"preformatted blocks of text, and three types of bullet points for lists."
+msgstr ""
+"Na levé straně lišty nástrojů můžete vybrat Normální pro výchozí formátování "
+"textu nebo Header 1 až Header 6 pro různé velikost záhlaví od velkého (1) po "
+"malé (6). Ostatní styly obsahují předformátované (použití HTML značek pro "
+"předformátované bloky textu) a tři druhy odrážek pro seznamy."
 
-#: C/evolution.xml:1684(para)
-msgid "For instance, instead of using asterisks to mark a bulleted list, you can use the Bulleted List style from the style drop-down list. Evolution uses different bullet styles, and handles word wrap and multiple levels of indentation."
-msgstr "Například místo používání hvězdiček k označení seznamu s odrážkami můžete použít styl Bulleted List z vysouvací nabídky. Evolution používá různé styly odrážek, zalamování slov a několik úrovní odsazení."
+#: C/evolution.xml:1777(para)
+msgid ""
+"For instance, instead of using asterisks to mark a bulleted list, you can "
+"use the Bulleted List style from the style drop-down list. Evolution uses "
+"different bullet styles, and handles word wrap and multiple levels of "
+"indentation."
+msgstr ""
+"Například místo používání hvězdiček k označení seznamu s odrážkami můžete "
+"použít styl Bulleted List z vysouvací nabídky. Evolution používá různé styly "
+"odrážek, zalamování slov a několik úrovní odsazení."
 
-#: C/evolution.xml:1686(title)
+#: C/evolution.xml:1779(title)
 msgid "Text Styles:"
 msgstr "Styly textu:"
 
-#: C/evolution.xml:1687(para)
-msgid "Use these buttons to determine the way your e-mail looks. If you have text selected, the style applies to the selected text. If you do not have text selected, the style applies to whatever you type next."
-msgstr "Použijte tyto tlačítka k určení vzhledu vašich e-mailů. Pokud máte vybraný text, styly se aplikují na vybraný text. Pokud text vybraný nemáte, stypy se aplikují na vše, co dále napíšete."
+#: C/evolution.xml:1780(para)
+msgid ""
+"Use these buttons to determine the way your email looks. If you have text "
+"selected, the style applies to the selected text. If you do not have text "
+"selected, the style applies to whatever you type next."
+msgstr ""
+"Použijte tyto tlačítka k určení vzhledu vašich e-mailů. Pokud máte vybraný "
+"text, styly se aplikují na vybraný text. Pokud text vybraný nemáte, stypy se "
+"aplikují na vše, co dále napíšete."
 
-#: C/evolution.xml:1696(para)
+#: C/evolution.xml:1789(para)
 msgid "Button"
 msgstr "Tlačítko"
 
-#: C/evolution.xml:1706(para)
+#: C/evolution.xml:1799(para)
 msgid "TT"
 msgstr "TT"
 
-#: C/evolution.xml:1709(para)
-msgid "Typewriter text, which is approximately the same as the Courier monospace font."
-msgstr "Text psacího stroje, který je přibližně stejný jako písmo Courier monospace."
+#: C/evolution.xml:1802(para)
+msgid ""
+"Typewriter text, which is approximately the same as the Courier monospace "
+"font."
+msgstr ""
+"Text psacího stroje, který je přibližně stejný jako písmo Courier monospace."
 
-#: C/evolution.xml:1714(para)
+#: C/evolution.xml:1807(para)
 msgid "Bold A"
 msgstr "Tučné A"
 
-#: C/evolution.xml:1717(para)
+#: C/evolution.xml:1810(para)
 msgid "Bolds the text."
 msgstr "Udělá text tučný."
 
-#: C/evolution.xml:1722(para)
+#: C/evolution.xml:1815(para)
 msgid "Italic A"
 msgstr "A v kurzívě"
 
-#: C/evolution.xml:1725(para)
+#: C/evolution.xml:1818(para)
 msgid "Italicizes the text."
 msgstr "Udělát text v kurzívě."
 
-#: C/evolution.xml:1730(para)
+#: C/evolution.xml:1823(para)
 msgid "Underlined A"
 msgstr "Podtržené A"
 
-#: C/evolution.xml:1733(para)
+#: C/evolution.xml:1826(para)
 msgid "Underlines the text."
 msgstr "Podtrhne text."
 
-#: C/evolution.xml:1738(para)
+#: C/evolution.xml:1831(para)
 msgid "Strike through A"
 msgstr "Přeškrtnuté A"
 
-#: C/evolution.xml:1741(para)
+#: C/evolution.xml:1834(para)
 msgid "Marks a line through the text."
 msgstr "Přeškrtne text."
 
-#: C/evolution.xml:1748(title)
+#: C/evolution.xml:1841(title)
 msgid "Alignment:"
 msgstr "Zarovnání:"
 
-#: C/evolution.xml:1749(para)
-msgid "Located next to the text style buttons, the three paragraph icons should be familiar to users of most word processing software. The left most button aligns your text to the left, the center button centers text, and the right button aligns the text to the right."
-msgstr "Tři ikony paragrafů by měly být známé uživatelům většiny textových procesorů. Tlačítko úplně nalevo zarovnává text doleva, prostředí tlačítko doprostřed a pravé tlačítko doprava."
+#: C/evolution.xml:1842(para)
+msgid ""
+"Located next to the text style buttons, the three paragraph icons should be "
+"familiar to users of most word processing software. The left most button "
+"aligns your text to the left, the center button centers text, and the right "
+"button aligns the text to the right."
+msgstr ""
+"Tři ikony paragrafů by měly být známé uživatelům většiny textových "
+"procesorů. Tlačítko úplně nalevo zarovnává text doleva, prostředí tlačítko "
+"doprostřed a pravé tlačítko doprava."
 
-#: C/evolution.xml:1752(title)
+#: C/evolution.xml:1845(title)
 msgid "Indentation Rules:"
 msgstr "Pravidla odsazení:"
 
-#: C/evolution.xml:1753(para)
-msgid "The button with the arrow pointing left decreases a paragraph's indentation, and the right arrow increases its indentation."
-msgstr "Tlačítko s šipkou ukazující doleva zmenšuje odsazení odstavce a šipka doprava zvětšuje odsazení."
+#: C/evolution.xml:1846(para)
+msgid ""
+"The button with the arrow pointing left decreases a paragraph's indentation, "
+"and the right arrow increases its indentation."
+msgstr ""
+"Tlačítko s šipkou ukazující doleva zmenšuje odsazení odstavce a šipka "
+"doprava zvětšuje odsazení."
 
-#: C/evolution.xml:1756(title)
+#: C/evolution.xml:1849(title)
 msgid "Color Selection:"
 msgstr "Výběr barev:"
 
-#: C/evolution.xml:1757(para)
-msgid "At the far right is the color section tool, where a box displays the current text color. To choose a new color, click the arrow button to the right. If you have text selected, the color applies to the selected text. If you do not have text selected, the color applies to whatever you type next. You can select a background color or image by right-clicking the message background, then selecting Style Page."
-msgstr "Úplně napravo je nástroj na výběr barev, kde čtverec ukazuje aktuální barvu textu. Chcete-li vybrat novou barvu, klikněte napravo na tlačítko s šipkou. Pokud máte vybraný text, barva se aplikuje na vybraný text. Pokud text vybraný nemáte, barva se aplikuje na barvu všechno, co dále napíšete. Můžete vybrat barvu pozadí nebo obrázek kliknutím pravým tlačítkem na pozadí stránky vybráním Stylu stránky."
-
-#: C/evolution.xml:1762(title)
+#: C/evolution.xml:1850(para)
+msgid ""
+"At the far right is the color section tool, where a box displays the current "
+"text color. To choose a new color, click the arrow button to the right. If "
+"you have text selected, the color applies to the selected text. If you do "
+"not have text selected, the color applies to whatever you type next. You can "
+"select a background color or image by right-clicking the message background, "
+"then selecting Style &gt; Page Style."
+msgstr ""
+"Úplně napravo je nástroj na výběr barev, kde čtverec ukazuje aktuální barvu "
+"textu. Chcete-li vybrat novou barvu, klikněte napravo na tlačítko s šipkou. "
+"Pokud máte vybraný text, barva se aplikuje na vybraný text. Pokud text "
+"vybraný nemáte, barva se aplikuje na barvu všechno, co dále napíšete. Můžete "
+"vybrat barvu pozadí nebo obrázek kliknutím pravým tlačítkem na pozadí "
+"stránky zvolením Vzhled &gt; Styl stránky."
+
+#: C/evolution.xml:1855(title)
 msgid "Advanced HTML Formatting"
 msgstr "Pokročilé HTML formátování"
 
-#: C/evolution.xml:1763(para)
-msgid "Under the Insert menu, there are several more items you can use to style your e-mail. To use these and other HTML formatting tools, make sure you have enabled HTML mode by using Format HTML."
-msgstr "Pod nabídnou Vložit je několik položek, které můžete použít k formátování vašeho e-mailu. K tomu, abyste mohli tyto a další nástroje HTML formátování používat, se ujistěte, zda máte zapnutý režim HTML."
+#: C/evolution.xml:1856(para)
+msgid ""
+"Under the Insert menu, there are several more items you can use to style "
+"your email. To use these and other HTML formatting tools, make sure you have "
+"enabled HTML mode by using Format &gt; HTML from the menu bar."
+msgstr ""
+"Pod nabídnou Vložit je několik položek, které můžete použít k formátování "
+"vašeho e-mailu. K tomu, abyste mohli tyto a další nástroje HTML formátování "
+"používat, se ujistěte, že máte zapnutý režim HTML, pomocí Formát &gt; HTML v "
+"liště nástrojů."
 
-#: C/evolution.xml:1766(title)
+#: C/evolution.xml:1859(title)
 msgid "Inserting a Link"
 msgstr "Vložení odkazu"
 
-#: C/evolution.xml:1767(para)
-msgid "Use the Insert a Link tool to put hyperlinks in your HTML messages. If you don't want special link text, you can just enter the address directly, and Evolution recognizes it as a link."
-msgstr "Použijte nástroj Vložit odkaz pro vložení hypertextových odkazů do vaší HTML zprávy. Pokud nechcete mít pro odkaz speciální text, můžete vložit adresu rovnou a Evolution rozpozná, že se jedná o odkaz."
+#: C/evolution.xml:1860(para)
+msgid ""
+"Use the Insert a Link tool to put hyperlinks in your HTML messages. If you "
+"don't want special link text, you can just enter the address directly, and "
+"Evolution recognizes it as a link."
+msgstr ""
+"Použijte nástroj Vložit odkaz pro vložení hypertextových odkazů do vaší HTML "
+"zprávy. Pokud nechcete mít pro odkaz speciální text, můžete vložit adresu "
+"rovnou a Evolution rozpozná, že se jedná o odkaz."
 
-#: C/evolution.xml:1770(para)
+#: C/evolution.xml:1863(para)
 msgid "Select the text you want to link from."
 msgstr "Vyberte text, z kterého chcete udělat odkaz."
 
-#: C/evolution.xml:1773(para)
+#: C/evolution.xml:1866(para)
 msgid "Right-click in the text, then click Insert Link."
 msgstr "Klikněte pravým tlačítkem na text a dejte Vložit odkaz."
 
-#: C/evolution.xml:1776(para)
+#: C/evolution.xml:1869(para)
 msgid "Type the URL in the URL field."
 msgstr "Napište URL do podle URL."
 
-#: C/evolution.xml:1785(title)
+#: C/evolution.xml:1878(title)
 msgid "Inserting an Image"
 msgstr "Vložení obrázku"
 
-#: C/evolution.xml:1788(para)
-msgid "Click Image."
-msgstr "Klikněte na Obrázek."
+#: C/evolution.xml:1881(para)
+msgid "Click Insert &gt; Image in the menubar."
+msgstr "Klikněte v liště nástrojů na Vložit &gt; Obrázek."
 
-#: C/evolution.xml:1791(para)
+#: C/evolution.xml:1884(para)
 msgid "Browse to and select the image file."
 msgstr "Najděte a vyberte soubor obrázku."
 
-#: C/evolution.xml:1800(title)
+#: C/evolution.xml:1893(title)
 msgid "Inserting a Rule"
 msgstr "Vložení čáry"
 
-#: C/evolution.xml:1801(para)
-msgid "You can insert a horizontal line into the text to help divide two sections:"
-msgstr "Můžete do textu vložit vodorovnou čáru, která jej pomůže rozdělit na dvě části:"
+#: C/evolution.xml:1894(para)
+msgid ""
+"You can insert a horizontal line into the text to help divide two sections:"
+msgstr ""
+"Můžete do textu vložit vodorovnou čáru, která jej pomůže rozdělit na dvě "
+"části:"
 
-#: C/evolution.xml:1804(para)
-msgid "Click Rule."
-msgstr "Klikněte na Čáru."
+#: C/evolution.xml:1897(para)
+msgid "Click Insert &gt; Rule in the menubar."
+msgstr ""
 
-#: C/evolution.xml:1807(para)
+#: C/evolution.xml:1900(para)
 msgid "Select the width, size, and alignment."
 msgstr "Vyberte šířku, velikost a zarovnání."
 
-#: C/evolution.xml:1810(para)
+#: C/evolution.xml:1903(para)
 msgid "Select Shade if necessary."
 msgstr "Vyberte Stín, je-li to nezbytné."
 
-#: C/evolution.xml:1819(title)
+#: C/evolution.xml:1912(title)
 msgid "Inserting a Table"
 msgstr "Vložení tabulky"
 
-#: C/evolution.xml:1820(para)
+#: C/evolution.xml:1913(para)
 msgid "You can insert a table into the text:"
 msgstr "Můžete vložit tabulku do textu:"
 
-#: C/evolution.xml:1823(para)
-msgid "Click Table."
-msgstr "Klikněte na Tabulku:"
+#: C/evolution.xml:1916(para)
+msgid "Click Insert &gt; Table in the menubar."
+msgstr ""
 
-#: C/evolution.xml:1826(para)
+#: C/evolution.xml:1919(para)
 msgid "Select the number of rows and columns."
 msgstr "Vyberte počet řádků a sloupců."
 
-#: C/evolution.xml:1829(para)
+#: C/evolution.xml:1922(para)
 msgid "Select the type of layout for the table."
 msgstr "Vyberte typ rozložení tabulky."
 
-#: C/evolution.xml:1832(para)
+#: C/evolution.xml:1925(para)
 msgid "Select a background for the table."
 msgstr "Vyberte pozadí tabulky."
 
-#: C/evolution.xml:1833(para)
-msgid "To insert a picture for the background, click Browse and select the desired image."
-msgstr "Chcete-li vložit jako pozadí obrázek, klikněte na Vybrat a vyberte požadovaný obrázek."
+#: C/evolution.xml:1926(para)
+msgid ""
+"To insert a picture for the background, click the filechooser button and "
+"select the desired image."
+msgstr ""
+"Chcete-li vložit jako pozadí obrázek, klikněte na tlačítko pro výběr souboru "
+"a vyberte požadovaný obrázek."
 
-#: C/evolution.xml:1845(para)
-msgid "You can set the following options when sending mails in Evolution."
+#: C/evolution.xml:1938(para)
+msgid "You can set the following options when sending mail in Evolution."
 msgstr "Můžete nastavit následující volby, když posíláte e-maily v Evolutionu."
 
-#: C/evolution.xml:1847(title)
+#: C/evolution.xml:1940(title)
 msgid "Read Receipts:"
 msgstr "Doručenka o čtení:"
 
-#: C/evolution.xml:1848(para)
-msgid "Evolution allows you to request a receipt for your sent messages to indicate when your message is being viewed by the recipient. Receipts are useful when sending e-mail that is time-sensitive. To request a receipt, click Insert &gt; Request Read Receipt in the composer window."
-msgstr "Evolution vám umožňuje požadovat doručenku pro vámi odeslanou zprávu, která ukazuje, zda byla zpráva příjemcem přečtena. Doručenky jsou užitečné, když posíláte e-mail, u kterého hraje roli čas. Chcete-li požádat o doručenku, klikněte v okně editoru na Vložit &gt; Žádat o doručenku o čtení."
+#: C/evolution.xml:1941(para)
+msgid ""
+"Evolution allows you to request a receipt for your sent messages to indicate "
+"when your message is being viewed by the recipient. Receipts are useful when "
+"sending email that is time-sensitive. To request a receipt, click Insert "
+"&gt; Request Read Receipt in the composer window."
+msgstr ""
+"Evolution vám umožňuje požadovat doručenku pro vámi odeslanou zprávu, která "
+"udává, kdy byla zpráva příjemcem přečtena. Doručenky jsou užitečné, když "
+"posíláte e-mail, u kterého hraje roli čas. Chcete-li požádat o doručenku, "
+"klikněte v okně editoru na Vložit &gt; Žádat o doručenku o čtení."
 
-#: C/evolution.xml:1851(title)
+#: C/evolution.xml:1944(title)
 msgid "Prioritize Message:"
 msgstr "Důležitost zprávy:"
 
-#: C/evolution.xml:1852(para)
-msgid "You can prioritize a message to be sent, so that the recipient sees its relative importance.To prioritize a message, click Insert &gt; Prioritize Message in the composer window."
-msgstr "Můžete zprávu, která má být odeslána, označit jako důležitou tak, aby přijemce viděl její relativní důležitost. Zprávu označíte jako důležitou tak, že kliknete v okně editoru na Vložit &gt; Důležitost zprávy."
+#: C/evolution.xml:1945(para)
+msgid ""
+"You can prioritize a message to be sent, so that the recipient sees its "
+"relative importance.To prioritize a message, click Insert &gt; Prioritize "
+"Message in the composer window."
+msgstr ""
+"Můžete zprávu, která má být odeslána, označit jako důležitou tak, aby "
+"přijemce viděl její relativní důležitost. Zprávu označíte jako důležitou "
+"tak, že kliknete v okně editoru na Vložit &gt; Důležitost zprávy."
 
-#: C/evolution.xml:1855(para)
-msgid "Evolution will ignore the message priority, because it assumes that the recipient should decide whether the message is important or not."
-msgstr "Evolution bude důležitost zprávy ignorovat, protože předpokládá, že se příjemce rozhodně, zda je zpráva důležitá nebo ne."
+#: C/evolution.xml:1948(para)
+msgid ""
+"Evolution will ignore the message priority, because it assumes that the "
+"recipient should decide whether the message is important or not."
+msgstr ""
+"Evolution bude důležitost zprávy ignorovat, protože předpokládá, že se "
+"příjemce rozhodně, zda je zpráva důležitá nebo ne."
 
-#: C/evolution.xml:1860(title)
+#: C/evolution.xml:1953(title)
 msgid "Default Settings"
 msgstr "Implicitní nastavení"
 
-#: C/evolution.xml:1861(para)
-msgid "Evolution allows you to change the default settings. You can organize your draft folder and sent folder, set the addresses to which you want to sent carbon copies and blind carbon copies to. You can also change the settings for message receipts from Default setting window."
-msgstr "Evolution vám dovoluje změnit výchozí nastavení. Můžete organizovat složky Koncepty a Odeslané, nastavit adresy, na které chcete posílat kopie a skryté kopie. V kartě Implicitní hodnoty můžete také změnit nastavení doručenek."
+#: C/evolution.xml:1954(para)
+msgid ""
+"Evolution allows you to change the default settings. You can organize your "
+"draft folder and sent folder, set the addresses to which you want to sent "
+"carbon copies and blind carbon copies to. You can also change the settings "
+"for message receipts from Default setting window."
+msgstr ""
+"Evolution vám dovoluje změnit výchozí nastavení. Můžete organizovat složky "
+"Koncepty a Odeslané, nastavit adresy, na které chcete posílat kopie a skryté "
+"kopie. V kartě Implicitní hodnoty můžete také změnit nastavení doručenek."
 
-#: C/evolution.xml:1863(para)
+#: C/evolution.xml:1956(para)
 msgid "To change your default settings,"
 msgstr "Pro změnu implicitního nastavení,"
 
-#: C/evolution.xml:1866(para)
-msgid "Select Edit &gt;Preferences to open Evolution Preferences window."
-msgstr "Vyberte Upravit &gt; Nastavení pro otevření okna s nastavením Evolutionu."
+#: C/evolution.xml:1962(para)
+msgid "Select the mail account whose default settings you want to change."
+msgstr "Vyberte účet e-mailu, jehož výchozí nastavení chcete změnit."
 
-#: C/evolution.xml:1869(para)
-msgid "Select the mail account you want to change the default settings."
-msgstr "Vyberte účet e-mailu, u kterého chcete změnit implicitní nastavení."
-
-#: C/evolution.xml:1872(para)
+#: C/evolution.xml:1965(para)
 msgid "Click Edit to open Account Editor window."
 msgstr "Klikněte na Upravit pro otevření okna s editorem účtu."
 
-#: C/evolution.xml:1875(para)
+#: C/evolution.xml:1968(para)
 msgid "Click Default tab."
 msgstr "Klikněte na kartu Implicitní hodnoty."
 
-#: C/evolution.xml:1878(para)
-msgid "Click the respective check boxes and enter the email addresses you want CC and BCC to."
-msgstr "Zatrhněte příslušné volby a vložte e-mailové adresy, na které chcete posílat kopie a skryté kopie."
+#: C/evolution.xml:1971(para)
+msgid ""
+"Click the respective check boxes and enter the email addresses you want CC "
+"and BCC to."
+msgstr ""
+"Zatrhněte příslušné volby a vložte e-mailové adresy, na které chcete posílat "
+"kopie a skryté kopie."
 
-#: C/evolution.xml:1881(para)
-msgid "Select the desired option for send message receipts from the drop-down list."
-msgstr "Vyberte z rozevírací nabídky požadovanou volbu pro posílání doručenek zpráv."
+#: C/evolution.xml:1974(para)
+msgid ""
+"Select the desired option for send message receipts from the drop-down list."
+msgstr ""
+"Vyberte z rozevírací nabídky požadovanou volbu pro posílání doručenek zpráv."
 
-#: C/evolution.xml:1886(title)
+#: C/evolution.xml:1979(title)
 msgid "Changing Default Folder for Sent and Draft Items"
 msgstr "Změna implicitní složky pro odeslané zprávy a koncepty."
 
-#: C/evolution.xml:1887(para)
-msgid "By default, all the sent messages directly goes to Sent folder and those messages marked as drafts are saved in Draft folder. To change the default setting for draft items,"
-msgstr "Implicitně jdou všechny odeslané zprávy do složky Odeslané a ty, které jsou označené jako koncepty jsou uloženy ve složce Koncepty. Pro změnu implicitního nastavení pro koncepty,"
+#: C/evolution.xml:1980(para)
+msgid ""
+"By default, all the sent messages directly goes to Sent folder and those "
+"messages marked as drafts are saved in Draft folder. To change the default "
+"setting for draft items,"
+msgstr ""
+"Implicitně jdou všechny odeslané zprávy do složky Odeslané a ty, které jsou "
+"označené jako koncepty jsou uloženy ve složce Koncepty. Pro změnu "
+"implicitního nastavení pro koncepty,"
 
-#: C/evolution.xml:1890(para)
+#: C/evolution.xml:1983(para)
 msgid "Click Drafts button to open Folder view."
 msgstr "Klikněte na tlačítko Koncepty pro náhled složek."
 
-#: C/evolution.xml:1893(para)
+#: C/evolution.xml:1986(para)
 msgid "Select the folder you want to save the drafts to."
 msgstr "Vyberte složku, kterou chcete používat pro ukládání konceptů."
 
-#: C/evolution.xml:1899(para)
-#: C/evolution.xml:1915(para)
+#: C/evolution.xml:1992(para) C/evolution.xml:2008(para)
 msgid "Click Revert button to revert back to previous settings."
 msgstr "Klikněte na tlačítko Vrátit pro obnovu předchozího nastavení."
 
-#: C/evolution.xml:1903(para)
+#: C/evolution.xml:1996(para)
 msgid "To change the default folder for sent items,"
 msgstr "Pro změnu implicitní složky pro odeslané právy,"
 
-#: C/evolution.xml:1906(para)
+#: C/evolution.xml:1999(para)
 msgid "Click Sent button to open the Folder view."
 msgstr "Klikněte na tlačítko Odeslané pro otevření náhledu složek."
 
-#: C/evolution.xml:1909(para)
+#: C/evolution.xml:2002(para)
 msgid "Select the desired folder for sent items."
 msgstr "Vyberte požadovanou složku pro odeslané zprávy."
 
-#: C/evolution.xml:1923(para)
-msgid "When you receive an e-mail, you can forward it to other individuals or groups that might be interested. You can forward a message as an attachment to a new message (this is the default) or you can send it <link linkend=\"inline\">in line</link> as a quoted portion of the message you are sending. Attachment forwarding is best if you want to send the full, unaltered message to someone else. Inline forwarding is best if you want to send portions of a message, or if you have a large number of comments on different sections of the message you are forwarding. Remember to note from whom the message came, and whether you have removed or altered content."
-msgstr "Když dostanete e-mail, můžete jej přeposlat jiným jedincům nebo skupinám, které může zajímat. Můžete přeposlat zprávu jako přílohu nové zprávy (tak je to implicitně) nebo ji můžete poslat <link linkend=\"inline\">vloženou</link> jako citovanou část zprávy, kterou odesíláte. Přeposílání přílohou je nejlepší, když chcete poslat celou, nezměněnou zprávu někomu jinému. Přeposílání vložením je nejlepší, když chcete poslat části zprávy nebo pokud máte množství komentářů v různých částech zprávy, kterou přeposíláte. Nezapomeňte poznamenat, od koho zpráva přišla a zda jste mazali nebo měnili obsah."
-
-#: C/evolution.xml:1924(para)
+#: C/evolution.xml:2016(para)
+msgid ""
+"When you receive an email, you can forward it to other individuals or groups "
+"that might be interested. You can forward a message as an attachment to a "
+"new message (this is the default) or you can send it <link linkend=\"inline"
+"\">in line</link> as a quoted portion of the message you are sending. "
+"Attachment forwarding is best if you want to send the full, unaltered "
+"message to someone else. Inline forwarding is best if you want to send "
+"portions of a message, or if you have a large number of comments on "
+"different sections of the message you are forwarding. Remember to note from "
+"whom the message came, and whether you have removed or altered content."
+msgstr ""
+"Když dostanete e-mail, můžete jej přeposlat jiným jedincům nebo skupinám, "
+"které může zajímat. Můžete přeposlat zprávu jako přílohu nové zprávy (tak je "
+"to implicitně) nebo ji můžete poslat <link linkend=\"inline\">vloženou</"
+"link> jako citovanou část zprávy, kterou odesíláte. Přeposílání přílohou je "
+"nejlepší, když chcete poslat celou, nezměněnou zprávu někomu jinému. "
+"Přeposílání vložením je nejlepší, když chcete poslat části zprávy nebo pokud "
+"máte množství komentářů v různých částech zprávy, kterou přeposíláte. "
+"Nezapomeňte poznamenat, od koho zpráva přišla a zda jste mazali nebo měnili "
+"obsah."
+
+#: C/evolution.xml:2017(para)
 msgid "To forward a message you are reading:"
 msgstr "Pro přeposlání zprávy, kterou čtete:"
 
-#: C/evolution.xml:1927(para)
+#: C/evolution.xml:2020(para)
 msgid "Click Forward on the toolbar."
 msgstr "Klikněte na Přeposlat v liště nástrojů."
 
-#: C/evolution.xml:1929(para)
-msgid "If you prefer to forward the message <link linkend=\"inline\">inline</link> instead of attached, click Message &gt; Forward As &gt; Inline from the menu."
-msgstr "Pokud dáváte přednost přeposílání zprávy <link linkend=\"inline\">vložené</link> místo přiložené, klikněte v nabídce na Zpráva &gt; Přeposlat jako &gt; Vložené."
+#: C/evolution.xml:2022(para)
+msgid ""
+"If you prefer to forward the message <link linkend=\"inline\">inline</link> "
+"instead of attached, click Message &gt; Forward As &gt; Inline from the menu."
+msgstr ""
+"Pokud dáváte přednost přeposílání zprávy <link linkend=\"inline\">vložené</"
+"link> místo přiložené, klikněte v nabídce na Zpráva &gt; Přeposlat jako &gt; "
+"Vložené."
 
-#: C/evolution.xml:1932(para)
-msgid "Select an addressee as you would when sending a new message; the subject is already entered, although you can alter it if you want."
-msgstr "Vyberte adresáta stejně, jako byste posílali zprávu; předmět je již vložený, i když ho můžete změnit, pokud chcete."
+#: C/evolution.xml:2025(para)
+msgid ""
+"Select an addressee as you would when sending a new message; the subject is "
+"already entered, although you can alter it if you want."
+msgstr ""
+"Vyberte adresáta stejně, jako byste posílali zprávu; předmět je již vložený, "
+"i když ho můžete změnit, pokud chcete."
 
-#: C/evolution.xml:1935(para)
-msgid "Add your comments on the message in the composition frame, then click Send."
-msgstr "Přidejte vaše komentáře do zprávy v editačním rámci, potom klikněte na Poslat."
+#: C/evolution.xml:2028(para)
+msgid "Add your comments on the message in the composition frame"
+msgstr "Přidejte vaše komentáře do zprávy v editačním rámci."
 
-#: C/evolution.xml:1938(para)
-msgid "Attachments to a message you are forwarding are forwarded only when you send the original message as an attachment. Inline messages do not forward any attachments."
-msgstr "Přílohy u zprávy, kterou přeposíláte, jsou přeposlány, pouze pokud pošlete původní zprávu jako přílohu. Vložené zprávy nepřeposílají žádné přílohy."
+#: C/evolution.xml:2032(para)
+msgid ""
+"Attachments to a message you are forwarding are forwarded only when you send "
+"the original message as an attachment. Inline messages do not forward any "
+"attachments."
+msgstr ""
+"Přílohy u zprávy, kterou přeposíláte, jsou přeposlány, pouze pokud pošlete "
+"původní zprávu jako přílohu. Vložené zprávy nepřeposílají žádné přílohy."
 
-#: C/evolution.xml:1945(para)
-msgid "Don't forward chain letters. If you must, watch out for hoaxes and urban legends, and make sure the message doesn't have multiple layers of greater-than signs, (&gt;) indicating multiple layers of careless in-line forwarding."
-msgstr "Nepřeposílete řetězové dopisy. Pokud musíte, dejte si pozor na hoaxy a urban legends a ujistěte se, že zpráva nemá několik vrstev znamének větší, (&gt;) signalizuje několik vrstev nedbale přeposlaných zpráv."
+#: C/evolution.xml:2039(para)
+msgid ""
+"Don't forward chain letters. If you must, watch out for hoaxes and urban "
+"legends, and make sure the message doesn't have multiple layers of greater-"
+"than signs, (&gt;) indicating multiple layers of careless in-line forwarding."
+msgstr ""
+"Nepřeposílete řetězové dopisy. Pokud musíte, dejte si pozor na hoaxy a urban "
+"legends a ujistěte se, že zpráva nemá několik vrstev znamének větší, (&gt;) "
+"signalizuje několik vrstev nedbale přeposlaných zpráv."
 
-#: C/evolution.xml:1948(para)
-msgid "Always begin and close with a salutation. Say <quote>please</quote> and <quote>thank you,</quote> just like you do in real life. You can keep your pleasantries short, but be polite."
-msgstr "Vždy začínejte a končete pozdravem. Říkejte <quote>prosím</quote> a <quote>děkuji</quote> stejně, jako to děláte ve skutečnosti. Nepřehánějte to se zdvořilostí, ale buďte slušní."
+#: C/evolution.xml:2042(para)
+msgid ""
+"Always begin and close with a salutation. Say <quote>please</quote> and "
+"<quote>thank you,</quote> just like you do in real life. You can keep your "
+"pleasantries short, but be polite."
+msgstr ""
+"Vždy začínejte a končete pozdravem. Říkejte <quote>prosím</quote> a "
+"<quote>děkuji</quote> stejně, jako to děláte ve skutečnosti. Nepřehánějte to "
+"se zdvořilostí, ale buďte slušní."
 
-#: C/evolution.xml:1951(para)
-msgid "WRITING IN CAPITAL LETTERS MEANS YOU'RE SHOUTING! Don't write a whole message in capital letters. It hurts people's ears."
-msgstr "PSANÍ VELKÝCH PÍSMEN ZNAMENÁ, ŽE KŘIČÍTE! Nepište celou zprávu velkými písmeny. Poškozuje to lidem uši."
+#: C/evolution.xml:2045(para)
+msgid ""
+"WRITING IN CAPITAL LETTERS MEANS YOU'RE SHOUTING! Don't write a whole "
+"message in capital letters. It hurts people's ears."
+msgstr ""
+"PSANÍ VELKÝCH PÍSMEN ZNAMENÁ, ŽE KŘIČÍTE! Nepište celou zprávu velkými "
+"písmeny. Poškozuje to lidem uši."
 
-#: C/evolution.xml:1954(para)
-msgid "Check your spelling and use complete sentences. By default, Evolution puts a red line beneath words it doesn't recognize, as you type them."
-msgstr "Kontrolujte pravopis a pište celými větami. Jak píšete, Evolution implicitně podtrhává červeně slova, která nerozpozná."
+#: C/evolution.xml:2048(para)
+msgid ""
+"Check your spelling and use complete sentences. By default, Evolution puts a "
+"red line beneath words it doesn't recognize, as you type them."
+msgstr ""
+"Kontrolujte pravopis a pište celými větami. Jak píšete, Evolution implicitně "
+"podtrhává červeně slova, která nerozpozná."
 
-#: C/evolution.xml:1957(para)
-msgid "Don't send nasty e-mails (flames). If you get one, don't write back."
-msgstr "Neposílejte sprosté e-maily (flamy). Pokud nějaký dostanete, neodpovídejte."
+#: C/evolution.xml:2051(para)
+msgid "Don't send nasty emails (flames). If you get one, don't write back."
+msgstr ""
+"Neposílejte sprosté e-maily (flamy). Pokud nějaký dostanete, neodpovídejte."
 
-#: C/evolution.xml:1960(para)
-msgid "When you reply or forward, include enough of the previous message to provide context."
-msgstr "Pokud odpovídáte nebo přeposíláte, ponechte dostatek předchozí zprávy, aby zůstal zachován kontext."
+#: C/evolution.xml:2054(para)
+msgid ""
+"When you reply or forward, include enough of the previous message to provide "
+"context."
+msgstr ""
+"Pokud odpovídáte nebo přeposíláte, ponechte dostatek předchozí zprávy, aby "
+"zůstal zachován kontext."
 
-#: C/evolution.xml:1963(para)
+#: C/evolution.xml:2057(para)
 msgid "Don't send spam."
 msgstr "Neposílejte spam."
 
-#: C/evolution.xml:1971(para)
-msgid "If you create an event in the calendar component, you can then send invitations to the attendee list through the Evolution e-mail tool. The invitation card is sent as an attachment in iCal format."
-msgstr "Pokud v komponentně kalendáře vytvoříte událost, můžete potom poslat pozvánky všem ze seznamu účastníků pomocí pošty v Evolutionu. Karta s pozvánkou je posílána jako příloha ve formátu iCal."
+#: C/evolution.xml:2065(para)
+msgid ""
+"A message template is a standard message that you can use at any time to "
+"send mail with the same pattern. Evolution allows you to create and edit "
+"message templates."
+msgstr ""
+
+#: C/evolution.xml:2068(link) C/evolution.xml:2088(title)
+msgid "Creating a Message Template from an Existing Message"
+msgstr ""
+
+#: C/evolution.xml:2071(link) C/evolution.xml:2115(title)
+msgid "Saving a New Message as a Template"
+msgstr ""
+
+#: C/evolution.xml:2074(link) C/evolution.xml:2127(title)
+msgid "Using a Message Template as a Reply"
+msgstr ""
+
+#: C/evolution.xml:2077(link) C/evolution.xml:2144(title)
+msgid "Configuring Message Templates"
+msgstr ""
+
+#: C/evolution.xml:2080(para)
+msgid "To enable the Message Template Plugin:"
+msgstr "Chcete-li zapnout zásuvný modul Přípomínka přílohy:"
+
+#: C/evolution.xml:2083(para)
+msgid "Select Edit &gt; Plugins, then select Templates."
+msgstr "Vyberte Upravit &gt; Zásuvné moduly, potom Šablony."
+
+#: C/evolution.xml:2091(para)
+msgid "Select the message."
+msgstr "Vyberete zprávu."
+
+#: C/evolution.xml:2094(para)
+msgid "Right-click &gt; Move to folder / Copy to folder."
+msgstr ""
+
+#: C/evolution.xml:2097(para)
+msgid "Select the Template local folder."
+msgstr "Vyberte místní složku pro šablony."
+
+#: C/evolution.xml:2100(para)
+msgid "You can also edit an existing message and save it as a template."
+msgstr ""
 
-#: C/evolution.xml:1972(para)
-msgid "To send an invitation in GroupWise, right click on the calendar item and click Forward as iCalendar."
-msgstr "Pro poslání pozvánky v GroupWise klikněte pravým tlačítkem na položku v kalendáři a klikněte na Odeslat jako iCalendar."
+#: C/evolution.xml:2103(para)
+msgid "Open the message and click Reply."
+msgstr "Otevřete zprávu a potom klikněte na Odpovědět."
 
-#: C/evolution.xml:1973(para)
+#: C/evolution.xml:2106(para)
+msgid "Edit the message body or the addresses according to your requirements."
+msgstr ""
+
+#: C/evolution.xml:2109(para) C/evolution.xml:2121(para)
+msgid "Select File &gt; Save as Template."
+msgstr "Vyberte Soubor &gt; Uložit jako šablonu."
+
+#: C/evolution.xml:2118(para)
+msgid ""
+"Click New and enter the information in the New Message window, according to "
+"your requirements."
+msgstr ""
+
+#: C/evolution.xml:2130(para)
+msgid "Right-click the message you are replying to, then click Templates."
+msgstr ""
+"Klikněte pravým tlačítkem na zprávu, na kterou odpovídáte, a potom na "
+"Šablony."
+
+#: C/evolution.xml:2131(para)
+msgid "This option lists all the message templates in the Template folder."
+msgstr ""
+
+#: C/evolution.xml:2134(para)
+msgid ""
+"Select Open the message template of your choice and make changes if required."
+msgstr ""
+
+#: C/evolution.xml:2138(para)
+msgid ""
+"When you select a message template for replying, the subject of the reply is "
+"preserved."
+msgstr ""
+
+#: C/evolution.xml:2145(para)
+msgid ""
+"In the Plugin Manager, select the Configuration tab to customize your "
+"message templates. You can add, edit or remove the key-value pairs. You can "
+"specify any number of key-value pairs."
+msgstr ""
+
+#: C/evolution.xml:2146(para)
+msgid ""
+"In any template, the occurrence of every $key is replaced by the value it "
+"has in the configuration. For example, if you set the key to Manager and the "
+"value to Harry, any occurrence of $Manager is replaced by Harry in the "
+"message."
+msgstr ""
+
+#: C/evolution.xml:2147(para)
+msgid ""
+"Assume that you have 1000 message templates with your current manager's name "
+"has a reference in them. When the current manager is replaced by a new one, "
+"it's not easy for you to manually replace the manager's name in all the 1000 "
+"messages. If the messages have a $Manager key value, you can reset the value "
+"in the Configuration tab of this plugin."
+msgstr ""
+
+#: C/evolution.xml:2148(para)
+msgid ""
+"By default, the entire environment variables are used as a key-value pair. "
+"An occurrence of $env_variable is replaced by the value it carries. For "
+"example, an occurrence of $PATH in your template is replaced by its value "
+"when the template is used."
+msgstr ""
+
+#: C/evolution.xml:2149(para)
+msgid "The replacement process uses the following order of precedence:"
+msgstr ""
+
+#: C/evolution.xml:2152(para)
+msgid ""
+"$key is replaced by the value set for it in the Configuration tab of the "
+"Templates plugin."
+msgstr ""
+
+#: C/evolution.xml:2155(para)
+msgid ""
+"If the key is not found, it is then replaced with the value of its "
+"environment variable."
+msgstr ""
+
+#: C/evolution.xml:2158(para)
+msgid ""
+"If key is neither a configuration option nor an environment variable, no "
+"changes are made."
+msgstr ""
+
+#: C/evolution.xml:2166(para)
+msgid ""
+"If you create an event in the calendar component, you can then send "
+"invitations to the attendee list through the Evolution email tool. The "
+"invitation card is sent as an attachment in iCal format."
+msgstr ""
+"Pokud v komponentně kalendáře vytvoříte událost, můžete potom poslat "
+"pozvánky všem ze seznamu účastníků pomocí pošty v Evolutionu. Karta s "
+"pozvánkou je posílána jako příloha ve formátu iCal."
+
+#: C/evolution.xml:2167(para)
+msgid ""
+"To send an invitation, right click on the calendar item and click Forward as "
+"iCalendar."
+msgstr ""
+"Pro poslání pozvánky klikněte pravým tlačítkem na položku kalendáře a "
+"klikněte na Odeslat jako iCalendar."
+
+#: C/evolution.xml:2168(para)
 msgid "When you receive an invitation, you have several options:"
 msgstr "Když dostanete pozvánku, máte několik možností:"
 
-#: C/evolution.xml:1975(title)
+#: C/evolution.xml:2170(title)
 msgid "Accept:"
 msgstr "Akceptovat:"
 
-#: C/evolution.xml:1976(para)
-msgid "Indicates you will attend the meeting. When you click the OK button, the meeting is entered into your calendar."
-msgstr "Dává najevo, že se na schůzku dostavíte. Když kliknete na tlačítko Budiž, schůzka se vloží do vašeho kalendáře."
+#: C/evolution.xml:2171(para)
+msgid ""
+"Indicates you will attend the meeting. When you click the OK button, the "
+"meeting is entered into your calendar."
+msgstr ""
+"Dává najevo, že se na schůzku dostavíte. Když kliknete na tlačítko Budiž, "
+"schůzka se vloží do vašeho kalendáře."
 
-#: C/evolution.xml:1979(title)
+#: C/evolution.xml:2174(title)
 msgid "Tentatively Accept:"
 msgstr "Předběžně akceptovat:"
 
-#: C/evolution.xml:1980(para)
-msgid "Indicates you will probably attend the meeting. When you click the OK button, the meeting is entered into your calendar, but is marked as tentative."
-msgstr "Dává najevo, že se pravděpodobně na schůzku dostavíte. Když kliknete na tlačítko Budiž, schůzka se vložít do vašeho kalendáře, ale označená jako předběžná."
+#: C/evolution.xml:2175(para)
+msgid ""
+"Indicates you will probably attend the meeting. When you click the OK "
+"button, the meeting is entered into your calendar, but is marked as "
+"tentative."
+msgstr ""
+"Dává najevo, že se pravděpodobně na schůzku dostavíte. Když kliknete na "
+"tlačítko Budiž, schůzka se vložít do vašeho kalendáře, ale označená jako "
+"předběžná."
 
-#: C/evolution.xml:1983(title)
+#: C/evolution.xml:2178(title)
 msgid "Decline:"
 msgstr "Odmítnout:"
 
-#: C/evolution.xml:1984(para)
-msgid "Indicates you are unable to attend the meeting. The meeting is not entered into your calendar when you click OK, although your response is sent to the meeting host if you have selected the RSVP option."
-msgstr "Dává najevo, že se nemůžete schůzky zúčastnit. Schůzka se nevloží do vašeho kalendáře, když kliknete na Budiž, vaše odpověď bude hostiteli odeslána, pokud jste zvolili RSVP."
-
-#: C/evolution.xml:1987(title)
-msgid "RSVP:"
-msgstr "RSVP:"
+#: C/evolution.xml:2179(para)
+msgid ""
+"Indicates you are unable to attend the meeting. The meeting is not entered "
+"into your calendar when you click OK, although your response is sent to the "
+"meeting host if you have selected the Send reply to sender option."
+msgstr ""
+"Dává najevo, že se nemůžete schůzky zúčastnit. Schůzka se nevloží do vašeho "
+"kalendáře, když kliknete na Budiž, i když vaše odpověď bude hostiteli "
+"odeslána, pokud jste zvolili možnost Odpovědět odesílateli."
 
-#: C/evolution.xml:1988(para)
-msgid "Select this option if you want your response sent to the meeting organizers."
-msgstr "Vyberte tuto možnost, pokud má být vaše odpověď odeslána organizátorům schůzky."
+#: C/evolution.xml:2182(title)
+msgid "Send reply to sender:"
+msgstr "Odpovědět odesílateli:"
 
-#: C/evolution.xml:1994(para)
-msgid "Because IMAP folders exist on the server, and opening them or checking them takes time, you need fine-grained control over the way that you use IMAP folders. You use the IMAP subscriptions manager to do this. If you prefer to have every mail folder displayed, you can select that option as well. However, if you want to choose specific items in your mailbox, and exclude others, you can use the subscription management tool to do that."
-msgstr "Jelikož jsou složky IMAPu umístěny na serveru, jejich otevírání a kontrola trvá déle, potřebujete selektivní kontrolu nad používáním složek IMAPu. Použijte pro to správce přihlášení IMAP. Pokud dáváte přednost tomu mít všechny složky pošty zobrazené, můžete tuto možnost vybrat také. Nicméně pokud chcete vybrat specifickou položku ve vaší schránce a vyloučit ostatní, můžete použít nástroj pro správu přihlášení."
+#: C/evolution.xml:2183(para)
+msgid ""
+"Select this option if you want your response sent to the meeting organizers."
+msgstr ""
+"Vyberte tuto možnost, pokud má být vaše odpověď odeslána organizátorům "
+"schůzky."
 
-#: C/evolution.xml:1997(para)
+#: C/evolution.xml:2189(para)
+msgid ""
+"Because IMAP folders exist on the server, and opening them or checking them "
+"takes time, you need fine-grained control over the way that you use IMAP "
+"folders. You use the IMAP subscriptions manager to do this. If you prefer to "
+"have every mail folder displayed, you can select that option as well. "
+"However, if you want to choose specific items in your mailbox, and exclude "
+"others, you can use the subscription management tool to do that."
+msgstr ""
+"Jelikož jsou složky IMAPu umístěny na serveru, jejich otevírání a kontrola "
+"trvá déle, potřebujete selektivní kontrolu nad používáním složek IMAPu. "
+"Použijte pro to správce přihlášení IMAP. Pokud dáváte přednost tomu mít "
+"všechny složky pošty zobrazené, můžete tuto možnost vybrat také. Nicméně "
+"pokud chcete vybrat specifickou položku ve vaší schránce a vyloučit ostatní, "
+"můžete použít nástroj pro správu přihlášení."
+
+#: C/evolution.xml:2192(para)
 msgid "Select Folder &gt; Subscriptions."
 msgstr "Vyberte Složka &gt; Přihlášení."
 
-#: C/evolution.xml:2000(para)
-msgid "If you have accounts on multiple IMAP servers, select the server where you want to manage your subscriptions."
-msgstr "Máte-li účty na více IMAP serverech, vyberte server, kde chcete spravovat vaše přihlášení."
+#: C/evolution.xml:2195(para)
+msgid ""
+"If you have accounts on multiple IMAP servers, select the server where you "
+"want to manage your subscriptions."
+msgstr ""
+"Máte-li účty na více IMAP serverech, vyberte server, kde chcete spravovat "
+"vaše přihlášení."
 
-#: C/evolution.xml:2001(para)
+#: C/evolution.xml:2196(para)
 msgid "Evolution displays a list of available files and folders."
 msgstr "Evolution zobrazí seznam dostupných souborů a složek."
 
-#: C/evolution.xml:2004(para)
+#: C/evolution.xml:2199(para)
 msgid "Select a file or folder by clicking it."
 msgstr "Vyberte soubor nebo složku kliknutím na ni."
 
-#: C/evolution.xml:2005(para)
-msgid "You should select at least the Inbox folder. Depending upon the way your IMAP server is configured, the list of available files might include non-mail folders. If it does, you can ignore them."
-msgstr "Měli byste vybrat alespoň složku Příchozí. V závislosti na tom, jak je váš IMAP server nastaven, seznam dostupných souborů může obsahovat nepoštovní složky. Pokud ano, můžete je ignorovat."
+#: C/evolution.xml:2200(para)
+msgid ""
+"You should select at least the Inbox folder. Depending upon the way your "
+"IMAP server is configured, the list of available files might include non-"
+"mail folders. If it does, you can ignore them."
+msgstr ""
+"Měli byste vybrat alespoň složku Příchozí. V závislosti na tom, jak je váš "
+"IMAP server nastaven, seznam dostupných souborů může obsahovat nepoštovní "
+"složky. Pokud ano, můžete je ignorovat."
 
-#: C/evolution.xml:2008(para)
-msgid "Click Subscribe to add a folder to the subscribed list."
-msgstr "Klikněte na Přihlásit pro přidání složky do seznamu přihlášených."
+#: C/evolution.xml:2203(para)
+msgid ""
+"Enable the corresponding checkbox to add a folder to the subscribed list."
+msgstr "Zatrhněte políčko pro přidání složky do seznamu přihlášených."
 
-#: C/evolution.xml:2011(para)
+#: C/evolution.xml:2206(para)
 msgid "When you have subscribed to the folders you want, close the window."
 msgstr "Když jste přihlásili složky, které jste chtěli, zavřete okno."
 
-#: C/evolution.xml:2018(para)
-msgid "To protect and encode your e-mail transmissions, Evolution offers two encryption methods:"
-msgstr "Pro ochranu a šifrování vašich e-mailových přenosů Evolution nabízí dvě metody šifrování:"
+#: C/evolution.xml:2213(para)
+msgid ""
+"To protect and encode your email transmissions, Evolution offers two "
+"encryption methods:"
+msgstr ""
+"Pro ochranu a šifrování vašich e-mailových přenosů Evolution nabízí dvě "
+"metody šifrování:"
 
-#: C/evolution.xml:2021(para)
+#: C/evolution.xml:2216(para)
 msgid "GPG Encryption"
 msgstr "Šifrování pomocí GPG"
 
-#: C/evolution.xml:2024(para)
-#: C/evolution.xml:2181(title)
+#: C/evolution.xml:2219(para) C/evolution.xml:2377(title)
 msgid "S/MIME Encryption"
 msgstr "Šifrování pomocí S/MIME"
 
-#: C/evolution.xml:2027(para)
-msgid "Evolution helps you protect your privacy by using GNU Privacy Guard (GPG), an implementation of strong <link linkend=\"public-key-encryption\">Public Key Encryption.</link>"
-msgstr "Evolution vám pomáhá schránit vaše soukromí použitím GNU Privacy Guard (GPG), implementace silného <link linkend=\"public-key-encryption\">šifrování veřejným klíčem.</link>"
+#: C/evolution.xml:2222(para)
+msgid ""
+"Evolution helps you protect your privacy by using GNU Privacy Guard (GPG), "
+"an implementation of strong <link linkend=\"public-key-encryption\">Public "
+"Key Encryption.</link>"
+msgstr ""
+"Evolution vám pomáhá schránit vaše soukromí použitím GNU Privacy Guard "
+"(GPG), implementace silného <link linkend=\"public-key-encryption"
+"\">šifrování veřejným klíčem.</link>"
 
-#: C/evolution.xml:2028(para)
-msgid "GPG uses two keys: public and private. You can give your public key to anyone you want to receive encrypted messages, or put it on a public key server so that people can look it up before contacting you. Your private key lets you decrypt any message encrypted with your public key. Never give your private key to anyone."
-msgstr "GPG používá dva klíče: veřejný a privátní. Můžete dát váš veřejný klíč všem, kteří by měli přijímat vaše zašifrované zprávy, nebo dát veřejný klíč na server tak, aby si jej mohli lidé vyhledat před tím, než vás budou kontaktovat. Váš privátní klíč vám umožňuje dešifrovat jakoukoliv zprávu zašifrovanou vašim veřejným klíčem. Nikdy nedávejte nikomu váš privátní klíč."
+#: C/evolution.xml:2223(para)
+msgid ""
+"In order to send and receive encrypted emails using GPG, it is necessary to "
+"use two kinds of encryption keys: public and private. Public keys are used "
+"to encrypt messages and private keys to decrypt them. To send encrypted "
+"email, you must have the recepient's public key, which is used to encrypt "
+"the message. The recipient then uses his/her private key to decrypt (and "
+"read) the encrypted message."
+msgstr ""
 
-#: C/evolution.xml:2029(para)
-msgid "When you send a message that is encrypted, you must encrypt it using your intended recipient's public key. To receive an encrypted message, you must make sure that the sender has your public key in advance. For signing messages, you encrypt the signature with your private key, so only your public key can unlock it. When you send the message, the recipient gets your public key and unlocks the signature, verifying your identity."
-msgstr "Když posíláte zprávu, která je zašifrovaná, musíte ji zašifrovat k tomu určeným veřejným klíčem příjemce. Chcete-li přijímat zašifrované zprávy, musíte se ujistit, že má odesílatel váš veřejný klíč v předstihu. Pro podpis zpráv zašifrujte váš podpis vaším privátním klíčem tak, že pouze váš veřejný klíč jej může odemčít. Když pošlete zprávu, příjemce dostane váš veřejný klíč a odemče podpis a tím si ověří vaši identitu."
+#: C/evolution.xml:2224(para)
+msgid ""
+"Those who wish to send you encrypted email must first have a copy of your "
+"public key on your keyring. To this end, public keys can be shared with "
+"those who want to send encrypted messages to you. In order to do this, you "
+"may place your public key on a public key server. Private keys should not be "
+"shared with others."
+msgstr ""
 
-#: C/evolution.xml:2030(para)
-msgid "Evolution does not support older versions of PGP, such as OpenPGP and Inline PGP."
+#: C/evolution.xml:2225(para)
+msgid ""
+"Evolution does not support older versions of PGP, such as OpenPGP and Inline "
+"PGP."
 msgstr "Evolution nepodporuje starší verze PGP, jako je OpenPGP a Inline PGP."
 
-#: C/evolution.xml:2031(para)
+#: C/evolution.xml:2226(para)
 msgid "You can use encryption in two different ways:"
 msgstr "Můžete použít šifrování dvěma způsoby:"
 
-#: C/evolution.xml:2034(para)
-msgid "You can encrypt the entire message, so that nobody but the recipient can read it."
-msgstr "Můžete zašifrovat celou zprávu tak, že ji nebude moci přečíst nikdo jiný než příjemce."
+#: C/evolution.xml:2229(para)
+msgid ""
+"You can encrypt the entire message, so that nobody but the recipient can "
+"read it."
+msgstr ""
+"Můžete zašifrovat celou zprávu tak, že ji nebude moci přečíst nikdo jiný než "
+"příjemce."
 
-#: C/evolution.xml:2037(para)
-msgid "You can attach an encrypted signature to a plain text message, so that the recipient can read the message without decrypting it, and needs decrypting only to verify the sender's identity."
-msgstr "Můžete připojit zašifrovaný podpis ke zprávě prostého textu tak, že příjemce může zprávu přečíst bez dešifrování a dešifrování musí použít, pouze pokud chce ověřit identitu odesílatele."
+#: C/evolution.xml:2232(para)
+msgid ""
+"You can attach an encrypted signature to a plain text message, so that the "
+"recipient can read the message without decrypting it, and needs decrypting "
+"only to verify the sender's identity."
+msgstr ""
+"Můžete připojit zašifrovaný podpis ke zprávě prostého textu tak, že příjemce "
+"může zprávu přečíst bez dešifrování a dešifrování musí použít, pouze pokud "
+"chce ověřit identitu odesílatele."
 
-#: C/evolution.xml:2040(para)
-msgid "For example, suppose that Kevin wants to send an encrypted message to his friend Rachel. He looks up her public key on a general key server, and then tells Evolution to encrypt the message. The message now reads <quote>@#$23ui7yr87#@!48970fsd.</quote> When the information gets to Rachel, she decrypts it using her private key, and it appears as plain text for her to read."
-msgstr "Například dejme tomu, že chce Kevin poslat zašifrovanou zprávu své přítelkyni Rachel. Najde si její veřejný klíč na všeobecném serveru klíčů a potom řekne Evolutionu, aby zašifroval zprávu. Ve zprávě nyní stojí <quote>@#$23ui7yr87#@!48970fsd.</quote>. Když informace dorazí k Rachel, dešifruje ji pomocí privátního klíče a zobrazí se jí prostý text, který si může přečíst."
+#: C/evolution.xml:2235(para)
+msgid ""
+"For example, suppose that Kevin wants to send an encrypted message to his "
+"friend Rachel. He looks up her public key on a general key server, and then "
+"tells Evolution to encrypt the message. The message now reads <quote>@#"
+"$23ui7yr87#@!48970fsd.</quote> When the information gets to Rachel, she "
+"decrypts it using her private key, and it appears as plain text for her to "
+"read."
+msgstr ""
+"Například dejme tomu, že chce Kevin poslat zašifrovanou zprávu své "
+"přítelkyni Rachel. Najde si její veřejný klíč na všeobecném serveru klíčů a "
+"potom řekne Evolutionu, aby zašifroval zprávu. Ve zprávě nyní stojí <quote>@#"
+"$23ui7yr87#@!48970fsd.</quote>. Když informace dorazí k Rachel, dešifruje ji "
+"pomocí privátního klíče a zobrazí se jí prostý text, který si může přečíst."
 
-#: C/evolution.xml:2043(title)
+#: C/evolution.xml:2238(title)
 msgid "Making a GPG Encryption Key"
 msgstr "Tvorba šifrovacího GPG klíče"
 
-#: C/evolution.xml:2044(para)
-msgid "Before you can get or send encrypted mail, you need to generate your public and private keys with GPG. This procedure covers version 1.2.4 of GPG. If your version is different, these steps might vary slightly. You can find out your version number by entering <command>gpg --version</command>."
-msgstr "Před tím, než dostanete nebo pošlete zašifrovanou poštu, si musíte vygenerovat veřejné a privátní klíče pomocí GPG. Tento postup pokrývá verzi GPG 1.2.4. Pokud je vaše verze jiná, můžou se tyto kroky mírně lišit. Vaši verzi můžete zjistit vložením <command>gpg --version</command>."
+#: C/evolution.xml:2239(para)
+msgid ""
+"Before you can get or send encrypted mail, you need to generate your public "
+"and private keys with GPG. This procedure covers version 1.2.4 of GPG. If "
+"your version is different, these steps might vary slightly. You can find out "
+"your version number by entering <command>gpg --version</command>."
+msgstr ""
+"Před tím, než dostanete nebo pošlete zašifrovanou poštu, si musíte "
+"vygenerovat veřejné a privátní klíče pomocí GPG. Tento postup pokrývá verzi "
+"GPG 1.2.4. Pokud je vaše verze jiná, můžou se tyto kroky mírně lišit. Vaši "
+"verzi můžete zjistit vložením <command>gpg --version</command>."
 
-#: C/evolution.xml:2047(para)
+#: C/evolution.xml:2242(para)
 msgid "Open a terminal and enter <command>gpg --gen-key</command>."
 msgstr "Otevřete termínal a vložte <command>gpg --gen-key</command>."
 
-#: C/evolution.xml:2050(para)
+#: C/evolution.xml:2245(para)
 msgid "Select an algorithm, then press Enter."
 msgstr "Vyberte algoritmus a stiskněte Enter."
 
-#: C/evolution.xml:2052(para)
-msgid "To accept the default algorithm of DSA and ElGamal, press Enter (recommended)."
-msgstr "Pro přijetí implicitního algoritmu DSA nebo ElGamal stiskněte Enter (doporučeno)."
+#: C/evolution.xml:2247(para)
+msgid ""
+"To accept the default algorithm of DSA and ElGamal, press Enter "
+"(recommended)."
+msgstr ""
+"Pro přijetí implicitního algoritmu DSA nebo ElGamal stiskněte Enter "
+"(doporučeno)."
 
-#: C/evolution.xml:2055(para)
-msgid "Select a key length, then press Enter. To accept the default, 1024 bits, press Enter."
-msgstr "Vyberte délku klíče, potom stiskněte Enter. Pro přijetí implicitních 1024 bitů stiskněte Enter."
+#: C/evolution.xml:2250(para)
+msgid ""
+"Select a key length, then press Enter. To accept the default, 1024 bits, "
+"press Enter."
+msgstr ""
+"Vyberte délku klíče, potom stiskněte Enter. Pro přijetí implicitních 1024 "
+"bitů stiskněte Enter."
 
-#: C/evolution.xml:2058(para)
+#: C/evolution.xml:2253(para)
 msgid "Enter how long your key should be valid for."
 msgstr "Zadejte, jak dlouho by měl váš klíč platit."
 
-#: C/evolution.xml:2060(para)
-msgid "To accept the default of no expiration, press Enter, then press Y when you are prompted to verify the selection."
-msgstr "Pro přijetí implicitní hodnoty bez expirace stiskněte Enter, potom, když jste vyzváni k potvrzení výběru, stiskněte Y."
+#: C/evolution.xml:2255(para)
+msgid ""
+"To accept the default of no expiration, press Enter, then press Y when you "
+"are prompted to verify the selection."
+msgstr ""
+"Pro přijetí implicitní hodnoty bez expirace stiskněte Enter, potom, když "
+"jste vyzváni k potvrzení výběru, stiskněte Y."
 
-#: C/evolution.xml:2063(para)
+#: C/evolution.xml:2258(para)
 msgid "Type your real name, then press Enter."
 msgstr "Napište vaše skutečné jméno, pak stiskněte Enter."
 
-#: C/evolution.xml:2066(para)
-msgid "Type your e-mail address, then press Enter."
+#: C/evolution.xml:2261(para)
+msgid "Type your email address, then press Enter."
 msgstr "Napište vaši e-mailovou adresu, pak stiskněte Enter."
 
-#: C/evolution.xml:2069(para)
+#: C/evolution.xml:2264(para)
 msgid "(Optional) Type a comment, then press Enter."
 msgstr "(Volitelně) Napište komentář, pak stiskněte Enter."
 
-#: C/evolution.xml:2072(para)
+#: C/evolution.xml:2267(para)
 msgid "Review your selected user ID. If it is correct, press O."
-msgstr "Prohlédněte si vámi vybrané uživatelské ID. Pokud je správně, stiskněte O."
+msgstr ""
+"Prohlédněte si vámi vybrané uživatelské ID. Pokud je správně, stiskněte O."
 
-#: C/evolution.xml:2075(para)
+#: C/evolution.xml:2270(para)
 msgid "Type a passphrase, then press Enter."
 msgstr "Napište heslo, pak stiskněte Enter."
 
-#: C/evolution.xml:2078(para)
+#: C/evolution.xml:2273(para)
 msgid "Move your mouse randomly to generate the keys."
 msgstr "Pro vygenerování hesla pohybujte náhodně myší."
 
-#: C/evolution.xml:2081(para)
-msgid "After the keys are generated, you can view your key information by entering <command>gpg --list-keys</command>. You should see something similar to this: <computeroutput> /home/you/.gnupg/pubring.gpg ----------------------------  pub 1024D/32j38dk2 2001-06-20 you &lt;you@example.com&gt;  sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]  </computeroutput>"
-msgstr "Poté, co jsou klíče vygenerovány, si můžete informace o vašich klíčích prohlednout vložením <command>gpg --list-keys</command>. Měli byste vidět něco podobné tomuto: <computeroutput> /home/you/.gnupg/pubring.gpg ----------------------------  pub 1024D/32j38dk2 2001-06-20 you &lt;you@example.com&gt;  sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]  </computeroutput>"
+#: C/evolution.xml:2276(para)
+msgid ""
+"After the keys are generated, you can view your key information by entering "
+"<command>gpg --list-keys</command>. You should see something similar to "
+"this: <computeroutput> /home/you/.gnupg/pubring.gpg "
+"----------------------------  pub 1024D/32j38dk2 2001-06-20 you &lt;"
+"you@example.com&gt;  sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]  </"
+"computeroutput>"
+msgstr ""
+"Poté, co jsou klíče vygenerovány, si můžete informace o vašich klíčích "
+"prohlednout vložením <command>gpg --list-keys</command>. Měli byste vidět "
+"něco podobné tomuto: <computeroutput> /home/you/.gnupg/pubring.gpg "
+"----------------------------  pub 1024D/32j38dk2 2001-06-20 you &lt;"
+"you@example.com&gt;  sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]  </"
+"computeroutput>"
 
-#: C/evolution.xml:2082(para)
-msgid "GPG creates one list, or keyring, for your public keys and one for your private keys. All the public keys you know are stored in the file ~/.gnupg/pubring.gpg. If you want to give other people your key, send them that file."
-msgstr "GPG vytvoří jeden seznam (nebo klíčenku) pro vaše veřejné klíče a jeden pro vaše pro vaše privátní klíče. Všechny veřejné klíče, které znáte, jsou uloženy v souboru ~/.gnupg/pubring.gpg. Pokud chcete dát ostatním lidem váš klíč, pošlete jim tento soubor."
+#: C/evolution.xml:2277(para)
+msgid ""
+"GPG creates one list, or keyring, for your public keys and one for your "
+"private keys. All the public keys you know are stored in the file ~/.gnupg/"
+"pubring.gpg. If you want to give other people your key, send them that file."
+msgstr ""
+"GPG vytvoří jeden seznam (nebo klíčenku) pro vaše veřejné klíče a jeden pro "
+"vaše pro vaše privátní klíče. Všechny veřejné klíče, které znáte, jsou "
+"uloženy v souboru ~/.gnupg/pubring.gpg. Pokud chcete dát ostatním lidem váš "
+"klíč, pošlete jim tento soubor."
 
-#: C/evolution.xml:2083(para)
+#: C/evolution.xml:2278(para)
 msgid "If you want, you can upload your keys to a key server."
 msgstr "Pokud chcete, můžete nahrát vaše klíče na server klíčů."
 
-#: C/evolution.xml:2086(para)
-msgid "Check your public key ID with gpg--list-keys. It is the string after 1024D on the line beginning with pub. In the example above, it is 32j38dk2."
-msgstr "Zkontrolujte váše ID pro veřejné klíče pomocí gpg--list-keys. Je to řetězec po 1024D na řádku začínajícím pub. V příkladu výše je to např. 32j38dk2."
-
-#: C/evolution.xml:2089(para)
-msgid "Enter the command <command>gpg --send-keys --keyserver wwwkeys.pgp.net <varname>32j38dk2</varname></command>. Substitute your key ID for <varname>32j38dk2</varname>. You need your password to do this."
-msgstr "Vložte příkaz <command>gpg --send-keys --keyserver wwwkeys.pgp.net <varname>32j38dk2</varname></command>.  Nahraďte vaše ID klíče <varname>32j38dk2</varname>. Abyste to udělali, potřebujete heslo."
+#: C/evolution.xml:2281(para)
+msgid ""
+"Check your public key ID with gpg--list-keys. It is the string after 1024D "
+"on the line beginning with pub. In the example above, it is 32j38dk2."
+msgstr ""
+"Zkontrolujte váše ID pro veřejné klíče pomocí gpg--list-keys. Je to řetězec "
+"po 1024D na řádku začínajícím pub. V příkladu výše je to např. 32j38dk2."
 
-#: C/evolution.xml:2092(para)
-msgid "Key servers store your public keys for you so that your friends can decrypt your messages. If you choose not to use a key server, you can manually send your public key, include it in your signature file, or put it on your own Web page. However, it is easier to publish a key once, and then let people download it from a central place when they want."
-msgstr "Server klíčů pro vás uchovává vaše veřejné klíče tak, že vaši přátelé mohou dešifrovat vaše zprávy. Pokud se rozhodnete nepoužívat server klíčů, můžete vaše veřejné klíče posílat ručně, obsažené v souboru podpisu, nebo je dát na vaši vlastní webovou stránku. Avšak je jednodušší zveřejnit klíč jednou a potom lidi nechat, aby si ho stáhli centrálního místa, kdy chtějí."
+#: C/evolution.xml:2284(para)
+msgid ""
+"Enter the command <command>gpg --send-keys --keyserver wwwkeys.pgp.net "
+"<varname>32j38dk2</varname></command>. Substitute your key ID for "
+"<varname>32j38dk2</varname>. You need your password to do this."
+msgstr ""
+"Vložte příkaz <command>gpg --send-keys --keyserver wwwkeys.pgp.net "
+"<varname>32j38dk2</varname></command>.  Nahraďte vaše ID klíče "
+"<varname>32j38dk2</varname>. Abyste to udělali, potřebujete heslo."
 
-#: C/evolution.xml:2093(para)
-msgid "If you don't have a key to unlock or encrypt a message, you can set your encryption tool to look it up automatically. If it can't find the key, an error message appears."
-msgstr "Pokud nemáte klíč k odemčení nebo dešifrování zprávy, můžete nastavit váš šifrovací nástroj, aby se po něm automaticky podíval. Pokud jej nebude moci najít, objeví se chybová hláška. "
+#: C/evolution.xml:2287(para)
+msgid ""
+"Key servers store your public keys for you so that your friends can decrypt "
+"your messages. If you choose not to use a key server, you can manually send "
+"your public key, include it in your signature file, or put it on your own "
+"Web page. However, it is easier to publish a key once, and then let people "
+"download it from a central place when they want."
+msgstr ""
+"Server klíčů pro vás uchovává vaše veřejné klíče tak, že vaši přátelé mohou "
+"dešifrovat vaše zprávy. Pokud se rozhodnete nepoužívat server klíčů, můžete "
+"vaše veřejné klíče posílat ručně, obsažené v souboru podpisu, nebo je dát na "
+"vaši vlastní webovou stránku. Avšak je jednodušší zveřejnit klíč jednou a "
+"potom lidi nechat, aby si ho stáhli centrálního místa, kdy chtějí."
+
+#: C/evolution.xml:2288(para)
+msgid ""
+"If you don't have a key to unlock or encrypt a message, you can set your "
+"encryption tool to look it up automatically. If it can't find the key, an "
+"error message appears."
+msgstr ""
+"Pokud nemáte klíč k odemčení nebo dešifrování zprávy, můžete nastavit váš "
+"šifrovací nástroj, aby se po něm automaticky podíval. Pokud jej nebude moci "
+"najít, objeví se chybová hláška. "
 
-#: C/evolution.xml:2097(title)
+#: C/evolution.xml:2292(title)
 msgid "Getting and Using GPG Public Keys"
 msgstr "Získání a používání veřejných klíčů GPG"
 
-#: C/evolution.xml:2098(para)
-msgid "To send an encrypted message, you need to use the recipient's public key in combination with your private key. Evolution handles the encryption, but you need to get the public key and add it to your keyring."
-msgstr "Pro odeslání zašifrované zprávy musíte použít veřejný klíč příjemce v kombinaci s vaším privátním klíčem. Evolution se postará o šifrování, ale vy musíte získat veřejný klíč a přidat ho do vaší klíčenky."
-
-#: C/evolution.xml:2099(para)
-msgid "To get public keys from a public key server, enter the command<command> gpg --recv-keys --keyserver wwwkeys.pgp.net <varname>keyid</varname></command>, substituting <varname>keyid</varname> for your recipient's ID. You need to enter your password, and the ID is automatically added to your keyring."
-msgstr "Pro získání veřejných klíčů ze serveru veřejných klíčů, vložte příkaz <command> gpg --recv-keys --keyserver wwwkeys.pgp.net <varname>keyid</varname></command> s tím, že nahradíte <varname>keyid</varname> ID vašeho příjemce. Musíte vložit vaše heslo a ID se automaticky přidá do vaší klíčenky."
-
-#: C/evolution.xml:2101(para)
-msgid "The domain <quote><emphasis>wwwkeys.pgp.net</emphasis></quote> is assigned to multiple hosts in various networks. The gpg utility tries to connect to one in the current network; and if that particular host is down, it fails with a time-out."
-msgstr "Doména <quote><emphasis>wwwkeys.pgp.net</emphasis></quote> je přidělená více hostům v různých sítích. Nástroj gpg se zkouší připojit k jednomu z nich v aktuální síti a pokud je určitý host nedostupný, selže vypršením časového limitu."
+#: C/evolution.xml:2293(para)
+msgid ""
+"To send an encrypted message, you need to use the recipient's public key in "
+"combination with your private key. Evolution handles the encryption, but you "
+"need to get the public key and add it to your keyring."
+msgstr ""
+"Pro odeslání zašifrované zprávy musíte použít veřejný klíč příjemce v "
+"kombinaci s vaším privátním klíčem. Evolution se postará o šifrování, ale vy "
+"musíte získat veřejný klíč a přidat ho do vaší klíčenky."
 
-#: C/evolution.xml:2104(para)
-msgid "To avoid this, Type <command>$ host wwwkeys.pgp.net</command> in a terminal console and get the IP address of the hosts. You can ping each of them to find the one which is up and running. Now, you can replace wwwkeys.pgp.net in the gpg --recv-keys --keyserver wwwkeys.pgp.net keyid command with that explicit IP number as returned by the host utility."
-msgstr "Abyste se tomuto vyhli, napište do terminálu <command>$ host wwwkeys.pgp.net</command> a dostanete IP adresy hostů. Můžete poslat ping na každý z nich a zjistit, který z nich běží. Nyní můžete nahradit wwwkeys.pgp.net v příkazu gpg --recv-keys --keyserver wwwkeys.pgp.net explicitním číslem IP, které vám vrátil host."
+#: C/evolution.xml:2294(para)
+msgid ""
+"To get public keys from a public key server, enter the command<command> gpg "
+"--recv-keys --keyserver wwwkeys.pgp.net <varname>keyid</varname></command>, "
+"substituting <varname>keyid</varname> for your recipient's ID. You need to "
+"enter your password, and the ID is automatically added to your keyring."
+msgstr ""
+"Pro získání veřejných klíčů ze serveru veřejných klíčů, vložte příkaz "
+"<command> gpg --recv-keys --keyserver wwwkeys.pgp.net <varname>keyid</"
+"varname></command> s tím, že nahradíte <varname>keyid</varname> ID vašeho "
+"příjemce. Musíte vložit vaše heslo a ID se automaticky přidá do vaší "
+"klíčenky."
+
+#: C/evolution.xml:2296(para)
+msgid ""
+"The domain <quote><emphasis>wwwkeys.pgp.net</emphasis></quote> is assigned "
+"to multiple hosts in various networks. The gpg utility tries to connect to "
+"one in the current network; and if that particular host is down, it fails "
+"with a time-out."
+msgstr ""
+"Doména <quote><emphasis>wwwkeys.pgp.net</emphasis></quote> je přidělená více "
+"hostům v různých sítích. Nástroj gpg se zkouší připojit k jednomu z nich v "
+"aktuální síti a pokud je určitý host nedostupný, selže vypršením časového "
+"limitu."
 
-#: C/evolution.xml:2109(para)
-msgid "If someone sends you a public key directly, save it as a plain text file and enter the command <command>gpg <varname>--import</varname></command> to add it to your keyring."
-msgstr "Pokud vám někdo pošle veřejný klíč napřímo, uložte jej jako textový soubor a vložte příkaz <command>gpg <varname>--import</varname></command> pro jeho přidání do klíčenky."
+#: C/evolution.xml:2299(para)
+msgid ""
+"To avoid this, Type <command>$ host wwwkeys.pgp.net</command> in a terminal "
+"console and get the IP address of the hosts. You can ping each of them to "
+"find the one which is up and running. Now, you can replace wwwkeys.pgp.net "
+"in the gpg --recv-keys --keyserver wwwkeys.pgp.net keyid command with that "
+"explicit IP number as returned by the host utility."
+msgstr ""
+"Abyste se tomuto vyhli, napište do terminálu <command>$ host wwwkeys.pgp."
+"net</command> a dostanete IP adresy hostů. Můžete poslat ping na každý z "
+"nich a zjistit, který z nich běží. Nyní můžete nahradit wwwkeys.pgp.net v "
+"příkazu gpg --recv-keys --keyserver wwwkeys.pgp.net explicitním číslem IP, "
+"které vám vrátil host."
+
+#: C/evolution.xml:2304(para)
+msgid ""
+"If someone sends you a public key directly, save it as a plain text file and "
+"enter the command <command>gpg <varname>--import</varname></command> to add "
+"it to your keyring."
+msgstr ""
+"Pokud vám někdo pošle veřejný klíč napřímo, uložte jej jako textový soubor a "
+"vložte příkaz <command>gpg <varname>--import</varname></command> pro jeho "
+"přidání do klíčenky."
 
-#: C/evolution.xml:2113(title)
+#: C/evolution.xml:2308(title)
 msgid "Setting up GPG Encryption"
 msgstr "Nastavení šifrování pomocí GPG"
 
-#: C/evolution.xml:2116(para)
-#: C/evolution.xml:5630(para)
-#: C/evolution.xml:5646(para)
-#: C/evolution.xml:6061(para)
-msgid "Click Edit &gt; Preferences, then click Mail Accounts."
-msgstr "Klikněte na Upravit &gt; Nastavení a potom na Účty e-mailu."
-
-#: C/evolution.xml:2119(para)
+#: C/evolution.xml:2314(para) C/evolution.xml:2353(para)
 msgid "Select the account you want to use securely, then click Edit."
-msgstr "Vyberte, který účet chcete používat zabezpečeně, a klikněte na Upravit."
+msgstr ""
+"Vyberte, který účet chcete používat zabezpečeně, a klikněte na Upravit."
 
-#: C/evolution.xml:2122(para)
-#: C/evolution.xml:2160(para)
+#: C/evolution.xml:2317(para) C/evolution.xml:2356(para)
 msgid "Click the Security tab."
 msgstr "Klikněte na kartu Zabezpečení."
 
-#: C/evolution.xml:2125(para)
+#: C/evolution.xml:2320(para)
 msgid "Specify your key ID in the PGP/GPG Key ID field."
 msgstr "Zajdete vaše ID klíče do pole ID PGP/GPG klíče."
 
-#: C/evolution.xml:2134(para)
-msgid "Evolution requires that you know your key ID. If you don't remember it, you can find it by typing <command>gpg --list-keys</command> in a console window. Your key ID is an eight-character string with random numbers and letters."
-msgstr "Evolution vyžaduje, aby jste znali ID svého klíče. Pokud si jej nepamatujete, můžete jej najít v konzole po zadání příkazu <command>gpg --list-keys</command>. ID vašeho klíče je osmimístný řetězec s libovolnými číslicemi a písmeny."
+#: C/evolution.xml:2329(para)
+msgid ""
+"Evolution requires that you know your key ID. If you don't remember it, you "
+"can find it by typing <command>gpg --list-keys</command> in a terminal "
+"window. Your key ID is an eight-character string with random numbers and "
+"letters."
+msgstr ""
+"Evolution vyžaduje, aby jste znali ID svého klíče. Pokud si jej "
+"nepamatujete, můžete jej najít v konzole po zadání příkazu <command>gpg --"
+"list-keys</command>. ID vašeho klíče je osmimístný řetězec s libovolnými "
+"číslicemi a písmeny."
 
-#: C/evolution.xml:2138(title)
+#: C/evolution.xml:2333(title)
 msgid "Encrypting Messages"
 msgstr "Šifrování zpráv"
 
-#: C/evolution.xml:2139(para)
+#: C/evolution.xml:2334(para)
 msgid "To encrypt a single message:"
 msgstr "Pro šifrování jedné zprávy:"
 
-#: C/evolution.xml:2142(para)
+#: C/evolution.xml:2337(para)
 msgid "Open a Compose a Message window."
 msgstr "Otevřete okno editoru zprávy."
 
-#: C/evolution.xml:2145(para)
+#: C/evolution.xml:2340(para)
 msgid "Click Security &gt; PGP Encrypt."
 msgstr "Klikněte na Zabezpečení &gt; Šifrování PGP."
 
-#: C/evolution.xml:2148(para)
-msgid "Compose your message, then click Send."
-msgstr "Vytvořte zprávu a potom klikněte na Poslat."
+#: C/evolution.xml:2343(para)
+msgid "Compose your message."
+msgstr "Vytvořte zprávu."
 
-#: C/evolution.xml:2151(para)
-msgid "You can set Evolution to always sign your e-mail messages:"
+#: C/evolution.xml:2347(para)
+msgid "You can set Evolution to always sign your email messages:"
 msgstr "Můžete také Evolution nastavit, aby vždy podepisoval e-mailové zprávy:"
 
-#: C/evolution.xml:2154(para)
-msgid "Click Edit &gt; Preferences, then select Mail Accounts."
-msgstr "Klikněte na Upravit &gt; Nastavení, potom vyberte Účty e-mailu."
-
-#: C/evolution.xml:2157(para)
-msgid "Select the mail account to encrypt, then click Edit."
-msgstr "Vyberte e-mailový účet, který chcete šifrovat a klikněte na Upravit."
-
-#: C/evolution.xml:2163(para)
+#: C/evolution.xml:2359(para)
 msgid "Select Always Sign Outgoing Messages When Using This Account."
 msgstr "Vyberte Vždy podepisovat odchozí zprávy, když se používá tento účet. "
 
-#: C/evolution.xml:2175(title)
+#: C/evolution.xml:2371(title)
 msgid "Unencrypting a Received Message"
 msgstr "Dešifrování přijatých zpráv"
 
-#: C/evolution.xml:2176(para)
-msgid "If you receive an encrypted message, you need to decrypt it before you read it. Remember, the sender must have your public key before they can send you an encrypted message."
-msgstr "Obdržíte-li zašifrovanou zprávu, musíte ji dešifrovat před tím, než ji budete číst. Pamatujte, že odesílatel musí mít váš veřejný klíč před tím, než vám může poslat zašifrovanou zprávu."
-
-#: C/evolution.xml:2177(para)
-msgid "When you view the message, Evolution prompts you for your PGP password. Enter it, and the unencrypted message is displayed."
-msgstr "Když si budete zprávu prohlížet, Evolution vás vyzve, abyste zadali heslo PGP. Vložte jej a dešifrovaná zpráva se zobrazí."
+#: C/evolution.xml:2372(para)
+msgid ""
+"If you receive an encrypted message, you need to decrypt it before you read "
+"it. Remember, the sender must have your public key before they can send you "
+"an encrypted message."
+msgstr ""
+"Obdržíte-li zašifrovanou zprávu, musíte ji dešifrovat před tím, než ji "
+"budete číst. Pamatujte, že odesílatel musí mít váš veřejný klíč před tím, "
+"než vám může poslat zašifrovanou zprávu."
 
-#: C/evolution.xml:2182(para)
-msgid "S/MIME encryption also uses a key-based approach, but it has some significant advantages in convenience and security. S/MIME uses certificates, which are similar to keys. The public portion of each certificate is held by the sender of a message and by one of several certificate authorities, who are paid to guarantee the identity of the sender and the security of the message. Evolution already recognizes a large number of certificate authorities, so when you get a message with an S/MIME certificate, your system automatically receives the public portion of the certificate and decrypts or verifies the message."
-msgstr "Šifrování pomocí S/MIME také využívá přístup založený na klíčích, ale má některé významné výhody v pohodlnosti a bezpečnosti. S/MIME používá certifikáty, které jsou podobné klíčům. Veřejná část každého certifikátu je držená odesílatelem zprávy a jednou z několika certifikačních autorit, které jsou placeny za to, že garantují identitu odesílatele a zabezpečení zprávy. Evolution už rozezná velké množství certifikačních autorit, takže, když dostanete zprávu s certifikátem S/MIME, váš systém automaticky obdrží veřejnou část certifikátu a dešifruje nebo ověří zprávu."
+#: C/evolution.xml:2373(para)
+msgid ""
+"When you view the message, Evolution prompts you for your PGP password. "
+"Enter it, and the unencrypted message is displayed."
+msgstr ""
+"Když si budete zprávu prohlížet, Evolution vás vyzve, abyste zadali heslo "
+"PGP. Vložte jej a dešifrovaná zpráva se zobrazí."
 
-#: C/evolution.xml:2183(para)
-msgid "S/MIME is used most often in corporate settings. In these cases, administrators supply certificates that they have purchased from a certificate authority. In some cases, an organization can act as its own certificate authority, with or without a guarantee from a dedicated authority such as VeriSign* or Thawte*. In either case, the system administrator provides you with a certificate file."
-msgstr "S/MIME je nejčastěji používáno v korporátním nasazení. V těchto případech administrátoři poskytují certifikáty, které obdrželi od certifikační autority. V některých případech může organizace vystupovat jako svoje vlastní certifikační autorita s nebo bez garance vyhrazené autority jako jsou VeriSign* nebo Thawte*. V obou případech vás systémoví administrátoři vybaví souborem certifikátu."
+#: C/evolution.xml:2378(para)
+msgid ""
+"S/MIME encryption also uses a key-based approach, but it has some "
+"significant advantages in convenience and security. S/MIME uses "
+"certificates, which are similar to keys. The public portion of each "
+"certificate is held by the sender of a message and by one of several "
+"certificate authorities, who are paid to guarantee the identity of the "
+"sender and the security of the message. Evolution already recognizes a large "
+"number of certificate authorities, so when you get a message with an S/MIME "
+"certificate, your system automatically receives the public portion of the "
+"certificate and decrypts or verifies the message."
+msgstr ""
+"Šifrování pomocí S/MIME také využívá přístup založený na klíčích, ale má "
+"některé významné výhody v pohodlnosti a bezpečnosti. S/MIME používá "
+"certifikáty, které jsou podobné klíčům. Veřejná část každého certifikátu je "
+"držená odesílatelem zprávy a jednou z několika certifikačních autorit, které "
+"jsou placeny za to, že garantují identitu odesílatele a zabezpečení zprávy. "
+"Evolution už rozezná velké množství certifikačních autorit, takže, když "
+"dostanete zprávu s certifikátem S/MIME, váš systém automaticky obdrží "
+"veřejnou část certifikátu a dešifruje nebo ověří zprávu."
 
-#: C/evolution.xml:2184(para)
-msgid "If you want to use S/MIME independently, you can extract an identification certificate from your Mozilla* or Netscape* Web browser. See the Mozilla help <ulink url=\"http://www.mozilla.org/projects/security/pki/psm/help_21/using_certs_help.html\">Mozilla Help</ulink>for more information on security certificates."
-msgstr "Chcete-li používat S/MIME nezávisle, můžete vyjmout identifikační certifikát z vašeho prohlížeče Mozilla* nebo Netscape*. Více informací o bezpečnostních certifikátech naleznete v <ulink url=\"http://www.mozilla.org/projects/security/pki/psm/help_21/using_certs_help.html\">Nápovědě Mozilly</ulink>"
+#: C/evolution.xml:2379(para)
+msgid ""
+"S/MIME is used most often in corporate settings. In these cases, "
+"administrators supply certificates that they have purchased from a "
+"certificate authority. In some cases, an organization can act as its own "
+"certificate authority, with or without a guarantee from a dedicated "
+"authority such as VeriSign* or Thawte*. In either case, the system "
+"administrator provides you with a certificate file."
+msgstr ""
+"S/MIME je nejčastěji používáno v korporátním nasazení. V těchto případech "
+"administrátoři poskytují certifikáty, které obdrželi od certifikační "
+"autority. V některých případech může organizace vystupovat jako svoje "
+"vlastní certifikační autorita s nebo bez garance vyhrazené autority jako "
+"jsou VeriSign* nebo Thawte*. V obou případech vás systémoví administrátoři "
+"vybaví souborem certifikátu."
+
+#: C/evolution.xml:2380(para)
+msgid ""
+"If you want to use S/MIME independently, you can extract an identification "
+"certificate from your Mozilla* or Netscape* Web browser. See the <ulink url="
+"\"http://www.mozilla.org/projects/security/pki/psm/help_21/using_certs_help."
+"html\">Mozilla Help</ulink>for more information on security certificates."
+msgstr ""
+"Chcete-li používat S/MIME nezávisle, můžete vyjmout identifikační certifikát "
+"z vašeho prohlížeče Mozilla* nebo Netscape*. Více informací o bezpečnostních "
+"certifikátech naleznete v <ulink url=\"http://www.mozilla.org/projects/"
+"security/pki/psm/help_21/using_certs_help.html\">Nápovědě Mozilly</ulink>"
 
-#: C/evolution.xml:2185(para)
+#: C/evolution.xml:2381(para)
 msgid "The certificate file is a password-protected file on your computer."
 msgstr "Soubor certifikátu je soubor ve vašem počítači chráněný heslem."
 
-#: C/evolution.xml:2188(title)
+#: C/evolution.xml:2384(title)
 msgid "Adding a Signing Certificate"
 msgstr "Přidání podpisového certifikátu"
 
-#: C/evolution.xml:2191(para)
-msgid "Click Edit &gt; Preferences, then click Certificate."
-msgstr "Klikněte na Upravit &gt; Nastavení, potom klikněte na Certifikáty."
+#: C/evolution.xml:2390(para)
+msgid "Click Certificates."
+msgstr "Klikněte na Certifikáty."
 
-#: C/evolution.xml:2194(para)
-#: C/evolution.xml:2314(para)
+#: C/evolution.xml:2393(para) C/evolution.xml:2516(para)
 msgid "Click Import."
 msgstr "Klikněte na Importovat."
 
-#: C/evolution.xml:2197(para)
+#: C/evolution.xml:2396(para)
 msgid "Select the file to import, then click Open."
 msgstr "Vyberte soubor, který chcete importovat, potom klikněte na Otevřít."
 
-#: C/evolution.xml:2203(para)
-msgid "Similarly, you can add certificates that are sent to you independently of any authority by clicking the Contact Certificates tab and using the same Import tool. You can also add new certificate authorities, which have their own certificate files, in the same way."
-msgstr "Podobně můžete přidat všechny certifikáty, které vám byly poslány nezávisle na autoritě, kliknutím na kartu Certifikáty kontaktů a použitím stejného importovacího nástroje. Můžete také stejným způsobem přidat nové certifikační autority, které mají svoje vlastní soubory certifikátů."
+#: C/evolution.xml:2402(para)
+msgid ""
+"Similarly, you can add certificates that are sent to you independently of "
+"any authority by clicking the Contact Certificates tab and using the same "
+"Import tool. You can also add new certificate authorities, which have their "
+"own certificate files, in the same way."
+msgstr ""
+"Podobně můžete přidat všechny certifikáty, které vám byly poslány nezávisle "
+"na autoritě, kliknutím na kartu Certifikáty kontaktů a použitím stejného "
+"importovacího nástroje. Můžete také stejným způsobem přidat nové "
+"certifikační autority, které mají svoje vlastní soubory certifikátů."
 
-#: C/evolution.xml:2207(title)
+#: C/evolution.xml:2406(title)
 msgid "Signing or Encrypting Every Message"
 msgstr "Podepisování nebo šifrování všech zpráv"
 
-#: C/evolution.xml:2208(para)
-msgid "After you have added your certificate, you can sign or encrypt a message by clicking Security &gt; S/MIME Sign or S/MIME Encrypt in the message composer."
-msgstr "Poté, co jste přidali svůj certifikát, můžete podepisovat nebo šifrovat zprávy kliknutím v editoru zpráv na Zabezpečení &gt; Podpis S/MIME nebo Šifrování S/MIME."
+#: C/evolution.xml:2407(para)
+msgid ""
+"After you have added your certificate, you can sign or encrypt a message by "
+"clicking Security &gt; S/MIME Sign or S/MIME Encrypt in the message composer."
+msgstr ""
+"Poté, co jste přidali svůj certifikát, můžete podepisovat nebo šifrovat "
+"zprávy kliknutím v editoru zpráv na Zabezpečení &gt; Podpis S/MIME nebo "
+"Šifrování S/MIME."
 
-#: C/evolution.xml:2209(para)
+#: C/evolution.xml:2408(para)
 msgid "To have every message signed or encrypted:"
 msgstr "Chcete-li mít podepsanou nebo zašifrovanou každou zprávu:"
 
-#: C/evolution.xml:2212(para)
-msgid "Click Edit &gt; Preferences, then select the account to encrypt the messages in."
-msgstr "Klikněte na Upravit &gt; Nastavení, potom vyberte účet, v kterém chcete šifrovat zprávy."
+#: C/evolution.xml:2414(para)
+msgid "Select the account to encrypt the messages in."
+msgstr "Vyberte e-mailový účet, který chcete šifrovat."
 
-#: C/evolution.xml:2215(para)
+#: C/evolution.xml:2417(para)
 msgid "Click Edit, then click Security."
 msgstr "Klikněte na Upravit a potom na Zabezpečení."
 
-#: C/evolution.xml:2218(para)
-msgid "Click Select next to Signing Certificate and specify the path to your signing certificate."
-msgstr "Klikněte na Vybrat vedle Podpisového certifikátu a zadejte cestu k vašemu podpisovému certifikátu."
+#: C/evolution.xml:2420(para)
+msgid ""
+"Click Select next to Signing Certificate and specify the path to your "
+"signing certificate."
+msgstr ""
+"Klikněte na Vybrat vedle Podpisového certifikátu a zadejte cestu k vašemu "
+"podpisovému certifikátu."
 
-#: C/evolution.xml:2220(para)
-msgid "Click Select next to Encryption Certificate and specify the path to your encryption certificate."
-msgstr "Klikněte na Vybrat vedle Šifrovacího certifikátu a zadejte cestu k vašemu šifrovacímu certifikátu."
+#: C/evolution.xml:2422(para)
+msgid ""
+"Click Select next to Encryption Certificate and specify the path to your "
+"encryption certificate."
+msgstr ""
+"Klikněte na Vybrat vedle Šifrovacího certifikátu a zadejte cestu k vašemu "
+"šifrovacímu certifikátu."
 
-#: C/evolution.xml:2223(para)
+#: C/evolution.xml:2425(para)
 msgid "Select the appropriate options."
 msgstr "Vyberte příslušné volby."
 
-#: C/evolution.xml:2239(para)
-msgid "Whether you only get a few e-mail messages a day, or you receive hundreds, you probably want to sort and organize them. <trademark>Evolution</trademark> has the tools to help you do it."
-msgstr "Jestli dostanete jen pár e-mailových zpráv denně, nebo obdržíte stovky, pravděpodobně je chcete třídit a organizovat. <trademark>Evolution</trademark> má nástroje, které vám s tím pomůžou."
+#: C/evolution.xml:2441(para)
+msgid ""
+"Whether you only get a few email messages a day, or you receive hundreds, "
+"you probably want to sort and organize them. <trademark>Evolution</"
+"trademark> has the tools to help you do it."
+msgstr ""
+"Jestli dostanete jen pár e-mailových zpráv denně, nebo obdržíte stovky, "
+"pravděpodobně je chcete třídit a organizovat. <trademark>Evolution</"
+"trademark> má nástroje, které vám s tím pomůžou."
 
-#: C/evolution.xml:2242(link)
-#: C/evolution.xml:2265(title)
-msgid "Importing Your Old E-Mail"
+#: C/evolution.xml:2444(link) C/evolution.xml:2467(title)
+msgid "Importing Your Old Email"
 msgstr "Import vaší staré pošty"
 
-#: C/evolution.xml:2245(link)
-#: C/evolution.xml:2354(title)
+#: C/evolution.xml:2447(link) C/evolution.xml:2557(title)
 msgid "Sorting the Message List"
 msgstr "Řazení seznamu zpráv"
 
-#: C/evolution.xml:2248(link)
-#: C/evolution.xml:2525(title)
+#: C/evolution.xml:2450(link) C/evolution.xml:2728(title)
 msgid "Getting Organized with Folders"
 msgstr "Organizace pomocí složek"
 
-#: C/evolution.xml:2251(link)
-#: C/evolution.xml:2540(title)
+#: C/evolution.xml:2453(link) C/evolution.xml:2743(title)
 msgid "Searching for Messages"
 msgstr "Vyhledávání zpráv"
 
-#: C/evolution.xml:2254(link)
-#: C/evolution.xml:2744(title)
+#: C/evolution.xml:2456(link) C/evolution.xml:2947(title)
 msgid "Create Rules to Automatically Organize Mail"
 msgstr "Tvorba pravidel pro automatickou organizaci pošty"
 
-#: C/evolution.xml:2257(link)
-#: C/evolution.xml:2983(title)
+#: C/evolution.xml:2459(link) C/evolution.xml:3186(title)
 msgid "Using Search Folders"
 msgstr "Používaní složek hledání"
 
-#: C/evolution.xml:2260(link)
-#: C/evolution.xml:3116(title)
+#: C/evolution.xml:2462(link) C/evolution.xml:3319(title)
 msgid "Stopping Junk Mail (Spam)"
 msgstr "Zastavení nevyžádáné pošty (spamu)"
 
-#: C/evolution.xml:2266(para)
-msgid "Evolution allows you to import old e-mail and contacts so that you don't need to worry about losing your old information."
-msgstr "Evolution vám umožňuje importovat starou poštu a kontakty, abyste se nemuseli bát ztráty starých informací."
+#: C/evolution.xml:2468(para)
+msgid ""
+"Evolution allows you to import old email and contacts so that you don't need "
+"to worry about losing your old information."
+msgstr ""
+"Evolution vám umožňuje importovat starou poštu a kontakty, abyste se "
+"nemuseli bát ztráty starých informací."
 
-#: C/evolution.xml:2269(title)
+#: C/evolution.xml:2471(title)
 msgid "Importing Single Files"
 msgstr "Import jednotlivých souborů"
 
-#: C/evolution.xml:2270(para)
+#: C/evolution.xml:2472(para)
 msgid "Evolution can import the following types of files:"
 msgstr "Evolution umí importovat následující typy souborů:"
 
-#: C/evolution.xml:2272(title)
+#: C/evolution.xml:2474(title)
 msgid "vCard (.vcf, .gcrd):"
 msgstr "vCard (.vcf, .gcrd):"
 
-#: C/evolution.xml:2273(para)
-msgid "The address book format used by the GNOME, KDE, and many other contact management applications. You should be able to export to vCard format from any address book application."
-msgstr "Formát adresáře používaný GNOME, KDE a jinými aplikacemi pro správu kontaktů. Měli byste být schopní exportovat formát vCard z jakékoliv aplikace adresáře."
+#: C/evolution.xml:2475(para)
+msgid ""
+"The address book format used by the GNOME, KDE, and many other contact "
+"management applications. You should be able to export to vCard format from "
+"any address book application."
+msgstr ""
+"Formát adresáře používaný GNOME, KDE a jinými aplikacemi pro správu "
+"kontaktů. Měli byste být schopní exportovat formát vCard z jakékoliv "
+"aplikace adresáře."
 
-#: C/evolution.xml:2276(title)
-msgid "vCalender:"
-msgstr "vCalender:"
+#: C/evolution.xml:2478(title)
+msgid "vCalendar:"
+msgstr "vCalendar:"
 
-#: C/evolution.xml:2277(para)
-msgid "A format for storing calender files, which is generally used by Evolution, Microsoft Outlook, Sunbird, and Korganizer."
-msgstr "Formát pro uchovávání souborů kalendáře, který je obecně používán Evolutionem, Microsoft Outlookem, Sunbirdem a Korganizerem."
+#: C/evolution.xml:2479(para)
+msgid ""
+"A format for storing calender files, which is generally used by Evolution, "
+"Microsoft Outlook, Sunbird, and Korganizer."
+msgstr ""
+"Formát pro uchovávání souborů kalendáře, který je obecně používán "
+"Evolutionem, Microsoft Outlookem, Sunbirdem a Korganizerem."
 
-#: C/evolution.xml:2280(title)
+#: C/evolution.xml:2482(title)
 msgid "iCalendar or iCal (.ics):"
 msgstr "iCalendar nebo iCal (.ics):"
 
-#: C/evolution.xml:2281(para)
-msgid "A format for storing calendar files. iCalendar is used by Palm OS handhelds, Evolution, and Microsoft Outlook."
-msgstr "Formát pro uchovávání souborů kalendáře. iCalendar je používán zařízeními s PalmOS, Evolutionem a Microsoft Outlookem."
+#: C/evolution.xml:2483(para)
+msgid ""
+"A format for storing calendar files. iCalendar is used by Palm OS handhelds, "
+"Evolution, and Microsoft Outlook."
+msgstr ""
+"Formát pro uchovávání souborů kalendáře. iCalendar je používán zařízeními s "
+"PalmOS, Evolutionem a Microsoft Outlookem."
 
-#: C/evolution.xml:2284(title)
+#: C/evolution.xml:2486(title)
 msgid "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):"
 msgstr "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):"
 
-#: C/evolution.xml:2285(para)
-msgid "CSV or Tab files saved using Evolution, Microsoft Outlook and Mozilla."
-msgstr "Soubory CSV nebo Tab ukládají používání Evolutionu, Microsoft Outlooku a Mozilly."
+#: C/evolution.xml:2487(para)
+msgid ""
+"CSV or Tab files saved by using Evolution, Microsoft Outlook and Mozilla."
+msgstr ""
+"Soubory CSV nebo Tab uložené používáním Evolutionu, Microsoft Outlooku a "
+"Mozilly."
 
-#: C/evolution.xml:2288(title)
+#: C/evolution.xml:2490(title)
 msgid "Microsoft Outlook Express 4 (.mbx):"
 msgstr "Microsoft Outlook Express 4 (.mbx):"
 
-#: C/evolution.xml:2289(para)
-msgid "The e-mail file format used by Microsoft Outlook Express 4. For other versions of Microsoft Outlook and Outlook Express, see the workaround described in <link linkend=\"bsawgkk\">Step 1</link>."
-msgstr "Formát e-mailového souboru používaný Microsoft Outlook Express 4. Pro ostatní verze Microsoft Outlooku a Outlooku Express najdete řešení popsané v <link linkend=\"bsawgkk\">Kroku 1</link>."
+#: C/evolution.xml:2491(para)
+msgid ""
+"The email file format used by Microsoft Outlook Express 4. For other "
+"versions of Microsoft Outlook and Outlook Express, see the workaround "
+"described in <link linkend=\"bsawgkk\">Step 1</link>."
+msgstr ""
+"Formát e-mailového souboru používaný Microsoft Outlook Express 4. Pro "
+"ostatní verze Microsoft Outlooku a Outlooku Express najdete řešení popsané v "
+"<link linkend=\"bsawgkk\">Kroku 1</link>."
 
-#: C/evolution.xml:2292(title)
+#: C/evolution.xml:2494(title)
 msgid "LDAP Data Interchange Format (.LDIF):"
 msgstr "LDAP Data Interchange Format (.LDIF):"
 
-#: C/evolution.xml:2293(para)
+#: C/evolution.xml:2495(para)
 msgid "A standard data format for contact cards."
 msgstr "Standardní datový formát pro karty kontaktů."
 
-#: C/evolution.xml:2296(title)
+#: C/evolution.xml:2498(title)
 msgid "Berkley Mailbox (.mbox or null extension):"
 msgstr "Berkley Mailbox (.mbox or null extension):"
 
-#: C/evolution.xml:2297(para)
-msgid "The e-mail format used by Mozilla, Netscape, Evolution, Eudora*, and many other e-mail clients."
-msgstr "E-mailový formát používaný Mozillou, Netscapem, Evolutionem, Eudorou* a mnoha dalšími e-mailovými klienty."
+#: C/evolution.xml:2499(para)
+msgid ""
+"The email format used by Mozilla, Netscape, Evolution, Eudora*, and many "
+"other email clients."
+msgstr ""
+"E-mailový formát používaný Mozillou, Netscapem, Evolutionem, Eudorou* a "
+"mnoha dalšími e-mailovými klienty."
 
-#: C/evolution.xml:2299(para)
-msgid "To import your old e-mail:"
+#: C/evolution.xml:2501(para)
+msgid "To import your old email:"
 msgstr "Pro importování vaší staré pošty:"
 
-#: C/evolution.xml:2302(para)
-#: C/evolution.xml:2324(para)
-#: C/evolution.xml:3428(para)
+#: C/evolution.xml:2504(para) C/evolution.xml:2526(para)
+#: C/evolution.xml:3686(para)
 msgid "Click File &gt; Import."
 msgstr "Klikněte na Soubor &gt; Importovat."
 
-#: C/evolution.xml:2308(para)
+#: C/evolution.xml:2510(para)
 msgid "Select Import a Single File, then click Forward."
 msgstr "Vyberte Importovat jeden soubory a klikněte na Vpřed."
 
-#: C/evolution.xml:2311(para)
+#: C/evolution.xml:2513(para)
 msgid "Select the file to import, then click Forward."
 msgstr "Vyberte soubor, který chcete importovat, a klikněte na Vpřed."
 
-#: C/evolution.xml:2320(title)
+#: C/evolution.xml:2522(title)
 msgid "Importing Multiple Files"
 msgstr "Import více souborů"
 
-#: C/evolution.xml:2321(para)
-msgid "Evolution automates the import process for several applications it can recognize."
-msgstr "Evolution automatizuje proces importu pro několik aplikací, které rozezná."
-
-#: C/evolution.xml:2330(para)
-msgid "Select Import Data and Settings From Older Programs, then click Forward."
-msgstr "Vyberte Importovat data a nastavení ze starších programů a klikněte na Vpřed."
+#: C/evolution.xml:2523(para)
+msgid ""
+"Evolution automates the import process for several applications it can "
+"recognize."
+msgstr ""
+"Evolution automatizuje proces importu pro několik aplikací, které rozezná."
 
-#: C/evolution.xml:2331(para)
-msgid "Follow the steps <link linkend=\"bsawely\">Step 3</link> through <link linkend=\"bsawf2t\">Step 5</link> to import."
-msgstr "Pro importování následujte kroky od <link linkend=\"bsawely\">Kroku 3</link> až po <link linkend=\"bsawf2t\">Krok 5</link>."
+#: C/evolution.xml:2532(para)
+msgid ""
+"Select Import Data and Settings From Older Programs, then click Forward."
+msgstr ""
+"Vyberte Importovat data a nastavení ze starších programů a klikněte na Vpřed."
 
-#: C/evolution.xml:2332(para)
-msgid "Evolution searches for old mail programs and, if possible, imports the data from them."
-msgstr "Evolution hledá staré poštovní programy a, pokud je to možné, importuje z nich data."
+#: C/evolution.xml:2533(para)
+msgid ""
+"Follow the steps <link linkend=\"bsawely\">Step 3</link> through <link "
+"linkend=\"bsawf2t\">Step 5</link> to import."
+msgstr ""
+"Pro importování následujte kroky od <link linkend=\"bsawely\">Kroku 3</link> "
+"až po <link linkend=\"bsawf2t\">Krok 5</link>."
 
-#: C/evolution.xml:2336(para)
-msgid "Microsoft Outlook and versions of Outlook Express after version 4 use proprietary formats that Evolution cannot read or import. One migration method that works well is to use the Outport application. See <ulink url=\"http://outport.sourceforge.net\">outport.sourceforge.net</ulink> for additional information. You can also import data into another Windows mail client such as Mozilla."
-msgstr "Microsoft Outlook a verze Outlooku Express starší než 4 používají proprietární formáty, které Evolution nemůže přečíst a importovat. Jednou z metod migrace, která dobře funguje, je použít aplikaci Outport. Více informací najdete v <ulink url=\"http://outport.sourceforge.net\">outport.sourceforge.net</ulink>. Můžete také importovat data z jiného poštovního klienta pro Windows, např. Mozilly."
+#: C/evolution.xml:2534(para)
+msgid ""
+"Evolution searches for old mail programs and, if possible, imports the data "
+"from them."
+msgstr ""
+"Evolution hledá staré poštovní programy a, pokud je to možné, importuje z "
+"nich data."
 
-#: C/evolution.xml:2339(para)
-msgid "While in Windows, import your .pst files into Mozilla Mail (or another mail program such as Netscape or Eudora that uses the standard mbox format)."
-msgstr "Ve Windows importujte vaše soubory .pst do Mozilla Mail (nebo jiného poštovního programu jako je Netscape nebo Eudora, který používá formát mbox)."
+#: C/evolution.xml:2539(para)
+msgid ""
+"One migration method that works well is to use the Outport application. See "
+"<ulink url=\"http://outport.sourceforge.net\">outport.sourceforge.net</"
+"ulink> for additional information. You can also import data into another "
+"Windows mail client such as Mozilla."
+msgstr ""
+"Jednou z metod migrace, která dobře funguje, je použít aplikaci Outport. "
+"Více informací najdete v <ulink url=\"http://outport.sourceforge.net"
+"\">outport.sourceforge.net</ulink>. Můžete také importovat data z jiného "
+"poštovního klienta pro Windows, např. Mozilly."
 
-#: C/evolution.xml:2340(para)
-msgid "Mozilla and Netscape users need to click File &gt; Compact &gt; All Folders from within the Netscape or Mozilla mail tool. Otherwise, Evolution imports and undeletes the messages in your Trash folders."
-msgstr "Uživatelé Mozilly a Netscape musí kliknout na Soubor &gt; Provést údržbu služeb &gt; Všechny složky v poštovním nástroji Netscapu a Mozilly. Jinak Evolution importuje a obnoví všechny zprávy ze složky Koš."
+#: C/evolution.xml:2542(para)
+msgid ""
+"While in Windows, import your .pst files into Mozilla Mail (or another mail "
+"program such as Netscape or Eudora that uses the standard mbox format)."
+msgstr ""
+"Ve Windows importujte vaše soubory .pst do Mozilla Mail (nebo jiného "
+"poštovního programu jako je Netscape nebo Eudora, který používá formát mbox)."
 
-#: C/evolution.xml:2343(para)
-msgid "Copy the files to the system or partition that Evolution is installed on."
-msgstr "Zkopírujte soubory do systému nebo oddílu, kde je Evolution nainstalovaný."
+#: C/evolution.xml:2546(para)
+msgid ""
+"Copy the files to the system or partition that Evolution is installed on."
+msgstr ""
+"Zkopírujte soubory do systému nebo oddílu, kde je Evolution nainstalovaný."
 
-#: C/evolution.xml:2346(para)
+#: C/evolution.xml:2549(para)
 msgid "Use the Evolution import tool to import the files."
 msgstr "Pro importování souborů použijte nástroj Evolution pro import."
 
-#: C/evolution.xml:2349(para)
-msgid "For POP mail, filters are applied as messages are downloaded. For IMAP mail, filters are applied to new messages when you open the Inbox folder. On Exchange servers, filters are not applied until you select your Inbox folder and click Message &gt; Apply Filters, or press Ctrl+Y. To force your filters to act on all messages in the folder, select the entire folder by pressing Ctrl+A, then apply the filters by pressing Ctrl+Y."
-msgstr "Pro POP jsou filtry použity, jak jsou zprávy stahovány. Pro IMAP jsou filtry použity, když otevřete složku Příchozí. Na serverech Exchange nejsou filtry použity, dokud nevyberete vaši složku Příchozí a nekliknete na Zpráva &gt; Použít filtry nebo nestisknete Ctrl+Y. Chcete-li filtry přinutit, aby zapůsobily na všechny zprávy ve složce, vyberte celou složku stisknutím Ctrl+A a potom použijte filtry stisknutím Ctrl+Y."
-
-#: C/evolution.xml:2355(para)
-msgid "Evolution helps you work by letting you sort your e-mail. To sort by sender, subject, or date, click the bars with those labels at the top of the message list. The direction of the arrow next to the label indicates the direction of the sort. Click again, to sort them in reverse order. For example, click Date to sort messages by date from oldest to newest. Click again, and Evolution sorts the list from newest to oldest. You can also right-click the message header bars to get a set of sorting options, and to add to or remove columns from the message list."
-msgstr "Evolution vám pomáhá pracovat tak, že vám umožňuje seřadit vaši poštu. Pro seřazení podle odesílatele, předmětu nebo data klikněte na lištu s těmito popisy navrchu seznamu zpráv. Směr šipky vedle popisu ukazuje směr seřazení. Klikněte znovu a seřadíte je opačným směrem. Např. klikněte na Datum pro seřazení podle data od nejnovější po nejstarší. Můžete také kliknout pravým tlačítkem na lištu a získáte možnosti řazení a můžete přidat nebo odstranit sloupce ze seznamu zpráv."
+#: C/evolution.xml:2552(para)
+msgid ""
+"For POP mail, filters are applied as messages are downloaded. For IMAP mail, "
+"filters are applied to new messages when you open the Inbox folder. On "
+"Exchange servers, filters are not applied until you select your Inbox folder "
+"and click Message &gt; Apply Filters, or press Ctrl+Y. To force your filters "
+"to act on all messages in the folder, select the entire folder by pressing "
+"Ctrl+A, then apply the filters by pressing Ctrl+Y."
+msgstr ""
+"Pro POP jsou filtry použity, jak jsou zprávy stahovány. Pro IMAP jsou filtry "
+"použity, když otevřete složku Příchozí. Na serverech Exchange nejsou filtry "
+"použity, dokud nevyberete vaši složku Příchozí a nekliknete na Zpráva &gt; "
+"Použít filtry nebo nestisknete Ctrl+Y. Chcete-li filtry přinutit, aby "
+"zapůsobily na všechny zprávy ve složce, vyberte celou složku stisknutím Ctrl"
+"+A a potom použijte filtry stisknutím Ctrl+Y."
 
-#: C/evolution.xml:2356(para)
-msgid "To look at the complete headers for a message, click View &gt; Message Display &gt; Show Full Headers. To see all message data, click View &gt; Message Display &gt; Show E-Mail Source."
-msgstr "Chcete-li se podívat na všechny hlavičky zprávy, klikněte Zobrazit &gt; Všechny hlavičky zprávy. Chcete-li vidět všechna data zprávy, klikněte na Zobrazit &gt; Zdroj zprávy."
+#: C/evolution.xml:2558(para)
+msgid ""
+"Evolution helps you work by letting you sort your email. To sort by sender, "
+"subject, or date, click the bars with those labels at the top of the message "
+"list. The direction of the arrow next to the label indicates the direction "
+"of the sort. Click again, to sort them in reverse order. For example, click "
+"Date to sort messages by date from oldest to newest. Click again, and "
+"Evolution sorts the list from newest to oldest. You can also right-click the "
+"message header bars to get a set of sorting options, and to add to or remove "
+"columns from the message list."
+msgstr ""
+"Evolution vám pomáhá pracovat tak, že vám umožňuje seřadit vaši poštu. Pro "
+"seřazení podle odesílatele, předmětu nebo data klikněte na lištu s těmito "
+"popisy navrchu seznamu zpráv. Směr šipky vedle popisu ukazuje směr seřazení. "
+"Klikněte znovu a seřadíte je opačným směrem. Např. klikněte na Datum pro "
+"seřazení podle data od nejnovější po nejstarší. Můžete také kliknout pravým "
+"tlačítkem na lištu a získáte možnosti řazení a můžete přidat nebo odstranit "
+"sloupce ze seznamu zpráv."
+
+#: C/evolution.xml:2559(para)
+msgid ""
+"To look at the complete headers for a message, click View &gt; All Message "
+"Headers. To see all message data, click View &gt; Message Source."
+msgstr ""
+"Chcete-li se podívat na všechny hlavičky zprávy, klikněte Zobrazit &gt; "
+"Všechny hlavičky zprávy. Chcete-li vidět všechna data zprávy, klikněte na "
+"Zobrazit &gt; Zdroj zprávy."
 
-#: C/evolution.xml:2359(title)
-msgid "Sorting Mail In E-mail Threads"
+#: C/evolution.xml:2562(title)
+msgid "Sorting Mail In Email Threads"
 msgstr "Řazení pošty ve vláknech"
 
-#: C/evolution.xml:2360(para)
-msgid "You can also choose a threaded message view. Click View &gt; Threaded Message List to turn the threaded view on or off. When you select this option, Evolution groups the replies to a message with the original, so you can follow the thread of a conversation from one message to the next."
-msgstr "Můžete také vybrat zobrazení zpráv ve vláknech. Klikněte na Zobrazit &gt; Seznam zpráv dle vláken pro zapnutí nebo vypnutí zobrazení s vlákny. Když vyberete tuto možnost, Evolution seskupí odpovědi k původní zprávě, takže můžete sledovat vlákno konverzace od jedné zprávy k další."
-
-#: C/evolution.xml:2362(para)
-msgid "In a thread of conversation view, each new message is stacked below of the ones that arrived before it, so that the newest message is always the one you see first. Whenever a new message arrives to an old thread as a reply, you will see it below the parent message. You always see the thread based on the date of the recent message received. The threads are sorted by the date of most recent message in the threads."
-msgstr "Při zobrazení vláken koverzace je každá nová zpráva umístěna pod tou, která dorazila před ní, tak, že nejnovější zpráva je vždy tak, kterou vidíte první. Kdykoliv dorazí nová zpráva do starého vlákna jako odpověď, uvidíte ji pod původní zprávou. Vždy uvidíte vlákna založená na datu, kdy jste obdrželi poslední zprávu. Vlákna jsou seřazena podle data podle poslední zprávy ve vlákně."
+#: C/evolution.xml:2563(para)
+msgid ""
+"You can also choose a threaded message view. Click View &gt; Group By "
+"Threads to turn the threaded view on or off. When you select this option, "
+"Evolution groups the replies to a message with the original, so you can "
+"follow the thread of a conversation from one message to the next."
+msgstr ""
+"Můžete také vybrat zobrazení zpráv ve vláknech. Klikněte na Zobrazit &gt; "
+"Seznam zpráv dle vláken, chcete-li zapnout nebo vypnout zobrazení s vlákny. "
+"Když vyberete tuto možnost, Evolution seskupí odpovědi k původní zprávě, "
+"takže můžete sledovat vlákno konverzace od jedné zprávy k další."
 
-#: C/evolution.xml:2364(para)
-msgid "There is a gconf key to toggle between the collapsed or expanded state of mail thread. By default, it is collapsed and you can change this at /apps/evolution/mail/display/thread_expand. If the value is set to false, expanded state is remembered. When you restart Evolution, all the threads are arranged to this state. This is a highly advanced option only for the advanced users."
-msgstr "Existuje zkratka v gconf, která přepíná mezi sbaleným a rozbaleným stavem vlákna. Implicitně je sbalený a můžete jej změnit v /apps/evolution/mail/display/thread_expand. Pokud je hodnota nastavená na false, rozbalený stav bude zapamatován. Když restartujete Evolution, všechny vlákna se uspořádají podle tohoto stavu. Toto je hodně pokročilá volba pouze pro pokročilé uživatele."
+#: C/evolution.xml:2565(para)
+msgid ""
+"In a thread of conversation view, each new message is stacked below of the "
+"ones that arrived before it, so that the newest message is always the one "
+"you see first. Whenever a new message arrives to an old thread as a reply, "
+"you will see it below the parent message. You always see the thread based on "
+"the date of the recent message received. The threads are sorted by the date "
+"of most recent message in the threads."
+msgstr ""
+"Při zobrazení vláken koverzace je každá nová zpráva umístěna pod tou, která "
+"dorazila před ní, tak, že nejnovější zpráva je vždy tak, kterou vidíte "
+"první. Kdykoliv dorazí nová zpráva do starého vlákna jako odpověď, uvidíte "
+"ji pod původní zprávou. Vždy uvidíte vlákna založená na datu, kdy jste "
+"obdrželi poslední zprávu. Vlákna jsou seřazena podle data podle poslední "
+"zprávy ve vlákně."
 
-#: C/evolution.xml:2369(title)
+#: C/evolution.xml:2567(para)
+msgid ""
+"There is a gconf key to toggle between the collapsed or expanded state of "
+"mail thread. By default, it is collapsed and you can change this at /apps/"
+"evolution/mail/display/thread_expand. If the value is set to false, expanded "
+"state is remembered. When you restart Evolution, all the threads are "
+"arranged to this state. This is a highly advanced option only for the "
+"advanced users."
+msgstr ""
+"Existuje zkratka v gconf, která přepíná mezi sbaleným a rozbaleným stavem "
+"vlákna. Implicitně je sbalený a můžete jej změnit v /apps/evolution/mail/"
+"display/thread_expand. Pokud je hodnota nastavená na false, rozbalený stav "
+"bude zapamatován. Když restartujete Evolution, všechny vlákna se uspořádají "
+"podle tohoto stavu. Toto je hodně pokročilá volba pouze pro pokročilé "
+"uživatele."
+
+#: C/evolution.xml:2572(title)
 msgid "Sorting Mail with Column Headers"
 msgstr "Řazení pošty podle sloupců"
 
-#: C/evolution.xml:2370(para)
-msgid "The message list normally has columns to indicate whether a message has been read, whether it has attachments, how important it is, and the sender, date, and subject. You can change the column order, or add and remove columns by dragging and dropping them."
-msgstr "Seznam zpráv má sloupce, které ukazují, zda byla zpráva přečtena, zda má přílohu, jak důležitá je, jaký je odesílatel, datum a předmět. Můžete změnit pořadí sloupců nebo přidat a odebrat sloupce táhnutím a puštěním. "
+#: C/evolution.xml:2573(para)
+msgid ""
+"The message list normally has columns to indicate whether a message has been "
+"read, whether it has attachments, how important it is, and the sender, date, "
+"and subject. You can change the column order, or add and remove columns by "
+"dragging and dropping them."
+msgstr ""
+"Seznam zpráv má sloupce, které ukazují, zda byla zpráva přečtena, zda má "
+"přílohu, jak důležitá je, jaký je odesílatel, datum a předmět. Můžete změnit "
+"pořadí sloupců nebo přidat a odebrat sloupce táhnutím a puštěním. "
 
-#: C/evolution.xml:2374(title)
+#: C/evolution.xml:2577(title)
 msgid "Sorting Mail With Column Headers"
 msgstr "Řazení pošty podle sloupců"
 
-#: C/evolution.xml:2375(para)
-msgid "In addition to it, Evolution enables you to sort your messages by using Sort-by list.You can use any of the criteria given in the Sort-by list such as <emphasis>sender, location, to, from, size, </emphasis>and so forth to perform sorting. It returns the sorted email list that matches the criteria you have selected."
-msgstr "K tomu vám Evolution umožňuje řadit vaše zprávy pomocí seznamu Řadit podle. Můžete použít jakékoliv kritérium ze seznamu Řadit podle jako jsou <emphasis>odesílatel, umístění, komu, od, velikost</emphasis> a tak dále. Vrací seřazený seznam zpráv, který splňuje kritérium, které jste vybrali."
+#: C/evolution.xml:2578(para)
+msgid ""
+"In addition to it, Evolution enables you to sort your messages by using Sort-"
+"by list. You can use any of the criteria given in the Sort-by list such as "
+"<emphasis>sender, location, to, from, size</emphasis> and so forth to "
+"perform sorting. It returns the sorted email list that matches the criteria "
+"you have selected."
+msgstr ""
+"K tomu vám Evolution umožňuje řadit vaše zprávy pomocí seznamu Řadit podle. "
+"Můžete použít jakékoliv kritérium ze seznamu Řadit podle jako jsou "
+"<emphasis>odesílatel, umístění, komu, od, velikost</emphasis> atd. Vrací "
+"seřazený seznam zpráv, který splňuje kritérium, které jste vybrali."
 
-#: C/evolution.xml:2376(para)
+#: C/evolution.xml:2579(para)
 msgid "To sort messages, perform the following procedure:"
 msgstr "Pro seřazení zpráv vykonejte následující postup:"
 
-#: C/evolution.xml:2379(para)
-msgid "Right click message header bar."
+#: C/evolution.xml:2582(para)
+msgid "Right-click message header bar."
 msgstr "Klikněte pravým tlačítkem na lištu hlaviček."
 
-#: C/evolution.xml:2382(para)
+#: C/evolution.xml:2585(para)
 msgid "Click Sort by to get a list of options."
 msgstr "Klikněte na Řadit podle a získáte seznam možností."
 
-#: C/evolution.xml:2384(title)
+#: C/evolution.xml:2587(title)
 msgid "Sort by:"
 msgstr "Řadit podle:"
 
-#: C/evolution.xml:2385(para)
+#: C/evolution.xml:2588(para)
 msgid "Sorts the message by different criteria as listed below:"
 msgstr "Seřadí zprávy podle různých kritérií uvedených níže:"
 
-#: C/evolution.xml:2389(para)
+#: C/evolution.xml:2592(para)
 msgid "Recipients"
 msgstr "Příjemce"
 
-#: C/evolution.xml:2392(para)
-#: C/evolution.xml:2398(para)
+#: C/evolution.xml:2595(para) C/evolution.xml:2601(para)
 msgid "Sender"
 msgstr "Odesílatel"
 
-#: C/evolution.xml:2395(para)
+#: C/evolution.xml:2598(para)
 msgid "Location"
 msgstr "Místo"
 
-#: C/evolution.xml:2401(para)
+#: C/evolution.xml:2604(para)
 msgid "Due By"
 msgstr "Termín dokončení"
 
-#: C/evolution.xml:2404(para)
+#: C/evolution.xml:2607(para)
 msgid "Follow Up Flag"
 msgstr "Značka K vyřízení"
 
-#: C/evolution.xml:2407(para)
+#: C/evolution.xml:2610(para)
 msgid "Flag Status"
 msgstr "Stav značek"
 
-#: C/evolution.xml:2410(para)
+#: C/evolution.xml:2613(para)
 msgid "Size"
 msgstr "Velikost"
 
-#: C/evolution.xml:2413(para)
+#: C/evolution.xml:2616(para)
 msgid "To"
 msgstr "Komu"
 
-#: C/evolution.xml:2416(para)
+#: C/evolution.xml:2619(para)
 msgid "Received"
 msgstr "Přijato"
 
-#: C/evolution.xml:2419(para)
+#: C/evolution.xml:2622(para)
 msgid "Date"
 msgstr "Datum"
 
-#: C/evolution.xml:2422(para)
+#: C/evolution.xml:2625(para)
 msgid "Subject"
 msgstr "Předmět"
 
-#: C/evolution.xml:2425(para)
+#: C/evolution.xml:2628(para)
 msgid "From"
 msgstr "Od"
 
-#: C/evolution.xml:2428(para)
+#: C/evolution.xml:2631(para)
 msgid "Attachment"
 msgstr "Příloha"
 
-#: C/evolution.xml:2431(para)
+#: C/evolution.xml:2634(para)
 msgid "Score"
 msgstr "Skóre"
 
-#: C/evolution.xml:2434(para)
+#: C/evolution.xml:2637(para)
 msgid "Flagged"
 msgstr "Označeno"
 
-#: C/evolution.xml:2437(para)
-#: C/evolution.xml:3350(para)
-#: C/evolution.xml:4236(para)
-#: C/evolution.xml:4585(para)
-#: C/evolution.xml:4780(para)
+#: C/evolution.xml:2640(para) C/evolution.xml:3608(para)
+#: C/evolution.xml:4498(para) C/evolution.xml:4849(para)
+#: C/evolution.xml:5044(para)
 msgid "Status"
 msgstr "Stav"
 
-#: C/evolution.xml:2440(para)
+#: C/evolution.xml:2643(para)
 msgid "Custom"
 msgstr "Vlastní"
 
-#: C/evolution.xml:2444(para)
-msgid "Clicking each sort criteria cycles take you through three possibilities. Sort by criteria in ascending or descending order or unsort the message. When you click any of the sort criteria reiteratively, Evolution sort the messages in a sequential order - ascending, descending and unsort. For example, when you click Recepients for the first time, Evolution sort the messages by recepients in ascending order and for the second time, sort in the reverse order. For the next click, messages will be displayed unsorted."
-msgstr "Kliknutí na každé kritérium seřazení vám dává tři možnosti. Seřadit podle kritéria vzestupně, nestupně nebo neřadit. Když opakovaně klikněte na jedno z kritérií, Evolution seřadí zprávy v následujícím pořadí - vzestupně, sestupně, netřídí. Např. když kliknete poprvé na Příjemce, Evolution seřadí zprávy podle příjemců vzestupně, a když podruhé, seřadí je v opačném pořadí. Po dalším kliknutí zůstanou zprávy neseřazeny. "
+#: C/evolution.xml:2647(para)
+msgid ""
+"Clicking each sort criteria cycles take you through three possibilities. "
+"Sort by criteria in ascending or descending order or unsort the message. "
+"When you click any of the sort criteria reiteratively, Evolution sort the "
+"messages in a sequential order - ascending, descending and unsort. For "
+"example, when you click Recepients for the first time, Evolution sort the "
+"messages by recipients in ascending order and for the second time, sort in "
+"the reverse order. For the next click, messages will be displayed unsorted."
+msgstr ""
+"Kliknutí na každé kritérium seřazení vám dává tři možnosti. Seřadit podle "
+"kritéria vzestupně, nestupně nebo neřadit. Když opakovaně klikněte na jedno "
+"z kritérií, Evolution seřadí zprávy v následujícím pořadí - vzestupně, "
+"sestupně, netřídí. Např. když kliknete poprvé na Příjemce, Evolution seřadí "
+"zprávy podle příjemců vzestupně, a když podruhé, seřadí je v opačném pořadí. "
+"Po dalším kliknutí zůstanou zprávy neseřazeny. "
 
-#: C/evolution.xml:2447(title)
+#: C/evolution.xml:2650(title)
 msgid "Sort Ascending:"
 msgstr "Řadit vzestupně:"
 
-#: C/evolution.xml:2448(para)
-msgid "Sorts the messages top to bottom and returns you the sorted e-mail list in the order of oldest to the latest."
-msgstr "Seřazuje zprávy vrchu dolů a vrací vám seřazený seznam zpráv v pořadí od nejstarší po nejnovější."
+#: C/evolution.xml:2651(para)
+msgid ""
+"Sorts the messages top to bottom and returns you the sorted message list in "
+"the order of oldest to the latest."
+msgstr ""
+"Seřazuje zprávy od vrchu dolů a vrací vám seřazený seznam zpráv v pořadí od "
+"nejstarší po nejnovější."
 
-#: C/evolution.xml:2451(title)
+#: C/evolution.xml:2654(title)
 msgid "Sort Descending:"
 msgstr "Řadit sestupně:"
 
-#: C/evolution.xml:2452(para)
-msgid "Sort descending revers the order and returns you the sorted e-mail list in the order of newest to oldest."
-msgstr "Řadit sestupně obrací pořadí a vrací vám seřazený seznam zpráv v pořadí od nejnovější po nejstarší."
+#: C/evolution.xml:2655(para)
+msgid ""
+"Sort descending revers the order and returns you the sorted message list in "
+"the order of newest to oldest."
+msgstr ""
+"Řadit sestupně obrací pořadí a vrací vám seřazený seznam zpráv v pořadí od "
+"nejnovější po nejstarší."
 
-#: C/evolution.xml:2455(title)
+#: C/evolution.xml:2658(title)
 msgid "Unsort:"
 msgstr "Neřadit:"
 
-#: C/evolution.xml:2456(para)
-msgid "Unsort removes sorting from this column, reverting to the order of messages as they were added to the folder."
-msgstr "Neřadit z tohoto sloupce odstraňuje řazení, návrací se k pořadí zpráv tak, jak byly přidány do složky."
+#: C/evolution.xml:2659(para)
+msgid ""
+"Unsort removes sorting from this column, reverting to the order of messages "
+"as they were added to the folder."
+msgstr ""
+"Neřadit z tohoto sloupce odstraňuje řazení, návrací se k pořadí zpráv tak, "
+"jak byly přidány do složky."
 
-#: C/evolution.xml:2459(title)
+#: C/evolution.xml:2662(title)
 msgid "Removing a Column:"
 msgstr "Odstranění sloupce:"
 
-#: C/evolution.xml:2460(para)
-msgid "Remove this column from the display. You can also remove columns by dragging the header off the list and letting it drop."
-msgstr "Odstraní tento sloupec ze zobrazení. Sloupec můžete odstranit také tak, že jeho hlavičku přetáhnete mímo seznam a pustíte ho."
+#: C/evolution.xml:2663(para)
+msgid ""
+"Remove this column from the display. You can also remove columns by dragging "
+"the header off the list and letting it drop."
+msgstr ""
+"Odstraní tento sloupec ze zobrazení. Sloupec můžete odstranit také tak, že "
+"jeho hlavičku přetáhnete mímo seznam a pustíte ho."
 
-#: C/evolution.xml:2463(title)
+#: C/evolution.xml:2666(title)
 msgid "Adding a Column:"
 msgstr "Přidání sloupce:"
 
-#: C/evolution.xml:2464(para)
-msgid "When you select this item, a dialog box appears, listing the possible columns. Drag the column you want into a space between existing column headers. A red arrow shows where the column will be placed."
-msgstr "Když vyberete tuto položku, objeví se dialogové okno. Přetáhněte sloupec, který chcete, do prostoru mezi existujícími hlavičkami sloupců. Červená šipka ukazuje, kde bude sloupec umístěn."
+#: C/evolution.xml:2667(para)
+msgid ""
+"When you select this item, a dialog box appears, listing the possible "
+"columns. Drag the column you want into a space between existing column "
+"headers. A red arrow shows where the column will be placed."
+msgstr ""
+"Když vyberete tuto položku, objeví se dialogové okno. Přetáhněte sloupec, "
+"který chcete, do prostoru mezi existujícími hlavičkami sloupců. Červená "
+"šipka ukazuje, kde bude sloupec umístěn."
 
-#: C/evolution.xml:2467(title)
+#: C/evolution.xml:2670(title)
 msgid "Best Fit:"
 msgstr "Nejlepší velikost:"
 
-#: C/evolution.xml:2468(para)
-msgid "Automatically adjusts the widths of the columns for the most efficient use of space."
+#: C/evolution.xml:2671(para)
+msgid ""
+"Automatically adjusts the widths of the columns for the most efficient use "
+"of space."
 msgstr "Automaticky nastaví šířku sloupců pro co nejefektivější využití místa."
 
-#: C/evolution.xml:2471(title)
+#: C/evolution.xml:2674(title)
 msgid "Customizing the Current View:"
 msgstr "Přizpůsobit aktuální zobrazení:"
 
-#: C/evolution.xml:2472(para)
-msgid "Choose this item to pick a more complex sort order for messages, or to choose which columns of information about your messages you want to display."
-msgstr "Vyberte tuto položku pro výběr komplexnějších metod řazení zpráv nebo pro výběr sloupců s informacemi, které chcete zobrazit."
+#: C/evolution.xml:2675(para)
+msgid ""
+"Choose this item to pick a more complex sort order for messages, or to "
+"choose which columns of information about your messages you want to display."
+msgstr ""
+"Vyberte tuto položku pro výběr komplexnějších metod řazení zpráv nebo pro "
+"výběr sloupců s informacemi, které chcete zobrazit."
 
-#: C/evolution.xml:2476(para)
-msgid "Select the search criteria."
-msgstr "Vyberte kritérium vyhledávání"
+#: C/evolution.xml:2679(para)
+msgid "Select the search criteria from the list."
+msgstr "Vyberte ze seznamu kritérium hledání."
 
-#: C/evolution.xml:2477(para)
+#: C/evolution.xml:2680(para)
 msgid "You can view the messages in the desired order in the message list."
 msgstr "Můžete vidět zprávy v seznamu zpráv v požadovaném pořadí."
 
-#: C/evolution.xml:2483(title)
+#: C/evolution.xml:2686(title)
 msgid "Using the Follow up Feature"
 msgstr "Používání funkce K vyřízení"
 
-#: C/evolution.xml:2484(para)
-msgid "To make sure you don't forget about a message, you can use the Follow up feature."
-msgstr "Chcete-li se ujistit, že na zprávu nezapomenete, můžete použít funkci K vyřízení."
+#: C/evolution.xml:2687(para)
+msgid ""
+"To make sure you don't forget about a message, you can use the Follow up "
+"feature."
+msgstr ""
+"Chcete-li se ujistit, že na zprávu nezapomenete, můžete použít funkci K "
+"vyřízení."
 
-#: C/evolution.xml:2487(para)
+#: C/evolution.xml:2690(para)
 msgid "Select one or more messages."
 msgstr "Vyberte jednu nebo více zpráv."
 
-#: C/evolution.xml:2490(para)
+#: C/evolution.xml:2693(para)
 msgid "Right-click one of the messages."
 msgstr "Klikněte pravým tlačítkem na jednu z nich."
 
-#: C/evolution.xml:2493(para)
+#: C/evolution.xml:2696(para)
 msgid "Click Mark for Follow Up."
 msgstr "Vyberte Označit k vyřízení."
 
-#: C/evolution.xml:2496(para)
+#: C/evolution.xml:2699(para)
 msgid "You can also open the Flag to Follow Up window by"
 msgstr "Můžete také otevřít Označit k vyřízení tak, že"
 
-#: C/evolution.xml:2499(para)
+#: C/evolution.xml:2702(para)
 msgid "Select the messages."
 msgstr "Vyberete zprávy."
 
-#: C/evolution.xml:2502(para)
+#: C/evolution.xml:2705(para)
 msgid "Select Message menu."
 msgstr "Vyberete v nabídce Zpráva."
 
-#: C/evolution.xml:2505(para)
+#: C/evolution.xml:2708(para)
 msgid "Click Mark as."
 msgstr "Klikněte na Označit jako."
 
-#: C/evolution.xml:2508(para)
+#: C/evolution.xml:2711(para)
 msgid "Select Follow Up or press Shift+Ctrl+G."
 msgstr "Vyberete K vyřízení nebo stisknete Shift+Ctrl+G."
 
-#: C/evolution.xml:2509(para)
-msgid "A dialog box opens to allow you to set the type of flag and the due date."
-msgstr "Dialogové okno, které se otevře, vám umožní nastavit druh značky a termín dokončení."
-
-#: C/evolution.xml:2513(para)
-msgid "The flag itself is the action you want to remind yourself about. Several are provided for you, such as Call, Forward, and Reply, but you can enter your own note or action if you want."
-msgstr "Značka sama o sobě je akce, kterou vás má upomenout. Některé jsou vám k dispozici jako Zavolat, Přeposlat nebo Odpovědět, ale můžete vložit vaše vlastní poznámky nebo akce, pokud chcete."
+#: C/evolution.xml:2712(para)
+msgid ""
+"A dialog box opens to allow you to set the type of flag and the due date."
+msgstr ""
+"Dialogové okno, které se otevře, vám umožní nastavit druh značky a termín "
+"dokončení."
 
-#: C/evolution.xml:2514(para)
-msgid "After you have added a flag, you can mark it as complete or remove it entirely by right-clicking the message, then click either Flag Completed or Clear Flag."
-msgstr "Poté, co jste značku přidali, ji můžete označit jako dokončenou nebo úplně vymazat tak, že kliknete na zprávu pravým tlačítkem a potom kliknete buď na Označit jako dokončeno nebo na Zrušit značku."
+#: C/evolution.xml:2716(para)
+msgid ""
+"The flag itself is the action you want to remind yourself about. Several are "
+"provided for you, such as Call, Forward, and Reply, but you can enter your "
+"own note or action if you want."
+msgstr ""
+"Značka sama o sobě je akce, kterou vás má upomenout. Některé jsou vám k "
+"dispozici jako Zavolat, Přeposlat nebo Odpovědět, ale můžete vložit vaše "
+"vlastní poznámky nebo akce, pokud chcete."
 
-#: C/evolution.xml:2515(para)
-msgid "When you read a flagged message, its flag status is displayed at the top, before the message headers. An overdue message might tell you <quote>Overdue: Call by April 07, 2003, 5:00 PM.</quote>"
-msgstr "Když čtete označenou zprávu, stav značky je zobrazen nahoře nad hlavičkami zprávy. Ve zpoždění vám muže zpráva říkat  <quote>Již mělo být splněno: Zavolat do 7. duben, 2003, 17:00</quote>."
+#: C/evolution.xml:2717(para)
+msgid ""
+"After you have added a flag, you can mark it as complete or remove it "
+"entirely by right-clicking the message, then click either Flag Completed or "
+"Clear Flag."
+msgstr ""
+"Poté, co jste značku přidali, ji můžete označit jako dokončenou nebo úplně "
+"vymazat tak, že kliknete na zprávu pravým tlačítkem a potom kliknete buď na "
+"Označit jako dokončeno nebo na Zrušit značku."
 
-#: C/evolution.xml:2516(para)
-msgid "Flags can help you organize your work in a number of ways. For example, you might add a Flag Status column to your message list and sort that way. Alternately, you could create a search folder that displays all your flagged messages, then clear the flags when you're done, so the search folder contains only messages with upcoming deadlines."
-msgstr "Značky vám můžou pomoci organizovat vaši práci v několika směrech. Např. můžete přidat sloupec Stav značek do vašeho seznamu zpráv a seřadit je takto. Nebo můžete vytvořit složku hledání, která zobrazuje všechny vaše označené zprávy, zrušit značky, když jste hotoví, takže složka hledání obsahuje pouze nadcházející termíny."
+#: C/evolution.xml:2718(para)
+msgid ""
+"When you read a flagged message, its flag status is displayed at the top, "
+"before the message headers. An overdue message might tell you "
+"<quote>Overdue: Call by April 07, 2003, 5:00 PM.</quote>"
+msgstr ""
+"Když čtete označenou zprávu, stav značky je zobrazen nahoře nad hlavičkami "
+"zprávy. Ve zpoždění vám muže zpráva říkat  <quote>Již mělo být splněno: "
+"Zavolat do 7. duben, 2003, 17:00</quote>."
 
-#: C/evolution.xml:2518(title)
+#: C/evolution.xml:2719(para)
+msgid ""
+"Flags can help you organize your work in a number of ways. For example, you "
+"might add a Flag Status column to your message list and sort that way. "
+"Alternately, you could create a search folder that displays all your flagged "
+"messages, then clear the flags when you're done, so the search folder "
+"contains only messages with upcoming deadlines."
+msgstr ""
+"Značky vám můžou pomoci organizovat vaši práci v několika směrech. Např. "
+"můžete přidat sloupec Stav značek do vašeho seznamu zpráv a seřadit je "
+"takto. Nebo můžete vytvořit složku hledání, která zobrazuje všechny vaše "
+"označené zprávy, zrušit značky, když jste hotoví, takže složka hledání "
+"obsahuje pouze nadcházející termíny."
+
+#: C/evolution.xml:2721(title)
 msgid "Mark as Important Feature:"
 msgstr "Funkce Označit jako důležité:"
 
-#: C/evolution.xml:2519(para)
-msgid "If you prefer a simpler way to remind yourself about messages, you can mark them as important by right-clicking the message, then click Mark as Important or Select Message &gt; Mark as &gt;Important."
-msgstr "Pokud dáváte přednost jednoduššímu způsobu, jak se upomínat na zprávy, můžete je označit jako důležité tak, že kliknete pravým tlačítkem na zprávu a potom kliknete na Označit jako důležité nebo vyberete Zpráva &gt; Označit jako &gt; Důležité."
+#: C/evolution.xml:2722(para)
+msgid ""
+"If you prefer a simpler way to remind yourself about messages, you can mark "
+"them as important by right-clicking the message, then click Mark as "
+"Important or Select Message &gt; Mark as &gt; Important from the menubar."
+msgstr ""
+"Pokud dáváte přednost jednoduššímu způsobu, jak se upomínat na zprávy, "
+"můžete je označit jako důležité tak, že kliknete pravým tlačítkem na zprávu "
+"a potom kliknete na Označit jako důležité nebo vyberete v nabídce Zpráva "
+"&gt; Označit jako &gt; Důležité."
+
+#: C/evolution.xml:2729(para)
+msgid ""
+"Evolution, like most other mail systems, stores mail in folders. You start "
+"out with a few mail folders, such as Inbox, Outbox, and Drafts, but you can "
+"create as many as you like. Create new folders by clicking Folder &gt; New, "
+"or by right-clicking in the folder list and selecting New Folder."
+msgstr ""
+"Evolution stejně jako většina ostatních poštovních programů uchovává poštu "
+"ve složkách. Na začátku máte pár složek jako Příchozí, K odeslání nebo "
+"Koncepty, ale můžete si jich vytvořit tolik, kolik chcete. Novou složku "
+"vytvoříte tak, že kliknete na Složka &gt; Nová nebo kliknete pravým "
+"tlačítkem v seznamu zpráv a vyberete Nová složka."
+
+#: C/evolution.xml:2730(para)
+msgid ""
+"When you click OK, your new folder appears in the folder view. You can then "
+"move the messages to it by dragging and dropping them, or right click on the "
+"message and choose Move to folder, or press Shift+Ctrl+V."
+msgstr ""
+"Když kliknete na Budiž, vaše nová složka se objeví v zobrazení složek. Potom "
+"do ní můžete přesouvat zprávy tak, že je přetáhnete a pustíte nebo kliknete "
+"pravým tlačítkem a vyberete Přesunout do složky nebo stisknete Shift+Ctrl+V."
 
-#: C/evolution.xml:2526(para)
-msgid "Evolution, like most other mail systems, stores mail in folders. You start out with a few mail folders, such as Inbox, Outbox, and Drafts, but you can create as many as you like. Create new folders by clicking Folder &gt; New, or by right-clicking in the folder list and selecting New Folder."
-msgstr "Evolution stejně jako většina ostatních poštovních programů uchovává poštu ve složkách. Na začátku máte pár složek jako Příchozí, K odeslání nebo Koncepty, ale můžete si jich vytvořit tolik, kolik chcete. Novou složku vytvoříte tak, že kliknete na Složka &gt; Nová nebo kliknete pravým tlačítkem v seznamu zpráv a vyberete Nová složka."
+#: C/evolution.xml:2731(para)
+msgid ""
+"You can also drop the messages to a particular folder by selecting Message "
+"&gt; Move to folder. This will open the Select folder window, where you can "
+"drop your message to any of the folders listed."
+msgstr ""
+"Můžete zprávu umístit do určité složky také tak, že vyberete Zpráva &gt; "
+"Přesunout do složky. Otevře se okno pro výběr složky, kde umístíte zprávu do "
+"kterékoliv z uvedených složek."
 
-#: C/evolution.xml:2527(para)
-msgid "When you click OK, your new folder appears in the folder view. You can then move the messages to it by dragging and dropping them, or right click &gt; Move to folder or press Shift+Ctrl+V."
-msgstr "Když kliknete na Budiž, vaše nová složka se objeví v náhledu složek. Potom do ní můžete přesouvat zprávy tak, že je přetáhnete a pustíte nebo kliknete pravým tlačítkem &gt; Přesunout do složky nebo stisknete Shift+Ctrl+V."
+#: C/evolution.xml:2733(para)
+msgid ""
+"If you want to create a new folder click New at the bottom left of the "
+"window. Specify the location and enter the label of the folder at the entry "
+"box appeared at the top. You can also move the messages from one folder to "
+"another by selecting the message and then press Move tab at the bottom right."
+msgstr ""
+"Chcete-li vytvořit novou složku, klikněte na Nová  v okně vlevo dole. "
+"Zadejte umístění a vyplňte popis složky do pole nahoře. Můžete také "
+"přesouvat zprávy z jedné složky do druhé tak, že vyberete zprávu a potom "
+"stisknete tlačítko Přesunout vpravo dole."
 
-#: C/evolution.xml:2528(para)
-msgid "You can also drop the messages to a particular folder by selecting Message &gt; Move to folder or press Shift+Ctrl +V. This will open Select folder window, where you can drop your message to any of the folders listed."
-msgstr "Můžete zprávu umístit do určité složky také tak, že vyberete Zpráva &gt; Přesunout do složky nebo stisknete Shift+Ctrl+V. Otevře se okno pro výběr složky, kde umístíte zprávu do kterékoliv z uvedených složek."
+#: C/evolution.xml:2734(para)
+msgid ""
+"If you create a filter with the filter assistant, you can have mail filed "
+"automatically. Select Edit &gt; Message Filters to bring up the Message "
+"Filters window."
+msgstr ""
+"Pokud si vytvoříte filtr pomocí asistenta pro vytváření filtrů, můžete poštu "
+"rozřazovat automaticky. Pro tuto možnost klikněte na Upravit &gt; Filtry "
+"zpráv a objeví se okno Filtru zpráv."
 
-#: C/evolution.xml:2530(para)
-msgid "If you want to create a new folder click New at the bottom left of the window. Specify the location and enter the label of the folder at the entry box appeared at the top. You can also move the messages from one folder to another by selecting the message and then press Move tab at the bottom right."
-msgstr "Chcete-li vytvořit novou složku, klikněte na Nová  v okně vlevo dole. Zadejte umístění a vyplňte popis složky do pole nahoře. Můžete také přesouvat zprávy z jedné složky do druhé tak, že vyberete zprávu a potom stisknete tlačítko Přesunout vpravo dole."
+#: C/evolution.xml:2736(para)
+msgid ""
+"Click on the Add button to bring up the Add Rule window from where you can "
+"set different criteria for filtering messages. For additional information on "
+"filtering, see <link linkend=\"usage-mail-org-filters-new\">Creating New "
+"Filter Rules</link>."
+msgstr ""
+"Klikněte na tlačítko Přidat a objeví se okno pro přidání pravidla, z kterého "
+"můžete nastavit různá kritéria pro filtrování zpráv. Více informací "
+"naleznete ve <link linkend=\"usage-mail-org-filters-new\">Vytváření nových "
+"pravidel filtrování</link>."
 
-#: C/evolution.xml:2531(para)
-msgid "If you create a filter with the filter assistant, you can have mail filed automatically. For that select Edit &gt; Message Filters to appear Message Filters window"
-msgstr "Pokud si vytvoříte filtr pomocí asistenta pro vytváření filtrů, můžete poštu rozřazovat automaticky. Pro tuto možnost klikněte na Upravit &gt; Filtry zpráv a objeví se okno Filtru zpráv."
+#: C/evolution.xml:2738(para)
+msgid ""
+"The Inbox folder on most IMAP servers cannot contain both subfolders and "
+"messages. When you create additional folders on your IMAP mail server, "
+"branch them from the root of the IMAP account's folder tree, not from the "
+"Inbox. If you create subfolders in your Inbox folder, you lose the ability "
+"to read messages that exist in your Inbox until you move the folders out of "
+"the way."
+msgstr ""
+"Složka Příchozí na většině IMAP serverů nemůže obsahovat zároveň podsložky a "
+"zprávy. Když vytváříte další složky na IMAP serveru, větvěte je od kořene "
+"stromu účtů, ne od složky Příchozí. Pokud vytvoříte podsložky v Příchozích, "
+"ztrácíte možnost číst zprávy, kterou jsou v Příchozích, dokud složky "
+"neodstraníte."
+
+#: C/evolution.xml:2744(para)
+msgid ""
+"Most email clients can search the message for you, but Evolution does it "
+"differently and efficiently giving you faster search result with Quick "
+"search, Customized Search and Advanced Search."
+msgstr ""
+"Většina vám umí vyhledat zprávy, ale Evolution to dělá jinak a efektivněji "
+"tím, že vám dává rychlé výsledky hledání pomocí Rychlého hledání, Vlastního "
+"hledání a Pokročilého hledání."
 
-#: C/evolution.xml:2533(para)
-msgid "Click the Add tab to appear Add Rule window from where you can set different criteria for filtering messages. For more information refer <link linkend=\"usage-mail-org-filters-new\">Creating New Filter Rules</link>."
-msgstr "Klikněte na tlačítko Přidat a objeví se okno pro přidání pravidla, z kterého můžete nastavit různá kritéria pro filtrování zpráv. Více informací naleznete ve <link linkend=\"usage-mail-org-filters-new\">Vytváření nových pravidel filtrování</link>."
-
-#: C/evolution.xml:2535(para)
-msgid "The Inbox folder on most IMAP servers cannot contain both subfolders and messages. When you create additional folders on your IMAP mail server, branch them from the root of the IMAP account's folder tree, not from the Inbox. If you create subfolders in your Inbox folder, you lose the ability to read messages that exist in your Inbox until you move the folders out of the way."
-msgstr "Složka Příchozí na většině IMAP serverů nemůže obsahovat zároveň podsložky a zprávy. Když vytváříte další složky na IMAP serveru, větvěte je od kořene stromu účtů, ne od složky Příchozí. Pokud vytvoříte podsložky v Příchozích, ztrácíte možnost číst zprávy, kterou jsou v Příchozích, dokud složky neodstraníte."
-
-#: C/evolution.xml:2541(para)
-msgid "Most email clients can search the message for you, but Evolution does it differently and efficiently giving you faster search result with Quick search, Customized Search and Advanced Search."
-msgstr "Většina vám umí vyhledat zprávy, ale Evolution to dělá jinak a efektivněji tím, že vám dává rychlé výsledky hledání pomocí Rychlého hledání, Vlastního hledání a Pokročilého hledání."
-
-#: C/evolution.xml:2543(title)
-#: C/evolution.xml:3290(title)
-#: C/evolution.xml:4168(title)
-#: C/evolution.xml:4474(title)
-#: C/evolution.xml:4718(title)
+#: C/evolution.xml:2746(title) C/evolution.xml:3548(title)
+#: C/evolution.xml:4430(title) C/evolution.xml:4738(title)
+#: C/evolution.xml:4982(title)
 msgid "Quick Search:"
 msgstr "Rychlé hledání:"
 
-#: C/evolution.xml:2544(para)
-msgid "Quick Search displays all the messages that match the in-built criteria you selected from the drop-down list at the top left side, just above the message list."
-msgstr "Rychlé hledání zobrazuje všechny zprávy, které odpovídají předem daným kritériím, které můžete vybrat z rozbalovacího seznamu vlevo nahoře, přímo nad seznamem zpráv."
+#: C/evolution.xml:2747(para)
+msgid ""
+"Quick Search displays all the messages that match the in-built criteria you "
+"selected from the drop-down list at the top left side, just above the "
+"message list."
+msgstr ""
+"Rychlé hledání zobrazuje všechny zprávy, které odpovídají předem daným "
+"kritériím, které můžete vybrat z rozbalovacího seznamu vlevo nahoře, přímo "
+"nad seznamem zpráv."
 
-#: C/evolution.xml:2546(para)
-msgid "To perform quick search, perform the following procedure:"
+#: C/evolution.xml:2749(para)
+msgid "To perform a quick search, perform the following procedure:"
 msgstr "Pro provedení rychlého hledání proveďte následující postup:"
 
-#: C/evolution.xml:2549(para)
-msgid "Click Show to expand the drop-down list."
-msgstr "Klikněte na Zobrazit pro rozbalení seznamu."
+#: C/evolution.xml:2752(para) C/evolution.xml:2831(para)
+#: C/evolution.xml:3511(para) C/evolution.xml:3554(para)
+#: C/evolution.xml:4382(para) C/evolution.xml:4698(para)
+#: C/evolution.xml:4934(para)
+msgid ""
+"Click the search icon <inlinegraphic format=\"PNG\" fileref=\"figures/"
+"stock_search.png\"/> to expand the drop-down list."
+msgstr ""
+"Klikněte na ikonu hledání <inlinegraphic format=\"PNG\" fileref=\"figures/"
+"stock_search.png\"/> pro rozbalení seznamu."
 
-#: C/evolution.xml:2552(para)
-msgid "Select the search criteria from the list"
-msgstr "Vyberte ze seznamu kritérium hledání"
+#: C/evolution.xml:2755(para) C/evolution.xml:3557(para)
+#: C/evolution.xml:4438(para) C/evolution.xml:4780(para)
+#: C/evolution.xml:4990(para)
+msgid "Select the search criteria from the list:"
+msgstr "Vyberte ze seznamu kritérium hledání:"
 
-#: C/evolution.xml:2555(para)
+#: C/evolution.xml:2758(para)
 msgid "All Messages"
 msgstr "Všechny zprávy"
 
-#: C/evolution.xml:2558(para)
+#: C/evolution.xml:2761(para)
 msgid "Unread Messages"
 msgstr "Nepřečtené zprávy"
 
-#: C/evolution.xml:2561(para)
+#: C/evolution.xml:2764(para)
 msgid "No Label"
 msgstr "Bez štítku"
 
-#: C/evolution.xml:2564(para)
-#: C/evolution.xml:2606(para)
+#: C/evolution.xml:2767(para) C/evolution.xml:2809(para)
 msgid "Important"
 msgstr "Důležité"
 
-#: C/evolution.xml:2567(para)
-#: C/evolution.xml:2609(para)
+#: C/evolution.xml:2770(para) C/evolution.xml:2812(para)
 msgid "Work"
 msgstr "Pracovní"
 
-#: C/evolution.xml:2570(para)
-#: C/evolution.xml:2612(para)
-#: C/evolution.xml:3344(para)
-#: C/evolution.xml:4230(para)
-#: C/evolution.xml:4579(para)
-#: C/evolution.xml:4774(para)
-#: C/evolution.xml:5389(para)
+#: C/evolution.xml:2773(para) C/evolution.xml:2815(para)
+#: C/evolution.xml:3602(para) C/evolution.xml:4492(para)
+#: C/evolution.xml:4843(para) C/evolution.xml:5038(para)
+#: C/evolution.xml:5608(para)
 msgid "Personal"
 msgstr "Osobní"
 
-#: C/evolution.xml:2573(para)
-#: C/evolution.xml:2615(para)
+#: C/evolution.xml:2776(para) C/evolution.xml:2818(para)
 msgid "To do"
 msgstr "Zpracovávané"
 
-#: C/evolution.xml:2576(para)
-#: C/evolution.xml:2618(para)
+#: C/evolution.xml:2779(para) C/evolution.xml:2821(para)
 msgid "Later"
 msgstr "Později"
 
-#: C/evolution.xml:2579(para)
+#: C/evolution.xml:2782(para)
 msgid "Read Messages"
 msgstr "Přečtené zprávy"
 
-#: C/evolution.xml:2582(para)
+#: C/evolution.xml:2785(para)
 msgid "Recent Messages"
 msgstr "Nedávné zprávy"
 
-#: C/evolution.xml:2585(para)
+#: C/evolution.xml:2788(para)
 msgid "Last 5 Days' Messages"
 msgstr "Zprávy za posledních 5 dní"
 
-#: C/evolution.xml:2588(para)
+#: C/evolution.xml:2791(para)
 msgid "Messages with Attachments"
 msgstr "Zprávy s přílohami"
 
-#: C/evolution.xml:2591(para)
+#: C/evolution.xml:2794(para)
 msgid "Important Messages"
 msgstr "Důležité zprávy"
 
-#: C/evolution.xml:2594(para)
+#: C/evolution.xml:2797(para)
 msgid "Messages Not Junk"
 msgstr "Zprávy nepatřící do smetí"
 
-#: C/evolution.xml:2599(para)
-msgid "Evolution displays the messages matching the criteria present in the shown message list"
+#: C/evolution.xml:2802(para)
+msgid ""
+"Evolution displays the messages matching the criteria present in the shown "
+"message list"
 msgstr "Evolution zobrazuje zprávy odpovídající kritériu v seznamu zpráv"
 
-#: C/evolution.xml:2603(para)
-msgid "The following labels need not necessarily be the same as the default names listed here.You can change the name of these labels by selecting Edit &gt; Preferences &gt; Mail Preferences &gt; Colors."
-msgstr "Následující popisky nemusí být nezbytně stejné jako implicitní názvy uvedené zde. Názvy těchto popisků můžete změnit tak, že vyberete Upravit &gt; Nastavení &gt; Nastavení pošty &gt; Barvy."
+#: C/evolution.xml:2806(para)
+msgid ""
+"The following labels need not necessarily be the same as the default names "
+"listed here. You can change the name of these labels by selecting Edit &gt; "
+"Preferences &gt; Mail Preferences &gt; Colors."
+msgstr ""
+"Následující popisky nemusí být nezbytně stejné jako výchozí názvy uvedené "
+"zde. Názvy těchto popisků můžete změnit tak, že vyberete Upravit &gt; "
+"Nastavení &gt; Nastavení pošty &gt; Barvy."
 
-#: C/evolution.xml:2623(title)
-#: C/evolution.xml:3248(title)
-#: C/evolution.xml:4115(title)
-#: C/evolution.xml:4430(title)
-#: C/evolution.xml:4665(title)
+#: C/evolution.xml:2826(title) C/evolution.xml:3506(title)
+#: C/evolution.xml:4377(title) C/evolution.xml:4693(title)
+#: C/evolution.xml:4929(title)
 msgid "Customized Search:"
 msgstr "Vlastní hledání:"
 
-#: C/evolution.xml:2624(para)
-msgid "Evolution allows you to perform customized search.To search for a message use the following procedure:"
-msgstr "Evolution vám umožňuje provádět vlastní hledání. Pro vyhledání zprávy použijte následující postup:"
-
-#: C/evolution.xml:2628(para)
-msgid "Click search icon <inlinegraphic format=\"PNG\" fileref=\"figures/stock_search.png\"/> to specify the search type."
-msgstr "Klikněte na ikonu hledání <inlinegraphic format=\"PNG\" fileref=\"figures/stock_search.png\"/> a specifikujte typ hledání."
+#: C/evolution.xml:2827(para)
+msgid ""
+"Evolution allows you to perform customized search. To search for a message "
+"use the following procedure:"
+msgstr ""
+"Evolution vám umožňuje provádět vlastní hledání. Pro vyhledání zprávy "
+"použijte následující postup:"
 
-#: C/evolution.xml:2630(title)
+#: C/evolution.xml:2833(title)
 msgid "Subject or Sender Contain:"
 msgstr "Předmět nebo odesílatel obsahuje:"
 
-#: C/evolution.xml:2631(para)
-msgid "Finds messages that contain the search text in the subject or sender. It does not search in the message body."
-msgstr "Najde zprávy, které obsahují hledaný text v předmětu nebo odesílateli. Nehledá v těle zprávy."
+#: C/evolution.xml:2834(para)
+msgid ""
+"Finds messages that contain the search text in the subject or sender. It "
+"does not search in the message body."
+msgstr ""
+"Najde zprávy, které obsahují hledaný text v předmětu nebo odesílateli. "
+"Nehledá v těle zprávy."
 
-#: C/evolution.xml:2634(title)
+#: C/evolution.xml:2837(title)
 msgid "Recipients Contain:"
 msgstr "Příjemci obsahují:"
 
-#: C/evolution.xml:2635(para)
+#: C/evolution.xml:2838(para)
 msgid "Finds messages with the search text in the To: and Cc: headers."
 msgstr "Najde zprávy s textem v hlavičkách Komu: a Kopie:"
 
-#: C/evolution.xml:2638(title)
+#: C/evolution.xml:2841(title)
 msgid "Message Contains:"
 msgstr "Zpráva obsahuje:"
 
-#: C/evolution.xml:2639(para)
+#: C/evolution.xml:2842(para)
 msgid "Searches the message body and all headers for the specified text."
 msgstr "Hledá zadaný text v těle zprávy a všech hlavičkách."
 
-#: C/evolution.xml:2642(title)
+#: C/evolution.xml:2845(title)
 msgid "Subject Contain:"
 msgstr "Předmět obsahuje:"
 
-#: C/evolution.xml:2643(para)
+#: C/evolution.xml:2846(para)
 msgid "Shows messages where the search text is in the subject line."
 msgstr "Zobrazí zprávy, kde je hledaný text v předmětu."
 
-#: C/evolution.xml:2646(title)
+#: C/evolution.xml:2849(title)
 msgid "Sender Contain:"
 msgstr "Odesílatel obsahuje:"
 
-#: C/evolution.xml:2647(para)
-msgid "Finds messages whose From: header contains a match for your search text."
-msgstr "Najde zprávy, jejichž hlavička Od: obsahuje text odpovídající hledanému."
+#: C/evolution.xml:2850(para)
+msgid ""
+"Finds messages whose From: header contains a match for your search text."
+msgstr ""
+"Najde zprávy, jejichž hlavička Od: obsahuje text odpovídající hledanému."
 
-#: C/evolution.xml:2650(title)
+#: C/evolution.xml:2853(title)
 msgid "Body Contains:"
 msgstr "Tělo obsahuje:"
 
-#: C/evolution.xml:2651(para)
+#: C/evolution.xml:2854(para)
 msgid "Searches only in message text, not any other header."
 msgstr "Hledá pouze v těle zprávy, ne v hlavičkách."
 
-#: C/evolution.xml:2655(para)
+#: C/evolution.xml:2858(para)
 msgid "Click the drop-down list to select the scope"
 msgstr "Pro vybrání rozsahu klikněte na rozbalovací seznam"
 
-#: C/evolution.xml:2658(para)
+#: C/evolution.xml:2861(para)
 msgid "Current Folder"
 msgstr "Současná složka"
 
-#: C/evolution.xml:2661(para)
+#: C/evolution.xml:2864(para)
 msgid "Current Account"
 msgstr "Současný účet"
 
-#: C/evolution.xml:2664(para)
+#: C/evolution.xml:2867(para)
 msgid "All Accounts"
 msgstr "Všechny účty"
 
-#: C/evolution.xml:2667(para)
+#: C/evolution.xml:2870(para)
 msgid "Current Message"
 msgstr "Současná zpráva"
 
-#: C/evolution.xml:2672(para)
+#: C/evolution.xml:2875(para)
 msgid "Type the search string in the search entry and press Enter."
 msgstr "Napište hledaný řetězec do pole hledání a stiskněte Enter."
 
-#: C/evolution.xml:2674(para)
-msgid "The folder list will be disabled while you perform search on All Accounts or Current Account."
-msgstr "Seznam složek bude zobrazen během toho, co budete provádět hledání ve všech účtech nebo v současném účtu."
+#: C/evolution.xml:2877(para)
+msgid ""
+"The folder list will be disabled while you perform search on All Accounts or "
+"Current Account."
+msgstr ""
+"Seznam složek bude zobrazen během toho, co budete provádět hledání ve všech "
+"účtech nebo v současném účtu."
 
-#: C/evolution.xml:2678(para)
-msgid "Evolution shows your search results in the message list. You might want to create a search folder instead; see <link linkend=\"usage-mail-organize-vfolders\">Using Search Folders</link> for more detail."
-msgstr "Evolution zobrazuje výsledky hledání v seznamu zpráv. Možná budete chtít místo toho vytvořit složku hledání; více informací naleznete v <link linkend=\"usage-mail-organize-vfolders\">Používání složek hledání.</link>"
+#: C/evolution.xml:2881(para)
+msgid ""
+"Evolution shows your search results in the message list. You might want to "
+"create a search folder instead; see <link linkend=\"usage-mail-organize-"
+"vfolders\">Using Search Folders</link> for more detail."
+msgstr ""
+"Evolution zobrazuje výsledky hledání v seznamu zpráv. Možná budete chtít "
+"místo toho vytvořit složku hledání; více informací naleznete v <link linkend="
+"\"usage-mail-organize-vfolders\">Používání složek hledání.</link>"
 
-#: C/evolution.xml:2680(para)
-msgid "To clear your search click the Clear button or menu, or enter a blank search. You can also press Shift+Ctrl+Q to clear the search."
-msgstr "Pro zrušení hledání klikněte na ikonu metly nebo na nabídku, nebo nechce vyhledat prázdný řetězec. Pro zrušení hledání můžete také stisknout Shift+Ctrl+Q."
+#: C/evolution.xml:2883(para) C/evolution.xml:3546(para)
+msgid ""
+"To clear your search you can click the Clear icon in the search string "
+"field, or choose Search &gt; Clear from the menubar, or enter a blank "
+"search. You can also press Shift+Ctrl+Q to clear the search."
+msgstr ""
+"Pro zrušení hledání klikněte na ikonu metly v poli řetězce nebo vyberte z "
+"nabídky Hledat &gt; Vymazat, nebo nechte vyhledat prázdný řetězec. Pro "
+"zrušení hledání můžete také stisknout Shift+Ctrl+Q."
 
-#: C/evolution.xml:2683(para)
-msgid "You can even perform a quick search on a customized search results as it just filters and displays the messages in the message list."
-msgstr "Můžete dokonce provést hledání ve výsledcích vlastního hledání tak, že profiltruje a zobrazí zprávy v seznamu zpráv."
+#: C/evolution.xml:2886(para)
+msgid ""
+"You can even perform a quick search on a customized search results as it "
+"just filters and displays the messages in the message list."
+msgstr ""
+"Můžete dokonce provést hledání ve výsledcích vlastního hledání tak, že "
+"profiltruje a zobrazí zprávy v seznamu zpráv."
 
-#: C/evolution.xml:2686(title)
-#: C/evolution.xml:4141(title)
-#: C/evolution.xml:4456(title)
-#: C/evolution.xml:4691(title)
+#: C/evolution.xml:2889(title) C/evolution.xml:4403(title)
+#: C/evolution.xml:4719(title) C/evolution.xml:4955(title)
 msgid "Advanced Search:"
 msgstr "Pokročilé hledání:"
 
-#: C/evolution.xml:2687(para)
-msgid "To perform advanced search,"
-msgstr "Chcete-li provést pokročilé hledání,"
+#: C/evolution.xml:2890(para) C/evolution.xml:4404(para)
+#: C/evolution.xml:4720(para) C/evolution.xml:4956(para)
+msgid "You can perform an advanced search based on any of the search types."
+msgstr ""
 
-#: C/evolution.xml:2691(para)
-msgid "Select Search menu"
-msgstr "Vyberte v nabídce Hledat"
+#: C/evolution.xml:2894(para) C/evolution.xml:4408(para)
+#: C/evolution.xml:4724(para)
+msgid "Select the Search menu."
+msgstr "Vyberte v nabídce Hledat."
 
-#: C/evolution.xml:2694(para)
-msgid "Click Advanced Search to open Advanced Search dialogue box"
-msgstr "Klikněte na Pokročilé hledání a otevře se vám dialogové okno Pokročilého hledání"
+#: C/evolution.xml:2897(para)
+msgid "Click Advanced Search to open Advanced Search dialog box."
+msgstr ""
+"Klikněte na Pokročilé hledání a otevře se vám dialogové okno Pokročilého "
+"hledání."
 
-#: C/evolution.xml:2699(para)
+#: C/evolution.xml:2902(para)
 msgid "Enter the Search name."
 msgstr "Zadejte Název hledání."
 
-#: C/evolution.xml:2702(para)
-msgid "Click Add to add rules. For more information on rules, refer <link linkend=\"bsazsjd\">Step 4</link> under <link linkend=\"vfolder-create\">Creating A Search Folder</link>."
-msgstr "Pro přidání pravidla klikněte na Přidat. Více informací o pravidlech naleznete v <link linkend=\"bsazsjd\">Kroku 4</link> ve <link linkend=\"vfolder-create\">Vytvoření složky hledání</link>."
+#: C/evolution.xml:2905(para)
+msgid ""
+"Click Add to add rules. For more information on rules, refer <link linkend="
+"\"bsazsjd\">Step 4</link> under <link linkend=\"vfolder-create\">Creating A "
+"Search Folder</link>."
+msgstr ""
+"Pro přidání pravidla klikněte na Přidat. Více informací o pravidlech "
+"naleznete v <link linkend=\"bsazsjd\">Kroku 4</link> ve <link linkend="
+"\"vfolder-create\">Vytvoření složky hledání</link>."
 
-#: C/evolution.xml:2708(para)
+#: C/evolution.xml:2911(para)
 msgid "Press Save to save your search results."
 msgstr "Pro uložení vašich výsledků hledání klikněte na Uložit."
 
-#: C/evolution.xml:2712(title)
+#: C/evolution.xml:2915(title)
 msgid "Save Search:"
 msgstr "Uložení hledání:"
 
-#: C/evolution.xml:2713(para)
-msgid "To save your search results other than from advanced search, select Search &gt; Save Search. You can view the label of your search results listed under Search menu."
-msgstr "Chcete-li uložit jiné výsledky než z pokročilého hledání, vyberte Hledat &gt; Uložit vyhledávání. Můžete vidět popisek výsledků vašeho vyhledávání uvedený v nabídce Hledat."
+#: C/evolution.xml:2916(para)
+msgid ""
+"To save your search results other than from advanced search, select Search "
+"&gt; Save Search. You can view the label of your search results listed under "
+"Search menu."
+msgstr ""
+"Chcete-li uložit jiné výsledky než z pokročilého hledání, vyberte Hledat "
+"&gt; Uložit vyhledávání. Můžete vidět popisek výsledků vašeho vyhledávání "
+"uvedený v nabídce Hledat."
 
-#: C/evolution.xml:2716(title)
+#: C/evolution.xml:2919(title)
 msgid "Edit Saved Searches:"
 msgstr "Úprava uložených hledání:"
 
-#: C/evolution.xml:2717(para)
-msgid "To edit your saved searches"
-msgstr "Pro úpravu uložených hledání"
+#: C/evolution.xml:2920(para)
+msgid "To edit your saved searches,"
+msgstr "Pro úpravu uložených hledání,"
 
-#: C/evolution.xml:2721(para)
-msgid "Select Search"
-msgstr "Vyberte Hledat"
+#: C/evolution.xml:2924(para)
+msgid "Select Search from the menu bar."
+msgstr "Vyberte v nabídce Hledat."
 
-#: C/evolution.xml:2724(para)
-msgid "Click Edit Saved Searches to open Searches dialogue box."
-msgstr "Klikněte na Upravit uložená hledání a otevře se dialogové okno Hledání."
+#: C/evolution.xml:2927(para)
+msgid "Click Edit Saved Searches to open the Searches dialog box."
+msgstr ""
+"Klikněte na Upravit uložená vyhledávání a otevře se dialogové okno Hledání."
 
-#: C/evolution.xml:2729(para)
-msgid "Click Edit tab to edit to open Edit Rule dialogue box"
-msgstr "Klikněte na tlačítko Upravit a otevře se dialogové okno Upravit pravidlo."
+#: C/evolution.xml:2932(para)
+msgid "Click the Edit button to open the Edit Rule dialog box."
+msgstr ""
+"Klikněte na tlačítko Upravit a otevře se dialogové okno Upravit pravidlo."
 
-#: C/evolution.xml:2730(para)
-msgid "You can also add or remove Searches from the list by using the respective buttons available at the right."
-msgstr "Můžete také v seznamu přidávat nebo odebírat Hledání použitím příslušných tlačítek napravo."
+#: C/evolution.xml:2933(para)
+msgid ""
+"You can also add or remove Searches from the list by using the respective "
+"buttons available at the right."
+msgstr ""
+"Můžete také v seznamu přidávat nebo odebírat Hledání použitím příslušných "
+"tlačítek napravo."
 
-#: C/evolution.xml:2735(para)
-msgid "Edit the title or search criteria from the dialogue box."
+#: C/evolution.xml:2938(para)
+msgid "Edit the title or search criteria from the dialog box."
 msgstr "Upravte v dialogovém okně název nebo kritérium hledání."
 
-#: C/evolution.xml:2745(para)
-msgid "Filters work very much like the mail room in a large company. Their purpose is to bundle, sort, and distribute mail to the various folders. In addition, you can have multiple filters performing multiple actions that might effect the same message in several ways. For example, your filters could put copies of one message into multiple folders, or keep one copy and send one to another person."
-msgstr "Filtry pracuji velmi podobně jako poštovní ústředna ve velké společnosti. Jejich úloha je sbalit, třídit a distribuovat poštu do různých složek. Navíc můžete mít několik filtrů, které budou provádět několik akcí, které můžou mít na stejnou zprávu jiný účinnek. Např. vaše filtry mohou ukládat kopie jedné zprávy do několika složek nebo uložit jednu kopii a druhou odeslat jiné osobě."
-
-#: C/evolution.xml:2748(title)
+#: C/evolution.xml:2948(para)
+msgid ""
+"Filters work very much like the mail room in a large company. Their purpose "
+"is to bundle, sort, and distribute mail to the various folders. In addition, "
+"you can have multiple filters performing multiple actions that might effect "
+"the same message in several ways. For example, your filters could put copies "
+"of one message into multiple folders, or keep one copy and send one to "
+"another person."
+msgstr ""
+"Filtry pracuji velmi podobně jako poštovní ústředna ve velké společnosti. "
+"Jejich úloha je sbalit, třídit a distribuovat poštu do různých složek. Navíc "
+"můžete mít několik filtrů, které budou provádět několik akcí, které můžou "
+"mít na stejnou zprávu jiný účinnek. Např. vaše filtry mohou ukládat kopie "
+"jedné zprávy do několika složek nebo uložit jednu kopii a druhou odeslat "
+"jiné osobě."
+
+#: C/evolution.xml:2951(title)
 msgid "Creating New Filter Rules"
 msgstr "Vytváření nových pravidel filtrování"
 
-#: C/evolution.xml:2751(para)
-#: C/evolution.xml:2955(para)
-#: C/evolution.xml:2970(para)
+#: C/evolution.xml:2954(para) C/evolution.xml:3158(para)
+#: C/evolution.xml:3173(para)
 msgid "Click Edit &gt; Message Filters."
 msgstr "Klikněte na Upravit &gt; Filtry zpráv."
 
-#: C/evolution.xml:2754(para)
-#: C/evolution.xml:3005(para)
-#: C/evolution.xml:5007(para)
-#: C/evolution.xml:5633(para)
+#: C/evolution.xml:2957(para) C/evolution.xml:3208(para)
+#: C/evolution.xml:5271(para) C/evolution.xml:5852(para)
 msgid "Click Add."
 msgstr "Klikněte na Přidat."
 
-#: C/evolution.xml:2757(para)
+#: C/evolution.xml:2960(para)
 msgid "Type a name for the filter in the Rule name field."
 msgstr "Napište jméno filtru do pole pro jméno."
 
-#: C/evolution.xml:2762(para)
-msgid "Define the criteria for the filter in the If section."
-msgstr "Určete kritéria filtru v sekci Pokud."
+#: C/evolution.xml:2965(para)
+msgid "Define the criteria for the filter in the first section."
+msgstr "V první části určete kritéria filtru."
 
-#: C/evolution.xml:2763(para)
-msgid "For each of the filter criteria, you must first select which parts of the message you want to filter:"
-msgstr "Pro každé kritérium musíte první vybrat, kterou část zprávy chcete filtrovat:"
+#: C/evolution.xml:2966(para)
+msgid ""
+"For each of the filter criteria, you must first select which parts of the "
+"message you want to filter:"
+msgstr ""
+"Pro každé kritérium musíte první vybrat, kterou část zprávy chcete filtrovat:"
 
-#: C/evolution.xml:2765(title)
-#: C/evolution.xml:3015(title)
+#: C/evolution.xml:2968(title) C/evolution.xml:3218(title)
 msgid "Sender:"
 msgstr "Odesílatel:"
 
-#: C/evolution.xml:2766(para)
-msgid "The sender's address."
-msgstr "Adresa odesílatele."
+#: C/evolution.xml:2969(para)
+msgid "The sender's email address or the name of the sender."
+msgstr "E-mailová adresa nebo jméno odesílatele."
 
-#: C/evolution.xml:2769(title)
+#: C/evolution.xml:2972(title)
 msgid "Recipient:"
 msgstr "Příjemce:"
 
-#: C/evolution.xml:2770(para)
-#: C/evolution.xml:3020(para)
+#: C/evolution.xml:2973(para) C/evolution.xml:3223(para)
 msgid "The recipients of the message."
 msgstr "Příjemci zprávy."
 
-#: C/evolution.xml:2773(title)
-#: C/evolution.xml:3023(title)
+#: C/evolution.xml:2976(title) C/evolution.xml:3226(title)
 msgid "Subject:"
 msgstr "Předmět:"
 
-#: C/evolution.xml:2774(para)
-#: C/evolution.xml:3024(para)
+#: C/evolution.xml:2977(para) C/evolution.xml:3227(para)
 msgid "The subject line of the message."
 msgstr "Předmět zprávy."
 
-#: C/evolution.xml:2777(title)
+#: C/evolution.xml:2980(title)
 msgid "Specific Header:"
 msgstr "Určitá hlavička:"
 
-#: C/evolution.xml:2778(para)
+#: C/evolution.xml:2981(para)
 msgid "Any header including custom ones."
 msgstr "Jakákoliv hlavička včetně vlastních."
 
-#: C/evolution.xml:2780(para)
-msgid "If a message uses a header more than once, Evolution pays attention only to the first instance, even if the message defines the header differently the second time. For example, if a message declares the Resent-From: header as <quote>engineering@example.com</quote> and then restates it as <quote>marketing@example.com,</quote> Evolution filters as though the second declaration did not occur. To filter on messages that use headers multiple times, use a regular expression."
-msgstr "Pokud zpráva používá hlavičku více než jedenkrát, Evolution se jí zabývá pouze v první instanci, dokonce i když zpráva definuje podruhé hlavičku jinak. Např. pokud zpráva deklaruje hlavičku Resent-From: jako <quote>engineering@example.com</quote> a potom ji zopakuje jako <quote>marketing@example.com,</quote>, Evolution ji filtruje, jakoby se druhá deklarace neobjevila. Pro filtrování zpráv, které používají hlavičky vícekrát, použijte regulární výrazy. "
-
-#: C/evolution.xml:2782(title)
-#: C/evolution.xml:3027(title)
+#: C/evolution.xml:2983(para)
+msgid ""
+"If a message uses a header more than once, Evolution pays attention only to "
+"the first instance, even if the message defines the header differently the "
+"second time. For example, if a message declares the Resent-From: header as "
+"<quote>engineering@example.com</quote> and then restates it as "
+"<quote>marketing@example.com,</quote> Evolution filters as though the second "
+"declaration did not occur. To filter on messages that use headers multiple "
+"times, use a regular expression."
+msgstr ""
+"Pokud zpráva používá hlavičku více než jedenkrát, Evolution se jí zabývá "
+"pouze v první instanci, dokonce i když zpráva definuje podruhé hlavičku "
+"jinak. Např. pokud zpráva deklaruje hlavičku Resent-From: jako "
+"<quote>engineering@example.com</quote> a potom ji zopakuje jako "
+"<quote>marketing@example.com,</quote>, Evolution ji filtruje, jakoby se "
+"druhá deklarace neobjevila. Pro filtrování zpráv, které používají hlavičky "
+"vícekrát, použijte regulární výrazy. "
+
+#: C/evolution.xml:2985(title) C/evolution.xml:3230(title)
 msgid "Message Body:"
 msgstr "Tělo zprávy:"
 
-#: C/evolution.xml:2783(para)
-#: C/evolution.xml:3028(para)
+#: C/evolution.xml:2986(para) C/evolution.xml:3231(para)
 msgid "Searches in the actual text of the message."
 msgstr "Prohledává skutečné tělo zprávy."
 
-#: C/evolution.xml:2786(title)
+#: C/evolution.xml:2989(title)
 msgid "Expression:"
 msgstr "Výraz:"
 
-#: C/evolution.xml:2787(para)
-msgid "(For programmers only) Match a message according to an expression you write in the Scheme language, used to define filters in Evolution."
-msgstr "(pouze pro programátory) Porovnává zprávy podle výrazu, který napíšete v jazyku Scheme, používaného v Evolutionu pro definování filtrů."
+#: C/evolution.xml:2990(para)
+msgid ""
+"(For programmers only) Match a message according to an expression you write "
+"in the Scheme language used to define filters in Evolution."
+msgstr ""
+"(pouze pro programátory) Porovnává zprávy podle výrazu, který napíšete v "
+"jazyku Scheme, používaného v Evolutionu pro definování filtrů."
 
-#: C/evolution.xml:2790(title)
-#: C/evolution.xml:3035(title)
+#: C/evolution.xml:2993(title) C/evolution.xml:3238(title)
 msgid "Date Sent:"
 msgstr "Datum odeslání:"
 
-#: C/evolution.xml:2791(para)
-#: C/evolution.xml:3036(para)
-msgid "Filters messages according to the date on which they were sent. First, choose the conditions you want a message to meet, such as before a given time or after a given time. Then choose the time. The filter compares the message's time stamp to the system clock when the filter is run, or to a specific time and date you choose from a calendar. You can also have it look for a message within a range of time relative to the filter, such as two to four days ago."
-msgstr "Filtruje zprávy podle data, kdy byly odeslány. Prvně vyberte podmínky, které chcete, aby zpráva splnila jako před určitým časem nebo po určitém čase. Potom zvolte čas. Filtr porovnává časové razítko zprávy se systémovými hodinami, když filtr běží, nebo s určitým časem a datem, které vyberete v kalendáři. Můžete jej také nechat, aby se podíval po zprávách v určitém časovém rozmezí jako před dvěma až čtyřmi dny."
-
-#: C/evolution.xml:2794(title)
-#: C/evolution.xml:3039(title)
+#: C/evolution.xml:2994(para) C/evolution.xml:3239(para)
+msgid ""
+"Filters messages according to the date on which they were sent. First, "
+"choose the conditions you want a message to meet, such as before a given "
+"time or after a given time. Then choose the time. The filter compares the "
+"message's time stamp to the system clock when the filter is run, or to a "
+"specific time and date you choose from a calendar. You can also have it look "
+"for a message within a range of time relative to the filter, such as two to "
+"four days ago."
+msgstr ""
+"Filtruje zprávy podle data, kdy byly odeslány. Prvně vyberte podmínky, které "
+"chcete, aby zpráva splnila jako před určitým časem nebo po určitém čase. "
+"Potom zvolte čas. Filtr porovnává časové razítko zprávy se systémovými "
+"hodinami, když filtr běží, nebo s určitým časem a datem, které vyberete v "
+"kalendáři. Můžete jej také nechat, aby se podíval po zprávách v určitém "
+"časovém rozmezí jako před dvěma až čtyřmi dny."
+
+#: C/evolution.xml:2997(title) C/evolution.xml:3242(title)
 msgid "Date Received:"
 msgstr "Datum přijetí:"
 
-#: C/evolution.xml:2795(para)
-#: C/evolution.xml:3040(para)
-msgid "This works the same way as the Date Sent option, except that it compares the time you received the message with the dates you specify."
-msgstr "Toto funkce stejným způsobem jako volba Datum odeslání až na to, že to porovnává čas, kdy jste zprávu přijali, s datem, které jste zadali."
+#: C/evolution.xml:2998(para) C/evolution.xml:3243(para)
+msgid ""
+"This works the same way as the Date Sent option, except that it compares the "
+"time you received the message with the dates you specify."
+msgstr ""
+"Toto funkce stejným způsobem jako volba Datum odeslání až na to, že to "
+"porovnává čas, kdy jste zprávu přijali, s datem, které jste zadali."
 
-#: C/evolution.xml:2798(title)
-#: C/evolution.xml:3043(title)
+#: C/evolution.xml:3001(title) C/evolution.xml:3246(title)
 msgid "Label:"
 msgstr "Štítek:"
 
-#: C/evolution.xml:2799(para)
-msgid "Messages can have labels of Important, Work, Personal, To Do, or Later. You can set tables with other filters or by hand."
-msgstr "Zprávy mohou mít štítky Důležité, Pracovní, Osobní, Zpracovávané a Později. Můžete nastavit tabulky s jinými filtry nebo ručně."
+#: C/evolution.xml:3002(para) C/evolution.xml:3247(para)
+msgid ""
+"Messages can have labels of Important, Work, Personal, To Do, or Later. You "
+"can set labels with other filters or manually."
+msgstr ""
+"Zprávy mohou mít štítky Důležité, Pracovní, Osobní, Zpracovávané, Později. "
+"Štítky můžete nastavit jinými filtry nebo ručně."
 
-#: C/evolution.xml:2802(title)
-#: C/evolution.xml:3047(title)
+#: C/evolution.xml:3005(title) C/evolution.xml:3250(title)
 msgid "Score:"
 msgstr "Skóre:"
 
-#: C/evolution.xml:2803(para)
-#: C/evolution.xml:3048(para)
-msgid "Sets the message score to any whole number greater than 0. You can have one filter set or change a message score, and then set up another filter to move the messages you have scored. A message score is not based on anything in particular: it is simply a number you can assign to messages so other filters can process them."
-msgstr "Nastaví zprávě skóre na jakékoliv celé číslo větší než 0. Můžete mít jeden filtr na nastavení nebo skóre zprávy změnit ručně a potom nastavit jiný filtr k přesouvání zpráv, které jste ohodnotili. Skóre zprávy není založeno na ničem konkrétním: je to jednoduše číslo, které můžete zprávě přidělit tak, aby je mohly jiné filtry zpracovat."
-
-#: C/evolution.xml:2806(title)
-#: C/evolution.xml:3051(title)
+#: C/evolution.xml:3006(para) C/evolution.xml:3251(para)
+msgid ""
+"Sets the message score to any whole number greater than 0. You can have one "
+"filter set or change a message score, and then set up another filter to move "
+"the messages you have scored. A message score is not based on anything in "
+"particular: it is simply a number you can assign to messages so other "
+"filters can process them."
+msgstr ""
+"Nastaví zprávě skóre na jakékoliv celé číslo větší než 0. Můžete mít jeden "
+"filtr na nastavení nebo skóre zprávy změnit ručně a potom nastavit jiný "
+"filtr k přesouvání zpráv, které jste ohodnotili. Skóre zprávy není založeno "
+"na ničem konkrétním: je to jednoduše číslo, které můžete zprávě přidělit "
+"tak, aby je mohly jiné filtry zpracovat."
+
+#: C/evolution.xml:3009(title) C/evolution.xml:3254(title)
 msgid "Size:"
 msgstr "Velikost:"
 
-#: C/evolution.xml:2807(para)
-#: C/evolution.xml:3052(para)
+#: C/evolution.xml:3010(para) C/evolution.xml:3255(para)
 msgid "Sorts based on the size of the message in kilobytes."
 msgstr "Třídí na základě velikosti zpráv v kilobajtech."
 
-#: C/evolution.xml:2810(title)
-#: C/evolution.xml:3055(title)
+#: C/evolution.xml:3013(title) C/evolution.xml:3258(title)
 msgid "Status:"
 msgstr "Stav:"
 
-#: C/evolution.xml:2811(para)
-#: C/evolution.xml:3056(para)
-msgid "Filters according to the status of a message. The status can be Replied To, Draft, Important, Read, or Junk."
-msgstr "Filtruje podle stavu zprávy. Stav může být Zodpovězeno, Koncept, Důležité, Přečteno nebo Nevyžádaná pošta."
+#: C/evolution.xml:3014(para) C/evolution.xml:3259(para)
+msgid ""
+"Filters according to the status of a message. The status can be Replied To, "
+"Draft, Important, Read, or Junk."
+msgstr ""
+"Filtruje podle stavu zprávy. Stav může být Zodpovězeno, Koncept, Důležité, "
+"Přečteno nebo Nevyžádaná pošta."
 
-#: C/evolution.xml:2814(title)
+#: C/evolution.xml:3017(title)
 msgid "Flagged:"
 msgstr "K vyřízení:"
 
-#: C/evolution.xml:2815(para)
-#: C/evolution.xml:3060(para)
+#: C/evolution.xml:3018(para) C/evolution.xml:3263(para)
 msgid "Checks whether the message is flagged for follow-up."
 msgstr "Kontroluje, zda není zpráva označena k vyřízení."
 
-#: C/evolution.xml:2818(title)
-#: C/evolution.xml:3063(title)
+#: C/evolution.xml:3021(title) C/evolution.xml:3266(title)
 msgid "Attachments:"
 msgstr "Přílohy:"
 
-#: C/evolution.xml:2819(para)
-#: C/evolution.xml:3064(para)
-msgid "Creates a filter based on whether there is an attachment for the e-mail."
+#: C/evolution.xml:3022(para) C/evolution.xml:3267(para)
+msgid "Creates a filter based on whether there is an attachment for the email."
 msgstr "Vytváří filtr založeny na tom, zda e-mail obsahuje přílohu."
 
-#: C/evolution.xml:2822(title)
+#: C/evolution.xml:3025(title)
 msgid "Mailing List"
 msgstr "Poštovní konference"
 
-#: C/evolution.xml:2823(para)
-#: C/evolution.xml:3068(para)
-msgid "Filters based on the mailing list the message came from. This filter might miss messages from some list servers, because it checks for the X-BeenThere header, which is used to identify mailing lists or other redistributors of mail. Mail from list servers that do not set X-BeenThere properly are not be caught by these filters."
-msgstr "Filtruje na základě toho, z které poštovní konference zpráva přišla. Tento filtr může opomenout zprávy z některých serverů, protože kontroluje hlavičku X-BeenThere, která se používá pro identifikaci poštovních konferencí nebo jiných redistributorů pošty. Pošta ze serverů, které nenastavují X-BeenThere správně, nemůže být tímto filtrem zachycena."
-
-#: C/evolution.xml:2826(title)
+#: C/evolution.xml:3026(para) C/evolution.xml:3271(para)
+msgid ""
+"Filters based on the mailing list the message came from. This filter might "
+"miss messages from some list servers, because it checks for the X-BeenThere "
+"header, which is used to identify mailing lists or other redistributors of "
+"mail. Mail from list servers that do not set X-BeenThere properly are not be "
+"caught by these filters."
+msgstr ""
+"Filtruje na základě toho, z které poštovní konference zpráva přišla. Tento "
+"filtr může opomenout zprávy z některých serverů, protože kontroluje hlavičku "
+"X-BeenThere, která se používá pro identifikaci poštovních konferencí nebo "
+"jiných redistributorů pošty. Pošta ze serverů, které nenastavují X-BeenThere "
+"správně, nemůže být tímto filtrem zachycena."
+
+#: C/evolution.xml:3029(title)
 msgid "Regex Match:"
 msgstr "Odpovídající regexu:"
 
-#: C/evolution.xml:2827(para)
-msgid "If you know your way around a <link linkend=\"regular-expression\">regex</link>, or regular expression, this option allows you to search for complex patterns of letters, so that you can find, for example, all words that start with a and end with m, and are between six and fifteen letters long, or all messages that declare a particular header twice. For information about how to use regular expressions, check the man page for the grep command."
-msgstr "Pokud víte, jak zacházet s <link linkend=\"regular-expression\">regexy</link> nebo regulárními výrazy, tato volba vám umožňuje vyhledávat komplexní struktury znaků, takže můžete např. najít všechna slova, které začínají na a a končí na m a jsou dlouhé 6 až 15 znaků nebo všechny zprávy, které deklarují určité hlavičky dvakrát. Pro více informací o tom, jak používat regulární výrazy, zkontrolujte stránku manuálu k příkazu grep."
-
-#: C/evolution.xml:2830(title)
+#: C/evolution.xml:3030(para)
+msgid ""
+"If you know your way around a <link linkend=\"regular-expression\">regex</"
+"link>, or regular expression, this option allows you to search for complex "
+"patterns of letters, so that you can find, for example, all words that start "
+"with a and end with m, and are between six and fifteen letters long, or all "
+"messages that declare a particular header twice. For information about how "
+"to use regular expressions, check the man page for the grep command."
+msgstr ""
+"Pokud víte, jak zacházet s <link linkend=\"regular-expression\">regexy</"
+"link> nebo regulárními výrazy, tato volba vám umožňuje vyhledávat komplexní "
+"struktury znaků, takže můžete např. najít všechna slova, které začínají na a "
+"a končí na m a jsou dlouhé 6 až 15 znaků nebo všechny zprávy, které "
+"deklarují určité hlavičky dvakrát. Pro více informací o tom, jak používat "
+"regulární výrazy, zkontrolujte stránku manuálu k příkazu grep."
+
+#: C/evolution.xml:3033(title)
 msgid "Source Account:"
 msgstr "Zdrojový účet:"
 
-#: C/evolution.xml:2831(para)
-msgid "Filters messages according the server you got them from. This is most useful if you use multiple POP mail accounts."
-msgstr "Filtruje zprávy podle serveru, z kterých jste je získali. Toto je nejužitečnější, používáte-li účty POP."
+#: C/evolution.xml:3034(para)
+msgid ""
+"Filters messages according the server you got them from. This is most useful "
+"if you use multiple POP mail accounts."
+msgstr ""
+"Filtruje zprávy podle serveru, z kterých jste je získali. Toto je "
+"nejužitečnější, používáte-li účty POP."
 
-#: C/evolution.xml:2834(title)
-#: C/evolution.xml:2918(title)
+#: C/evolution.xml:3037(title) C/evolution.xml:3121(title)
 msgid "Pipe to Program:"
 msgstr "Předat programu:"
 
-#: C/evolution.xml:2835(para)
-msgid "Evolution can use an external command to process a message, then process it based on the return value. Commands used in this way must return an integer. This is most commonly used to add an external junk mail filter."
-msgstr "Evolution může použít ke zpracování zprávy externí program, potom ji zpracovává na základě vrácené hodnoty. Použité příkazy musí vracet celá čísla. Toto je nejčastěji používáno pro přidání externího filtru nevyžádané pošty."
+#: C/evolution.xml:3038(para)
+msgid ""
+"Evolution can use an external command to process a message, then process it "
+"based on the return value. Commands used in this way must return an integer. "
+"This is most commonly used to add an external junk mail filter."
+msgstr ""
+"Evolution může použít ke zpracování zprávy externí program, potom ji "
+"zpracovává na základě vrácené hodnoty. Použité příkazy musí vracet celá "
+"čísla. Toto je nejčastěji používáno pro přidání externího filtru nevyžádané "
+"pošty."
 
-#: C/evolution.xml:2838(title)
+#: C/evolution.xml:3041(title)
 msgid "Junk Test:"
 msgstr "Test na nevyžádanou poštu:"
 
-#: C/evolution.xml:2839(para)
+#: C/evolution.xml:3042(para)
 msgid "Filters based on the results of the junk mail test."
 msgstr "Filtruje na základě výsledků testu na nevyžádanou poštu."
 
-#: C/evolution.xml:2842(title)
+#: C/evolution.xml:3045(title)
 msgid "Select the Criteria for the Condition:"
 msgstr "Vyberte kritéritum pro podmínku:"
 
-#: C/evolution.xml:2843(para)
-msgid "If you want multiple criteria for this filter, click Add Criterion and repeat step 4."
-msgstr "Pokud chcete pro tento filtr více kritérií, klikněte na Přidat kritérium a opakujte krok 4."
+#: C/evolution.xml:3046(para)
+msgid ""
+"If you want multiple criteria for this filter, click Add and repeat step 4."
+msgstr ""
+"Pokud chcete pro tento filtr více kritérií, klikněte na Přidat a opakujte "
+"krok 4."
 
-#: C/evolution.xml:2846(title)
+#: C/evolution.xml:3049(title)
 msgid "Select the Actions for the Filter in the Then Section:"
 msgstr "Vyberte akce pro filtr v sekci Potom:"
 
-#: C/evolution.xml:2847(para)
+#: C/evolution.xml:3050(para)
 msgid "Select any of the following options."
 msgstr "Vyberte kteroukoliv z následujících možností:"
 
-#: C/evolution.xml:2852(title)
+#: C/evolution.xml:3055(title)
 msgid "Move to Folder:"
 msgstr "Přesunout do složky:"
 
-#: C/evolution.xml:2853(para)
-msgid "Moves the message into a folder you specify. Click Here to select the destination folder."
-msgstr "Přesune zprávu do složky, kterou uvedete. Kliknutím zde vyberete složku."
+#: C/evolution.xml:3056(para)
+msgid "Moves the message into a folder you specify."
+msgstr "Přesune zprávu do složky, kterou určíte."
 
-#: C/evolution.xml:2858(title)
+#: C/evolution.xml:3061(title)
 msgid "Copy to Folder:"
 msgstr "Kopírovat do složky:"
 
-#: C/evolution.xml:2859(para)
-msgid "Puts a copy of the message into a folder you specify. Click Here to select the destination folder."
-msgstr "Vloží kopii zprávy do složky, kterou uvedete. Kliknutím zde vyberete složku."
+#: C/evolution.xml:3062(para)
+msgid "Puts a copy of the message into a folder you specify."
+msgstr "Vloží kopii zprávy do složky, kterou uvedete."
 
-#: C/evolution.xml:2865(para)
-msgid "Marks the message for deletion. The message can be undeleted until you expunge or empty the trash."
-msgstr "Označí zprávu pro odstranění. Zpráva může být obnovena, dokud ji nevyčistíte nebo nevyprázdníte koš."
+#: C/evolution.xml:3068(para)
+msgid ""
+"Marks the message for deletion. The message can be undeleted until you "
+"expunge or empty the trash."
+msgstr ""
+"Označí zprávu pro odstranění. Zpráva může být obnovena, dokud ji nevyčistíte "
+"nebo nevyprázdníte koš."
 
-#: C/evolution.xml:2870(title)
+#: C/evolution.xml:3073(title)
 msgid "Stop Processing:"
 msgstr "Zastavit zpracování:"
 
-#: C/evolution.xml:2871(para)
-msgid "Select this if you want to have all other filters ignore this message."
-msgstr "Zvolte tohle, pokud chcete, aby všechny ostatní filtry tuto zprávu ignorovaly."
+#: C/evolution.xml:3074(para)
+msgid ""
+"Select this if you want to all other filters ignore this message. Note that "
+"only filters listed after this particular rule will be ignored."
+msgstr ""
+"Zvolte tohle, pokud chcete, aby všechny ostatní filtry tuto zprávu "
+"ignorovaly. Uvědomte si, že budou ignorovány pouze filtry, které se "
+"nacházejí za tímto pravidlem."
 
-#: C/evolution.xml:2876(title)
+#: C/evolution.xml:3079(title)
 msgid "Assign Color:"
 msgstr "Přiřadit barvu:"
 
-#: C/evolution.xml:2877(para)
+#: C/evolution.xml:3080(para)
 msgid "Marks the message with a color of your choice."
 msgstr "Označí zprávu barvou, kterou vyberete."
 
-#: C/evolution.xml:2882(title)
+#: C/evolution.xml:3085(title)
 msgid "Assign Score:"
 msgstr "Přiřadit skóre:"
 
-#: C/evolution.xml:2883(para)
+#: C/evolution.xml:3086(para)
 msgid "Assigns the message a numeric score."
 msgstr "Přiřadí zprávě číselné skóre."
 
-#: C/evolution.xml:2888(title)
+#: C/evolution.xml:3091(title)
 msgid "Adjust Score:"
 msgstr "Upravit skóre:"
 
-#: C/evolution.xml:2889(para)
+#: C/evolution.xml:3092(para)
 msgid "Changes the numeric score by the amount you set."
 msgstr "Změní číselné skóre o sumu, kterou nastavíte."
 
-#: C/evolution.xml:2894(title)
+#: C/evolution.xml:3097(title)
 msgid "Set Status:"
 msgstr "Nastavit stav:"
 
-#: C/evolution.xml:2895(para)
-msgid "Sets the status of the message. The status can be Replied To, Draft, Important, Read, or Junk."
-msgstr "Nastaví stav zprávy. Status může být Zodpovězeno, Koncept, Důležité, Přečteno nebo Nevyžádaná pošta."
+#: C/evolution.xml:3098(para)
+msgid ""
+"Sets the status of the message. The status can be Replied To, Draft, "
+"Important, Read, or Junk."
+msgstr ""
+"Nastaví stav zprávy. Status může být Zodpovězeno, Koncept, Důležité, "
+"Přečteno nebo Nevyžádaná pošta."
 
-#: C/evolution.xml:2900(title)
+#: C/evolution.xml:3103(title)
 msgid "Unset Status:"
 msgstr "Odnastavit stav:"
 
-#: C/evolution.xml:2901(para)
-msgid "If the message has a status value, unsets it. If a status value is not set, it does nothing."
-msgstr "Pokud má zpráva nějakou statovou hodnotu, odnastaví ji. Pokud žádnou nemá, neudělá nic."
-
-#: C/evolution.xml:2906(title)
-msgid "Beep:"
-msgstr "Pípnout:"
+#: C/evolution.xml:3104(para)
+msgid ""
+"If the message has a status value, unsets it. If a status value is not set, "
+"it does nothing."
+msgstr ""
+"Pokud má zpráva nějakou statovou hodnotu, odnastaví ji. Pokud žádnou nemá, "
+"neudělá nic."
 
-#: C/evolution.xml:2907(para)
+#: C/evolution.xml:3110(para)
 msgid "Makes the system beep."
 msgstr "Nechá systém pípnout."
 
-#: C/evolution.xml:2912(title)
+#: C/evolution.xml:3115(title)
 msgid "Play Sound:"
 msgstr "Přehrát zvuk:"
 
-#: C/evolution.xml:2913(para)
+#: C/evolution.xml:3116(para)
 msgid "Select a sound file for Evolution to play."
 msgstr "Vyberte zvukový soubor, který má Evolution přehrát."
 
-#: C/evolution.xml:2919(para)
-msgid "Sends the message to a program of your choice. No return value is expected. This feature can be used to create automatic Web postings from e-mail messages or to perform additional message post processing not supported by Evolution."
-msgstr "Posílá zprávu programu, který vyberete. Neočekává se návrat hodnoty. Tato fuknce může být využita při automatickém vkládání e-mailových zpráv na web nebo pro vykonání dalšího zpracování zprávy, které není podporováno Evolutionem."
+#: C/evolution.xml:3122(para)
+msgid ""
+"Sends the message to a program of your choice. No return value is expected. "
+"This feature can be used to create automatic Web postings from email "
+"messages or to perform additional message post processing not supported by "
+"Evolution."
+msgstr ""
+"Posílá zprávu programu, který vyberete. Neočekává se návrat hodnoty. Tato "
+"fuknce může být využita při automatickém vkládání e-mailových zpráv na web "
+"nebo pro vykonání dalšího zpracování zprávy, které není podporováno "
+"Evolutionem."
 
-#: C/evolution.xml:2924(title)
+#: C/evolution.xml:3127(title)
 msgid "Run Program:"
 msgstr "Spustit program:"
 
-#: C/evolution.xml:2925(para)
+#: C/evolution.xml:3128(para)
 msgid "Evolution runs an application."
 msgstr "Evolution spustí nějakou aplikaci."
 
-#: C/evolution.xml:2931(para)
-msgid "Click Add Action if you need multiple actions and click OK."
-msgstr "Klikněte na Přidat akci, pokud potřebujete více akcí a klikněte na Budiž."
+#: C/evolution.xml:3134(para)
+msgid "Click Add if you need multiple actions and click OK."
+msgstr "Klikněte na Přidat, pokud potřebujete více akcí, a klikněte na Budiž."
 
-#: C/evolution.xml:2937(para)
+#: C/evolution.xml:3140(para)
 msgid "There is an easy shortcut for fast filter or search folder creation:"
-msgstr "Existuje jednoduchá zkratka pro rychlé vytvoření filtru nebo složky hledání:"
+msgstr ""
+"Existuje jednoduchá zkratka pro rychlé vytvoření filtru nebo složky hledání:"
 
-#: C/evolution.xml:2940(para)
-msgid "Right-click the message in the e-mail list."
-msgstr "Klikněte pravým tlačítkem na zprávu v seznamu e-mailů."
+#: C/evolution.xml:3143(para)
+msgid "Right-click the message in the message list."
+msgstr "Klikněte pravým tlačítkem na zprávu v seznamu zpráv."
 
-#: C/evolution.xml:2943(para)
-msgid "Select one of the items under the Create Rule from the Message submenu."
+#: C/evolution.xml:3146(para)
+msgid "Select one of the items under the Create Rule From Message submenu."
 msgstr "Vyberte jednu z položek v podnabídce pod Vytvořit pravidlo ze zprávy."
 
-#: C/evolution.xml:2944(para)
-msgid "Creating a rule based on a message opens the filter creation tool with some of the information about the message already filled in for your convenience."
-msgstr "Vytváření pravidel na základě zprávy otevře nástroj pro vytváření filtrů s některými již vyplněnými informacemi ze zprávy."
+#: C/evolution.xml:3147(para)
+msgid ""
+"Creating a rule based on a message opens the filter creation tool with some "
+"of the information about the message already filled in for your convenience."
+msgstr ""
+"Vytváření pravidel na základě zprávy otevře nástroj pro vytváření filtrů s "
+"některými již vyplněnými informacemi ze zprávy."
 
-#: C/evolution.xml:2947(para)
-msgid "If you have several filters that match a single message, they are all applied to the message in order, unless one of the filters has the Stop Processing action. If you use that action in a filter, the messages that it affects are not touched by other filters."
-msgstr "Máte-li několik filtrů, které se vztahují k jedné zprávě, všechny budou na zprávu aplikovány popořadě, nebude-li mít jeden z filtrů akci Zastavit zpracování."
+#: C/evolution.xml:3150(para)
+msgid ""
+"If you have several filters that match a single message, they are all "
+"applied to the message in order, unless one of the filters has the Stop "
+"Processing action. If you use that action in a filter, the messages that it "
+"affects are not touched by other filters."
+msgstr ""
+"Máte-li několik filtrů, které se vztahují k jedné zprávě, všechny budou na "
+"zprávu aplikovány popořadě, nebude-li mít jeden z filtrů akci Zastavit "
+"zpracování."
 
-#: C/evolution.xml:2948(para)
-msgid "When you first open the Filters dialog box, you are shown the list of filters sorted in the order in which they will be applied. You can move them up and down in the priority list by clicking the Up and Down buttons."
-msgstr "Hned, jak otevřete dialogové okno filtrů, zobrazí se vám seznam filtrů seřazených tak, jak jsou postupně aplikovány. Můžeze je posouvat seznamu priority nahořů nebo dolů klikáním na tlačítka Nahoru a Dolů."
+#: C/evolution.xml:3151(para)
+msgid ""
+"When you first open the Filters dialog box, you are shown the list of "
+"filters sorted in the order in which they will be applied. You can move them "
+"up and down in the priority list by clicking the Up and Down buttons."
+msgstr ""
+"Hned, jak otevřete dialogové okno filtrů, zobrazí se vám seznam filtrů "
+"seřazených tak, jak jsou postupně aplikovány. Můžeze je posouvat seznamu "
+"priority nahořů nebo dolů klikáním na tlačítka Nahoru a Dolů."
 
-#: C/evolution.xml:2952(title)
+#: C/evolution.xml:3155(title)
 msgid "Editing Filters"
 msgstr "Úprava filtrů"
 
-#: C/evolution.xml:2958(para)
+#: C/evolution.xml:3161(para)
 msgid "Select the filter to edit, then click Edit."
 msgstr "Vyberte filtr, který chcete upravit a klikněte na Upravit."
 
-#: C/evolution.xml:2961(para)
+#: C/evolution.xml:3164(para)
 msgid "Make the desired corrections, then click OK twice."
 msgstr "Udělejte požadované korekce a klikněte dvakrát na Budiž."
 
-#: C/evolution.xml:2967(title)
+#: C/evolution.xml:3170(title)
 msgid "Deleting Filters"
 msgstr "Odstranění filtrů"
 
-#: C/evolution.xml:2973(para)
+#: C/evolution.xml:3176(para)
 msgid "Select the filter to remove, then click Remove."
-msgstr "Vyberte filtr, který chcete odstranit a klikněte na tlačítko Odstranit."
-
-#: C/evolution.xml:2984(para)
-msgid "If filters aren't flexible enough, or you find yourself performing the same search again and again, consider a search folder. Search folders are an advanced way of viewing your e-mail messages within Evolution. If you get a lot of mail or often forget where you put messages, search folders can help you keep things organized."
-msgstr "Nejsou-li filtry dostatečně flexibilní nebo zjistíte, že provádíte stejné vyhledávání znovu a znovu, zvažte použití složek hledání. Složky hledání jsou pokročilým způsobem prohlížení e-mailů v rámci Evolutionu. Pokud dostáváte hodně e-mailů nebo často zapomenete, kam jste zprávu dali, složky hledání vám pomohou udržet pořádek."
-
-#: C/evolution.xml:2985(para)
-msgid "A search folder is really a hybrid of all the other organizational tools: it looks like a folder, it acts like a search, and you set it up like a filter. In other words, a conventional folder actually contains messages, but a search folder is a view of messages that might be in several different folders. The messages it contains are determined on the fly using a set of criteria you choose in advance."
-msgstr "Složka hledání je kombinací všech ostatních organizačních nástrojů: vypadá jako složka, chová se jako vyhledávání a můžete ji nastavit jako filtr. Jinými slovy obyčejná složka obsahuje zprávy, ale složka hledání je zobrazení zpráv, které mohou být v několika různých složkách. Zprávy, které obsahuje, jsou za běhu vybírány podle kritérií, které předem vyberete."
-
-#: C/evolution.xml:2986(para)
-msgid "As messages that meet the search folder criteria arrive or are deleted, Evolution automatically adjusts the search folder contents. When you delete a message, it is erased from the folder in which it actually exists, as well as any search folders that display it."
-msgstr "Jak zprávy, které splňují kritéria složky hledání, přicházejí nebo jsou mazány, Evolution automaticky mění obsah složky hledání. Když odstraníte zprávu, je vymazána ze složky, kde opravdu je, stejně tak jako ze všech složek hledání, které ji zobrazují. "
+msgstr ""
+"Vyberte filtr, který chcete odstranit a klikněte na tlačítko Odstranit."
 
-#: C/evolution.xml:2987(para)
-msgid "The Unmatched Search Folder is the opposite of other search folders: it displays all messages that do not appear in other search folders."
-msgstr "Nepřiřazená složka hledání je opakem ostatních složek hledání: zobrazuje všechny zprávy, které se neobjevují v ostatních složkách hledání. "
+#: C/evolution.xml:3187(para)
+msgid ""
+"If filters aren't flexible enough, or you find yourself performing the same "
+"search again and again, consider a search folder. Search folders are an "
+"advanced way of viewing your email messages within Evolution. If you get a "
+"lot of mail or often forget where you put messages, search folders can help "
+"you keep things organized."
+msgstr ""
+"Nejsou-li filtry dostatečně flexibilní nebo zjistíte, že provádíte stejné "
+"vyhledávání znovu a znovu, zvažte použití složek hledání. Složky hledání "
+"jsou pokročilým způsobem prohlížení e-mailů v rámci Evolutionu. Pokud "
+"dostáváte hodně e-mailů nebo často zapomenete, kam jste zprávu dali, složky "
+"hledání vám pomohou udržet pořádek."
 
-#: C/evolution.xml:2988(para)
-msgid "If you use remote e-mail storage like IMAP or Microsoft Exchange, and have created search folders to search through them, the Unmatched Search Folder also searches the remote folders. If you do not create any search folders that search remote mail stores, the Unmatched Search Folder does not search in them either."
-msgstr "Používáte-li vzdálené úložiště e-mailu jako IMAP nebo Microsoft Exchange a vytvořili jste složky hledání, aby ho prohledávaly, Nepřiřazená složka hledání bude také prohledávat vzdálené složky. Pokud jste nevytvořili jedinou složku hledání, která prohledává vzdálená úložiště, Nepřiřazená složka hledání je nebude prohledávat také."
+#: C/evolution.xml:3188(para)
+msgid ""
+"A search folder is really a hybrid of all the other organizational tools: it "
+"looks like a folder, it acts like a search, and you set it up like a filter. "
+"In other words, a conventional folder actually contains messages, but a "
+"search folder is a view of messages that might be in several different "
+"folders. The messages it contains are determined on the fly using a set of "
+"criteria you choose in advance."
+msgstr ""
+"Složka hledání je kombinací všech ostatních organizačních nástrojů: vypadá "
+"jako složka, chová se jako vyhledávání a můžete ji nastavit jako filtr. "
+"Jinými slovy obyčejná složka obsahuje zprávy, ale složka hledání je "
+"zobrazení zpráv, které mohou být v několika různých složkách. Zprávy, které "
+"obsahuje, jsou za běhu vybírány podle kritérií, které předem vyberete."
+
+#: C/evolution.xml:3189(para)
+msgid ""
+"As messages that meet the search folder criteria arrive or are deleted, "
+"Evolution automatically adjusts the search folder contents. When you delete "
+"a message, it is erased from the folder in which it actually exists, as well "
+"as any search folders that display it."
+msgstr ""
+"Jak zprávy, které splňují kritéria složky hledání, přicházejí nebo jsou "
+"mazány, Evolution automaticky mění obsah složky hledání. Když odstraníte "
+"zprávu, je vymazána ze složky, kde opravdu je, stejně tak jako ze všech "
+"složek hledání, které ji zobrazují. "
 
-#: C/evolution.xml:2989(para)
-msgid "As an example of using folders, searches, and search folders, consider the following: To organize his mailbox, Jim sets up a search folder for e-mail from his friend and co-worker Anna. He has another search folder for messages that have novell.com in the address and Evolution in the subject line, so he can keep a record of what people from work send him about Evolution. If Anna sends him a message about anything other than Evolution, it only shows up in the <quote>Anna</quote> search folder. When Anna sends him mail about the user interface for Evolution, he can see the message both in the <quote>Anna</quote> search folder and in the <quote>Internal Evolution Discussion</quote> search folder."
-msgstr "Za příklad použití složek, hledání a složek hledání považujte toto: Aby Jim zorganizoval svoji poštovní schránku, nastavil si složku hledání pro e-maily od jeho kamarádky a spolupracovnice Anny. Má i složku hledání pro zprávy mající novell.com v adrese a Evolution v předmětu, takže si může udržovat záznamy o tom, co mu lidé z práce poslali ohledně Evolutionu. Pokud mu Anna pošle zprávu o čemkoliv jiném než Evolutionu, objeví se to pouze ve složce hledání <quote>Anna</quote>. Když mu Anna pošle e-mail o uživatelském rozhraní pro Evolution, může vidět zprávu jak ve složce hledání <quote>Anna</quote>, tak ve složce hledání <quote>Interní diskuse o Evolutionu</quote>."
+#: C/evolution.xml:3190(para)
+msgid ""
+"The Unmatched Search Folder is the opposite of other search folders: it "
+"displays all messages that do not appear in other search folders."
+msgstr ""
+"Nepřiřazená složka hledání je opakem ostatních složek hledání: zobrazuje "
+"všechny zprávy, které se neobjevují v ostatních složkách hledání. "
 
-#: C/evolution.xml:2992(title)
+#: C/evolution.xml:3191(para)
+msgid ""
+"If you use remote email storage like IMAP or Microsoft Exchange, and have "
+"created search folders to search through them, the Unmatched Search Folder "
+"also searches the remote folders. If you do not create any search folders "
+"that search remote mail stores, the Unmatched Search Folder does not search "
+"in them either."
+msgstr ""
+"Používáte-li vzdálené úložiště e-mailů jako IMAP nebo Microsoft Exchange a "
+"vytvořili jste složky hledání, aby ho prohledávaly, Nepřiřazená složka "
+"hledání bude také prohledávat vzdálené složky. Pokud jste nevytvořili "
+"jedinou složku hledání, která prohledává vzdálená úložiště, Nepřiřazená "
+"složka hledání je nebude prohledávat také."
+
+#: C/evolution.xml:3192(para)
+msgid ""
+"As an example of using folders, searches, and search folders, consider the "
+"following: To organize his mailbox, Jim sets up a search folder for email "
+"from his friend and co-worker Anna. He has another search folder for "
+"messages that have novell.com in the address and Evolution in the subject "
+"line, so he can keep a record of what people from work send him about "
+"Evolution. If Anna sends him a message about anything other than Evolution, "
+"it only shows up in the <quote>Anna</quote> search folder. When Anna sends "
+"him mail about the user interface for Evolution, he can see the message both "
+"in the <quote>Anna</quote> search folder and in the <quote>Internal "
+"Evolution Discussion</quote> search folder."
+msgstr ""
+"Za příklad použití složek, hledání a složek hledání považujte toto: Aby Jim "
+"zorganizoval svoji poštovní schránku, nastavil si složku hledání pro e-maily "
+"od jeho kamarádky a spolupracovnice Anny. Má i složku hledání pro zprávy "
+"mající novell.com v adrese a Evolution v předmětu, takže si může udržovat "
+"záznamy o tom, co mu lidé z práce poslali ohledně Evolutionu. Pokud mu Anna "
+"pošle zprávu o čemkoliv jiném než Evolutionu, objeví se to pouze ve složce "
+"hledání <quote>Anna</quote>. Když mu Anna pošle e-mail o uživatelském "
+"rozhraní pro Evolution, může vidět zprávu jak ve složce hledání <quote>Anna</"
+"quote>, tak ve složce hledání <quote>Interní diskuse o Evolutionu</quote>."
+
+#: C/evolution.xml:3195(title)
 msgid "Creating A Search Folder"
 msgstr "Vytvoření složky hledání"
 
-#: C/evolution.xml:2995(para)
-msgid "Click Message &gt; Create Rule, then select a search folder based on Subject, Sender, Recipient, or Mailing List."
-msgstr "Klikněte na Zpráva &gt; Vytvořit pravidlo a vyberte složku hledání podle předmětu, odesílatele, příjemce nebo poštovní konference."
+#: C/evolution.xml:3198(para)
+msgid ""
+"Click Message &gt; Create Rule, then select a search folder based on "
+"Subject, Sender, Recipient, or Mailing List."
+msgstr ""
+"Klikněte na Zpráva &gt; Vytvořit pravidlo a vyberte složku hledání podle "
+"předmětu, odesílatele, příjemce nebo poštovní konference."
 
-#: C/evolution.xml:2997(para)
+#: C/evolution.xml:3200(para)
 msgid "Select Search menu &gt; Create Search Folder From Search."
 msgstr "Vyberte nabídku Hledat &gt; Vytvořit složku hledání z vyhledávání."
 
-#: C/evolution.xml:2999(para)
-msgid "Perform this operation from the search results. Create a search folder from search is enabled only when you already have performed a search."
-msgstr "Proveďte tuto operaci z výsledků vyhledávání. Tvorba složky hledání z vyhledávání je povolena, pouze když jste provedli vyhledávání."
+#: C/evolution.xml:3202(para)
+msgid ""
+"Perform this operation from the search results. Create a search folder from "
+"search is enabled only when you already have performed a search."
+msgstr ""
+"Proveďte tuto operaci z výsledků vyhledávání. Tvorba složky hledání z "
+"vyhledávání je povolena, pouze když jste provedli vyhledávání."
 
-#: C/evolution.xml:3002(para)
+#: C/evolution.xml:3205(para)
 msgid "Select Edit &gt; Search Folder"
 msgstr "Vyberte Upravit &gt; Prohledat složky"
 
-#: C/evolution.xml:3010(para)
+#: C/evolution.xml:3213(para)
 msgid "Type the name of the search folder in the Search name field."
 msgstr "Napište jméno složky hledání do podle Název pravidla."
 
-#: C/evolution.xml:3013(para)
-msgid "Select your search criteria. For each criterion, you must first select which of the following parts of the message you want the search to examine. The criteria are almost similar to those for filters."
-msgstr "Vyberte kritéria hledání. Pro každé kritérium musíte prvně vybrat, která z následujících části má být prohledávána. Kritéria jsou téměř stejná jako ty pro filtry."
+#: C/evolution.xml:3216(para)
+msgid ""
+"Select your search criteria. For each criterion, you must first select which "
+"of the following parts of the message you want the search to examine. The "
+"criteria are almost similar to those for filters."
+msgstr ""
+"Vyberte kritéria hledání. Pro každé kritérium musíte prvně vybrat, která z "
+"následujících části má být prohledávána. Kritéria jsou téměř stejná jako ty "
+"pro filtry."
 
-#: C/evolution.xml:3016(para)
+#: C/evolution.xml:3219(para)
 msgid "Sender's address."
 msgstr "Adresa odesílatele."
 
-#: C/evolution.xml:3019(title)
+#: C/evolution.xml:3222(title)
 msgid "Recipients:"
 msgstr "Příjemci:"
 
-#: C/evolution.xml:3031(title)
-msgid "Expression:(For programmers only)"
-msgstr "Výraz:(pouze pro programátory)"
+#: C/evolution.xml:3234(title)
+msgid "Expression (For programmers only):"
+msgstr "Výraz (pouze pro programátory):"
 
-#: C/evolution.xml:3032(para)
-msgid "Match a message according to an expression you write in the Scheme language used to define filters in Evolution."
-msgstr "Porovnává zprávu s výrazem, který jste napsali v jazyku Scheme, který se používá pro definování filtrů v Evolutionu."
-
-#: C/evolution.xml:3044(para)
-msgid "Messages can have labels of Important, Work, Personal, To Do, or Later. You can set labels with other filters or manually."
-msgstr "Zprávy mohou mít štítky Důležité, Pracovní, Osobní, Zpracovávané, Později. Štítky můžete nastavit jinými filtry nebo ručně."
+#: C/evolution.xml:3235(para)
+msgid ""
+"Match a message according to an expression you write in the Scheme language "
+"used to define filters in Evolution."
+msgstr ""
+"Porovnává zprávu s výrazem, který jste napsali v jazyku Scheme, který se "
+"používá pro definování filtrů v Evolutionu."
 
-#: C/evolution.xml:3059(title)
+#: C/evolution.xml:3262(title)
 msgid "Follow Up:"
 msgstr "K vyřízení:"
 
-#: C/evolution.xml:3067(title)
+#: C/evolution.xml:3270(title)
 msgid "Mailing List:"
 msgstr "Poštovní konference:"
 
-#: C/evolution.xml:3071(title)
+#: C/evolution.xml:3274(title)
 msgid "Match all:"
 msgstr "Vše odpovídá:"
 
-#: C/evolution.xml:3072(para)
+#: C/evolution.xml:3275(para)
 msgid "Checks whether the message matchs all the criteria listed."
 msgstr "Kontroluje, zda zpráva odpovídá všem uvedeným kritériím."
 
-#: C/evolution.xml:3076(para)
-msgid "Select the folders where this search folder will search. Your options are:"
-msgstr "Vyberte složky, kde bude tato složka hledání hledat. Vaše možnosti jsou:"
+#: C/evolution.xml:3279(para)
+msgid ""
+"Select which folders will be used for the search folder. Your options are:"
+msgstr ""
+"Vyberte, které složky budou použity pro složku hledání. Vaše možnosti jsou:"
 
-#: C/evolution.xml:3078(title)
+#: C/evolution.xml:3281(title)
 msgid "All local folders:"
 msgstr "Všechny místní složky:"
 
-#: C/evolution.xml:3079(para)
-msgid "Uses all local folders for the search folder source in addition to individual folders that are selected."
-msgstr "Jako zdroj pro složku hledání používá všechny místní složky navíc k těm, které jste jednotlivě vybrali."
+#: C/evolution.xml:3282(para)
+msgid ""
+"Uses all local folders for the search folder source in addition to "
+"individual folders that are selected."
+msgstr ""
+"Jako zdroj pro složku hledání používá všechny místní složky navíc k těm, "
+"které jste jednotlivě vybrali."
 
-#: C/evolution.xml:3082(title)
+#: C/evolution.xml:3285(title)
 msgid "All active remote folders:"
 msgstr "Všechny aktivní, vzdálené složky:"
 
-#: C/evolution.xml:3083(para)
-msgid "Remote folders are considered active if you are connected to the server; you must be connected to your mail server for the search folder to include any messages from that source in addition to individual folders that are selected."
-msgstr "Vzdálené složky jsou považovány za aktivní, pokud jste připojeni k serveru; pro složky hledání musíte být připojeni k vašemu poštovního serveru, chcete-li přidat jakékoliv zprávy z tohoto zdroje ke složkám, které jste vybrali jednotlivě."
+#: C/evolution.xml:3286(para)
+msgid ""
+"Remote folders are considered active if you are connected to the server; you "
+"must be connected to your mail server for the search folder to include any "
+"messages from that source in addition to individual folders that are "
+"selected."
+msgstr ""
+"Vzdálené složky jsou považovány za aktivní, pokud jste připojeni k serveru; "
+"pro složky hledání musíte být připojeni k vašemu poštovního serveru, chcete-"
+"li přidat jakékoliv zprávy z tohoto zdroje ke složkám, které jste vybrali "
+"jednotlivě."
 
-#: C/evolution.xml:3086(title)
+#: C/evolution.xml:3289(title)
 msgid "All local and active remote folders:"
 msgstr "Všechny místní a aktivní, vzdálené složky:"
 
-#: C/evolution.xml:3087(para)
-msgid "Uses all local and active remote folders for the search folder source in addition to individual folders that are selected."
-msgstr "Používá všechny místní a aktivní, vzdálené složky navíc ke složkám, které jste vybrali jednotlivě."
+#: C/evolution.xml:3290(para)
+msgid ""
+"Uses all local and active remote folders for the search folder source in "
+"addition to individual folders that are selected."
+msgstr ""
+"Používá všechny místní a aktivní, vzdálené složky navíc ke složkám, které "
+"jste vybrali jednotlivě."
 
-#: C/evolution.xml:3090(title)
+#: C/evolution.xml:3293(title)
 msgid "Specific folders only:"
 msgstr "Pouze konkrétní složky:"
 
-#: C/evolution.xml:3091(para)
+#: C/evolution.xml:3294(para)
 msgid "Uses individual folders for the search folder source."
 msgstr "Jako zdroj pro složky hledání používá jednotlivé složky."
 
-#: C/evolution.xml:3093(para)
+#: C/evolution.xml:3296(para)
 msgid "If you select Specific folders only,"
 msgstr "Vyberete-li pouze konkrétní složky,"
 
-#: C/evolution.xml:3096(para)
+#: C/evolution.xml:3299(para)
 msgid "click Add button to open the Select folder window."
 msgstr "klikněte na tlačítko Přidat a otevře se okno Vybrat složku."
 
-#: C/evolution.xml:3103(para)
+#: C/evolution.xml:3306(para)
 msgid "Select the folder and press Add button."
 msgstr "Vyberte složku a klikněte na tlačítko Přidat."
 
-#: C/evolution.xml:3106(para)
-msgid "You can view the folder added to the list in the entry box at the bottom of the New Search Folder window."
-msgstr "Složku přidanou do seznamu můžete vidět v rámečku s položkami dole v okně Nová složka hledání."
-
-#: C/evolution.xml:3117(para)
-msgid "Evolution can check for junk mail for you. Evolution uses SpamAssassin and/ or Bogofilter with trainable Bayesian filters to perform the spam check. When the software detects mail that appears to be junk mail, it will flag it and hide it from your view. Messages that are flagged as junk mail are displayed only in the Junk folder."
-msgstr "Evolution vám může kontrolovat nevyžádanou poštu. Ke kontrole spamu Evolution používá SpamAssassin a/nebo Bogofilter s Bayesian filtrem, který je schopný se učit. Když software odhalí zprávu, která se jeví jako nevyžádaná, označí ji a skryje ji před vaším pohledem. Zprávy, kterou jsou označeny jako nevyžádaná pošta jsou zobrazeny pouze ve složce Nevyžádaná pošta."
+#: C/evolution.xml:3309(para)
+msgid ""
+"You can view the folder added to the list in the entry box at the bottom of "
+"the New Search Folder window."
+msgstr ""
+"Složku přidanou do seznamu můžete vidět v rámečku s položkami dole v okně "
+"Nová složka hledání."
 
-#: C/evolution.xml:3118(para)
-msgid "The junk mail filter can learn which kinds of mail are legitimate and which are not if you train it. When you first start using junk mail blocking, check the Junk folder to be sure that legitimate mail doesn't get flagged as junk mail. If good mail, is incorrectly flagged, remove it from the Junk folder by right-clicking it and selecting Mark as Not Junk or press Shift+Ctrl+J. If Evolution misses junk mail, right-click the message, then click Mark as Junk or press Ctrl+J. When you correct it, the filter can recognize similar messages in the future, and becomes more accurate as time goes on."
-msgstr "Filtr nevyžádané pošty se umí učit, který typ pošty je v pořádku a který není, pokud ho učit necháte. Když začnete poprvé používat blokování nevyžádané pošty, kontrolujte si složku Nevyžádaná pošta, abyste se ujistili, že pošta, která je v pořádku, není označena jako spam. Pokud je dobrá pošta nesprávně označena, odstraňte ji ze složky Nevyžádaná pošta kliknutím pravým tlačítkem a zvolením Označit, že není nevyžádaná nebo stisknutím Shift+Ctrl+J. Pokud Evolutionu spam proklouzne, klikněte pravým tlačítkem na zprávu a potom klikněte na Označit jako nevyžádaná nebo stiskněte Ctrl+J. Když provedete opravu, filtr bude umět v budoucnu rozpoznat podobné zprávy a bude postupně přesnější."
+#: C/evolution.xml:3320(para)
+msgid ""
+"Evolution can check for junk mail for you. Evolution uses SpamAssassin and/"
+"or Bogofilter with trainable Bayesian filters to perform the spam check. "
+"When the software detects mail that appears to be junk mail, it will flag it "
+"and hide it from your view. Messages that are flagged as junk mail are "
+"displayed only in the Junk folder."
+msgstr ""
+"Evolution vám může kontrolovat nevyžádanou poštu. Ke kontrole spamu "
+"Evolution používá SpamAssassin a/nebo Bogofilter s bayesiánským filtrem, "
+"který je schopný se učit. Když software odhalí zprávu, která se jeví jako "
+"nevyžádaná, označí ji a skryje ji před vaším pohledem. Zprávy, kterou jsou "
+"označeny jako nevyžádaná pošta jsou zobrazeny pouze ve složce Nevyžádaná "
+"pošta."
+
+#: C/evolution.xml:3321(para)
+msgid ""
+"The junk mail filter can learn which kinds of mail are legitimate and which "
+"are not if you train it. When you first start using junk mail blocking, "
+"check the Junk folder to be sure that legitimate mail doesn't get flagged as "
+"junk mail. If good mail is incorrectly flagged, remove it from the Junk "
+"folder by right-clicking it and selecting Mark as Not Junk or press Shift"
+"+Ctrl+J. If Evolution misses junk mail, right-click the message, then click "
+"Mark as Junk or press Ctrl+J. When you correct it, the filter can recognize "
+"similar messages in the future, and becomes more accurate as time goes on."
+msgstr ""
+"Filtr nevyžádané pošty se umí učit, který typ pošty je v pořádku a který "
+"není, pokud ho učit necháte. Když začnete poprvé používat blokování "
+"nevyžádané pošty, kontrolujte si složku Nevyžádaná pošta, abyste se "
+"ujistili, že pošta, která je v pořádku, není označena jako spam. Pokud je "
+"dobrá pošta nesprávně označena, odstraňte ji ze složky Nevyžádaná pošta "
+"kliknutím pravým tlačítkem a zvolením Označit, že není nevyžádaná nebo "
+"stisknutím Shift+Ctrl+J. Pokud Evolutionu spam proklouzne, klikněte pravým "
+"tlačítkem na zprávu a potom klikněte na Označit jako nevyžádaná nebo "
+"stiskněte Ctrl+J. Když provedete opravu, filtr bude umět v budoucnu "
+"rozpoznat podobné zprávy a bude postupně přesnější."
+
+#: C/evolution.xml:3322(para)
+msgid ""
+"Every filter needs to learn at the least 100 spam and 100 ham to start "
+"working. For that, you must mark each message manually by clicking the "
+"<emphasis>Not junk</emphasis> button in the toolbar to learn that it is ham. "
+"The <emphasis>Junk</emphasis> button learns a message as spam."
+msgstr ""
+"Každý filtr se potřebuje naučit aspoň 100 spamů a 100 hamů, aby začal "
+"pracovat. Proto musíte ručně označit každou zprávu kliknutím na tlačítko "
+"<emphasis>Není nevyžádané</emphasis> v liště nástrojů, aby se naučil, že jde "
+"o ham.  Tlačítko <emphasis>Nevyžádaná pošta</emphasis> naopak učí, že jde o "
+"spam. "
 
-#: C/evolution.xml:3119(para)
-msgid "Every filter needs to learn at the least 100 spam and 100 ham to start working. For that, you must mark each message manually by clicking the <emphasis>Not junk</emphasis> button in the toolbar to learn that it is ham. The <emphasis>Junk</emphasis> button learns a message as spam."
-msgstr "Každý filtr se potřebuje naučit aspoň 100 spamů a 100 hamů, aby začal pracovat. Proto musíte ručně označit každou zprávu kliknutím na tlačítko <emphasis>Není nevyžádané</emphasis> v liště nástrojů, aby se naučil, že jde o ham.  Tlačítko <emphasis>Nevyžádaná pošta</emphasis> naopak učí, že jde o spam. "
+#: C/evolution.xml:3323(para)
+msgid ""
+"To change your junk mail filtering preferences, click Edit &gt; Preferences, "
+"then click Mail Preferences."
+msgstr ""
+"Chcete-li změnit nastavení filtrování nevyžádané pošty, klikněte na Upravit "
+"&gt; Nastavení, potom na Nastavení pošty."
 
-#: C/evolution.xml:3120(para)
-msgid "To change your junk mail filtering preferences, click Edit &gt; Preferences, then click Mail Preferences. For more information on this see, <link linkend=\"mail-prefs-junk\">Junk Mail Preferences</link>."
-msgstr "Pro změnu vašeho nastavení filtrování nevyžádané pošty klikněte na Upravit &gt; Nastavení, potom na Nastavení pošty. Více informací najdete v <link linkend=\"mail-prefs-junk\">Nastavení nevyžádané pošty</link>."
+#: C/evolution.xml:3324(para) C/evolution.xml:5905(para)
+msgid ""
+"For additional information on junk content, see <link linkend=\"mail-prefs-"
+"junk\">Junk Mail Preferences</link>."
+msgstr ""
+"Více informací o nevyžádané poště se dozvíte v <link linkend=\"mail-prefs-"
+"junk\">Nastavení nevyžádané pošty</link>."
 
-#: C/evolution.xml:3121(para)
-msgid "For additional junk mail settings, see <link linkend=\"more-mail-options\">Receiving Mail Options</link>."
-msgstr "Informace o dalším nastavení nevyžádané pošty naleznete v <link linkend=\"more-mail-options\">Možnosti přijímání pošty</link>."
+#: C/evolution.xml:3325(para)
+msgid ""
+"For additional junk mail settings, see <link linkend=\"more-mail-options"
+"\">Receiving Mail Options</link>."
+msgstr ""
+"Informace o dalším nastavení nevyžádané pošty naleznete v <link linkend="
+"\"more-mail-options\">Možnosti přijímání pošty</link>."
 
-#: C/evolution.xml:3123(para)
-msgid "SpamAssassin is an application that scan through the mail box to find junk mails. Evolution uses SpamAssassin as the default spam-filtering application. For more information, see<ulink url=\"http://spamassassin.apache.org/\"> The Apache SpamAssassin Project</ulink>."
-msgstr "SpamAssassin je aplikace, který skenuje poštovní schránku, aby nalezl nevyžádanou poštu. Evolution používá SpamAssassin jako výchozí aplikaci na filtrování spamu. Více informací naleznete na <ulink url=\"http://spamassassin.apache.org/\"> The Apache SpamAssassin Project</ulink>."
+#: C/evolution.xml:3327(para)
+msgid ""
+"SpamAssassin is an application that scan through the mail box to find junk "
+"mail. Evolution uses SpamAssassin as the default spam-filtering application. "
+"For more information, see<ulink url=\"http://spamassassin.apache.org/\"> The "
+"Apache SpamAssassin Project</ulink>."
+msgstr ""
+"SpamAssassin je aplikace, který skenuje poštovní schránku, aby nalezl "
+"nevyžádanou poštu. Evolution používá SpamAssassin jako výchozí aplikaci na "
+"filtrování spamu. Více informací naleznete na <ulink url=\"http://"
+"spamassassin.apache.org/\"> The Apache SpamAssassin Project</ulink>."
 
-#: C/evolution.xml:3124(para)
-msgid "Bogofilter is a mail filter that classifies mail as spam or ham (non-spam) by a statistical analysis of the message's header and content (body). It is able to learn from the user's classifications and corrections. For more information on Bogofilter, see <ulink url=\"http://bogofilter.sourceforge.net/\">The Bogofilter site</ulink>."
-msgstr "Bogofilter je filtr pošty, který třídí poštu na spam a ham (nespam) podle statistické analýzy hlaviček a těla zprávy. Je schopen se učit z uživatelova třídění a oprav. Více informací naleznete na <ulink url=\"http://bogofilter.sourceforge.net/\">stránkách  o Bogofilter</ulink>."
+#: C/evolution.xml:3328(para)
+msgid ""
+"Bogofilter is a mail filter that classifies mail as spam or ham (non-spam) "
+"by a statistical analysis of the message's header and content (body). It is "
+"able to learn from the user's classifications and corrections. For more "
+"information on Bogofilter, see <ulink url=\"http://bogofilter.sourceforge."
+"net/\">The Bogofilter site</ulink>."
+msgstr ""
+"Bogofilter je filtr pošty, který třídí poštu na spam a ham (nespam) podle "
+"statistické analýzy hlaviček a těla zprávy. Je schopen se učit z uživatelova "
+"třídění a oprav. Více informací naleznete na <ulink url=\"http://bogofilter."
+"sourceforge.net/\">stránkách  o Bogofilter</ulink>."
 
-#: C/evolution.xml:3131(para)
-msgid "This section shows you how to use the <trademark>Evolution</trademark> contacts tool to organize any amount of contact information, share addresses over a network, and save time with everyday tasks."
-msgstr "Tato sekce vám ukáže, jak používat nástroj kontaktů <trademark>Evolutionu</trademark> pro organizaci jakéhokoliv množství informací kontaktů, sdílení adres po síti a časovou úsporu při plnění každodenních úkolů."
+#: C/evolution.xml:3335(para)
+msgid ""
+"This section shows you how to use the <trademark>Evolution</trademark> "
+"contacts tool to organize any amount of contact information, share addresses "
+"over a network, and save time with everyday tasks."
+msgstr ""
+"Tato sekce vám ukáže, jak používat nástroj kontaktů <trademark>Evolutionu</"
+"trademark> pro organizaci jakéhokoliv množství informací kontaktů, sdílení "
+"adres po síti a časovou úsporu při plnění každodenních úkolů."
 
-#: C/evolution.xml:3134(link)
-#: C/evolution.xml:3151(title)
+#: C/evolution.xml:3338(link) C/evolution.xml:3355(title)
 msgid "Contacts and Cards"
 msgstr "Kontakty a karty"
 
-#: C/evolution.xml:3137(link)
-#: C/evolution.xml:3246(title)
+#: C/evolution.xml:3341(link) C/evolution.xml:3504(title)
 msgid "Searching for Contacts"
 msgstr "Vyhledávání kontaktů"
 
-#: C/evolution.xml:3140(link)
-#: C/evolution.xml:3397(title)
+#: C/evolution.xml:3344(link) C/evolution.xml:3655(title)
 msgid "Organizing your Contacts"
 msgstr "Organizace kontaktů"
 
-#: C/evolution.xml:3143(link)
-#: C/evolution.xml:3513(title)
+#: C/evolution.xml:3347(link) C/evolution.xml:3771(title)
 msgid "LDAP: Shared Address Books on a Network"
 msgstr "LDAP: Sdílené adresáře po síti"
 
-#: C/evolution.xml:3146(link)
-#: C/evolution.xml:3536(title)
+#: C/evolution.xml:3350(link) C/evolution.xml:3794(title)
 msgid "Send Me a Card: Adding New Cards Quickly"
 msgstr "Pošli mi kartu: Rychlé přidávání nových karet"
 
-#: C/evolution.xml:3152(para)
-msgid "Contacts are the individuals you have chosen to add to your address book so you can keep track of information about them and send e-mail to them. In Evolution, an individual contact is called a card.For more information on organizing your contact list see <link linkend=\"usage-contact-organize\">Organizing your Contacts</link>. To learn about configuring the contacts tool, refer <link linkend=\"config-prefs-contact\">Contact Management</link>."
-msgstr "Kontakty jsou jednotlivci, které jste se rozhodli přidat do vašeho adresáře tak, abyste o nich měli uchované informace a mohli jim posílat e-maily. V Evolutionu se jednotlivé kontakty nazývají karty. Více informací o organizaci vašeho seznamu kontaktů naleznete v <link linkend=\"usage-contact-organize\">Organizaci kontaktů</link>."
-
-#: C/evolution.xml:3155(title)
+#: C/evolution.xml:3356(para)
+msgid ""
+"Contacts are the individuals you have chosen to add to your address book so "
+"you can keep track of information about them and send email to them. In "
+"Evolution, an individual contact is called a card. For more information on "
+"organizing your contacts see <link linkend=\"usage-contact-organize"
+"\">Organizing your Contacts</link>. To learn about configuring the contacts "
+"tool, refer <link linkend=\"config-prefs-contact\">Contact Management</link>."
+msgstr ""
+"Kontakty jsou jednotlivci, které jste se rozhodli přidat do vašeho adresáře "
+"tak, abyste o nich měli uchované informace a mohli jim posílat e-maily. V "
+"Evolutionu se jednotlivé kontakty nazývají karty. Více informací o "
+"organizaci vašeho seznamu kontaktů naleznete v <link linkend=\"usage-contact-"
+"organize\">Organizaci kontaktů</link>. Jak nastavit nástroj pro kontakty, "
+"najdete ve <link linkend=\"config-prefs-contact\">Správě kontaktů</link>"
+
+#: C/evolution.xml:3359(title)
 msgid "The Contact Editor"
 msgstr "Editor kontaktů"
 
-#: C/evolution.xml:3156(para)
-msgid "If you want to add or change cards, use the contact editor. You can edit email address, telephone numbers, mailer addresses and all other contact information you have entered for a particular contact."
-msgstr "Chcete-li přidat nebo změnit karty, použijte editor kontaktů. Můžete upravovat emailovou adresu, telefonní čísla, poštovní adresy a všechny ostatní informace kontaktu, které jste pro daný kontakt vložili."
+#: C/evolution.xml:3360(para)
+msgid ""
+"If you want to add or change cards, use the contact editor. You can edit "
+"email address, telephone numbers, mailer addresses and all other contact "
+"information you have entered for a particular contact."
+msgstr ""
+"Chcete-li přidat nebo změnit karty, použijte editor kontaktů. Můžete "
+"upravovat emailovou adresu, telefonní čísla, poštovní adresy a všechny "
+"ostatní informace kontaktu, které jste pro daný kontakt vložili."
 
-#: C/evolution.xml:3157(para)
+#: C/evolution.xml:3361(para)
 msgid "The contact editor window has three tabs:"
 msgstr "Okno editoru kontaktů má tři karty:"
 
-#: C/evolution.xml:3159(title)
-msgid "Contacts:"
-msgstr "Kontakty:"
+#: C/evolution.xml:3363(title)
+msgid "Contact:"
+msgstr "Kontakt:"
 
-#: C/evolution.xml:3160(para)
+#: C/evolution.xml:3364(para)
 msgid "Contains basic contact information."
 msgstr "Obsahuje základní informace o kontaktu."
 
-#: C/evolution.xml:3163(title)
+#: C/evolution.xml:3367(title)
 msgid "Personal Information:"
 msgstr "Osobní informace:"
 
-#: C/evolution.xml:3164(para)
-msgid "Contains a more specific description of the person, including URLs for calendar and free/busy information."
-msgstr "Obsahuje přesnější popis osoby včetně URL kalendáře a informací o volnu a obsazení."
+#: C/evolution.xml:3368(para)
+msgid ""
+"Contains a more specific description of the person, including URLs for "
+"calendar and free/busy information."
+msgstr ""
+"Obsahuje přesnější popis osoby včetně URL kalendáře a informací o volnu a "
+"obsazení."
 
-#: C/evolution.xml:3167(title)
+#: C/evolution.xml:3371(title)
 msgid "Mailing Address:"
 msgstr "Poštovní adresa:"
 
-#: C/evolution.xml:3168(para)
+#: C/evolution.xml:3372(para)
 msgid "Contains the individual's mailing address."
 msgstr "Obsahuje poštovní adresu daného jednotlivce."
 
-#: C/evolution.xml:3170(para)
-msgid "You can also use Action Menu to find Forward Contact, which opens a new message with the card already attached, and Send Message to Contact, which opens a new message to the contact's e-mail address."
-msgstr "Můžete také použít nabídku akci pro nalezení funkce Přeposlat kontakt, která otevře novou zprávu s již přiloženou kartou, a Poslat kontaktu zprávu, která otevře novou zprávu s e-mailovou adresou kontaktu."
-
-#: C/evolution.xml:3171(para)
-msgid "From the Contact Editor toolbar, you can save and close, print, close, or delete the contact."
-msgstr "Z nástrojové lišty editoru kontaktů můžete ukládat, zavírat, tisknout nebo mazat kontakt."
+#: C/evolution.xml:3374(para)
+msgid ""
+"You can also the Forward Contact menu item in the Action menu, which opens a "
+"new message with the card already attached, and Send Message to Contact, "
+"which opens a new message to the contact's email address."
+msgstr ""
+"Můžete také použít v nabídce Akce položku Přeposlat kontakt , která otevře "
+"novou zprávu s již přiloženou kartou, a položku Poslat kontaktu zprávu, "
+"která otevře novou zprávu s e-mailovou adresou kontaktu."
 
-#: C/evolution.xml:3172(para)
-msgid "You can add card from within an e-mail message or calendar appointment. In an open e-mail, right-click any e-mail address or message, and click Add to Address Book or select Add Sender to Address Book from the Message menu."
-msgstr "Můžete přidat kartu z e-mailové zprávy nebo události v kalendáři. V otevřeném e-mailu klikněte pravým tlačítkem na kteroukoliv adresu nebo zprávu a klikněte na Přidat do adresáře nebo vyberte Přidat odesílatele do adresáře z nabídky Zpráva."
+#: C/evolution.xml:3375(para)
+msgid ""
+"You can add a card from within an email message or calendar appointment. In "
+"an open email, right-click any email address or message, and click Add to "
+"Address Book or select Add Sender to Address Book from the Message menu."
+msgstr ""
+"Můžete přidat kartu z e-mailové zprávy nebo události v kalendáři. V "
+"otevřeném e-mailu klikněte pravým tlačítkem na kteroukoliv adresu nebo "
+"zprávu a klikněte na Přidat do adresáře nebo vyberte Přidat odesílatele do "
+"adresáře z nabídky Zpráva."
 
-#: C/evolution.xml:3173(para)
-msgid "Most of the items in the contact editor simply display the information you enter, but some of them have additional features:"
-msgstr "Většina položek v editoru kontaktů jednoduše zobrazuje to, co jste vložili, některé však mají další funkce:"
+#: C/evolution.xml:3376(para)
+msgid ""
+"Most of the items in the contact editor simply display the information you "
+"enter, but some of them have additional features:"
+msgstr ""
+"Většina položek v editoru kontaktů jednoduše zobrazuje to, co jste vložili, "
+"některé však mají další funkce:"
 
-#: C/evolution.xml:3175(title)
+#: C/evolution.xml:3378(title)
 msgid "Full Name:"
 msgstr "Celé jméno:"
 
-#: C/evolution.xml:3176(para)
-msgid "Specify the name of your contact here. You can type a name into the Full Name field, but you can also click the Full Name button to bring up a small dialog box with text boxes for first and last names, titles like <quote>Mr.</quote> or <quote>Her Excellency,</quote> and suffixes like <quote>Jr.</quote> The Full Name field also interacts with the File Under box to help you organize your contacts and to handle multi-word surnames.To see how it works, type a name in the Full Name field. As an example, we'll use Miguel de Icaza. You'll notice that the File Under field also fills in, but in reverse: Icaza, Miguel de. If you had entered John Q. Doe, the contacts editor would have correctly guessed that the entry should be filed under <quote>Doe, John Q.</quote> However, Miguel's surname, <quote>de Icaza,</quote> has two words, and to sort it correctly you must enter de Icaza, Miguel in the File As entry."
-msgstr "Určuje zde jméno kontaktu. Můžete napsat jméno do pole Celé jméno, nebo kliknout na tlačítko Celé jméno a  vyskočí malé dialogové okno s textovými poli křestních jmen a příjmení, titulů jako \"Pan\" nebo \"Jeho excelence\" a příponami jako \"ml.\". Pole Celé jméno také ovlivňuje pole Uložit jako tak, aby pomohlo organizovat vaše kontakty a manipulovat s víceslovnými příjmeními. Chcete-li vidět, jak to funguje, napište jméno do pole Celé jméno. Jako příklad použijeme Miguel de Icaza. Všimněte si, že pole Uložit jako se vyplňuje také, ale opačně: Icaza, Miguel de. Vložíte-li John Q. Doe, editor kontaktů správně odhadne, že položka bude uložena jako \"Doe, John Q.\" Nicméně Miguelovo příjmení, \"de Icaza\", má dvě slova a abyste jej rozdělili správně, musíte vložit de Icaza, Miguel do pole Uložit jako."
-
-#: C/evolution.xml:3179(title)
+#: C/evolution.xml:3379(para)
+msgid ""
+"Specify the name of your contact here. You can type a name into the Full "
+"Name field, but you can also click the Full Name button to bring up a small "
+"dialog box with text boxes for first and last names, titles like <quote>Mr.</"
+"quote> or <quote>Her Excellency,</quote> and suffixes like <quote>Jr.</"
+"quote> The Full Name field also interacts with the File Under box to help "
+"you organize your contacts and to handle multi-word surnames. To see how it "
+"works, type a name in the Full Name field. As an example, we will use Miguel "
+"de Icaza. You will notice that the File Under field also fills in, but in "
+"reverse: Icaza, Miguel de. If you had entered John Q. Doe, the contacts "
+"editor would have correctly guessed that the entry should be filed under "
+"<quote>Doe, John Q.</quote> However, Miguel's surname, <quote>de Icaza,</"
+"quote> has two words, and to sort it correctly you must enter de Icaza, "
+"Miguel in the File As entry."
+msgstr ""
+"Určete zde jméno kontaktu. Můžete napsat jméno do pole Celé jméno, nebo "
+"kliknout na tlačítko Celé jméno a  vyskočí malé dialogové okno s textovými "
+"poli křestních jmen a příjmení, titulů jako \"Pan\" nebo \"Jeho excelence\" "
+"a příponami jako \"ml.\". Pole Celé jméno také ovlivňuje pole Uložit jako "
+"tak, aby pomohlo organizovat vaše kontakty a manipulovat s víceslovnými "
+"příjmeními. Chcete-li vidět, jak to funguje, napište jméno do pole Celé "
+"jméno. Jako příklad použijeme Miguel de Icaza. Všimněte si, že pole Uložit "
+"jako se vyplňuje také, ale opačně: Icaza, Miguel de. Vložíte-li John Q. Doe, "
+"editor kontaktů správně odhadne, že položka bude uložena jako \"Doe, John Q."
+"\" Nicméně Miguelovo příjmení, \"de Icaza\", má dvě slova a abyste jej "
+"rozdělili správně, musíte vložit de Icaza, Miguel do pole Uložit jako."
+
+#: C/evolution.xml:3382(title)
 msgid "Where:"
 msgstr "Kde:"
 
-#: C/evolution.xml:3180(para)
-msgid "Select one of your address books as the location for this contact. You might not be able to write to all available address books, especially those on a network."
-msgstr "Vyberte jeden z vašich adresářů jako umístění pro tento kontakt. Možná nebudete moct zapisovat do všech dostupných adresářů, především těch na síti."
+#: C/evolution.xml:3383(para)
+msgid ""
+"Select one of your address books as the location for this contact. You might "
+"not be able to write to all available address books, especially those on a "
+"network."
+msgstr ""
+"Vyberte jeden z vašich adresářů jako umístění pro tento kontakt. Možná "
+"nebudete moct zapisovat do všech dostupných adresářů, především těch na síti."
 
-#: C/evolution.xml:3183(title)
+#: C/evolution.xml:3386(title)
 msgid "Categories:"
 msgstr "Kategorie:"
 
-#: C/evolution.xml:3184(para)
-msgid "Click the Categories button to select categories for this card. If you assign contact categories, you can then search for contacts using those categories. For more information on contact categories, see <link linkend=\"usage-contact-organize\">Organizing your Contacts</link>"
-msgstr "Klikněte na tlačítko Kategorie a vyberte kategorie pro tuto kartu. Přidělíte-li kontaktu kategorie, můžete potom vyhledávat kontakty, které používají tyto kategorie. Více informací o kategoriích kontaktů naleznete v <link linkend=\"usage-contact-organize\">Organizaci kontaktů</link>."
+#: C/evolution.xml:3387(para)
+msgid ""
+"Click the Categories button to select categories for this card. If you "
+"assign contact categories, you can then search for contacts using those "
+"categories. For more information on contact categories, see <link linkend="
+"\"usage-contact-organize\">Organizing your Contacts</link>"
+msgstr ""
+"Klikněte na tlačítko Kategorie a vyberte kategorie pro tuto kartu. Přidělíte-"
+"li kontaktu kategorie, můžete potom vyhledávat kontakty, které používají "
+"tyto kategorie. Více informací o kategoriích kontaktů naleznete v <link "
+"linkend=\"usage-contact-organize\">Organizaci kontaktů</link>."
 
-#: C/evolution.xml:3187(title)
+#: C/evolution.xml:3390(title)
 msgid "Free/Busy and Calendar URLs:"
 msgstr ""
 
-#: C/evolution.xml:3188(para)
-msgid "Click the Personal Information tab to enter Web addresses for the contact. If the contact publishes Free/Busy or calendar data online, using a server other than Exchange or GroupWise, you can specify the addresses for those servers here. After you do so, you can check their schedules when creating appointments in the calendar."
+#: C/evolution.xml:3391(para)
+msgid ""
+"Click the Personal Information tab to enter Web addresses for the contact. "
+"If the contact publishes Free/Busy or calendar data online, using a server "
+"other than Exchange or GroupWise, you can specify the addresses for those "
+"servers here. After you do so, you can check their schedules when creating "
+"appointments in the calendar."
 msgstr ""
 
-#: C/evolution.xml:3193(title)
+#: C/evolution.xml:3396(title)
 msgid "Creating and Editing Contacts"
 msgstr ""
 
-#: C/evolution.xml:3194(para)
+#: C/evolution.xml:3397(para)
 msgid "Follow the steps given below to create a new card."
 msgstr ""
 
-#: C/evolution.xml:3197(para)
-msgid "Click the down arrow key next to the New button in the toolbar"
-msgstr ""
-
-#: C/evolution.xml:3200(para)
-msgid "Select Contacts from the drop-down list or press Shift+Ctrl+C to appear Contact Editor."
-msgstr ""
+#: C/evolution.xml:3400(para)
+msgid "Click File &gt; New &gt; Contact."
+msgstr "Klikněte na Soubor &gt; Nová &gt; Kontakt."
 
-#: C/evolution.xml:3203(para)
+#: C/evolution.xml:3403(para)
 msgid "Enter the contact information to the entry boxes provided."
 msgstr ""
 
-#: C/evolution.xml:3209(para)
+#: C/evolution.xml:3409(para)
 msgid "If you want to change a card that already exists,"
 msgstr ""
 
-#: C/evolution.xml:3212(para)
-msgid "Press Contact tool from the Switcher to appear the Contact list."
+#: C/evolution.xml:3412(para)
+msgid ""
+"Go to the Contacts window by selecting View &gt; Window &gt; Contacts from "
+"the menubar."
 msgstr ""
 
-#: C/evolution.xml:3215(para)
+#: C/evolution.xml:3415(para)
 msgid "Double click on the card you want to edit."
 msgstr ""
 
-#: C/evolution.xml:3218(para)
-msgid "Edit from the Contact Editor window."
+#: C/evolution.xml:3418(para) C/evolution.xml:3438(para)
+msgid "Edit the information in the Contact Editor window."
+msgstr "Upravte informace v okně Editoru kontaktů."
+
+#: C/evolution.xml:3424(para)
+msgid "You can also edit the contact information from the preview pane."
 msgstr ""
 
-#: C/evolution.xml:3224(para)
-msgid "You can also edit the contact information from the message list."
+#: C/evolution.xml:3427(para)
+msgid "Right click on the address from Message Header."
+msgstr "Klikněte pravým tlačítkem na adresu z hlavičky zprávy."
+
+#: C/evolution.xml:3430(para)
+msgid "Select Add to Address Book to bring up the Contact Quick-Add window."
 msgstr ""
 
-#: C/evolution.xml:3227(para)
-msgid "Right click on the address from Message Header"
+#: C/evolution.xml:3435(para)
+msgid ""
+"Press the Edit Full button at the bottom left to bring up the Contact Editor "
+"window."
 msgstr ""
 
-#: C/evolution.xml:3230(para)
-msgid "Select Add to Address Book to appear Contact Quick-Add window"
+#: C/evolution.xml:3446(title)
+msgid "Google Contacts"
+msgstr "Google kontakty"
+
+#: C/evolution.xml:3447(para)
+msgid ""
+"Evolution allows you to access your Google Address Book. You can view the "
+"Google contacts offline and create, modify and delete the contacts online."
 msgstr ""
 
-#: C/evolution.xml:3235(para)
-msgid "Press Edit Full tab at the bottom left to appear Contact Editor window"
+#: C/evolution.xml:3448(para)
+msgid "To configure your Google Address Book in Evolution contacts:"
+msgstr ""
+
+#: C/evolution.xml:3451(para)
+msgid ""
+"Select File &gt; New &gt; Address book to open the New Address Book window."
+msgstr ""
+"Vyberte Soubor &gt; Nová &gt; Adresář, abyste otevřeli okno nového adresáře."
+
+#: C/evolution.xml:3456(para) C/evolution.xml:3953(para)
+msgid "Select Google from the Type drop-down list."
+msgstr ""
+
+#: C/evolution.xml:3459(para)
+msgid "Specify a name for the address book."
+msgstr "Zadejte jméno adresáře."
+
+#: C/evolution.xml:3462(para)
+msgid ""
+"Select or deselect the following options and provide the username for the "
+"Google account:"
+msgstr ""
+
+#: C/evolution.xml:3466(title)
+msgid "Mark as default address book:"
+msgstr ""
+
+#: C/evolution.xml:3467(para)
+msgid ""
+"Select this option to make the Google address book as your default address "
+"book."
 msgstr ""
 
-#: C/evolution.xml:3238(para)
-msgid "Edit the required information from Contact Editor and press OK."
+#: C/evolution.xml:3472(title)
+msgid "Copy book content locally for offline operations:"
+msgstr "Kopírovat obsah adresáře lokálně pro offline operace:"
+
+#: C/evolution.xml:3473(para)
+msgid ""
+"Select this option to copy the address book to your machine so you can "
+"access the contacts even when you are not connected to the network."
 msgstr ""
 
-#: C/evolution.xml:3249(para)
-msgid "Evolution enables you to find the contact address quickly by using Customized Search. To find the contact address you are looking for, use the following procedure:"
+#: C/evolution.xml:3478(title) C/evolution.xml:3968(title)
+msgid "Username:"
 msgstr ""
 
-#: C/evolution.xml:3253(para)
-msgid "Click <inlinegraphic format=\"PNG\" fileref=\"figures/stock_search.png\"/> to expand the drop-down list."
+#: C/evolution.xml:3479(para)
+msgid "Specify the username of your Google account."
+msgstr ""
+
+#: C/evolution.xml:3484(title)
+msgid "Use SSL:"
+msgstr ""
+
+#: C/evolution.xml:3485(para)
+msgid ""
+"Select Use SSL to enable a secure connection between Evolution and the server"
+msgstr ""
+
+#: C/evolution.xml:3490(title)
+msgid "Refresh:"
+msgstr ""
+
+#: C/evolution.xml:3491(para)
+msgid "Set the time to automatically refresh the Google address book."
+msgstr ""
+
+#: C/evolution.xml:3507(para)
+msgid ""
+"Evolution enables you to find the contact address quickly by using "
+"Customized Search. To find the contact address you are looking for, use the "
+"following procedure:"
 msgstr ""
 
-#: C/evolution.xml:3256(para)
+#: 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 ""
 
-#: C/evolution.xml:3259(para)
+#: C/evolution.xml:3517(para)
 msgid "Name begins with"
 msgstr ""
 
-#: C/evolution.xml:3262(para)
+#: C/evolution.xml:3520(para)
 msgid "Email begins with"
 msgstr ""
 
-#: C/evolution.xml:3265(para)
+#: C/evolution.xml:3523(para)
 msgid "Any field contains"
 msgstr ""
 
-#: C/evolution.xml:3270(para)
+#: C/evolution.xml:3528(para)
 msgid "Press Enter to begin the search"
 msgstr ""
 
-#: C/evolution.xml:3273(para)
-msgid "For a more complex search, select Search Advanced and select criteria that describe your desired contact:"
+#: C/evolution.xml:3531(para)
+msgid ""
+"For a more complex search, select Search Advanced and select criteria that "
+"describe your desired contact:"
 msgstr ""
 
-#: C/evolution.xml:3276(para)
+#: C/evolution.xml:3534(para)
 msgid "Name the rule in the Rule Name field."
 msgstr ""
 
-#: C/evolution.xml:3279(para)
+#: C/evolution.xml:3537(para)
 msgid "Set up your criteria in the Find items field."
 msgstr ""
 
-#: C/evolution.xml:3282(para)
+#: C/evolution.xml:3540(para)
 msgid "Select Add to add additional criteria."
 msgstr ""
 
-#: C/evolution.xml:3285(para)
-msgid "Click Search."
-msgstr ""
-
-#: C/evolution.xml:3288(para)
-msgid "To show all your contacts, Click Clear in the search bar or search with an empty query."
-msgstr ""
-
-#: C/evolution.xml:3291(para)
-msgid "Displays all the contacts that match the built-in criteria you have selected from the drop-down list at the top left side, just above the Display pane."
+#: C/evolution.xml:3549(para)
+msgid ""
+"Displays all the contacts that match the built-in criteria you have selected "
+"from the drop-down list at the top left side, just above the Display pane."
 msgstr ""
 
-#: C/evolution.xml:3293(para)
+#: C/evolution.xml:3551(para)
 msgid "To perform quick search, use the following procedure:"
 msgstr ""
 
-#: C/evolution.xml:3296(para)
-msgid "Click show to expand the drop-down list."
-msgstr ""
-
-#: C/evolution.xml:3299(para)
-msgid "Select the search criteria from any of the following:"
-msgstr ""
-
-#: C/evolution.xml:3302(para)
-#: C/evolution.xml:4191(para)
-#: C/evolution.xml:4540(para)
-#: C/evolution.xml:4735(para)
+#: C/evolution.xml:3560(para) C/evolution.xml:4453(para)
+#: C/evolution.xml:4804(para) C/evolution.xml:4999(para)
 msgid "Anniversary"
 msgstr ""
 
-#: C/evolution.xml:3305(para)
-#: C/evolution.xml:4194(para)
-#: C/evolution.xml:4543(para)
-#: C/evolution.xml:4738(para)
+#: C/evolution.xml:3563(para) C/evolution.xml:4456(para)
+#: C/evolution.xml:4807(para) C/evolution.xml:5002(para)
 msgid "Birthday"
 msgstr ""
 
-#: C/evolution.xml:3308(para)
-#: C/evolution.xml:4197(para)
-#: C/evolution.xml:4546(para)
-#: C/evolution.xml:4741(para)
+#: C/evolution.xml:3566(para) C/evolution.xml:4459(para)
+#: C/evolution.xml:4810(para) C/evolution.xml:5005(para)
 msgid "Business"
 msgstr ""
 
-#: C/evolution.xml:3311(para)
-#: C/evolution.xml:4200(para)
-#: C/evolution.xml:4549(para)
-#: C/evolution.xml:4744(para)
+#: C/evolution.xml:3569(para) C/evolution.xml:4462(para)
+#: C/evolution.xml:4813(para) C/evolution.xml:5008(para)
 msgid "Competition"
 msgstr ""
 
-#: C/evolution.xml:3314(para)
-#: C/evolution.xml:4747(para)
+#: C/evolution.xml:3572(para) C/evolution.xml:5011(para)
 msgid "Favorites"
 msgstr ""
 
-#: C/evolution.xml:3317(para)
-#: C/evolution.xml:4206(para)
-#: C/evolution.xml:4555(para)
-#: C/evolution.xml:4750(para)
+#: C/evolution.xml:3575(para) C/evolution.xml:4468(para)
+#: C/evolution.xml:4819(para) C/evolution.xml:5014(para)
 msgid "Gifts"
 msgstr ""
 
-#: C/evolution.xml:3320(para)
-#: C/evolution.xml:4209(para)
-#: C/evolution.xml:4558(para)
-#: C/evolution.xml:4753(para)
+#: C/evolution.xml:3578(para) C/evolution.xml:4471(para)
+#: C/evolution.xml:4822(para) C/evolution.xml:5017(para)
 msgid "Goals/Objectives"
 msgstr ""
 
-#: C/evolution.xml:3323(para)
+#: C/evolution.xml:3581(para) C/evolution.xml:4474(para)
 msgid "Holiday"
 msgstr ""
 
-#: C/evolution.xml:3326(para)
-#: C/evolution.xml:4215(para)
-#: C/evolution.xml:4564(para)
-#: C/evolution.xml:4759(para)
+#: C/evolution.xml:3584(para) C/evolution.xml:4477(para)
+#: C/evolution.xml:4828(para) C/evolution.xml:5023(para)
 msgid "Holiday Cards"
 msgstr ""
 
-#: C/evolution.xml:3329(para)
+#: C/evolution.xml:3587(para)
 msgid "Hot Contacts"
 msgstr ""
 
-#: C/evolution.xml:3332(para)
-#: C/evolution.xml:4218(para)
-#: C/evolution.xml:4567(para)
-#: C/evolution.xml:4762(para)
+#: C/evolution.xml:3590(para) C/evolution.xml:4480(para)
+#: C/evolution.xml:4831(para) C/evolution.xml:5026(para)
 msgid "Ideas"
 msgstr ""
 
-#: C/evolution.xml:3335(para)
-#: C/evolution.xml:4221(para)
-#: C/evolution.xml:4570(para)
-#: C/evolution.xml:4765(para)
+#: C/evolution.xml:3593(para) C/evolution.xml:4483(para)
+#: C/evolution.xml:4834(para) C/evolution.xml:5029(para)
 msgid "International"
 msgstr ""
 
-#: C/evolution.xml:3338(para)
+#: C/evolution.xml:3596(para) C/evolution.xml:4486(para)
 msgid "Key Customer"
 msgstr ""
 
-#: C/evolution.xml:3341(para)
-#: C/evolution.xml:4227(para)
-#: C/evolution.xml:4576(para)
-#: C/evolution.xml:4771(para)
+#: C/evolution.xml:3599(para) C/evolution.xml:4489(para)
+#: C/evolution.xml:4840(para) C/evolution.xml:5035(para)
 msgid "Miscellaneous"
 msgstr ""
 
-#: C/evolution.xml:3347(para)
-#: C/evolution.xml:4233(para)
-#: C/evolution.xml:4582(para)
-#: C/evolution.xml:4777(para)
+#: C/evolution.xml:3605(para) C/evolution.xml:4495(para)
+#: C/evolution.xml:4846(para) C/evolution.xml:5041(para)
 msgid "Phone Calls"
 msgstr ""
 
-#: C/evolution.xml:3353(para)
-#: C/evolution.xml:4239(para)
-#: C/evolution.xml:4588(para)
-#: C/evolution.xml:4783(para)
+#: C/evolution.xml:3611(para) C/evolution.xml:4501(para)
+#: C/evolution.xml:4852(para) C/evolution.xml:5047(para)
 msgid "Strategies"
 msgstr ""
 
-#: C/evolution.xml:3356(para)
-#: C/evolution.xml:4242(para)
-#: C/evolution.xml:4591(para)
-#: C/evolution.xml:4786(para)
+#: C/evolution.xml:3614(para) C/evolution.xml:4504(para)
+#: C/evolution.xml:4855(para) C/evolution.xml:5050(para)
 msgid "Suppliers"
 msgstr ""
 
-#: C/evolution.xml:3359(para)
-msgid "Time &amp;Expenses"
+#: C/evolution.xml:3617(para) C/evolution.xml:4507(para)
+#: C/evolution.xml:4858(para) C/evolution.xml:5053(para)
+msgid "Time &amp; Expenses"
 msgstr ""
 
-#: C/evolution.xml:3362(para)
-#: C/evolution.xml:4248(para)
-#: C/evolution.xml:4597(para)
-#: C/evolution.xml:4792(para)
+#: C/evolution.xml:3620(para) C/evolution.xml:4510(para)
+#: C/evolution.xml:4861(para) C/evolution.xml:5056(para)
 msgid "VIP"
 msgstr ""
 
-#: C/evolution.xml:3365(para)
-#: C/evolution.xml:4251(para)
-#: C/evolution.xml:4600(para)
-#: C/evolution.xml:4795(para)
+#: C/evolution.xml:3623(para) C/evolution.xml:4513(para)
+#: C/evolution.xml:4864(para) C/evolution.xml:5059(para)
 msgid "Waiting"
 msgstr ""
 
-#: C/evolution.xml:3368(para)
-msgid "Weather:Cloudy"
+#: C/evolution.xml:3626(para)
+msgid "Weather: Cloudy"
 msgstr ""
 
-#: C/evolution.xml:3371(para)
-msgid "Weather:Fog"
+#: C/evolution.xml:3629(para)
+msgid "Weather: Fog"
 msgstr ""
 
-#: C/evolution.xml:3374(para)
-msgid "Weather:Partly Cloudy"
+#: C/evolution.xml:3632(para)
+msgid "Weather: Partly Cloudy"
 msgstr ""
 
-#: C/evolution.xml:3377(para)
-msgid "Weather:Rain"
+#: C/evolution.xml:3635(para)
+msgid "Weather: Rain"
 msgstr ""
 
-#: C/evolution.xml:3380(para)
-msgid "Weather:Snow"
+#: C/evolution.xml:3638(para)
+msgid "Weather: Snow"
 msgstr ""
 
-#: C/evolution.xml:3383(para)
-msgid "Weather:Sunny"
+#: C/evolution.xml:3641(para)
+msgid "Weather: Sunny"
 msgstr ""
 
-#: C/evolution.xml:3386(para)
-msgid "Weather:Thunderstorms"
+#: C/evolution.xml:3644(para)
+msgid "Weather: Thunderstorms"
 msgstr ""
 
-#: C/evolution.xml:3391(para)
+#: C/evolution.xml:3649(para)
 msgid "Evolution displays the desired contacts."
 msgstr ""
 
-#: C/evolution.xml:3398(para)
-msgid "Evolution allows you to organize your contact list. You can create several individual address books, or contact groups. Within a given address book, you can have several categories of contacts."
+#: C/evolution.xml:3656(para)
+msgid ""
+"Evolution allows you to organize your contacts. You can create several "
+"individual address books, or contact lists. Within a given address book, you "
+"can have several categories of contacts."
 msgstr ""
 
-#: C/evolution.xml:3401(link)
-#: C/evolution.xml:3415(title)
+#: C/evolution.xml:3659(link) C/evolution.xml:3673(title)
 msgid "Contacts Groups"
 msgstr ""
 
-#: C/evolution.xml:3404(link)
-#: C/evolution.xml:3437(title)
+#: C/evolution.xml:3662(link) C/evolution.xml:3695(title)
 msgid "Creating a List of Contacts"
 msgstr "Vytvoření seznamu kontaktů"
 
-#: C/evolution.xml:3407(link)
-#: C/evolution.xml:3469(title)
+#: C/evolution.xml:3665(link) C/evolution.xml:3727(title)
 msgid "Grouping with Categories"
 msgstr ""
 
-#: C/evolution.xml:3410(link)
-#: C/evolution.xml:3530(title)
+#: C/evolution.xml:3668(link) C/evolution.xml:3788(title)
 msgid "Configuring Evolution to use LDAP"
 msgstr ""
 
-#: C/evolution.xml:3416(para)
-msgid "Contacts Groups are nothing but Address Books.The simplest way to organize contacts is to create additional address books. You can create a new one by clicking File &gt; New &gt; Address Book. For contacts groups on your computer, you only need to provide a name. For contacts on the network, you need to provide more information about the contacts server you are trying to access."
+#: C/evolution.xml:3674(para)
+msgid ""
+"Contacts Groups are nothing but Address Books. The simplest way to organize "
+"contacts is to create additional address books. You can create a new one by "
+"clicking File &gt; New &gt; Address Book. For contacts groups on your "
+"computer, you only need to provide a name. For contacts on the network, you "
+"need to provide more information about the contacts server you are trying to "
+"access."
 msgstr ""
 
-#: C/evolution.xml:3417(para)
-msgid "To move a card from one group to another, just drag it from the main display of contacts. You cannot change the contents of most network contact groups."
+#: C/evolution.xml:3675(para)
+msgid ""
+"To move a card from one group to another, just drag it from the main display "
+"of contacts and drop it to a different group. You cannot change the contents "
+"of most network contact groups."
 msgstr ""
 
-#: C/evolution.xml:3419(para)
-msgid "Contacts groups are not the same as contact lists. A contact group is like a folder or address book full of contacts. A contact list is a single contact that contains other contacts, and is most often used to e-mail several people at once."
+#: C/evolution.xml:3677(para)
+msgid ""
+"Contacts groups are not the same as contact lists. A contact group is like a "
+"folder or address book full of contacts. A contact list is a single contact "
+"that contains other contacts, and is most often used to email several people "
+"at once."
 msgstr ""
 
-#: C/evolution.xml:3424(title)
+#: C/evolution.xml:3682(title)
 msgid "Importing Contacts"
 msgstr ""
 
-#: C/evolution.xml:3425(para)
-msgid "You can import contacts from other contact management tools with the Import tool."
+#: C/evolution.xml:3683(para)
+msgid ""
+"You can import contacts from other contact management tools with the Import "
+"tool."
 msgstr ""
 
-#: C/evolution.xml:3430(para)
+#: C/evolution.xml:3688(para)
 msgid "Mail yourself a contact as vCard attachment."
 msgstr ""
 
-#: C/evolution.xml:3431(para)
-msgid "Currently VCF and LDIF are supported. CSV and TAB format files are supported from Microsoft Outlook, Thunderbird, Mozilla, and Evolution."
+#: C/evolution.xml:3689(para)
+msgid ""
+"Currently VCF and LDIF are supported. CSV and TAB format files are supported "
+"from Microsoft Outlook, Thunderbird, Mozilla, and Evolution."
 msgstr ""
 
-#: C/evolution.xml:3438(para)
-msgid "A contact list is a set of contacts with a single nickname that you create. When you send e-mail to the nickname, it is sent to every member of the list. This differs from a network mailing list in that it exists only on your computer as a convenience to you, rather than as an actual e-mail address managed by a mailing list application on a server."
+#: C/evolution.xml:3696(para)
+msgid ""
+"A contact list is a set of contacts with a single nickname that you create. "
+"When you send email to the nickname, it is sent to every member of the list. "
+"This differs from a network mailing list in that it exists only on your "
+"computer as a convenience to you, rather than as an actual email address "
+"managed by a mailing list application on a server."
 msgstr ""
 
-#: C/evolution.xml:3439(para)
-msgid "For example, you could create one card for each family member, then add those cards to a contact list called <quote>Family.</quote> Then, instead of entering each person's e-mail address individually, you can send e-mail to <quote>Family</quote> and the message would go to all of them."
+#: C/evolution.xml:3697(para)
+msgid ""
+"For example, you could create one card for each family member, then add "
+"those cards to a contact list called <quote>Family.</quote> Then, instead of "
+"entering each person's email address individually, you can send email to "
+"<quote>Family</quote> and the message would go to all of them."
 msgstr ""
 
-#: C/evolution.xml:3440(para)
+#: C/evolution.xml:3698(para)
 msgid "To create a list of contacts:"
 msgstr ""
 
-#: C/evolution.xml:3443(para)
+#: C/evolution.xml:3701(para)
 msgid "Open the list creation dialog box by clicking the New List button."
 msgstr ""
 
-#: C/evolution.xml:3445(para)
+#: C/evolution.xml:3703(para)
 msgid "Click File &gt; New &gt; Contact List."
 msgstr ""
 
-#: C/evolution.xml:3448(para)
+#: C/evolution.xml:3706(para)
 msgid "Specify a name for the list."
 msgstr ""
 
-#: C/evolution.xml:3451(para)
-msgid "Specify the names or e-mail addresses of contacts."
+#: C/evolution.xml:3709(para)
+msgid "Specify the names or email addresses of contacts."
 msgstr ""
 
-#: C/evolution.xml:3453(para)
+#: C/evolution.xml:3711(para)
 msgid "Drag contacts from the main window into the list."
 msgstr ""
 
-#: C/evolution.xml:3456(para)
-msgid "Choose whether you want to hide the e-mail addresses when you send a message to the list."
+#: C/evolution.xml:3714(para)
+msgid ""
+"Choose whether you want to hide the email addresses when you send a message "
+"to the list."
 msgstr ""
 
-#: C/evolution.xml:3457(para)
-msgid "Unless it is a very small list, it is recommended that you leave the addresses hidden. This is the same thing as using the <quote>Bcc:</quote> feature discussed in <link linkend=\"usage-mail-getnsend-send-to-types\">Specifying Additional Recipients for E-Mail</link>."
+#: C/evolution.xml:3715(para)
+msgid ""
+"Unless it is a very small list, it is recommended that you leave the "
+"addresses hidden. This is the same thing as using the <quote>Bcc:</quote> "
+"feature discussed in <link linkend=\"usage-mail-getnsend-send-to-types"
+"\">Specifying Additional Recipients for Email</link>."
 msgstr ""
 
-#: C/evolution.xml:3460(para)
+#: C/evolution.xml:3718(para)
 msgid "When you are finished, click OK."
 msgstr ""
 
-#: C/evolution.xml:3463(para)
-msgid "The list appears as a contact card, which you can use as you would any other card, including mailing the list to another person and sending e-mail to the list."
+#: C/evolution.xml:3721(para)
+msgid ""
+"The list appears as a contact card, which you can use as you would any other "
+"card, including mailing the list to another person and sending email to the "
+"list."
 msgstr ""
 
-#: C/evolution.xml:3464(para)
-msgid "To mail the list, open a new e-mail and type the name you chose for the list. Evolution addresses the message to the entire list when you send the message. You can also right-click the list's address card in the contacts tool and select Send Message to List."
+#: C/evolution.xml:3722(para)
+msgid ""
+"To mail the list, open a new email and type the name you chose for the list. "
+"Evolution addresses the message to the entire list when you send the "
+"message. You can also right-click the list's address card in the contacts "
+"tool and select Send Message to List."
 msgstr ""
 
-#: C/evolution.xml:3465(para)
+#: C/evolution.xml:3723(para)
 msgid "Evolution cannot store contact lists on Microsoft Exchange servers."
 msgstr ""
 
-#: C/evolution.xml:3470(para)
-msgid "Another way to group cards is to mark them as belonging to different categories. You can mark a card as being in several categories or no category at all. For example, you put a friend's card in the <guilabel>Business</guilabel> category because he works with you, the <guilabel>Friends</guilabel> category because he's a friend, and the <guilabel>Frequent</guilabel> category because you call him often."
+#: C/evolution.xml:3728(para)
+msgid ""
+"Another way to group cards is to mark them as belonging to different "
+"categories. You can mark a card as being in several categories or no "
+"category at all. For example, you put a friend's card in the "
+"<guilabel>Business</guilabel> category because he works with you and the "
+"<guilabel>Friends</guilabel> category because he's a friend."
 msgstr ""
 
-#: C/evolution.xml:3471(para)
+#: C/evolution.xml:3729(para)
 msgid "To mark a card as belonging to a category,"
 msgstr ""
 
-#: C/evolution.xml:3474(para)
+#: C/evolution.xml:3732(para)
 msgid "Double click the card to appear the Contact Editor window"
 msgstr ""
 
-#: C/evolution.xml:3477(para)
+#: C/evolution.xml:3735(para)
 msgid "Click the Categories button at the left."
 msgstr ""
 
-#: C/evolution.xml:3478(para)
-msgid "You can view the Categories dialogue box as given below."
-msgstr ""
+#: C/evolution.xml:3736(para)
+msgid "You can view the Categories dialog box as given below."
+msgstr "Můžete vidět dialogové okno Kategorie tak, jak je ukázáno níže."
 
-#: C/evolution.xml:3490(para)
-msgid "Select the category from the list. You can select as many or as few categories as you like."
-msgstr ""
-
-#: C/evolution.xml:3493(para)
-msgid "If the master list of categories doesn't suit you, you can add your own categories. To add new category,"
+#: C/evolution.xml:3748(para)
+msgid ""
+"Select the category from the list. You can select as many or as few "
+"categories as you like."
 msgstr ""
 
-#: C/evolution.xml:3496(para)
-msgid "Enter the new category in the entry box at the top"
+#: C/evolution.xml:3751(para)
+msgid ""
+"If the master list of categories doesn't suit you, you can add your own "
+"categories. To add a new category,"
 msgstr ""
 
-#: C/evolution.xml:3500(para)
-msgid "You can view the category name appeared in the field next to Categories button in the Contact Editor"
+#: C/evolution.xml:3754(para)
+msgid "Enter the new category in the entry box at the top."
 msgstr ""
 
-#: C/evolution.xml:3503(para)
-msgid "Press OK at the right bottom of the Contact Editor window."
+#: C/evolution.xml:3758(para)
+msgid ""
+"You can view the category name appeared in the field next to Categories "
+"button in the Contact Editor."
 msgstr ""
 
-#: C/evolution.xml:3507(para)
-msgid "You can edit or set the color and icon for each categories available under categories list. To achieve that click Edit button at the bottom of the Categories window. Press delete button to delete the items from the list."
+#: C/evolution.xml:3765(para)
+msgid ""
+"You can edit or set the color and icon for each categories available under "
+"categories list. To achieve that click Edit button at the bottom of the "
+"Categories window. Press the Delete button to delete the items from the list."
 msgstr ""
 
-#: C/evolution.xml:3514(para)
-msgid "The <link linkend=\"ldap\">LDAP</link> protocol was created to let users share contact information over a network by sharing access to a central directory. LDAP allows a company to maintain a shared set of contact information. Many companies keep a common LDAP address book for all their employees or for client contacts."
+#: C/evolution.xml:3772(para)
+msgid ""
+"The <link linkend=\"ldap\">LDAP</link> protocol was created to let users "
+"share contact information over a network by sharing access to a central "
+"directory. LDAP allows a company to maintain a shared set of contact "
+"information. Many companies keep a common LDAP address book for all their "
+"employees or for client contacts."
 msgstr ""
 
-#: C/evolution.xml:3515(para)
-msgid "To learn how to add a remote LDAP directory to your available contact folders, see <link linkend=\"config-prefs-contact\">Contact Management</link>. Remote groups of contacts appear under the On LDAP Servers item in the switcher. They work like a local folder of contact cards, with the following exceptions:"
+#: C/evolution.xml:3773(para)
+msgid ""
+"To learn how to add a remote LDAP directory to your available address books, "
+"see <link linkend=\"config-prefs-contact\">Contact Management</link>. Remote "
+"groups of contacts appear under the On LDAP Servers item in the switcher. "
+"They work like a local folder of contact cards, with the following "
+"exceptions:"
 msgstr ""
 
-#: C/evolution.xml:3518(para)
-msgid "Network folders are only available when you are connected to the network. If you use a laptop or have a modem connection, you might want to copy or cache some of the network directory. You do this by dragging and dropping your desired contacts into the local contacts list."
+#: C/evolution.xml:3776(para)
+msgid ""
+"Network folders are only available when you are connected to the network. If "
+"you use a laptop or have a modem connection, you might want to copy or cache "
+"some of the network directory. You do this by dragging and dropping your "
+"desired contacts into the local address books."
 msgstr ""
 
-#: C/evolution.xml:3519(para)
-msgid "You can also mark the network folder for offline usage. To mark the folder, right-click the folder, then click Properties. Select Copy Folder Content Locally for Offline Operation."
+#: C/evolution.xml:3777(para)
+msgid ""
+"You can also mark the network folder for offline usage. To mark the folder, "
+"right-click the folder, then click Properties. Select Copy Folder Content "
+"Locally for Offline Operation."
 msgstr ""
 
-#: C/evolution.xml:3522(para)
-msgid "To prevent excess network traffic, Evolution does not normally load data from the LDAP server upon opening."
+#: C/evolution.xml:3780(para)
+msgid ""
+"To prevent excess network traffic, Evolution does not normally load data "
+"from the LDAP server upon opening."
 msgstr ""
 
-#: C/evolution.xml:3525(para)
-msgid "Depending on your server settings, you might not be able to edit all the fields in a contact stored on an LDAP server. Some servers prohibit some or all changes, and others use a smaller set of fields than Evolution allows. Check with your system administrator if you need different settings."
+#: C/evolution.xml:3783(para)
+msgid ""
+"Depending on your server settings, you might not be able to edit all the "
+"fields in a contact stored on an LDAP server. Some servers prohibit some or "
+"all changes, and others use a smaller set of fields than Evolution allows. "
+"Check with your system administrator if you need different settings."
 msgstr ""
 
-#: C/evolution.xml:3531(para)
-msgid "For information about setting up Evolution to use LDAP, refer to <link linkend=\"config-prefs-contact\">Contact Management</link>."
+#: C/evolution.xml:3789(para)
+msgid ""
+"For information about setting up Evolution to use LDAP, refer to <link "
+"linkend=\"config-prefs-contact\">Contact Management</link>."
 msgstr ""
+"Více informací o nastavení Evolutionu tak, aby používal LDAP naleznete ve "
+"<link linkend=\"config-prefs-contact\">Správě kontaktů</link>."
 
-#: C/evolution.xml:3537(para)
-msgid "When you get information about a person in the mail or in a calendar entry, you can add it to an address card. To do so, right-click any e-mail address or e-mail message, and click Add to Address Book on the menu that appears. If the sender already exists, the Editor tab opens and you can edit the detail. Evolution can also add cards from a hand-held device during HotSync* operation. For more information, see <link linkend=\"config-sync\">Synchronizing Your Handheld Device</link>."
+#: C/evolution.xml:3795(para)
+msgid ""
+"When you get information about a person in the mail or in a calendar entry, "
+"you can add it to an address card. To do so, right-click any email address "
+"or email message, and click Add to Address Book on the menu that appears. If "
+"the sender already exists, the Editor tab opens and you can edit the detail. "
+"Evolution can also add cards from a hand-held device during HotSync* "
+"operation. For more information, see <link linkend=\"config-sync"
+"\">Synchronizing Your Handheld Device</link>."
 msgstr ""
 
-#: C/evolution.xml:3543(para)
-msgid "This section shows you how to use the <trademark>Evolution</trademark> Calendar to manage your schedule alone or in conjunction with peers. To learn about importing calendar data, see <link linkend=\"importing-mail\">Importing Single Files</link>, which covers the Import tool."
+#: C/evolution.xml:3801(para)
+msgid ""
+"This section shows you how to use the <trademark>Evolution</trademark> "
+"Calendar to manage your schedule alone or in conjunction with peers. To "
+"learn about importing calendar data, see <link linkend=\"importing-mail"
+"\">Importing Single Files</link>, which covers the Import tool."
 msgstr ""
 
-#: C/evolution.xml:3546(link)
-#: C/evolution.xml:3578(title)
+#: C/evolution.xml:3804(link) C/evolution.xml:3836(title)
 msgid "Ways of Looking at your Calendar"
 msgstr ""
 
-#: C/evolution.xml:3549(link)
-#: C/evolution.xml:3736(title)
+#: C/evolution.xml:3807(link) C/evolution.xml:3994(title)
 msgid "Scheduling With the Evolution Calendar"
-msgstr ""
+msgstr "Plánování s Kalendářem Evolution"
 
-#: C/evolution.xml:3552(link)
-#: C/evolution.xml:4112(title)
+#: C/evolution.xml:3810(link) C/evolution.xml:4374(title)
 msgid "Searching for Calendar Items"
 msgstr ""
 
-#: C/evolution.xml:3555(link)
-#: C/evolution.xml:4260(title)
+#: C/evolution.xml:3813(link) C/evolution.xml:4522(title)
 msgid "Printing Displayed Items"
 msgstr ""
 
-#: C/evolution.xml:3558(link)
-#: C/evolution.xml:4265(title)
+#: C/evolution.xml:3816(link) C/evolution.xml:4527(title)
 msgid "Deleting Old Appointments and Meetings"
 msgstr ""
 
-#: C/evolution.xml:3561(link)
-#: C/evolution.xml:4270(title)
+#: C/evolution.xml:3819(link) C/evolution.xml:4532(title)
 msgid "Delegating Meetings"
 msgstr ""
 
-#: C/evolution.xml:3564(link)
-#: C/evolution.xml:4290(title)
+#: C/evolution.xml:3822(link) C/evolution.xml:4552(title)
 msgid "Multiple Calendars, Web Calendars, and CalDAV"
 msgstr ""
 
-#: C/evolution.xml:3567(link)
-#: C/evolution.xml:4297(title)
+#: C/evolution.xml:3825(link) C/evolution.xml:4559(title)
 msgid "The Task List"
 msgstr ""
 
-#: C/evolution.xml:3570(link)
-#: C/evolution.xml:4610(title)
+#: C/evolution.xml:3828(link) C/evolution.xml:4874(title)
 msgid "Memos"
 msgstr ""
 
-#: C/evolution.xml:3573(link)
-#: C/evolution.xml:4805(title)
+#: C/evolution.xml:3831(link) C/evolution.xml:5069(title)
 msgid "Configuring Time Zones"
 msgstr ""
 
-#: C/evolution.xml:3579(para)
-msgid "In Evolution, you can keep multiple calendars and overlay them one over the next. For example, you might have a schedule of events for work, one for home, and one for your favorite sports team. The switcher lists those calendars, and you can select or deselect the boxes next to them to show and hide the appointments in your calendar view. By hiding and showing different sets of appointments, you can be sure to avoid conflicts, while keeping a minimum of clutter in your view."
+#: C/evolution.xml:3837(para)
+msgid ""
+"In Evolution, you can keep multiple calendars and overlay them one over the "
+"next. For example, you might have a schedule of events for work, one for "
+"home, and one for your favorite sports team. The side bar lists those "
+"calendars, and you can select or deselect the boxes next to them to show and "
+"hide the appointments in your calendar view. By hiding and showing different "
+"sets of appointments, you can be sure to avoid conflicts, while keeping a "
+"minimum of clutter in your view."
 msgstr ""
 
-#: C/evolution.xml:3580(para)
+#: C/evolution.xml:3838(para)
 msgid "Appointments for each calendar appear as a different color."
 msgstr ""
 
-#: C/evolution.xml:3581(para)
-msgid "The toolbar offers you five different buttons that can show you different views of your calendar."
+#: C/evolution.xml:3839(para)
+msgid ""
+"The toolbar offers you five different buttons that can show you different "
+"views of your calendar."
 msgstr ""
 
-#: C/evolution.xml:3589(para)
+#: C/evolution.xml:3847(para)
 msgid "Calendar View"
 msgstr ""
 
-#: C/evolution.xml:3592(para)
+#: C/evolution.xml:3850(para)
 msgid "Shortcut Keys"
 msgstr ""
 
-#: C/evolution.xml:3599(para)
+#: C/evolution.xml:3857(para)
 msgid "Day"
 msgstr ""
 
-#: C/evolution.xml:3602(para)
+#: C/evolution.xml:3860(para)
 msgid "control+y"
 msgstr ""
 
-#: C/evolution.xml:3607(para)
+#: C/evolution.xml:3865(para)
 msgid "Work Week"
 msgstr ""
 
-#: C/evolution.xml:3610(para)
+#: C/evolution.xml:3868(para)
 msgid "control+j"
 msgstr ""
 
-#: C/evolution.xml:3615(para)
+#: C/evolution.xml:3873(para)
 msgid "Week"
 msgstr ""
 
-#: C/evolution.xml:3618(para)
+#: C/evolution.xml:3876(para)
 msgid "control+k"
 msgstr ""
 
-#: C/evolution.xml:3623(para)
+#: C/evolution.xml:3881(para)
 msgid "Month"
 msgstr ""
 
-#: C/evolution.xml:3626(para)
+#: C/evolution.xml:3884(para)
 msgid "control+m"
 msgstr ""
 
-#: C/evolution.xml:3631(para)
+#: C/evolution.xml:3889(para)
 msgid "List"
 msgstr ""
 
-#: C/evolution.xml:3634(para)
+#: C/evolution.xml:3892(para)
 msgid "control+l"
 msgstr ""
 
-#: C/evolution.xml:3640(para)
-msgid "You can also select an arbitrary range of days in the small calendar just above the switcher at the left. To do this, select the days that you want to view in your calendar."
+#: C/evolution.xml:3898(para)
+msgid ""
+"You can also select an arbitrary range of days in the small calendar in the "
+"side bar. To do this, select the days that you want to view in your calendar."
 msgstr ""
 
-#: C/evolution.xml:3642(para)
-msgid "The Prev and Next buttons move you forward and back in your calendar pages. If you are using a week or month view, you can move by week or month. To return to today's listing, click the Today button in the toolbar."
+#: C/evolution.xml:3900(para)
+msgid ""
+"The Previous and Next buttons move you forward and back in your calendar "
+"pages. If you are using a week or month view, you can move by week or month. "
+"To return to today's listing, click the Today button in the toolbar."
 msgstr ""
 
-#: C/evolution.xml:3643(para)
-msgid "To visit calendar entries for a specific date, click Go To and select the date in the dialog box that appears."
+#: C/evolution.xml:3901(para)
+msgid ""
+"To visit calendar entries for a specific date, click Go To and select the "
+"date in the dialog box that appears."
 msgstr ""
 
-#: C/evolution.xml:3646(title)
+#: C/evolution.xml:3904(title)
 msgid "Calendar Properties"
 msgstr ""
 
-#: C/evolution.xml:3647(para)
-msgid "Evolution allows you to edit the label of your calendar, assign color, and copy content for offline use. To set your calendar properties"
+#: C/evolution.xml:3905(para)
+msgid ""
+"Evolution allows you to edit the label of your calendar, assign color, and "
+"copy content for offline use. To set your calendar properties"
 msgstr ""
 
-#: C/evolution.xml:3650(para)
-msgid "Select the calendar from the folder view at the left."
-msgstr ""
+#: C/evolution.xml:3908(para)
+msgid "Select the calendar from the side bar at the left."
+msgstr "Vyberte kalendář z postranního panelu nalevo."
 
-#: C/evolution.xml:3653(para)
-msgid "Right click."
-msgstr ""
+#: C/evolution.xml:3911(para)
+msgid "Right-click on the calendar."
+msgstr "Klikněte pravým tlačítkem na kalendář."
 
-#: C/evolution.xml:3656(para)
-msgid "Select Properties to open Calendar Properties dialogue box."
+#: C/evolution.xml:3914(para)
+msgid "Select Properties to open Calendar Properties dialog box."
 msgstr ""
+"Vyberte Vlastnosti, abyste otevřeli dialogové okno Vlastností kalendáře."
 
-#: C/evolution.xml:3668(para)
+#: C/evolution.xml:3926(para)
 msgid "Edit the label from Name field."
 msgstr ""
 
-#: C/evolution.xml:3671(para)
-msgid "To assign a color for the calendar, click the Color tab."
+#: C/evolution.xml:3929(para)
+msgid "To assign a color for the calendar, click the Color button."
 msgstr ""
 
-#: C/evolution.xml:3674(para)
+#: C/evolution.xml:3932(para)
 msgid "Select the color and click OK."
 msgstr ""
 
-#: C/evolution.xml:3677(para)
-msgid "To mark your calendar content for offline use, click Copy calendar contents locally for offline operations."
+#: C/evolution.xml:3935(para)
+msgid ""
+"To mark your calendar content for offline use, click Copy calendar contents "
+"locally for offline operations."
 msgstr ""
 
-#: C/evolution.xml:3679(para)
-msgid "Right click on the calendar at the left and select Mark Calendar for offline use. For more information on working offline refer <link linkend=\"usage-mail-getnsend-offline\">Working Offline</link>."
+#: C/evolution.xml:3937(para)
+msgid ""
+"Right-click on the calendar at the left and select Mark Calendar for offline "
+"use. For more information on working offline refer <link linkend=\"usage-"
+"mail-getnsend-offline\">Working Offline</link>."
 msgstr ""
 
-#: C/evolution.xml:3681(para)
-msgid "To export or share or to store a calendar locally in iCal format, right click on the calendar in the calendar view at the left and select Save to Disk."
+#: C/evolution.xml:3939(para)
+msgid ""
+"To export or share or to store a calendar locally in iCal format, right "
+"click on the calendar in the calendar view at the left and select Save to "
+"Disk."
 msgstr ""
 
-#: C/evolution.xml:3683(para)
-msgid "Click Mark as default folder if you want to mark this folder as your default calendar folder."
+#: C/evolution.xml:3941(para)
+msgid ""
+"Click Mark as default folder if you want to mark this folder as your default "
+"calendar folder."
 msgstr ""
 
-#: C/evolution.xml:3687(title)
+#: C/evolution.xml:3945(title)
 msgid "Google Calendar"
 msgstr ""
 
-#: C/evolution.xml:3688(para)
-msgid "Evolution allows you to access your Google calendar. You can view the Google calendar offline or create, modify, and delete the calendar items online."
+#: C/evolution.xml:3946(para)
+msgid ""
+"Evolution allows you to access your Google calendar. You can view the Google "
+"calendar offline or create, modify, and delete the calendar items online."
 msgstr ""
 
-#: C/evolution.xml:3689(para)
+#: C/evolution.xml:3947(para)
 msgid "To integrate the Google calendar to Evolution:"
 msgstr ""
 
-#: C/evolution.xml:3692(para)
+#: C/evolution.xml:3950(para)
 msgid "Click New, then select Calendar to open the New Calendar dialog."
 msgstr ""
 
-#: C/evolution.xml:3695(para)
-msgid "Select Google from the Type drop-down list."
-msgstr ""
-
-#: C/evolution.xml:3700(para)
+#: C/evolution.xml:3958(para)
 msgid "Specify the following:"
 msgstr ""
 
-#: C/evolution.xml:3704(title)
+#: C/evolution.xml:3962(title)
 msgid "Name:"
 msgstr ""
 
-#: C/evolution.xml:3705(para)
+#: C/evolution.xml:3963(para)
 msgid "Specify a name for the Google calendar"
 msgstr ""
 
-#: C/evolution.xml:3710(title)
-msgid "Username:"
-msgstr ""
-
-#: C/evolution.xml:3711(para)
+#: C/evolution.xml:3969(para)
 msgid "Specify your username for your Google account"
 msgstr ""
 
-#: C/evolution.xml:3717(para)
+#: C/evolution.xml:3975(para)
 msgid "Set the time to automatically refresh the calendar."
 msgstr ""
 
-#: C/evolution.xml:3720(para)
-msgid "Select Use SSL to enable SSL for communication between Evolution and the Google server."
+#: C/evolution.xml:3978(para)
+msgid ""
+"Select Use SSL to enable a secure connection between Evolution and the "
+"Google server."
 msgstr ""
 
-#: C/evolution.xml:3723(para)
-msgid "If you want to set a color label for the calendar, click the Color tab, select the desired color, then click OK."
+#: C/evolution.xml:3981(para)
+msgid ""
+"If you want to set a color label for the calendar, click the Color tab, "
+"select the desired color, then click OK."
 msgstr ""
 
-#: C/evolution.xml:3726(para)
-msgid "If you want to view the calendar items offline, select Copy calendar content locally for offline operation check box."
+#: C/evolution.xml:3984(para)
+msgid ""
+"If you want to view the calendar items offline, select Copy calendar content "
+"locally for offline operation check box."
 msgstr ""
 
-#: C/evolution.xml:3727(para)
-msgid "If you select this option, you cannot modify or create the calendar items."
-msgstr "Pokud zvolíte tuto možnost, nebudete moci měnit nebo vytvářet položky v kalendáři."
-
-#: C/evolution.xml:3730(para)
-msgid "Click OK to save your modifications."
+#: C/evolution.xml:3985(para)
+msgid ""
+"If you select this option, you cannot modify or create the calendar items."
 msgstr ""
+"Pokud zvolíte tuto možnost, nebudete moci měnit nebo vytvářet položky v "
+"kalendáři."
 
-#: C/evolution.xml:3737(para)
-msgid "There are two types of events you can schedule with Evolution: appointments and meetings. An appointment is an event you schedule for yourself only, and a meeting is an event that you schedule multiple people for. You can also use the busy/free search for meetings to determine the availability of invitees."
+#: C/evolution.xml:3995(para)
+msgid ""
+"There are two types of events you can schedule with Evolution: appointments "
+"and meetings. An appointment is an event you schedule for yourself only, and "
+"a meeting is an event that you schedule multiple people for. You can also "
+"use the busy/free search for meetings to determine the availability of "
+"invitees."
 msgstr ""
 
-#: C/evolution.xml:3740(link)
-#: C/evolution.xml:3763(title)
+#: C/evolution.xml:3998(link) C/evolution.xml:4021(title)
 msgid "Appointments"
 msgstr ""
 
-#: C/evolution.xml:3743(link)
-#: C/evolution.xml:3936(title)
+#: C/evolution.xml:4001(link) C/evolution.xml:4193(title)
 msgid "Sending a Meeting Invitation"
 msgstr ""
 
-#: C/evolution.xml:3746(link)
-#: C/evolution.xml:4020(title)
+#: C/evolution.xml:4004(link) C/evolution.xml:4282(title)
 msgid "Accepting and Replying to a Meeting Request"
 msgstr ""
 
-#: C/evolution.xml:3749(link)
-#: C/evolution.xml:4038(title)
+#: C/evolution.xml:4007(link) C/evolution.xml:4300(title)
 msgid "Reading Responses to Meeting Requests"
 msgstr ""
 
-#: C/evolution.xml:3752(link)
-#: C/evolution.xml:4043(title)
+#: C/evolution.xml:4010(link) C/evolution.xml:4305(title)
 msgid "Using the Free/Busy View"
 msgstr ""
 
-#: C/evolution.xml:3755(link)
-#: C/evolution.xml:4072(title)
-msgid "Publishing Calendar and Free/Busy Information Without a Groupware Server"
+#: C/evolution.xml:4013(link) C/evolution.xml:4334(title)
+msgid ""
+"Publishing Calendar and Free/Busy Information Without a Groupware Server"
 msgstr ""
 
-#: C/evolution.xml:3758(link)
-#: C/evolution.xml:4105(title)
+#: C/evolution.xml:4016(link) C/evolution.xml:4367(title)
 msgid "Accessing Free/Busy Data Without a Groupware Server"
 msgstr ""
 
-#: C/evolution.xml:3764(para)
+#: C/evolution.xml:4022(para)
 msgid "In Evolution, an appointment is an event you schedule for yourself."
 msgstr ""
 
-#: C/evolution.xml:3767(link)
-#: C/evolution.xml:3781(title)
+#: C/evolution.xml:4025(link) C/evolution.xml:4039(title)
 msgid "Creating Appointments"
 msgstr ""
 
-#: C/evolution.xml:3770(link)
-#: C/evolution.xml:3867(title)
-#: C/evolution.xml:5338(title)
+#: C/evolution.xml:4028(link) C/evolution.xml:4127(title)
+#: C/evolution.xml:5557(title)
 msgid "Reminders"
 msgstr ""
 
-#: C/evolution.xml:3773(link)
-#: C/evolution.xml:3906(title)
+#: C/evolution.xml:4031(link) C/evolution.xml:4163(title)
 msgid "Classifications"
 msgstr ""
 
-#: C/evolution.xml:3776(link)
-#: C/evolution.xml:3929(title)
+#: C/evolution.xml:4034(link) C/evolution.xml:4186(title)
 msgid "Recurrence"
 msgstr ""
 
-#: C/evolution.xml:3784(para)
+#: C/evolution.xml:4042(para)
 msgid "Click File &gt; New &gt; Appointment."
 msgstr ""
 
-#: C/evolution.xml:3786(para)
-msgid "Click Calendars on the Switcher, then click New &gt; Appointment."
+#: C/evolution.xml:4044(para)
+msgid ""
+"Click Calendars on the Switcher, then click File &gt; New &gt; Appointment."
 msgstr ""
 
-#: C/evolution.xml:3788(para)
-msgid "Double-click in a blank space on the calendar view to open an Appointment dialogue box. The appointment is created for that particular time on the calendar view against which you have double clicked on."
+#: C/evolution.xml:4046(para)
+msgid ""
+"Double-click in a blank space on the calendar view to open an Appointment "
+"dialog box. The particular time on the calendar view against which you have "
+"double clicked on will be suggested for the new appointment."
 msgstr ""
 
-#: C/evolution.xml:3790(para)
-msgid "Select the required duration on the calender view and enter the summary."
+#: C/evolution.xml:4048(para)
+msgid ""
+"Select the required duration on the calender view and enter the summary."
 msgstr ""
 
-#: C/evolution.xml:3793(para)
-msgid "Select a calendar in the Calendar drop-down list. Type a brief summary of the appointment in the Summary field."
+#: C/evolution.xml:4051(para) C/evolution.xml:4206(para)
+msgid "Select a calendar in the Calendar drop-down list."
 msgstr ""
 
-#: C/evolution.xml:3798(para)
-msgid "Type a location for the appointment in the Location field."
-msgstr ""
+#: C/evolution.xml:4052(para) C/evolution.xml:4063(para)
+#: C/evolution.xml:4221(para) C/evolution.xml:4604(para)
+#: C/evolution.xml:4658(para) C/evolution.xml:4890(para)
+#: C/evolution.xml:5956(para)
+msgid "Enter a brief summary in the Summary field."
+msgstr "Vložte stručný souhrn do pole Shrnutí."
 
-#: C/evolution.xml:3801(para)
-msgid "Select the date, time and set the duration"
-msgstr ""
+#: C/evolution.xml:4057(para) C/evolution.xml:4224(para)
+msgid "(Optional) Type a location in the Location field."
+msgstr "(Volitelně) Napište umístění do pole Místo."
 
-#: C/evolution.xml:3804(para)
-msgid "Enter a brief summary of the appointment in the description field."
-msgstr ""
+#: C/evolution.xml:4060(para)
+msgid "Select the date and time."
+msgstr "Zvolte datum a čas."
 
-#: C/evolution.xml:3807(para)
-msgid "To select this appointment as an all day event, click Options &gt; All Day Event."
+#: C/evolution.xml:4066(para) C/evolution.xml:4227(para)
+msgid ""
+"To select this appointment as an all day event, click Options &gt; All Day "
+"Event."
 msgstr ""
 
-#: C/evolution.xml:3809(para)
+#: C/evolution.xml:4068(para) C/evolution.xml:4229(para)
 msgid "Click the All Day Event button on the toolbar."
 msgstr ""
 
-#: C/evolution.xml:3812(para)
-msgid "If the event is an all day event, specify a starting and ending date."
+#: 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."
 msgstr ""
 
-#: C/evolution.xml:3815(para)
-msgid "If the event is not an all day event, specify a starting and ending time."
+#: C/evolution.xml:4074(para) C/evolution.xml:4235(para)
+msgid ""
+"If the event is not an all day event, specify a starting time and an ending "
+"time."
 msgstr ""
 
-#: C/evolution.xml:3818(para)
+#: C/evolution.xml:4077(para) C/evolution.xml:4238(para)
 msgid "Select For to specify the duration."
 msgstr ""
 
-#: C/evolution.xml:3820(para)
+#: C/evolution.xml:4079(para) C/evolution.xml:4240(para)
 msgid "Select Until to specify the ending time of the event."
 msgstr ""
 
-#: C/evolution.xml:3823(para)
-#: C/evolution.xml:3982(para)
-#: C/evolution.xml:4350(para)
-#: C/evolution.xml:4401(para)
+#: C/evolution.xml:4082(para) C/evolution.xml:4243(para)
+#: C/evolution.xml:4613(para) C/evolution.xml:4664(para)
 msgid "Type the time zone information in the Time Zone field."
 msgstr ""
 
-#: C/evolution.xml:3825(para)
-#: C/evolution.xml:3984(para)
-#: C/evolution.xml:4352(para)
-#: C/evolution.xml:4403(para)
+#: C/evolution.xml:4084(para) C/evolution.xml:4245(para)
+#: C/evolution.xml:4615(para) C/evolution.xml:4666(para)
 msgid "Click the globe to customize the time zone."
 msgstr ""
 
-#: C/evolution.xml:3826(para)
-#: C/evolution.xml:3985(para)
-#: C/evolution.xml:4353(para)
-#: C/evolution.xml:4404(para)
+#: 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 ""
 
-#: C/evolution.xml:3829(para)
+#: C/evolution.xml:4088(para)
 msgid "To show the time as busy, click Options &gt; Show Time as Busy."
 msgstr ""
 
-#: C/evolution.xml:3832(para)
-msgid "(Optional) Type a category in the Categories field. To show or hide the Categories field, click View &gt; Categories."
+#: C/evolution.xml:4091(para) C/evolution.xml:4169(para)
+#: C/evolution.xml:4619(para) C/evolution.xml:4670(para)
+#: C/evolution.xml:4886(para)
+msgid "(Optional) Type a category in the Categories field."
 msgstr ""
 
-#: C/evolution.xml:3833(para)
-msgid "For more information on categories, see <link linkend=\"bxmtbjb\">Classifications</link>."
+#: C/evolution.xml:4092(para) C/evolution.xml:4175(para)
+#: C/evolution.xml:4620(para) C/evolution.xml:4671(para)
+msgid "To show or hide the Categories field, click View &gt; Categories."
 msgstr ""
 
-#: C/evolution.xml:3836(para)
-msgid "Type a description in the Description field."
+#: C/evolution.xml:4095(para) C/evolution.xml:4623(para)
+#: C/evolution.xml:4674(para) C/evolution.xml:4896(para)
+#: C/evolution.xml:5965(para)
+msgid "(Optional) Enter a description in the Description field."
+msgstr "(Volitelně) Napište popis do pole Popis."
+
+#: C/evolution.xml:4098(para) C/evolution.xml:4153(para)
+#: C/evolution.xml:4249(para)
+msgid ""
+"To create an alarm for this appointment, click Alarms on the toolbar, or "
+"click Options &gt; Alarms."
 msgstr ""
 
-#: C/evolution.xml:3839(para)
-msgid "To select an alarm for this appointment, click Alarm on the toolbar."
+#: C/evolution.xml:4099(para) C/evolution.xml:4156(para)
+#: C/evolution.xml:4250(para)
+msgid "Select Customize to add or remove customized alarms for the event."
 msgstr ""
 
-#: C/evolution.xml:3840(para)
-msgid "If you select an alarm, specify when and how you want the alarm to notify. For more information on reminders, see <link linkend=\"bshly4v\">Reminders</link>."
+#: C/evolution.xml:4100(para) C/evolution.xml:4251(para)
+msgid ""
+"For more information on reminders, see <link linkend=\"bshly4v\">Reminders</"
+"link>."
 msgstr ""
 
-#: C/evolution.xml:3843(para)
-#: C/evolution.xml:3992(para)
-msgid "(Optional) To add an attachment to the appointment, drag and drop the attachment into the attachment bar."
+#: C/evolution.xml:4103(para) C/evolution.xml:4254(para)
+#: C/evolution.xml:4632(para) C/evolution.xml:4677(para)
+#: C/evolution.xml:4899(para)
+msgid ""
+"(Optional) To add an attachment, drag and drop the attachment into the "
+"attachment bar."
 msgstr ""
+"(Volitelně) Chcete-li přidat přílohu, táhněte a pusťte přílohu na lištu "
+"příloh."
 
-#: C/evolution.xml:3845(para)
-#: C/evolution.xml:3994(para)
-msgid "Click the Attach button on the toolbar, or click Insert &gt; Attachment and then browse to the attachment."
+#: C/evolution.xml:4105(para) C/evolution.xml:4256(para)
+#: C/evolution.xml:4634(para) C/evolution.xml:4679(para)
+#: C/evolution.xml:4901(para)
+msgid ""
+"Click the Attach button on the toolbar, or click Insert &gt; Attachment and "
+"then browse to the attachment."
 msgstr ""
 
-#: C/evolution.xml:3848(para)
-#: C/evolution.xml:3997(para)
-msgid "(Optional) Select a classification (Public, Private, or Confidential) by clicking &gt; Options &gt; Classifications."
+#: C/evolution.xml:4108(para) C/evolution.xml:4259(para)
+msgid ""
+"(Optional) Select a classification (Public, Private, or Confidential) by "
+"clicking &gt; Options &gt; Classifications."
 msgstr ""
 
-#: C/evolution.xml:3851(para)
-#: C/evolution.xml:4000(para)
+#: C/evolution.xml:4111(para) C/evolution.xml:4262(para)
 msgid "(Optional) Click the Recurrence button on the toolbar."
 msgstr ""
 
-#: C/evolution.xml:3853(para)
-#: C/evolution.xml:4002(para)
-msgid "Click Options &gt; Recurrence, and specify whether you want the appointment to recur and how often."
+#: C/evolution.xml:4113(para) C/evolution.xml:4264(para)
+msgid ""
+"Click Options &gt; Recurrence, and specify whether you want the appointment "
+"to recur and how often."
 msgstr ""
 
-#: C/evolution.xml:3858(title)
+#: C/evolution.xml:4118(title)
 msgid "All Day Event"
 msgstr ""
 
-#: C/evolution.xml:3859(para)
-msgid "An All Day event appears at the top of a day's appointment list, in the header under the date, rather than inside. That makes it easy to have appointments that overlap and fit inside each other. For example, a conference might be an All Day appointment, and the meetings at the conference could be timed appointments. Appointments with specific starting and ending times can also overlap. When they do they display as multiple columns in the day view of the calendar."
+#: C/evolution.xml:4119(para)
+msgid ""
+"An All Day event appears at the top of a day's appointment list, in the "
+"header under the date, rather than inside. That makes it easy to have "
+"appointments that overlap and fit inside each other. For example, a "
+"conference might be an All Day appointment, and the meetings at the "
+"conference could be timed appointments. Appointments with specific starting "
+"and ending times can also overlap. When they do they display as multiple "
+"columns in the day view of the calendar."
 msgstr ""
 
-#: C/evolution.xml:3860(para)
-msgid "If you create calendar appointments that overlap, Evolution displays them side by side in your calendar."
+#: C/evolution.xml:4120(para)
+msgid ""
+"If you create calendar appointments that overlap, Evolution displays them "
+"side by side in your calendar."
 msgstr ""
 
-#: C/evolution.xml:3868(para)
-msgid "You can have several Reminders for individual appointments, any time prior to the appointment you schedule. You can have one reminder of each of the following types:"
+#: C/evolution.xml:4128(para)
+msgid ""
+"You can have several Reminders for individual appointments, any time prior "
+"to the appointment you schedule. You can have one reminder of each of the "
+"following types:"
 msgstr ""
 
-#: C/evolution.xml:3872(title)
+#: C/evolution.xml:4132(title)
 msgid "Display:"
 msgstr ""
 
-#: C/evolution.xml:3873(para)
-msgid "A notification pops up on your screen to remind you of your appointment."
+#: C/evolution.xml:4133(para)
+msgid ""
+"A notification pops up on your screen to remind you of your appointment."
 msgstr ""
 
-#: C/evolution.xml:3878(title)
+#: C/evolution.xml:4138(title)
 msgid "Audio:"
 msgstr ""
 
-#: C/evolution.xml:3879(para)
+#: C/evolution.xml:4139(para)
 msgid "Your computer delivers a sound alarm."
 msgstr ""
 
-#: C/evolution.xml:3884(title)
+#: C/evolution.xml:4144(title)
 msgid "Program:"
 msgstr ""
 
-#: C/evolution.xml:3885(para)
-msgid "You can run a program as a reminder. You can enter its name in the text field, or find it with the Browse button."
+#: C/evolution.xml:4145(para)
+msgid ""
+"You can run a program as a reminder. You can enter its name in the text "
+"field, or find it with the Browse button."
 msgstr ""
 
-#: C/evolution.xml:3889(para)
-msgid "Apart from the above notifications, the Evolution alarm icon blinks in the notification area. To pause the alarm or view the event, click the notification icon."
+#: C/evolution.xml:4149(para)
+msgid ""
+"Apart from the above notifications, the Evolution alarm icon blinks in the "
+"notification area. To pause the alarm or view the event, click the "
+"notification icon."
 msgstr ""
 
-#: C/evolution.xml:3890(para)
+#: C/evolution.xml:4150(para)
 msgid "To create a reminder:"
 msgstr ""
 
-#: C/evolution.xml:3893(para)
-msgid "When creating an appointment, click Alarms on the toolbar, or click Options &gt; Alarms."
-msgstr ""
-
-#: C/evolution.xml:3896(para)
-msgid "Select the alarm for the event."
-msgstr ""
-
-#: C/evolution.xml:3899(para)
-msgid "Select Customize to add or remove customized alarms for the event."
-msgstr ""
-
-#: C/evolution.xml:3902(para)
-msgid "If you have stored reminders in a local calendar, they work from the moment you log in. However, for reminders stored on any remote server like GroupWise Exchange which requires authentication, you must run Evolution at least once after logging in. No matter where the reminders are stored, you can quit Evolution and still be reminded of an upcoming appointment."
-msgstr ""
-
-#: C/evolution.xml:3907(para)
-msgid "If you are using a calendar on a Novell <trademark class=\"registered\">GroupWise</trademark> or Microsoft Exchange server, select a classification for the appointment to determine who can view it. Public is the default category, and a public appointment can be viewed by anyone on the calendar-sharing network. Private denotes one level of security, and Confidential an even higher level. The different levels vary depending on your server settings; check with your system administrator or adjust your delegation settings."
-msgstr ""
-
-#: C/evolution.xml:3908(para)
-msgid "If you are using a Novell GroupWise or Microsoft Exchange server, other people on the server can check your schedule to see if you are available at any given time. If you have an appointment that is flexible or that you want to designate as Free rather than Busy time, select the Free box in the Show Time As section. Normally, appointments display as Busy."
+#: C/evolution.xml:4159(para)
+msgid ""
+"If you have stored reminders in a local calendar, they work from the moment "
+"you log in. However, for reminders stored on any remote server like "
+"GroupWise or Exchange which requires authentication, you must run Evolution "
+"at least once after logging in. No matter where the reminders are stored, "
+"you can quit Evolution and still be reminded of an upcoming appointment."
 msgstr ""
 
-#: C/evolution.xml:3909(para)
-msgid "You can categorize appointments in the same way you can categorize contacts."
+#: C/evolution.xml:4164(para)
+msgid ""
+"If you are using a calendar on a Novell <trademark class=\"registered"
+"\">GroupWise</trademark> or Microsoft Exchange server, select a "
+"classification for the appointment to determine who can view it. Public is "
+"the default category, and a public appointment can be viewed by anyone on "
+"the calendar-sharing network. Private denotes one level of security, and "
+"Confidential an even higher level. The different levels vary depending on "
+"your server settings; check with your system administrator or adjust your "
+"delegation settings."
 msgstr ""
 
-#: C/evolution.xml:3912(para)
-msgid "Type a category in the Categories field."
+#: C/evolution.xml:4165(para)
+msgid ""
+"If you are using a Novell GroupWise or Microsoft Exchange server, other "
+"people on the server can check your schedule to see if you are available at "
+"any given time. If you have an appointment that is flexible or that you want "
+"to designate as Free rather than Busy time, select the Free box in the Show "
+"Time As section. Normally, appointments display as Busy."
 msgstr ""
 
-#: C/evolution.xml:3915(para)
-msgid "Select the check box next to each category that matches the appointment you are creating."
+#: C/evolution.xml:4166(para)
+msgid ""
+"You can categorize appointments in the same way you can categorize contacts."
 msgstr ""
 
-#: C/evolution.xml:3918(para)
-#: C/evolution.xml:4408(para)
-#: C/evolution.xml:4623(para)
-msgid "To show or hide Categories field, click View &gt; Categories."
+#: C/evolution.xml:4172(para)
+msgid ""
+"Select the check box next to each category that matches the appointment you "
+"are creating."
 msgstr ""
 
-#: C/evolution.xml:3922(para)
-msgid "You can add a new category to your category list by clicking Edit Master Category List, then click Click Here To Add A Category."
+#: C/evolution.xml:4179(para)
+msgid ""
+"You can add a new category to your category list by clicking Edit Master "
+"Category List, then click Click Here To Add A Category."
 msgstr ""
 
-#: C/evolution.xml:3924(para)
-msgid "After you have selected your categories, click OK to assign these categories to the appointment. The categories you selected are now listed in the text box to the right of the Categories button."
+#: C/evolution.xml:4181(para)
+msgid ""
+"After you have selected your categories, click OK to assign these categories "
+"to the appointment. The categories you selected are now listed in the text "
+"box to the right of the Categories button."
 msgstr ""
 
-#: C/evolution.xml:3925(para)
-msgid "Appointments with categories appear with icons in the calendar display, and you can also search for appointments by category. To display only the appointments in a particular category, select Category Is in the search bar at the top of the calendar, and select a category."
+#: C/evolution.xml:4182(para)
+msgid ""
+"Appointments with categories appear with icons in the calendar display, and "
+"you can also search for appointments by category. To display only the "
+"appointments in a particular category, select the corresponding category in "
+"the search bar at the top of the calendar."
 msgstr ""
 
-#: C/evolution.xml:3930(para)
-msgid "The Recurrence tool button lets you describe repetition in appointments ranging from once every day up to once every 100 years. You can then choose a time and date when the appointment stops recurring, and, under Exceptions, pick individual days when the appointment does not recur. Make your selections from left to right, and you form a sentence: <quote>Every two weeks on Monday and Friday until January 3, 2008</quote> or <quote>Every month on the first Friday for 12 occurrences.</quote>"
+#: C/evolution.xml:4187(para)
+msgid ""
+"The Recurrence tool button lets you describe repetition in appointments "
+"ranging from once every day up to once every 100 years. You can then choose "
+"a time and date when the appointment stops recurring, and, under Exceptions, "
+"pick individual days when the appointment does not recur. Make your "
+"selections from left to right, and you form a sentence: <quote>Every two "
+"weeks on Monday and Friday until January 3, 2008</quote> or <quote>Every "
+"month on the first Friday for 12 occurrences.</quote>"
 msgstr ""
 
-#: C/evolution.xml:3931(para)
-msgid "After you have finished settings, click the disk icon in the toolbar to save and close the appointment editor window. If you want, you can alter an appointment summary in the calendar view by clicking it and typing. You can change other settings by right-clicking the appointment then choosing Open, or double-clicking the appointment."
+#: C/evolution.xml:4188(para)
+msgid ""
+"After you have finished settings, click the Save button in the toolbar to "
+"save and close the appointment editor window. If you want, you can alter an "
+"appointment summary in the calendar view by clicking it and typing. You can "
+"change other settings by right-clicking the appointment then choosing Open, "
+"or double-clicking the appointment."
 msgstr ""
 
-#: C/evolution.xml:3937(para)
-msgid "A meeting is an event you schedule for multiple people. Evolution can be used to schedule group meetings and help you manage responses to meeting requests."
+#: C/evolution.xml:4194(para)
+msgid ""
+"A meeting is an event you schedule for multiple people. Evolution can be "
+"used to schedule group meetings and help you manage responses to meeting "
+"requests."
 msgstr ""
 
-#: C/evolution.xml:3938(para)
-msgid "When you create a meeting or group appointment, you can specify the attendees in several categories, such as <quote>chair</quote> or <quote>required.</quote> When you save the meeting listing, each attendee is sent an e-mail with the meeting information, which also gives them the option to respond."
+#: C/evolution.xml:4195(para)
+msgid ""
+"When you create a meeting or group appointment, you can specify the "
+"attendees in several categories, such as <quote>chair</quote> or "
+"<quote>required</quote>. When you save the meeting listing, each attendee is "
+"sent an email with the meeting information, which also gives them the option "
+"to respond."
 msgstr ""
 
-#: C/evolution.xml:3939(para)
-msgid "If you don't need to collect attendance information when you're scheduling an event, and would rather just announce the event, right-click the meeting and select Forward as iCalendar. This opens a new e-mail message with the event notification attached as an announcement. Recipients can add the event to their calendars with one click, but it won't automatically send you e-mail about whether they plan to attend."
+#: C/evolution.xml:4196(para)
+msgid ""
+"If you don't need to collect attendance information when you're scheduling "
+"an event, and would rather just announce the event, right-click the meeting "
+"and select Forward as iCalendar. This opens a new email message with the "
+"event notification attached as an announcement. Recipients can add the event "
+"to their calendars with one click, but it won't automatically send you email "
+"about whether they plan to attend."
 msgstr ""
 
-#: C/evolution.xml:3940(para)
+#: C/evolution.xml:4197(para)
 msgid "To schedule a meeting:"
 msgstr ""
 
-#: C/evolution.xml:3943(para)
-#: C/evolution.xml:4048(para)
+#: C/evolution.xml:4200(para) C/evolution.xml:4310(para)
 msgid "Click File &gt; New &gt; Meeting."
 msgstr ""
 
-#: C/evolution.xml:3946(para)
-#: C/evolution.xml:4386(para)
-msgid "If you have multiple e-mail accounts, select the one to use by selecting an item in the Organizer field."
-msgstr ""
-
-#: C/evolution.xml:3949(para)
-msgid "Select a calendar in the Calendar drop-down list."
+#: C/evolution.xml:4203(para) C/evolution.xml:4649(para)
+msgid ""
+"If you have multiple email accounts, select the one to use by selecting an "
+"item in the Organizer field."
 msgstr ""
 
-#: C/evolution.xml:3952(para)
-#: C/evolution.xml:4051(para)
-msgid "Click Add to add the e-mail addresses of people you want to invite."
+#: C/evolution.xml:4209(para) C/evolution.xml:4313(para)
+msgid "Click Add to add the email addresses of people you want to invite."
 msgstr ""
+"Klikněte na Přidat, abyste přidali e-mailové adresy lidí, které chcete "
+"pozvat."
 
-#: C/evolution.xml:3955(para)
-msgid "To remove an attendee from the list, select an attendee and press Remove."
+#: C/evolution.xml:4212(para)
+msgid ""
+"To remove an attendee from the list, select an attendee and press Remove."
 msgstr ""
 
-#: C/evolution.xml:3958(para)
+#: C/evolution.xml:4215(para)
 msgid "To edit a field, select the field and click Edit."
 msgstr ""
 
-#: C/evolution.xml:3961(para)
-msgid "Click View on the menu bar to show or hide the Type, Role, Status, and RSVP fields."
-msgstr ""
-
-#: C/evolution.xml:3964(para)
-msgid "Type summary of the meeting in the Summary field."
-msgstr ""
-
-#: C/evolution.xml:3967(para)
-msgid "Type a location for the meeting in the Location field."
-msgstr ""
-
-#: C/evolution.xml:3970(para)
-msgid "To select this meeting as an all day event, click the All Day Event button on the toolbar."
-msgstr ""
-
-#: C/evolution.xml:3973(para)
-msgid "If the event is an all day event, specify a starting date and an ending date."
-msgstr ""
-
-#: C/evolution.xml:3976(para)
-msgid "If the event is not an all day event, specify a starting time and an ending time."
-msgstr ""
-
-#: C/evolution.xml:3979(para)
-msgid "Select For to specify the duration or select Until to specify the ending time of the event."
-msgstr ""
-
-#: C/evolution.xml:3988(para)
-msgid "(Optional) To set an alarm for this meeting, click Alarms on the toolbar, then specify when and how you want to the alarm to notify you."
-msgstr ""
-
-#: C/evolution.xml:3989(para)
-msgid "For more information on reminders, see <link linkend=\"bshly4v\">Reminders</link>."
+#: C/evolution.xml:4218(para)
+msgid ""
+"Click View on the menu bar to show or hide the Type, Role, Status, and RSVP "
+"fields."
 msgstr ""
 
-#: C/evolution.xml:4005(para)
-msgid "To query free/busy information for the attendees, click the Free/Busy button on the toolbar."
+#: C/evolution.xml:4267(para)
+msgid ""
+"To query free/busy information for the attendees, click the Free/Busy button "
+"on the toolbar."
 msgstr ""
 
-#: C/evolution.xml:4007(para)
+#: C/evolution.xml:4269(para)
 msgid "Click Options &gt; Free/Busy."
 msgstr ""
 
-#: C/evolution.xml:4010(para)
+#: C/evolution.xml:4272(para)
 msgid "Click Save to save the meeting."
 msgstr ""
 
-#: C/evolution.xml:4013(para)
-msgid "An e-mail is sent out to all the recipients, inviting them to your event."
+#: C/evolution.xml:4275(para)
+msgid ""
+"An email is sent out to all the recipients, inviting them to your event."
 msgstr ""
 
-#: C/evolution.xml:4015(para)
-msgid "A meeting can have only one organizer, and only the organizer can add participants. You can designate yourself the organizer of the meeting, but if you are not the original organizer, you can create confusion in the scheduling process. If you want to invite additional people to a meeting without changing the organizer, it is best to forward the first organizer's message to the additional participants."
+#: C/evolution.xml:4277(para)
+msgid ""
+"In Evolution, a meeting can have only one organizer, and only the organizer "
+"can add participants to that meeting. Though it is possible to change the "
+"organizer of a meeting, this is not recommended as a means to invite "
+"additional participants to meetings. If you want to invite additional people "
+"to a meeting and are not that meeting's organizer, it is recommended that "
+"you forward the invitation message you received from the original meeting "
+"organiser to additional participants."
 msgstr ""
 
-#: C/evolution.xml:4021(para)
-msgid "Meeting requests are sent as iCal attachments. To view or respond to one, click the attachment icon and view it inline in the mail window. All the details are shown about the event, including time and dates. Then you can choose how to reply to the invitation. Your choices are:"
+#: C/evolution.xml:4283(para)
+msgid ""
+"Meeting requests are sent as iCal attachments. To view or respond to one, "
+"click the attachment icon and view it inline in the mail window. All the "
+"details are shown about the event, including time and dates. Then you can "
+"choose how to reply to the invitation. Your choices are:"
 msgstr ""
 
-#: C/evolution.xml:4024(para)
+#: C/evolution.xml:4286(para)
 msgid "Accept"
 msgstr ""
 
-#: C/evolution.xml:4027(para)
+#: C/evolution.xml:4289(para)
 msgid "Tentatively Accept"
 msgstr ""
 
-#: C/evolution.xml:4030(para)
+#: C/evolution.xml:4292(para)
 msgid "Decline"
 msgstr ""
 
-#: C/evolution.xml:4033(para)
-msgid "Click OK to send an e-mail to the organizer with your answer. The event is also added to your calendar if you accept."
+#: C/evolution.xml:4295(para)
+msgid ""
+"Click OK to send an email to the organizer with your answer. The event is "
+"also added to your calendar if you accept."
 msgstr ""
 
-#: C/evolution.xml:4034(para)
-msgid "After you add the meeting to your calendar, you can make changes to the information, but if the original organizer sends out another update, your changes might be overwritten."
+#: C/evolution.xml:4296(para)
+msgid ""
+"After you add the meeting to your calendar, you can make changes to the "
+"information, but if the original organizer sends out another update, your "
+"changes might be overwritten."
 msgstr ""
 
-#: C/evolution.xml:4039(para)
-msgid "When you get a reply to a meeting invitation you sent, you can view it inline by clicking the attachment and selecting View Inline. At the bottom, you can click OK to update your attendee list."
+#: C/evolution.xml:4301(para)
+msgid ""
+"When you get a reply to a meeting invitation you sent, you can view it "
+"inline by clicking the attachment and selecting View Inline."
 msgstr ""
 
-#: C/evolution.xml:4044(para)
-msgid "In addition to the standard meeting scheduling tools, you can use the Free/Busy view to check whether people are available in advance. The Free/Busy feature is normally a function of dedicated groupware servers such as Microsoft Exchange and Novell GroupWise. However, you can also publish Free/Busy information online, and access Free/Busy information published elsewhere. If not everyone you collaborate with publishes Free/Busy data, you can still use iCal event invitations to coordinate schedules with other people."
+#: C/evolution.xml:4306(para)
+msgid ""
+"In addition to the standard meeting scheduling tools, you can use the Free/"
+"Busy view to check whether people are available in advance. The Free/Busy "
+"feature is normally a function of dedicated groupware servers such as "
+"Microsoft Exchange and Novell GroupWise. However, you can also publish Free/"
+"Busy information online, and access Free/Busy information published "
+"elsewhere. If not everyone you collaborate with publishes Free/Busy data, "
+"you can still use iCal event invitations to coordinate schedules with other "
+"people."
 msgstr ""
 
-#: C/evolution.xml:4045(para)
+#: C/evolution.xml:4307(para)
 msgid "To access the free/busy view:"
 msgstr ""
 
-#: C/evolution.xml:4054(para)
-msgid "Click the Free/Busy button on the toolbar, or click Options &gt; Free/Busy."
+#: C/evolution.xml:4316(para)
+msgid ""
+"Click the Free/Busy button on the toolbar, or click Options &gt; Free/Busy."
 msgstr ""
 
-#: C/evolution.xml:4059(para)
-msgid "Adjust the meeting time, either by dragging the meeting borders or by using the Autopick buttons to choose a time automatically, then click Save and Close. Attendees on an Exchange server have the appointment updated automatically; others receive e-mail notification of any change in plans."
+#: C/evolution.xml:4321(para)
+msgid ""
+"Adjust the meeting time, either by dragging the meeting borders or by using "
+"the Autopick buttons to choose a time automatically, then click Save and "
+"Close. Attendees on an Exchange server have the appointment updated "
+"automatically; others receive email notification of any change in plans."
 msgstr ""
 
-#: C/evolution.xml:4063(title)
+#: C/evolution.xml:4325(title)
 msgid "Attendee List:"
 msgstr ""
 
-#: C/evolution.xml:4064(para)
-msgid "The Attendee List shows the people who have been invited to the appointment."
+#: C/evolution.xml:4326(para)
+msgid ""
+"The Attendee List shows the people who have been invited to the appointment."
 msgstr ""
 
-#: C/evolution.xml:4067(title)
+#: C/evolution.xml:4329(title)
 msgid "Schedule Grid:"
 msgstr ""
 
-#: C/evolution.xml:4068(para)
-msgid "The Schedule Grid shows the published Free/Busy information for the people you have invited. This is where you compare schedules to find free time to schedule the appointment. Individuals have visible scheduling information only if they use the same Novell GroupWise or Microsoft Exchange server you do (that is, if they are in the same organization as you), or if they publish free/busy information at a URL you can reach and you have entered that URL into their contact cards using the contact editor."
+#: C/evolution.xml:4330(para)
+msgid ""
+"The Schedule Grid shows the published Free/Busy information for the people "
+"you have invited. This is where you compare schedules to find free time to "
+"schedule the appointment. Individuals have visible scheduling information "
+"only if they use the same Novell GroupWise or Microsoft Exchange server you "
+"do (that is, if they are in the same organization as you), or if they "
+"publish free/busy information at a URL you can reach and you have entered "
+"that URL into their contact cards using the contact editor."
 msgstr ""
 
-#: C/evolution.xml:4073(para)
-msgid "You can publish Calendar and Free/Busy information to a WebDAV, FTP server, or remote machine through secure shell or other Web server with HTTP PUT support. Check with your system administrator if you are not sure you have this functionality."
+#: C/evolution.xml:4335(para)
+msgid ""
+"You can publish Calendar and Free/Busy information to a WebDAV, FTP server, "
+"or remote machine through secure shell or other Web server with HTTP PUT "
+"support. Check with your system administrator if you are not sure you have "
+"this functionality."
 msgstr ""
 
-#: C/evolution.xml:4074(para)
+#: C/evolution.xml:4336(para)
 msgid "To set up Calendar or Free/Busy publishing:"
 msgstr ""
 
-#: C/evolution.xml:4077(para)
-#: C/evolution.xml:4809(para)
+#: C/evolution.xml:4339(para) C/evolution.xml:5073(para)
 msgid "Click Edit &gt; Preferences, then click Calendar and Tasks."
 msgstr ""
 
-#: C/evolution.xml:4080(para)
-msgid "Click the Calendar Publishing tab, click Add, then select the information you want to publish."
+#: C/evolution.xml:4342(para)
+msgid ""
+"Click the Calendar Publishing tab, click Add, then select the information "
+"you want to publish."
 msgstr ""
 
-#: C/evolution.xml:4083(para)
+#: C/evolution.xml:4345(para)
 msgid "Select the frequency with which you want to upload data."
 msgstr ""
 
-#: C/evolution.xml:4086(para)
+#: C/evolution.xml:4348(para)
 msgid "Select the calendars you want to display data for."
 msgstr ""
 
-#: C/evolution.xml:4089(para)
+#: C/evolution.xml:4351(para)
 msgid "Specify the publishing location for the upload server."
 msgstr ""
 
-#: C/evolution.xml:4092(para)
+#: C/evolution.xml:4354(para)
 msgid "Type your username and password."
 msgstr ""
 
-#: C/evolution.xml:4098(para)
-msgid "To immediately publish calendar information, go to the Calendar tool and click Actions &gt; Publish Calendar Information."
-msgstr ""
-
-#: C/evolution.xml:4100(para)
-msgid "Evolution allows you to specify a template to use when posting to the Free/Busy server."
-msgstr ""
-
-#: C/evolution.xml:4106(para)
-msgid "If individuals give you a URL for Free/Busy data or for their Web calendar, you can enter it as part of the contact information in the Contacts tool. Then, when you schedule a meeting with them, Evolution looks up the schedule and displays it in the Free/Busy data."
+#: C/evolution.xml:4360(para)
+msgid ""
+"To immediately publish calendar information, go to the Calendar tool and "
+"click Actions &gt; Publish Calendar Information."
 msgstr ""
 
-#: C/evolution.xml:4113(para)
-msgid "You can use a customized search, an advanced search, or a quick search to search for Calendar items."
+#: C/evolution.xml:4362(para) C/evolution.xml:6915(para)
+msgid "You can specify a template to use when posting to the Free/Busy server."
 msgstr ""
 
-#: C/evolution.xml:4116(para)
-msgid "Evolution enables you to find the Calendar items by using a Customized Search."
+#: C/evolution.xml:4368(para)
+msgid ""
+"If individuals give you a URL for Free/Busy data or for their Web calendar, "
+"you can enter it as part of the contact information in the Contacts tool. "
+"Then, when you schedule a meeting with them, Evolution looks up the schedule "
+"and displays it in the Free/Busy data."
 msgstr ""
 
-#: C/evolution.xml:4120(para)
-#: C/evolution.xml:4435(para)
-#: C/evolution.xml:4670(para)
-msgid "Click the search icon <inlinegraphic format=\"PNG\" fileref=\"figures/stock_search.png\"/> to expand the drop-down list"
+#: C/evolution.xml:4375(para)
+msgid ""
+"You can use a customized search, an advanced search, or a quick search to "
+"search for Calendar items."
 msgstr ""
 
-#: C/evolution.xml:4123(para)
-#: C/evolution.xml:4438(para)
-#: C/evolution.xml:4673(para)
-msgid "Select the search type:"
+#: C/evolution.xml:4378(para)
+msgid ""
+"Evolution enables you to find the Calendar items by using a Customized "
+"Search."
 msgstr ""
 
-#: C/evolution.xml:4126(para)
-#: C/evolution.xml:4441(para)
-#: C/evolution.xml:4676(para)
+#: C/evolution.xml:4388(para) C/evolution.xml:4704(para)
+#: C/evolution.xml:4940(para)
 msgid "Summary contains"
 msgstr ""
 
-#: C/evolution.xml:4129(para)
-#: C/evolution.xml:4444(para)
-#: C/evolution.xml:4679(para)
+#: C/evolution.xml:4391(para) C/evolution.xml:4707(para)
+#: C/evolution.xml:4943(para)
 msgid "Description contains"
 msgstr ""
 
-#: C/evolution.xml:4132(para)
-#: C/evolution.xml:4447(para)
-#: C/evolution.xml:4682(para)
+#: C/evolution.xml:4394(para) C/evolution.xml:4710(para)
+#: C/evolution.xml:4946(para)
 msgid "Any field Contains"
 msgstr ""
 
-#: C/evolution.xml:4137(para)
-#: C/evolution.xml:4687(para)
+#: C/evolution.xml:4399(para) C/evolution.xml:4951(para)
 msgid "Evolution displays the desired Calendar items."
 msgstr ""
 
-#: C/evolution.xml:4142(para)
-#: C/evolution.xml:4692(para)
-msgid "You can perform an advanced search based on any of the search types."
-msgstr ""
-
-#: C/evolution.xml:4146(para)
-#: C/evolution.xml:4696(para)
-msgid "Select the desired search type from the drop-down list."
-msgstr ""
-
-#: C/evolution.xml:4149(para)
-#: C/evolution.xml:4461(para)
-#: C/evolution.xml:4699(para)
+#: C/evolution.xml:4411(para) C/evolution.xml:4725(para)
+#: C/evolution.xml:4963(para)
 msgid "Select Advanced Search to open Advanced Search dialog box."
 msgstr ""
 
-#: C/evolution.xml:4150(para)
-#: C/evolution.xml:4462(para)
-#: C/evolution.xml:4700(para)
+#: C/evolution.xml:4412(para) C/evolution.xml:4726(para)
+#: C/evolution.xml:4964(para)
 msgid "Search name field displays the search type you have selected."
 msgstr ""
 
-#: C/evolution.xml:4155(para)
-#: C/evolution.xml:4467(para)
-#: C/evolution.xml:4705(para)
+#: C/evolution.xml:4417(para) C/evolution.xml:4731(para)
+#: C/evolution.xml:4969(para)
 msgid "Click Add to add rules."
 msgstr ""
 
-#: C/evolution.xml:4158(para)
-#: C/evolution.xml:4470(para)
+#: C/evolution.xml:4420(para) C/evolution.xml:4734(para)
+#: C/evolution.xml:4972(para)
 msgid "Select the criteria, and then type a search entry in the given field."
 msgstr ""
 
-#: C/evolution.xml:4164(para)
-#: C/evolution.xml:4714(para)
+#: C/evolution.xml:4426(para) C/evolution.xml:4978(para)
 msgid "Click Save to save your search results."
 msgstr ""
 
-#: C/evolution.xml:4169(para)
-msgid "Displays all the Calendar items that match the criteria that you have selected from the drop-down list in the Search bar."
+#: C/evolution.xml:4431(para)
+msgid ""
+"Displays all the Calendar items that match the criteria that you have "
+"selected from the drop-down list in the Search bar."
 msgstr ""
 
-#: C/evolution.xml:4173(para)
-#: C/evolution.xml:4723(para)
+#: C/evolution.xml:4435(para) C/evolution.xml:4987(para)
 msgid "Click the Show drop-down list."
 msgstr ""
 
-#: C/evolution.xml:4176(para)
-#: C/evolution.xml:4516(para)
-#: C/evolution.xml:4726(para)
-msgid "Select the search criteria:"
-msgstr ""
-
-#: C/evolution.xml:4179(para)
-#: C/evolution.xml:4519(para)
-#: C/evolution.xml:4729(para)
+#: C/evolution.xml:4441(para) C/evolution.xml:4783(para)
+#: C/evolution.xml:4993(para)
 msgid "Any Category"
 msgstr ""
 
-#: C/evolution.xml:4182(para)
-#: C/evolution.xml:4522(para)
-#: C/evolution.xml:4732(para)
+#: C/evolution.xml:4444(para) C/evolution.xml:4786(para)
+#: C/evolution.xml:4996(para)
 msgid "Unmatched"
 msgstr ""
 
-#: C/evolution.xml:4185(para)
+#: C/evolution.xml:4447(para)
 msgid "Active Appointments"
 msgstr ""
 
-#: C/evolution.xml:4188(para)
+#: C/evolution.xml:4450(para)
 msgid "Next 7 Days' Appointments"
 msgstr ""
 
-#: C/evolution.xml:4203(para)
-#: C/evolution.xml:4552(para)
+#: C/evolution.xml:4465(para) C/evolution.xml:4816(para)
 msgid "Favourites"
 msgstr ""
 
-#: C/evolution.xml:4212(para)
-#: C/evolution.xml:4561(para)
-#: C/evolution.xml:4756(para)
-msgid "Holidays"
-msgstr ""
-
-#: C/evolution.xml:4224(para)
-#: C/evolution.xml:4573(para)
-#: C/evolution.xml:4768(para)
-msgid "Key Customers"
-msgstr ""
-
-#: C/evolution.xml:4245(para)
-#: C/evolution.xml:4594(para)
-#: C/evolution.xml:4789(para)
-msgid "Time &amp; Expenses"
-msgstr ""
-
-#: C/evolution.xml:4256(para)
+#: C/evolution.xml:4518(para)
 msgid "You can view the desired items listed in the Calendar view."
 msgstr "Můžete vidět požadované položky obsažené v náhledu kalendáře."
 
-#: C/evolution.xml:4261(para)
-msgid "To print the displayed calendar items, click File &gt; Print or right click on the calendar item &gt; Print."
+#: C/evolution.xml:4523(para)
+msgid "To print the displayed calendar items, click File &gt; Print."
 msgstr ""
 
-#: C/evolution.xml:4266(para)
-msgid "Keeping a list of everything you did in the past eventually slows down your calendar. To delete old events, click Actions &gt; Purge, then enter the number of days of past events you want to keep. Click OK to purge the items."
+#: C/evolution.xml:4528(para)
+msgid ""
+"Keeping a list of everything you did in the past eventually slows down your "
+"calendar. To delete old events, click Actions &gt; Purge, then enter the "
+"number of days of past events you want to keep. Click OK to purge the items."
 msgstr ""
 
-#: C/evolution.xml:4271(para)
+#: C/evolution.xml:4533(para)
 msgid "Only attendees of a meeting can delegate a meeting."
 msgstr ""
 
-#: C/evolution.xml:4274(para)
+#: C/evolution.xml:4536(para)
 msgid "In the Calendar, right-click the meeting you want to delegate."
 msgstr ""
 
-#: C/evolution.xml:4277(para)
-msgid "Click Delegate Meetings."
-msgstr ""
+#: C/evolution.xml:4539(para)
+msgid "Click Delegate Meeting."
+msgstr "Klikněte na Delegovat schůzku."
 
-#: C/evolution.xml:4280(para)
+#: C/evolution.xml:4542(para)
 msgid "Select the contacts you want to delegate the meeting to."
 msgstr ""
 
-#: C/evolution.xml:4286(para)
-msgid "Each contact receives a copy of the meeting."
+#: C/evolution.xml:4548(para)
+msgid "Each contact receives a copy of the meeting invitation."
 msgstr ""
 
-#: C/evolution.xml:4291(para)
-msgid "To create a new calendar, click File &gt; New &gt; Calendar. If the calendar is one you plan to store locally, you need only provide a name and color. If it is a remote calendar, specify the name, color, URL, and a refresh frequency. The refresh frequency determines how often Evolution checks to see if the calendar has changed. If you are working with someone who publishes an online calendar, you might want to check for updates every thirty minutes. On the other hand, if you have displayed a sports team schedule in your calendar, you might not need to refresh it more than once a week."
+#: C/evolution.xml:4553(para)
+msgid ""
+"To create a new calendar, click File &gt; New &gt; Calendar. If the calendar "
+"is one you plan to store locally, you need only provide a name and color. If "
+"it is a remote calendar, specify the name, color, URL, and a refresh "
+"frequency. The refresh frequency determines how often Evolution checks to "
+"see if the calendar has changed. If you are working with someone who "
+"publishes an online calendar, you might want to check for updates every "
+"thirty minutes. On the other hand, if you have displayed a sports team "
+"schedule in your calendar, you might not need to refresh it more than once a "
+"week."
+msgstr ""
+
+#: C/evolution.xml:4554(para)
+msgid ""
+"The <ulink url=\"http://icalshare.com\">icalshare.com Web site</ulink> has "
+"an extensive list of shared online calendars, including national and "
+"religious holidays, phases of the moon, sports, and local and regional "
+"events."
 msgstr ""
 
-#: C/evolution.xml:4292(para)
-msgid "The <ulink url=\"http://icalshare.com\">icalshare.com Web site</ulink> has an extensive list of shared online calendars, including national and religious holidays, phases of the moon, sports, and local and regional events."
+#: C/evolution.xml:4555(para)
+msgid ""
+"Evolution lets you view and manage calendars on remote CalDAV servers. The "
+"procedure to create a CalDAV calendar source is similar to that of a remote "
+"Web calendar source. You can view and create calendar events on CalDav "
+"accounts just like other calendars on Evolution."
 msgstr ""
 
-#: C/evolution.xml:4293(para)
-msgid "Evolution lets you view and manage calendars on remote CalDAV servers such as <trademark class=\"registered\">Hula</trademark>. For more information about Hula, see the <ulink url=\"http://www.hula-project.org\">Hula Project Web site</ulink>. The procedure to create a CalDAV calendar source is similar to that of a remote Web calendar source. You can view and create calendar events on CalDav accounts just like other calendars on Evolution."
+#: C/evolution.xml:4560(para)
+msgid ""
+"The Task List, located in the upper-right corner of the calendar, lets you "
+"keep a list of tasks separate from your calendar appointments."
 msgstr ""
 
-#: C/evolution.xml:4298(para)
-msgid "The Task List, located in the lower-right corner of the calendar, lets you keep a list of tasks separate from your calendar appointments. You can use the list in a larger window by clicking the Tasks button in the switcher or in the folder tree."
+#: C/evolution.xml:4561(para)
+msgid ""
+"You can use the list in a larger window by clicking the Tasks button in the "
+"side bar."
 msgstr ""
 
-#: C/evolution.xml:4299(para)
-msgid "Task Lists are more easily organized in the dedicated Tasks tool. Each task list is assigned a color, and you can use the Tasks tool switcher to hide and show task lists just like calendars. In the calendar display task pad, tasks from all visible task lists appear, color coded by list."
+#: C/evolution.xml:4562(para)
+msgid ""
+"Task Lists are more easily organized in the dedicated Tasks tool. Each task "
+"list is assigned a color, and you can use the Tasks tool switcher to hide "
+"and show task lists just like calendars. In the calendar display task pad, "
+"tasks from all visible task lists appear, color coded by list."
 msgstr ""
 
-#: C/evolution.xml:4302(link)
-#: C/evolution.xml:4313(title)
+#: C/evolution.xml:4565(link) C/evolution.xml:4576(title)
 msgid "Creating a New Task List"
 msgstr ""
 
-#: C/evolution.xml:4305(link)
-#: C/evolution.xml:4332(title)
+#: C/evolution.xml:4568(link) C/evolution.xml:4595(title)
 msgid "Creating a New Task"
 msgstr ""
 
-#: C/evolution.xml:4308(link)
-#: C/evolution.xml:4377(title)
+#: C/evolution.xml:4571(link) C/evolution.xml:4640(title)
 msgid "Assigned Tasks"
 msgstr ""
 
-#: C/evolution.xml:4316(para)
+#: C/evolution.xml:4579(para)
 msgid "Click File &gt; New &gt; Task List."
 msgstr ""
 
-#: C/evolution.xml:4319(para)
+#: C/evolution.xml:4582(para)
 msgid "Specify the name and color for the task list."
 msgstr ""
 
-#: C/evolution.xml:4322(para)
-msgid "(Optional) If the task is an online list, specify the URL of the task list."
+#: C/evolution.xml:4585(para)
+msgid ""
+"(Optional) If the task is an online list, specify the URL of the task list."
 msgstr ""
 
-#: C/evolution.xml:4328(para)
-msgid "After you have added a task to your to-do list, its summary appears in the Summary section of the task list. To view or edit a detailed description of an item, double-click it, or right-click it and select Open. You can delete items by selecting them, then clicking Delete.The list of tasks is sorted in a similar way to the list of e-mail messages in Evolution Mail. Click once on a message header to change the direction and type of sorting, or right-click to add or remove columns from the display."
+#: C/evolution.xml:4591(para)
+msgid ""
+"After you have added a task to your to-do list, its summary appears in the "
+"Summary section of the task list. To view or edit a detailed description of "
+"an item, double-click it, or right-click it and select Open. You can delete "
+"items by selecting them, then clicking Delete. The list of tasks is sorted "
+"in a similar way to the list of email messages in Evolution Mail. Click once "
+"on a message header to change the direction and type of sorting, or right-"
+"click to add or remove columns from the display."
 msgstr ""
 
-#: C/evolution.xml:4335(para)
-msgid "Click New &gt; Task."
-msgstr ""
+#: C/evolution.xml:4598(para)
+msgid "Click File &gt; New &gt; Task."
+msgstr "Klikněte na Soubor &gt; Nová &gt; Úkol."
 
-#: C/evolution.xml:4338(para)
-#: C/evolution.xml:4389(para)
+#: C/evolution.xml:4601(para) C/evolution.xml:4652(para)
 msgid "Select a group for the task."
 msgstr ""
 
-#: C/evolution.xml:4341(para)
-msgid "Type a brief summary for the task in the Summary field."
-msgstr ""
-
-#: C/evolution.xml:4344(para)
-msgid "(Optional) Specify a starting date and ending date for the task"
-msgstr ""
-
-#: C/evolution.xml:4347(para)
-msgid "(Optional) Specify a starting time and ending time for the task"
-msgstr ""
-
-#: C/evolution.xml:4356(para)
-#: C/evolution.xml:4407(para)
-#: C/evolution.xml:4622(para)
-msgid "(Optional) Type a category in the Categories field."
-msgstr ""
-
-#: C/evolution.xml:4357(para)
-msgid "To show or hide the Categories field, click View &gt; Categories."
-msgstr ""
-
-#: C/evolution.xml:4360(para)
-#: C/evolution.xml:4411(para)
-msgid "Type a description for the task."
+#: C/evolution.xml:4607(para)
+msgid "(Optional) Specify a starting date and ending date for the task."
 msgstr ""
 
-#: C/evolution.xml:4363(para)
-#: C/evolution.xml:4419(para)
-msgid "(Optional) Click Options &gt; Classifications, then select a classification (as Public, Private or Confidential) for the task."
+#: C/evolution.xml:4610(para)
+msgid "(Optional) Specify a starting time and ending time for the task."
 msgstr ""
 
-#: C/evolution.xml:4366(para)
-#: C/evolution.xml:4422(para)
-msgid "(Optional) To specify a status for the task, click Options &gt; Status Details."
-msgstr ""
-
-#: C/evolution.xml:4369(para)
-msgid "(Optional) To add an attachment to the task, drag and drop the attachment into the attachment bar."
+#: C/evolution.xml:4626(para) C/evolution.xml:4682(para)
+#: C/evolution.xml:4904(para)
+msgid ""
+"(Optional) Click Options &gt; Classifications, then select a classification "
+"(as Public, Private or Confidential)."
 msgstr ""
 
-#: C/evolution.xml:4371(para)
-#: C/evolution.xml:4416(para)
-#: C/evolution.xml:4637(para)
-msgid "Click the Attach button on the toolbar, then browse to the attachment."
+#: C/evolution.xml:4629(para) C/evolution.xml:4685(para)
+msgid ""
+"(Optional) To specify a status for the task, click Options &gt; Status "
+"Details."
 msgstr ""
 
-#: C/evolution.xml:4378(para)
+#: C/evolution.xml:4641(para)
 msgid "Evolution can be used to assign a task to multiple people."
 msgstr ""
 
-#: C/evolution.xml:4379(para)
-msgid "When you assign a task, you can specify the attendees in several categories, such as <quote>chair</quote> or <quote>required.</quote> When you save the task, each attendee is sent an e-mail with the task information, which also gives them the option to respond."
+#: C/evolution.xml:4642(para)
+msgid ""
+"When you assign a task, you can specify the attendees in several categories, "
+"such as <quote>chair</quote> or <quote>required.</quote> When you save the "
+"task, each attendee is sent an email with the task information, which also "
+"gives them the option to respond."
 msgstr ""
 
-#: C/evolution.xml:4380(para)
+#: C/evolution.xml:4643(para)
 msgid "To assign a new task:"
 msgstr ""
 
-#: C/evolution.xml:4383(para)
+#: C/evolution.xml:4646(para)
 msgid "Click File &gt; New &gt; Assigned Task."
 msgstr ""
 
-#: C/evolution.xml:4392(para)
-msgid "Click Add, or press Insert key, or right click and then press Add to add the e-mail addresses of people you want to assign the task.To remove an attendee from the list, select an attendee, then press Remove.To edit a field, select the field, then click Edit.Click View on the menu bar to show or hide the Type, Role, Status, and RSVP fields."
-msgstr ""
-
-#: C/evolution.xml:4395(para)
-msgid "Type a brief summary of the task in the Summary field."
-msgstr ""
-
-#: C/evolution.xml:4398(para)
-msgid "(Optional) Specify a starting date and time, and a due date and time for the task."
+#: C/evolution.xml:4655(para)
+msgid ""
+"Click Add, or press Insert key, or right click and then press Add to add the "
+"email addresses of people you want to assign the task. To remove an attendee "
+"from the list, select an attendee, then press Remove. To edit a field, "
+"select the field, then click Edit. Click View on the menu bar to show or "
+"hide the Type, Role, Status, and RSVP fields."
 msgstr ""
 
-#: C/evolution.xml:4414(para)
-msgid "(Optional) To add an attachment to the assigned task, drag and drop the attachment into the attachment bar."
+#: C/evolution.xml:4661(para)
+msgid ""
+"(Optional) Specify a starting date and time, and a due date and time for the "
+"task."
 msgstr ""
 
-#: C/evolution.xml:4428(title)
+#: C/evolution.xml:4691(title)
 msgid "Searching for Task Items"
 msgstr "Vyhledávání úkolů"
 
-#: C/evolution.xml:4431(para)
-msgid "Evolution enables you to find the task items by using Customized Search."
+#: C/evolution.xml:4694(para)
+msgid ""
+"Evolution enables you to find the task items by using Customized Search."
 msgstr ""
 
-#: C/evolution.xml:4452(para)
+#: C/evolution.xml:4715(para)
 msgid "Evolution displays the desired Task items."
 msgstr ""
 
-#: C/evolution.xml:4457(para)
-msgid "You can perform an advanced search based on any of the search type."
-msgstr ""
-
-#: C/evolution.xml:4475(para)
-msgid "Displays all the task items that match the criteria that you have selected from the drop-down list at the top left side, just above the display pane."
+#: C/evolution.xml:4739(para)
+msgid ""
+"Displays all the task items that match the criteria that you have selected "
+"from the drop-down list at the top left side, just above the display pane."
 msgstr ""
 
-#: C/evolution.xml:4477(para)
-msgid "This feature provides the following best quick search options. This allows you to quickly see when tasks are due, as it can become unwieldy for planning if you have a lot of tasks in hand."
+#: C/evolution.xml:4741(para)
+msgid ""
+"This feature provides the following best quick search options. This allows "
+"you to quickly see when tasks are due, as it can become unwieldy for "
+"planning if you have a lot of tasks in hand."
 msgstr ""
 
-#: C/evolution.xml:4479(title)
+#: C/evolution.xml:4743(title)
 msgid "Any Category:"
 msgstr ""
 
-#: C/evolution.xml:4480(para)
+#: C/evolution.xml:4744(para)
 msgid "Displays all the tasks that fall under any category."
 msgstr ""
 
-#: C/evolution.xml:4483(title)
+#: C/evolution.xml:4747(title)
 msgid "Unmatched:"
 msgstr ""
 
-#: C/evolution.xml:4484(para)
-msgid "Displays all the tasks that do not fall under any of the categories listed here."
+#: C/evolution.xml:4748(para)
+msgid ""
+"Displays all the tasks that do not fall under any of the categories listed "
+"here."
 msgstr ""
 
-#: C/evolution.xml:4487(title)
+#: C/evolution.xml:4751(title)
 msgid "Next 7 Days' Tasks:"
 msgstr ""
 
-#: C/evolution.xml:4488(para)
+#: C/evolution.xml:4752(para)
 msgid "Displays all the active tasks that are due within the next seven days."
 msgstr ""
 
-#: C/evolution.xml:4491(title)
+#: C/evolution.xml:4755(title)
 msgid "Active Tasks:"
 msgstr ""
 
-#: C/evolution.xml:4492(para)
-msgid "Displays all the tasks whose due date is yet to come. This allows you to see the date due for tasks due in the future."
+#: C/evolution.xml:4756(para)
+msgid ""
+"Displays all the tasks whose due date is yet to come. This allows you to see "
+"the date due for tasks due in the future."
 msgstr ""
 
-#: C/evolution.xml:4495(title)
+#: C/evolution.xml:4759(title)
 msgid "Over Due Tasks:"
 msgstr ""
 
-#: C/evolution.xml:4496(para)
+#: C/evolution.xml:4760(para)
 msgid "Displays all the tasks whose end date has already passed."
 msgstr ""
 
-#: C/evolution.xml:4499(title)
+#: C/evolution.xml:4763(title)
 msgid "Completed Tasks:"
 msgstr ""
 
-#: C/evolution.xml:4500(para)
+#: C/evolution.xml:4764(para)
 msgid "Displays the tasks whose status is 100% completed."
 msgstr ""
 
-#: C/evolution.xml:4503(title)
+#: C/evolution.xml:4767(title)
 msgid "Tasks With Attachment:"
 msgstr ""
 
-#: C/evolution.xml:4504(para)
-msgid "It shows all the tasks with attachments."
-msgstr ""
+#: C/evolution.xml:4768(para)
+msgid "Displays all the tasks with attachments."
+msgstr "Zobrazuje všechny úkoly s přílohami."
 
-#: C/evolution.xml:4507(title)
+#: C/evolution.xml:4771(title)
 msgid "&lt;List of Categories&gt;:"
 msgstr ""
 
-#: C/evolution.xml:4508(para)
-msgid "Lists all the tasks that belong to a particular category such as Anniversary, Holidays, Gifts, etc."
+#: C/evolution.xml:4772(para)
+msgid ""
+"Lists all the tasks that belong to a particular category such as "
+"Anniversary, Holidays, Gifts, etc."
 msgstr ""
 
-#: C/evolution.xml:4510(para)
+#: C/evolution.xml:4774(para)
 msgid "To perform quick search,"
 msgstr ""
 
-#: C/evolution.xml:4513(para)
+#: C/evolution.xml:4777(para)
 msgid "Click the Show drop-down list from the Search bar."
 msgstr ""
 
-#: C/evolution.xml:4525(para)
+#: C/evolution.xml:4789(para)
 msgid "Next 7 Days Tasks"
 msgstr ""
 
-#: C/evolution.xml:4528(para)
+#: C/evolution.xml:4792(para)
 msgid "Active Tasks"
 msgstr ""
 
-#: C/evolution.xml:4531(para)
+#: C/evolution.xml:4795(para)
 msgid "Over Due Tasks"
 msgstr ""
 
-#: C/evolution.xml:4534(para)
+#: C/evolution.xml:4798(para)
 msgid "Completed Tasks"
 msgstr ""
 
-#: C/evolution.xml:4537(para)
+#: C/evolution.xml:4801(para)
 msgid "Tasks With Attachments"
 msgstr ""
 
-#: C/evolution.xml:4605(para)
-msgid "You can view the desired items listed in the Task view."
-msgstr ""
-
-#: C/evolution.xml:4611(para)
-msgid "In Evolution, the Memos component lets you create, edit, and store journal entries without dates, using the filesystem as a backend."
+#: C/evolution.xml:4825(para) C/evolution.xml:5020(para)
+msgid "Holidays"
 msgstr ""
 
-#: C/evolution.xml:4613(para)
-msgid "To create a new memo entry:"
+#: C/evolution.xml:4837(para) C/evolution.xml:5032(para)
+msgid "Key Customers"
 msgstr ""
 
-#: C/evolution.xml:4616(para)
-msgid "Click File &gt; New &gt; Memo."
+#: C/evolution.xml:4869(para)
+msgid "You can view the desired items listed in the Task view."
 msgstr ""
 
-#: C/evolution.xml:4619(para)
-msgid "Select a group in which you would create a memo entry."
+#: C/evolution.xml:4875(para)
+msgid ""
+"In Evolution, the Memos component lets you create, edit, and store journal "
+"entries without dates, using the filesystem as a backend."
 msgstr ""
 
-#: C/evolution.xml:4626(para)
-msgid "Type text for the memo in the Summary field."
+#: C/evolution.xml:4877(para)
+msgid "To create a new memo entry:"
 msgstr ""
 
-#: C/evolution.xml:4629(para)
-#: C/evolution.xml:5738(para)
-msgid "In the Start Date field, type the date this reminder note should appear in the recipients' Calendars."
+#: C/evolution.xml:4880(para)
+msgid "Click File &gt; New &gt; Memo."
 msgstr ""
 
-#: C/evolution.xml:4632(para)
-msgid "Type text for the memo in the Memo Content field."
+#: C/evolution.xml:4883(para) C/evolution.xml:5953(para)
+msgid "Select the Group in which you would like to create the entry."
 msgstr ""
 
-#: C/evolution.xml:4635(para)
-msgid "(Optional) To add an attachment to the memo, drag and drop the attachment into the attachment bar."
+#: C/evolution.xml:4887(para)
+msgid "To show or hide Categories field, click View &gt; Categories."
 msgstr ""
 
-#: C/evolution.xml:4640(para)
-msgid "(Optional) Click Options &gt; Classifications, then select a classification (as Public, Private or Confidential) for the memo."
+#: C/evolution.xml:4893(para) C/evolution.xml:5959(para)
+msgid ""
+"In the Start Date field, type the date this reminder note should appear in "
+"the recipients' Calendars."
 msgstr ""
 
-#: C/evolution.xml:4645(title)
+#: C/evolution.xml:4909(title)
 msgid "The Memo List"
 msgstr "Seznam poznámek"
 
-#: C/evolution.xml:4646(para)
-msgid "As with calendars and tasks, you can create multiple memo lists. Each memo list is assigned a color, and you can use the Memos switcher to hide and show memos."
+#: C/evolution.xml:4910(para)
+msgid ""
+"As with calendars and tasks, you can create multiple memo lists. Each memo "
+"list is assigned a color, and you can use the side bar to hide and show memo "
+"lists."
 msgstr ""
 
-#: C/evolution.xml:4647(para)
+#: C/evolution.xml:4911(para)
 msgid "To create a new memo list:"
 msgstr ""
 
-#: C/evolution.xml:4650(para)
+#: C/evolution.xml:4914(para)
 msgid "Click File &gt; New &gt; Memo List."
 msgstr ""
 
-#: C/evolution.xml:4653(para)
-msgid "Type the group, name and color for the memo list."
+#: C/evolution.xml:4917(para)
+msgid "Enter the type, name and color for the memo list."
 msgstr ""
 
-#: C/evolution.xml:4662(title)
+#: C/evolution.xml:4926(title)
 msgid "Searching for Memo Items"
 msgstr "Vyhledávání poznámek"
 
-#: C/evolution.xml:4663(para)
-msgid "You can use a customized search, an advanced search, or a quick search to search for Memo Items."
+#: C/evolution.xml:4927(para)
+msgid ""
+"You can use a customized search, an advanced search, or a quick search to "
+"search for Memo Items."
 msgstr ""
 
-#: C/evolution.xml:4666(para)
-msgid "Evolution enables you to find the Memo items by using a Customized Search."
+#: C/evolution.xml:4930(para)
+msgid ""
+"Evolution enables you to find the Memo items by using a Customized Search."
 msgstr ""
 
-#: C/evolution.xml:4708(para)
-msgid "Select the criteria, then type a search entry in the given field."
+#: C/evolution.xml:4960(para)
+msgid "Select the desired search type from the drop-down list."
 msgstr ""
 
-#: C/evolution.xml:4719(para)
-msgid "Displays all the Memo items that match the criteria that you have selected from the Show drop-down list in the Search bar."
+#: C/evolution.xml:4983(para)
+msgid ""
+"Displays all the Memo items that match the criteria that you have selected "
+"from the Show drop-down list in the Search bar."
 msgstr ""
 
-#: C/evolution.xml:4798(para)
+#: C/evolution.xml:5062(para)
 msgid "You can view the desired items listed in the Memo view."
 msgstr ""
 
-#: C/evolution.xml:4806(para)
-msgid "Evolution supports the use of time zones. If you share calendar files with friends or co-workers, you might need to configure your time zone."
+#: C/evolution.xml:5070(para)
+msgid ""
+"Evolution supports the use of time zones. If you share calendar files with "
+"friends or co-workers, you might need to configure your time zone."
 msgstr ""
 
-#: C/evolution.xml:4812(para)
+#: C/evolution.xml:5076(para)
 msgid "Click the icon next to the Time Zone field, then select your location."
 msgstr ""
 
-#: C/evolution.xml:4813(para)
+#: C/evolution.xml:5077(para)
 msgid "Each red dot represents a major city."
 msgstr ""
 
-#: C/evolution.xml:4816(para)
+#: C/evolution.xml:5080(para)
 msgid "Select a city, then click OK."
 msgstr ""
 
-#: C/evolution.xml:4819(para)
-msgid "You can also configure time zone information specific to each appointment. To do that, simply create a new appointment and click the globe to customize the time zone that the time exists in. For example, if you live in New York but have a telephone meeting set for noon with someone in California, you need to make sure that your schedules are coordinated. Setting time zones on a per-appointment basis helps avoid that potential confusion."
+#: C/evolution.xml:5083(para)
+msgid ""
+"You can also configure time zone information specific to each appointment. "
+"To do that, simply create a new appointment and click the globe to customize "
+"the time zone that the time exists in. For example, if you live in New York "
+"but have a telephone meeting set for noon with someone in California, you "
+"need to make sure that your schedules are coordinated. Setting time zones on "
+"a per-appointment basis helps avoid that potential confusion."
 msgstr ""
 
-#: C/evolution.xml:4823(title)
+#: C/evolution.xml:5087(title)
 msgid "Marcus Bains Line"
 msgstr ""
 
-#: C/evolution.xml:4824(para)
-msgid "The Marcus Bains Line is a marker to show the current date and time. This feature is now available in the Evolution calendar."
+#: C/evolution.xml:5088(para)
+msgid ""
+"The Marcus Bains Line is a marker to show the current date and time. This "
+"feature is available in the Evolution calendar."
 msgstr ""
 
-#: C/evolution.xml:4830(para)
-msgid "<trademark>Evolution</trademark> Exchange for Microsoft Exchange allows Evolution clients to access accounts on Microsoft Exchange 2000 and 2003 servers. Like Evolution, it is free software and is licensed under the GPL."
+#: C/evolution.xml:5094(para)
+msgid ""
+"<trademark>Evolution</trademark> Exchange for Microsoft Exchange allows "
+"Evolution clients to access accounts on Microsoft Exchange 2000 and 2003 "
+"servers. Like Evolution, it is free software and is licensed under the GPL."
 msgstr ""
 
-#: C/evolution.xml:4833(link)
-#: C/evolution.xml:4853(title)
+#: C/evolution.xml:5097(link) C/evolution.xml:5117(title)
 msgid "Evolution Exchange Features"
 msgstr ""
 
-#: C/evolution.xml:4836(link)
-#: C/evolution.xml:4955(title)
+#: C/evolution.xml:5100(link) C/evolution.xml:5219(title)
 msgid "Adding Your Exchange Account to Evolution"
 msgstr ""
 
-#: C/evolution.xml:4839(link)
-#: C/evolution.xml:5122(title)
+#: C/evolution.xml:5103(link) C/evolution.xml:5337(title)
 msgid "Accessing the Exchange Server"
 msgstr ""
 
-#: C/evolution.xml:4842(link)
-#: C/evolution.xml:5130(title)
+#: C/evolution.xml:5106(link) C/evolution.xml:5345(title)
 msgid "Settings Exclusive to Evolution Exchange"
 msgstr ""
 
-#: C/evolution.xml:4845(link)
-#: C/evolution.xml:5153(link)
-#: C/evolution.xml:5371(title)
+#: C/evolution.xml:5109(link) C/evolution.xml:5368(link)
+#: C/evolution.xml:5590(title)
 msgid "Scheduling Meetings with Free/Busy"
 msgstr ""
 
-#: C/evolution.xml:4849(para)
-msgid "Evolution Exchange works only with Exchange 2000 and later, and requires that Outlook Web Access be enabled. Each user needs a valid Microsoft Exchange server account, including a license."
+#: C/evolution.xml:5113(para)
+msgid ""
+"Evolution Exchange works only with Exchange 2000 and later, and requires "
+"that Outlook Web Access be enabled. Each user needs a valid Microsoft "
+"Exchange server account, including a license."
 msgstr ""
 
-#: C/evolution.xml:4854(para)
-msgid "Evolution Exchange supports the following basic Microsoft Exchange features:"
+#: C/evolution.xml:5118(para)
+msgid ""
+"Evolution Exchange supports the following basic Microsoft Exchange features:"
 msgstr ""
 
-#: C/evolution.xml:4857(para)
-#: C/evolution.xml:6572(link)
-#: C/evolution.xml:6583(title)
-#: C/evolution.xml:6630(link)
-#: C/evolution.xml:6644(title)
+#: C/evolution.xml:5121(para) C/evolution.xml:6771(link)
+#: C/evolution.xml:6782(title) C/evolution.xml:6830(link)
+#: C/evolution.xml:6844(title)
 msgid "General"
 msgstr ""
 
-#: C/evolution.xml:4861(title)
+#: C/evolution.xml:5125(title)
 msgid "Remote Exchange Information Store:"
 msgstr ""
 
-#: C/evolution.xml:4862(para)
-msgid "Allows you to access mail, address book (including the Global Address List folder), calendars, and task folders on an Exchange server from Evolution."
+#: C/evolution.xml:5126(para)
+msgid ""
+"Allows you to access mail, address book (including the Global Address List "
+"folder), calendars, and task folders on an Exchange server from Evolution."
 msgstr ""
 
-#: C/evolution.xml:4867(title)
+#: C/evolution.xml:5131(title)
 msgid "Palm Synchronization:"
 msgstr ""
 
-#: C/evolution.xml:4868(para)
+#: C/evolution.xml:5132(para)
 msgid "Supported for Contacts and Calendars on Exchange."
 msgstr ""
 
-#: C/evolution.xml:4873(title)
+#: C/evolution.xml:5137(title)
 msgid "Password Management:"
 msgstr ""
 
-#: C/evolution.xml:4874(para)
-msgid "Allows you to reset your password. If your password has expired, Evolution asks you to change your password at startup."
+#: C/evolution.xml:5138(para)
+msgid ""
+"Allows you to reset your password. If your password has expired, Evolution "
+"asks you to change your password at startup."
 msgstr ""
 
-#: C/evolution.xml:4880(para)
-#: C/evolution.xml:5460(para)
+#: C/evolution.xml:5144(para) C/evolution.xml:5679(para)
 msgid "Mail"
 msgstr ""
 
-#: C/evolution.xml:4884(title)
+#: C/evolution.xml:5148(title)
 msgid "Viewing Mail in Exchange Folders:"
 msgstr ""
 
-#: C/evolution.xml:4885(para)
-msgid "Mail stored on the Exchange server is visible in the Mail component in Evolution."
+#: C/evolution.xml:5149(para)
+msgid ""
+"Mail stored on the Exchange server is visible in the Mail component in "
+"Evolution."
 msgstr ""
 
-#: C/evolution.xml:4890(title)
-msgid "Sending E-mail via Exchange Protocols:"
-msgstr ""
+#: C/evolution.xml:5154(title)
+msgid "Sending Email via Exchange Protocols:"
+msgstr "Posílání pošty přes protokoly Exchange:"
 
-#: C/evolution.xml:4891(para)
-msgid "If you use the Microsoft Exchange mail transport protocol to send e-mail, make sure that the address you have entered as your e-mail address is exactly the one that the Exchange server has on file. This might be <quote>yourname@exchange-server.example.com</quote> rather than <quote>yourname@example.com.</quote>"
+#: C/evolution.xml:5155(para)
+msgid ""
+"If you use the Microsoft Exchange mail transport protocol to send email, "
+"make sure that the address you have entered as your email address is exactly "
+"the one that the Exchange server has on file. This might be "
+"<quote>yourname@exchange-server.example.com</quote> rather than "
+"<quote>yourname@example.com.</quote>"
 msgstr ""
 
-#: C/evolution.xml:4896(title)
+#: C/evolution.xml:5160(title)
 msgid "Out of Office Message:"
 msgstr ""
 
-#: C/evolution.xml:4897(para)
-msgid "You can set <quote>out of Office</quote> message that will automatically be sent to people who send mails to you while you are away from office."
+#: C/evolution.xml:5161(para)
+msgid ""
+"You can set <quote>out of Office</quote> message that will automatically be "
+"sent to people who send mail to you while you are away from office."
 msgstr ""
 
-#: C/evolution.xml:4902(title)
+#: C/evolution.xml:5166(title)
 msgid "Send Options:"
 msgstr ""
 
-#: C/evolution.xml:4903(para)
-msgid "You can set the priority and sensitivity of the sent message so that the recipients will know how important the message is.The priority can have one of the three values - High, Normal or Low and sensitivity can have one of the four values-Normal, Personal, Private and Confidential respectively. You can also enable delivery receipt request and read receipt request for the messages sent."
+#: C/evolution.xml:5167(para)
+msgid ""
+"You can set the priority and sensitivity of the sent message so that the "
+"recipients will know how important the message is.The priority can have one "
+"of the three values - High, Normal or Low and sensitivity can have one of "
+"the four values-Normal, Personal, Private and Confidential respectively. You "
+"can also enable delivery receipt request and read receipt request for the "
+"messages sent."
 msgstr ""
 
-#: C/evolution.xml:4909(para)
-#: C/evolution.xml:5483(para)
-#: C/evolution.xml:7026(link)
-#: C/evolution.xml:7096(title)
+#: C/evolution.xml:5173(para) C/evolution.xml:5702(para)
+#: C/evolution.xml:7350(link) C/evolution.xml:7420(title)
 msgid "Calendar"
 msgstr ""
 
-#: C/evolution.xml:4913(title)
+#: C/evolution.xml:5177(title)
 msgid "Meeting Requests/Proposal:"
 msgstr ""
 
-#: C/evolution.xml:4914(para)
-msgid "Allows Evolution users to schedule meetings. You can check when other users are busy according to their calendars and send the meeting requests accordingly."
+#: C/evolution.xml:5178(para)
+msgid ""
+"Allows Evolution users to schedule meetings. You can check when other users "
+"are busy according to their calendars and send the meeting requests "
+"accordingly."
 msgstr ""
 
-#: C/evolution.xml:4919(title)
+#: C/evolution.xml:5183(title)
 msgid "Adding iCalendar Meeting Requests to the Calendar:"
 msgstr ""
 
-#: C/evolution.xml:4920(para)
-msgid "Allows you to add the iCalendar meeting requests you receive to your Exchange calendar. Note that you need to specify the calendar from the list, to which you want to add your meeting schedules."
+#: C/evolution.xml:5184(para)
+msgid ""
+"Allows you to add the iCalendar meeting requests you receive to your "
+"Exchange calendar. Note that you need to specify the calendar from the list, "
+"to which you want to add your meeting schedules."
 msgstr ""
 
-#: C/evolution.xml:4926(para)
-#: C/evolution.xml:5395(para)
-#: C/evolution.xml:5494(para)
+#: C/evolution.xml:5190(para) C/evolution.xml:5614(para)
+#: C/evolution.xml:5713(para)
 msgid "Contacts"
 msgstr ""
 
-#: C/evolution.xml:4930(title)
+#: C/evolution.xml:5194(title)
 msgid "Address Completion:"
 msgstr ""
 
-#: C/evolution.xml:4931(para)
+#: C/evolution.xml:5195(para)
 msgid "Supported for your Exchange Contacts folder."
 msgstr ""
 
-#: C/evolution.xml:4936(title)
+#: C/evolution.xml:5200(title)
 msgid "Adding vCards to the Address Book:"
 msgstr ""
 
-#: C/evolution.xml:4937(para)
-msgid "Allows you to save the vCards you receive in attachment to your Exchange address book.New Address Book entries can also be created on Exchange from received e-mail messages with a single click."
+#: C/evolution.xml:5201(para)
+msgid ""
+"Allows you to save the vCards you receive in attachment to your Exchange "
+"address book.New Address Book entries can also be created on Exchange from "
+"received email messages with a single click."
 msgstr ""
 
-#: C/evolution.xml:4943(para)
+#: C/evolution.xml:5207(para)
 msgid "Work Offline (disconnected mode)"
 msgstr ""
 
-#: C/evolution.xml:4944(para)
-msgid "To mark a folder for offline usage, right-click the folder, then click Properties. Click Copy Folder Content Locally for Offline Operation. For more information see <link linkend=\"usage-mail-getnsend-offline\">Working Offline</link>."
+#: C/evolution.xml:5208(para)
+msgid ""
+"To mark a folder for offline usage, right-click the folder, then click "
+"Properties. Click Copy Folder Content Locally for Offline Operation. For "
+"more information see <link linkend=\"usage-mail-getnsend-offline\">Working "
+"Offline</link>."
 msgstr ""
 
-#: C/evolution.xml:4949(para)
+#: C/evolution.xml:5213(para)
 msgid "Recall Message function is not available."
 msgstr ""
 
-#: C/evolution.xml:4956(para)
-msgid "After you have installed Evolution Exchange, you need to set up access for your Exchange account on both the Exchange server and within Evolution."
+#: C/evolution.xml:5220(para)
+msgid ""
+"After you have installed Evolution Exchange, you need to set up access for "
+"your Exchange account on both the Exchange server and within Evolution."
 msgstr ""
 
-#: C/evolution.xml:4959(link)
-#: C/evolution.xml:4976(title)
+#: C/evolution.xml:5223(link) C/evolution.xml:5240(title)
 msgid "Exchange Server Settings"
 msgstr ""
 
-#: C/evolution.xml:4962(link)
-#: C/evolution.xml:4990(title)
+#: C/evolution.xml:5226(link) C/evolution.xml:5254(title)
 msgid "Standard Configuration Tool for Evolution Exchange"
 msgstr ""
 
-#: C/evolution.xml:4965(link)
-#: C/evolution.xml:4994(title)
+#: C/evolution.xml:5229(link) C/evolution.xml:5258(title)
 msgid "Simple Configuration Tool for Evolution Exchange"
 msgstr ""
 
-#: C/evolution.xml:4968(link)
-#: C/evolution.xml:5001(title)
+#: C/evolution.xml:5232(link) C/evolution.xml:5265(title)
 msgid "Creating a New Exchange Account"
 msgstr ""
 
-#: C/evolution.xml:4971(link)
-#: C/evolution.xml:5043(title)
+#: C/evolution.xml:5235(link) C/evolution.xml:5289(title)
 msgid "Configuring an Existing Account for Evolution Exchange Account"
 msgstr ""
 
-#: C/evolution.xml:4977(para)
+#: C/evolution.xml:5241(para)
 msgid "Check with your system administrator to ensure that:"
 msgstr ""
 
-#: C/evolution.xml:4980(para)
+#: C/evolution.xml:5244(para)
 msgid "You have a valid account on the Exchange server."
 msgstr ""
 
-#: C/evolution.xml:4983(para)
-msgid "You are permitted to access the account with WebDAV. This is the default setting for the Exchange server, so unless your system administrator has specifically turned it off, no changes should be necessary."
-msgstr ""
-
-#: C/evolution.xml:4986(para)
-msgid "The <ulink url=\"http://support.novell.com\"><trademark class=\"registered\">Novell</trademark> Web site Knowledgebase</ulink> has additional information about checking to make sure that your Exchange server accepts connections from Evolution."
-msgstr ""
-
-#: C/evolution.xml:4991(para)
-msgid "When you know that your server is ready for you to connect, you are ready to add your Exchange account to Evolution Exchange."
+#: C/evolution.xml:5247(para)
+msgid ""
+"You are permitted to access the account with WebDAV. This is the default "
+"setting for the Exchange server, so unless your system administrator has "
+"specifically turned it off, no changes should be necessary."
 msgstr ""
 
-#: C/evolution.xml:4995(para)
-msgid "Evolution Exchange comes with a simple account creation tool for Exchange accounts."
+#: C/evolution.xml:5250(para)
+msgid ""
+"The <ulink url=\"http://support.novell.com\"><trademark class=\"registered"
+"\">Novell</trademark> Web site Knowledgebase</ulink> has additional "
+"information about checking to make sure that your Exchange server accepts "
+"connections from Evolution."
 msgstr ""
 
-#: C/evolution.xml:4996(para)
-msgid "If you have no accounts configured, the simple account configuration assistant starts when you start Evolution. It asks only for the Outlook Web Access URL, and your username and password. Evolution Exchange determines the remaining information for you."
+#: C/evolution.xml:5255(para)
+msgid ""
+"When you know that your server is ready for you to connect, you are ready to "
+"add your Exchange account to Evolution Exchange."
 msgstr ""
 
-#: C/evolution.xml:4997(para)
-msgid "If the simple account configuration tool does not run automatically, you need to create an account manually. For more information on how to do this, see <link linkend=\"config-exchange-new-account\">Creating a New Exchange Account</link>."
+#: C/evolution.xml:5259(para)
+msgid ""
+"Evolution Exchange comes with a simple account creation tool for Exchange "
+"accounts."
 msgstr ""
 
-#: C/evolution.xml:5004(para)
-msgid "Click Edit &gt; Preferences or press Shift+Ctrl+S"
+#: C/evolution.xml:5260(para)
+msgid ""
+"If you have no accounts configured, the simple account configuration "
+"assistant starts when you start Evolution. It asks only for the Outlook Web "
+"Access URL, and your username and password. Evolution Exchange determines "
+"the remaining information for you."
 msgstr ""
 
-#: C/evolution.xml:5012(para)
-msgid "Create the account following the procedure in <link linkend=\"usage-mainwindow-starting\">Starting Evolution for the First Time</link>. Remember to select Microsoft Exchange as server type in the Receiving Mail section."
+#: C/evolution.xml:5261(para)
+msgid ""
+"If the simple account configuration tool does not run automatically, you "
+"need to create an account manually. For more information on how to do this, "
+"see <link linkend=\"config-exchange-new-account\">Creating a New Exchange "
+"Account</link>."
 msgstr ""
 
-#: C/evolution.xml:5023(para)
-msgid "You may configure only Only one Microsoft Exchange account can be configured in Evolution."
+#: C/evolution.xml:5276(para)
+msgid ""
+"Create the account following the procedure in <link linkend=\"usage-"
+"mainwindow-starting\">Starting Evolution for the First Time</link>. Remember "
+"to select Microsoft Exchange as server type in the Receiving Mail section."
 msgstr ""
 
-#: C/evolution.xml:5044(para)
-msgid "Use the following procedure to configure your existing account for Evolution Exchange:"
+#: C/evolution.xml:5282(para)
+msgid "Only one Microsoft Exchange account can be configured in Evolution."
 msgstr ""
 
-#: C/evolution.xml:5047(para)
-msgid "Click Edit &gt; Preferences or press Shift+Ctrl+S, then click Mail Accounts."
+#: C/evolution.xml:5290(para)
+msgid ""
+"Use the following procedure to configure your existing account for Evolution "
+"Exchange:"
 msgstr ""
 
-#: C/evolution.xml:5050(para)
-msgid "Select the account you want to convert, then click Edit to appear the Account Editor."
+#: C/evolution.xml:5296(para)
+msgid ""
+"Select the account you want to convert, then click Edit to appear the "
+"Account Editor."
 msgstr ""
 
-#: C/evolution.xml:5051(para)
+#: C/evolution.xml:5297(para)
 msgid "You can view Identity tab enabled."
 msgstr ""
 
-#: C/evolution.xml:5065(para)
-#: C/evolution.xml:5657(para)
-msgid "Change your e-mail address as needed."
-msgstr ""
+#: C/evolution.xml:5302(para) C/evolution.xml:5876(para)
+msgid "Change your email address as needed."
+msgstr "Změňte vaši e-mailovou adresu, jak potřebujete."
 
-#: C/evolution.xml:5068(para)
-msgid "Click the Receiving Mail tab, then select Microsoft Exchange as your server type."
+#: C/evolution.xml:5305(para)
+msgid ""
+"Click the Receiving Mail tab, then select Microsoft Exchange as your server "
+"type."
 msgstr ""
 
-#: C/evolution.xml:5087(para)
-msgid "Type your user name, and the Outlook Web Access (OWA) URL. Click Authenticate, then enter the password at the prompt. The Exchange server authenticates your account."
+#: C/evolution.xml:5310(para)
+msgid ""
+"Type your user name, and the Outlook Web Access (OWA) URL. Click "
+"Authenticate, then enter the password at the prompt. The Exchange server "
+"authenticates your account."
 msgstr ""
 
-#: C/evolution.xml:5090(para)
-msgid "Select your authentication method."
-msgstr ""
+#: C/evolution.xml:5318(para) C/evolution.xml:5890(para)
+msgid "Click the Receiving Options tab."
+msgstr "Klikněte na kartu Možnosti příjmu."
 
-#: C/evolution.xml:5104(para)
-msgid "Click the Receiving Options tab, then specify how often to check for new mail, your Global Catalog server name and whether to apply filters to messages in your Inbox, check for junk, set a password expiry period, and any other settings you want to include."
+#: C/evolution.xml:5319(para)
+msgid ""
+"Specify how often to check for new mail, your Global Catalog server name and "
+"whether to apply filters to messages in your Inbox, check for junk, set a "
+"password expiry period, and any other settings you want to include."
 msgstr ""
 
-#: C/evolution.xml:5107(para)
-msgid "Use the Defaults tab to define folders, send cc: or bcc: messages to certain IDs, and set options for message receipts."
+#: C/evolution.xml:5322(para)
+msgid ""
+"Use the Defaults tab to define folders, send cc: or bcc: messages to certain "
+"IDs, and set options for message receipts."
 msgstr ""
 
-#: C/evolution.xml:5110(para)
+#: C/evolution.xml:5325(para)
 msgid "Use the Security tab to set PGP and s/MIME options."
 msgstr ""
 
-#: C/evolution.xml:5113(para)
+#: C/evolution.xml:5328(para)
 msgid "Quit Evolution and restart it."
 msgstr ""
 
-#: C/evolution.xml:5114(para)
-msgid "Changes to Evolution Exchange accounts configuration are not active until you have restarted the application."
+#: C/evolution.xml:5329(para)
+msgid ""
+"Changes to Evolution Exchange accounts configuration are not active until "
+"you have restarted the application."
 msgstr ""
 
-#: C/evolution.xml:5123(para)
-msgid "When you have installed Evolution Exchange, you can access public folders and perform certain Exchange actions like delegation and password management, and subscribing to other user's calendars, tasks, and contact folders. You can also carry out any folder-related operations like adding, deleting, and renaming folders, and selecting folder permissions on calendars, tasks, and contact folders. Use the regular Mail tool for mail, the Contacts tool for contacts, and the Calendar tool for setting schedules."
+#: C/evolution.xml:5338(para)
+msgid ""
+"When you have installed Evolution Exchange, you can access public folders "
+"and perform certain Exchange actions like delegation and password "
+"management, and subscribing to other user's calendars, tasks, and contact "
+"folders. You can also carry out any folder-related operations like adding, "
+"deleting, and renaming folders, and selecting folder permissions on "
+"calendars, tasks, and contact folders. Use the regular Mail tool for mail, "
+"the Contacts tool for contacts, and the Calendar tool for setting schedules."
 msgstr ""
 
-#: C/evolution.xml:5124(para)
-msgid "If you are using both an Exchange account and a local mail account, you should be aware that whenever you save an e-mail address or appointment from an e-mail message, it is saved in your Exchange contacts list or calendar, rather than in your local account. The same is true for synchronization with Palm OS devices; tasks, and appointments.Addresses from your Palm OS device are synchronized in the Exchange folders rather than in local folders."
+#: C/evolution.xml:5339(para)
+msgid ""
+"If you are using both an Exchange account and a local mail account, you "
+"should be aware that whenever you save an email address or appointment from "
+"an email message, it is saved in your Exchange contacts list or calendar, "
+"rather than in your local account. The same is true for synchronization with "
+"Palm OS devices; tasks, and appointments.Addresses from your Palm OS device "
+"are synchronized in the Exchange folders rather than in local folders."
 msgstr ""
 
-#: C/evolution.xml:5125(para)
-msgid "To avoid unnecessary strain on the server, the Global Address List (GAL) appears empty until you search for something in it."
+#: C/evolution.xml:5340(para)
+msgid ""
+"To avoid unnecessary strain on the server, the Global Address List (GAL) "
+"appears empty until you search for something in it."
 msgstr ""
 
-#: C/evolution.xml:5131(para)
-msgid "There are some settings in Evolution that are available only with Evolution Exchange, like delegation and permission handling, creating <quote>Out of Office</quote> messages, changing password and viewing folder size."
+#: C/evolution.xml:5346(para)
+msgid ""
+"There are some settings in Evolution that are available only with Evolution "
+"Exchange, like delegation and permission handling, creating <quote>Out of "
+"Office</quote> messages, changing password and viewing folder size."
 msgstr ""
 
-#: C/evolution.xml:5135(link)
-#: C/evolution.xml:5158(title)
+#: C/evolution.xml:5350(link) C/evolution.xml:5373(title)
 msgid "Send Options"
 msgstr ""
 
-#: C/evolution.xml:5138(link)
-#: C/evolution.xml:5238(title)
+#: C/evolution.xml:5353(link) C/evolution.xml:5454(title)
 msgid "Access Delegation"
 msgstr ""
 
-#: C/evolution.xml:5141(link)
-#: C/evolution.xml:5242(title)
+#: C/evolution.xml:5356(link) C/evolution.xml:5458(title)
 msgid "Delegating Access to Others"
 msgstr ""
 
-#: C/evolution.xml:5144(link)
-#: C/evolution.xml:5289(title)
+#: C/evolution.xml:5359(link) C/evolution.xml:5508(title)
 msgid "Subscribe to Other Users' Folders"
 msgstr ""
 
-#: C/evolution.xml:5147(link)
-#: C/evolution.xml:5313(title)
+#: C/evolution.xml:5362(link) C/evolution.xml:5532(title)
 msgid "Subscribe to Public Folders"
 msgstr ""
 
-#: C/evolution.xml:5150(link)
-#: C/evolution.xml:5343(title)
+#: C/evolution.xml:5365(link) C/evolution.xml:5562(title)
 msgid "Setting an Out of Office Message"
 msgstr ""
 
-#: C/evolution.xml:5159(para)
-msgid "You can set the priority and sensitivity of the sent message from an exchange account so that the recipients will know how important the message is.The priority can have one of the three options - High, Normal or Low and sensitivity can have one of the four options-Normal, Personal, Private and Confidential respectively. You can also enable delivery receipt request and read receipt request for the messages sent."
+#: C/evolution.xml:5374(para)
+msgid ""
+"You can set the priority and sensitivity of the sent message from an "
+"exchange account so that the recipients will know how important the message "
+"is.The priority can have one of the three options - High, Normal or Low and "
+"sensitivity can have one of the four options-Normal, Personal, Private and "
+"Confidential respectively. You can also enable delivery receipt request and "
+"read receipt request for the messages sent."
 msgstr ""
 
-#: C/evolution.xml:5162(title)
+#: C/evolution.xml:5377(title)
 msgid "Tracking Options"
 msgstr ""
 
-#: C/evolution.xml:5163(para)
-msgid "Evolution lets you track the status of an item you have sent. You can enable the Delivery Receipt request as well as Read Receipt request so that you will know when the item reached the recipients or read by them."
+#: C/evolution.xml:5378(para)
+msgid ""
+"Evolution lets you track the status of an item you have sent. You can enable "
+"the Delivery Receipt request as well as Read Receipt request so that you "
+"will know when the item reached the recipients or read by them."
 msgstr ""
 
-#: C/evolution.xml:5164(para)
+#: C/evolution.xml:5379(para)
 msgid "To set the importance and sensitivity of the message:"
 msgstr ""
 
-#: C/evolution.xml:5167(para)
+#: C/evolution.xml:5382(para)
 msgid "Open a Compose Message window."
 msgstr ""
 
-#: C/evolution.xml:5170(para)
+#: C/evolution.xml:5385(para)
 msgid "Select the exchange account from the From field."
 msgstr ""
 
-#: C/evolution.xml:5173(para)
+#: C/evolution.xml:5388(para)
 msgid "Click Insert &gt; Send Options to open the Send Option dialog box"
 msgstr ""
 
-#: C/evolution.xml:5178(para)
-msgid "Select the priority for your sent message from the given three options (Normal, High, Low)"
+#: C/evolution.xml:5393(para)
+msgid ""
+"Select the priority for your sent message from the given three options "
+"(Normal, High, Low)"
 msgstr ""
 
-#: C/evolution.xml:5181(para)
-msgid "Select the sensitivity for your sent message from the given four options (Normal, Personal, Private, Confidential)."
+#: C/evolution.xml:5396(para)
+msgid ""
+"Select the sensitivity for your sent message from the given four options "
+"(Normal, Personal, Private, Confidential)."
 msgstr ""
 
-#: C/evolution.xml:5185(title)
+#: C/evolution.xml:5400(title)
 msgid "Message Access Delegation:"
 msgstr ""
 
-#: C/evolution.xml:5186(para)
-msgid "Click Send as Delegate to send the message to the recipient on behalf of someone else."
-msgstr ""
-
-#: C/evolution.xml:5189(para)
-msgid "To send a calendar item as delegate, you should subscribe to the delegator's message and also you should have necessary rights assigned to you by the delegator."
+#: C/evolution.xml:5401(para)
+msgid ""
+"Click Send as Delegate to send the message to the recipient on behalf of "
+"someone else."
 msgstr ""
 
-#: C/evolution.xml:5193(para)
-msgid "Click User to open Show Contacts dialogue box."
+#: C/evolution.xml:5404(para)
+msgid ""
+"To send a calendar item as delegate, you should subscribe to the delegator's "
+"message and also you should have necessary rights assigned to you by the "
+"delegator."
 msgstr ""
 
-#: C/evolution.xml:5196(para)
-msgid "Select the contact from the desired Address book and click Add, then close the dialogue box."
+#: C/evolution.xml:5408(para)
+msgid "Click User to open Show Contacts dialog box."
 msgstr ""
+"Klikněte na Uživatel, abyste otevřeli dialogové okno Zobrazit kontakty."
 
-#: C/evolution.xml:5198(para)
-msgid "You are not permitted to send a message on behalf of more than one person at a time."
+#: C/evolution.xml:5411(para)
+msgid ""
+"Select the contact from the desired Address book and click Add, then close "
+"the dialog box."
 msgstr ""
 
-#: C/evolution.xml:5200(para)
-msgid "When the recipient opens the mail, he or she can also read a message that <guilabel>The message was sent by &lt;<emphasis>Delegator's name</emphasis>&gt; on behalf of &lt;<emphasis>Delegate's name</emphasis>&gt;</guilabel> on the preview pane header bar."
+#: C/evolution.xml:5413(para)
+msgid ""
+"You are not permitted to send a message on behalf of more than one person at "
+"a time."
 msgstr ""
 
-#: C/evolution.xml:5205(para)
-msgid "Select the Request a delivery receipt for this message check box to get a delivery receipt from your recipient."
+#: C/evolution.xml:5415(para)
+msgid ""
+"When the recipient opens the mail, he or she can also read a message that "
+"<guilabel>The message was sent by &lt;Delegator's name&gt; on behalf of &lt;"
+"Delegate's name&gt;</guilabel> on the preview pane header bar."
 msgstr ""
 
-#: C/evolution.xml:5208(para)
-msgid "Select the Request a read receipt for this message to get a read receipt for the message you have sent."
+#: C/evolution.xml:5420(para)
+msgid ""
+"Select the Request a delivery receipt for this message check box to get a "
+"delivery receipt from your recipient."
 msgstr ""
 
-#: C/evolution.xml:5211(para)
-msgid "Click OK to confirm your selection."
+#: C/evolution.xml:5423(para)
+msgid ""
+"Select the Request a read receipt for this message to get a read receipt for "
+"the message you have sent."
 msgstr ""
 
-#: C/evolution.xml:5217(title)
+#: C/evolution.xml:5432(title)
 msgid "Delegating Calendar Items"
 msgstr ""
 
-#: C/evolution.xml:5218(para)
-msgid "You can send Meetings or Appointments on behalf of someone else if you have subscribed to his or her Calendar."
+#: C/evolution.xml:5433(para)
+msgid ""
+"You can send Meetings or Appointments on behalf of someone else if you have "
+"subscribed to his or her Calendar."
 msgstr ""
 
-#: C/evolution.xml:5221(para)
+#: C/evolution.xml:5436(para)
 msgid "Select the delegator's Calendar."
 msgstr "Vyberte kalendář delegujícího."
 
-#: C/evolution.xml:5224(para)
+#: C/evolution.xml:5439(para)
 msgid "Open a new Meeting composer window."
 msgstr ""
 
-#: C/evolution.xml:5227(para)
+#: C/evolution.xml:5442(para)
 msgid "Add the recipients."
 msgstr ""
 
-#: C/evolution.xml:5230(para)
-msgid "Fill in the information, then click Send."
-msgstr "Vyplňte informaci a potom klikněte na Poslat."
+#: C/evolution.xml:5445(para)
+msgid "Fill in the information."
+msgstr "Vyplňte informace."
 
-#: C/evolution.xml:5231(para)
-msgid "When the recipient receives the calendar item, a message indicates that the item was created by someone on behalf of the Delegator."
+#: C/evolution.xml:5447(para)
+msgid ""
+"When the recipient receives the calendar item, a message indicates that the "
+"item was created by someone on behalf of the Delegator."
 msgstr ""
 
-#: C/evolution.xml:5239(para)
-msgid "You can allow other people in your organization's Global Address List to access your calendar, address book, and messages, and they can let you manage theirs. Delegation allows people to do anything from check on each other's schedules to completely manage their personal information."
+#: C/evolution.xml:5455(para)
+msgid ""
+"You can allow other people in your organization's Global Address List to "
+"access your calendar, address book, and messages, and they can let you "
+"manage theirs. Delegation allows people to do anything from check on each "
+"other's schedules to completely manage their personal information."
 msgstr ""
 
-#: C/evolution.xml:5243(para)
+#: C/evolution.xml:5459(para)
 msgid "To add someone to your list of delegates:"
 msgstr ""
 
-#: C/evolution.xml:5246(para)
-msgid "Click Edit &gt; Preferences or press Shift+Ctrl+S, then click the Exchange Settings tab."
-msgstr ""
+#: C/evolution.xml:5465(para)
+msgid "Click the Exchange Settings tab."
+msgstr "Klikněte na kartu Nastavení Exchange."
 
-#: C/evolution.xml:5249(para)
+#: C/evolution.xml:5468(para)
 msgid "Click Delegation Assistant to open the Delegates dialog box."
 msgstr ""
 
-#: C/evolution.xml:5254(para)
+#: C/evolution.xml:5473(para)
 msgid "Click Add, then search for a contact in the Global Address List."
 msgstr ""
 
-#: C/evolution.xml:5255(para)
-msgid "Remember that the Global Address List (GAL) appears empty until you have searched for something in it."
+#: C/evolution.xml:5474(para)
+msgid ""
+"Remember that the Global Address List (GAL) appears empty until you have "
+"searched for something in it."
 msgstr ""
 
-#: C/evolution.xml:5258(para)
-msgid "Select the delegate and click Edit to open the delegate permission dialog box."
+#: C/evolution.xml:5477(para)
+msgid ""
+"Select the delegate and click Edit to open the delegate permission dialog "
+"box."
 msgstr ""
 
-#: C/evolution.xml:5263(para)
-msgid "Select from the following access levels for each of the four types of folders:"
+#: C/evolution.xml:5482(para)
+msgid ""
+"Select from the following access levels for each of the four types of "
+"folders:"
 msgstr ""
 
-#: C/evolution.xml:5266(para)
+#: C/evolution.xml:5485(para)
 msgid "Do not allow this person to access any folders of this type."
 msgstr ""
 
-#: C/evolution.xml:5269(title)
+#: C/evolution.xml:5488(title)
 msgid "Reviewer (read-only):"
 msgstr ""
 
-#: C/evolution.xml:5270(para)
-msgid "Allows the delegate to see items in this type of folder, but not create new items or edit existing items."
+#: C/evolution.xml:5489(para)
+msgid ""
+"Allows the delegate to see items in this type of folder, but not create new "
+"items or edit existing items."
 msgstr ""
 
-#: C/evolution.xml:5273(title)
+#: C/evolution.xml:5492(title)
 msgid "Author (read, create):"
 msgstr ""
 
-#: C/evolution.xml:5274(para)
-msgid "The delegate can view items in your folders, and can create new items, but cannot change any existing items."
+#: C/evolution.xml:5493(para)
+msgid ""
+"The delegate can view items in your folders, and can create new items, but "
+"cannot change any existing items."
 msgstr ""
 
-#: C/evolution.xml:5277(title)
+#: C/evolution.xml:5496(title)
 msgid "Editor (read, create, edit):"
 msgstr ""
 
-#: C/evolution.xml:5278(para)
+#: C/evolution.xml:5497(para)
 msgid "The delegate can view, create, and change items in your folders."
 msgstr ""
 
-#: C/evolution.xml:5285(para)
-msgid "The delegate is notified through a separate mail that he or she is being added to your list of delegates. The mail summarizes all the rights that have been assigned to the delegate."
+#: C/evolution.xml:5504(para)
+msgid ""
+"The delegate is notified through a separate mail that he or she is being "
+"added to your list of delegates. The mail summarizes all the rights that "
+"have been assigned to the delegate."
 msgstr ""
 
-#: C/evolution.xml:5290(para)
+#: C/evolution.xml:5509(para)
 msgid "To access the folders delegated to you:"
 msgstr ""
 
-#: C/evolution.xml:5293(para)
+#: C/evolution.xml:5512(para)
 msgid "Click File &gt; Subscribe to Other User's Exchange Folder."
 msgstr ""
 
-#: C/evolution.xml:5298(para)
-msgid "Specify the e-mail address of the user who has delegated to you, or click User to select the user from your address book."
+#: C/evolution.xml:5517(para)
+msgid ""
+"Specify the email address of the user who has delegated to you, or click "
+"User to select the user from your address book."
 msgstr ""
 
-#: C/evolution.xml:5301(para)
+#: C/evolution.xml:5520(para)
 msgid "Select the folder you want to open."
 msgstr ""
 
-#: C/evolution.xml:5307(para)
-msgid "Folders delegated to you appear in your folder list inside a folder labeled with the name of its owner. For example, if Martha Thompson delegates folders to you, you see a folder called Martha Thompson's Folders in the folder tree at the same level as your Personal Folders and Public Folders."
+#: C/evolution.xml:5526(para)
+msgid ""
+"Folders delegated to you appear in your folder list inside a folder labeled "
+"with the name of its owner. For example, if Martha Thompson delegates "
+"folders to you, you see a folder called Martha Thompson's Folders in the "
+"folder tree at the same level as your Personal Folders and Public Folders."
 msgstr ""
 
-#: C/evolution.xml:5308(para)
-msgid "If the folder fails to open properly, check with the folder owner to make sure that you have been granted the correct access permissions."
+#: C/evolution.xml:5527(para)
+msgid ""
+"If the folder fails to open properly, check with the folder owner to make "
+"sure that you have been granted the correct access permissions."
 msgstr ""
 
-#: C/evolution.xml:5314(para)
+#: C/evolution.xml:5533(para)
 msgid "You can subscribe to public folders available on the Exchange server."
 msgstr ""
 
-#: C/evolution.xml:5320(para)
+#: C/evolution.xml:5539(para)
 msgid "Select the Exchange account."
 msgstr ""
 
-#: C/evolution.xml:5323(para)
+#: C/evolution.xml:5542(para)
 msgid "Check the folders you want to subscribe to."
 msgstr ""
 
-#: C/evolution.xml:5329(para)
-msgid "The folders you have subscribed to appear in the folder list at the left."
+#: C/evolution.xml:5548(para)
+msgid ""
+"The folders you have subscribed to appear in the folder list at the left."
 msgstr ""
 
-#: C/evolution.xml:5332(para)
+#: C/evolution.xml:5551(para)
 msgid "To view contents of a folder, click it."
 msgstr ""
 
-#: C/evolution.xml:5339(para)
-msgid "Reminders for meetings in your Exchange calendar do not work until you have run Evolution at least once after logging in. This is different from locally stored reminders, which work from the moment you log in, regardless of whether you have run Evolution in the session.so that you can fix a convenient time for a meeting.To enable Reminder setting in your Exchange account, select <guilabel>Remember the password</guilabel> checkbox. To find more information about Reminders see<link linkend=\"bshly4v\">Reminders</link>"
-msgstr ""
-
-#: C/evolution.xml:5344(para)
-msgid "An Out of Office message is an automatic reply that you can send as a reply to messages, explaining why you aren't immediately responding to their messages. For example, if you go on vacation for a week and won't access your e-mail, you can set an automatic reply so that people know that you aren't ignoring them."
+#: C/evolution.xml:5558(para)
+msgid ""
+"Reminders for meetings in your Exchange calendar do not work until you have "
+"run Evolution at least once after logging in. This is different from locally "
+"stored reminders, which work from the moment you log in, regardless of "
+"whether you have run Evolution in the session so that you can fix a "
+"convenient time for a meeting. To enable Reminder setting in your Exchange "
+"account, select <guilabel>Remember the password</guilabel> checkbox. To find "
+"more information about Reminders see<link linkend=\"bshly4v\">Reminders</"
+"link>."
 msgstr ""
 
-#: C/evolution.xml:5347(para)
-msgid "Click Edit &gt; Preferences &gt; Mail Accounts."
+#: C/evolution.xml:5563(para)
+msgid ""
+"An Out of Office message is an automatic reply that you can send as a reply "
+"to messages, explaining why you are not immediately responding to their "
+"messages. For example, if you go on vacation for a week and will not access "
+"your email, you can set an automatic reply so that people know that you are "
+"not ignoring them."
 msgstr ""
 
-#: C/evolution.xml:5350(para)
+#: C/evolution.xml:5569(para)
 msgid "Select the Exchange account, then click Edit."
 msgstr ""
 
-#: C/evolution.xml:5353(para)
-msgid "Select the Exchange Settings tab. The top option allows you to set an Out of Office message."
+#: C/evolution.xml:5572(para)
+msgid ""
+"Select the Exchange Settings tab. The top option allows you to set an Out of "
+"Office message."
 msgstr ""
 
-#: C/evolution.xml:5356(para)
+#: C/evolution.xml:5575(para)
 msgid "Click I Am Currently Out of the Office."
 msgstr ""
 
-#: C/evolution.xml:5359(para)
+#: C/evolution.xml:5578(para)
 msgid "Type a short message in the text field."
 msgstr ""
 
-#: C/evolution.xml:5366(para)
-msgid "Your message is automatically sent to anyone who sends you mail until you return and select I Am in the office."
+#: C/evolution.xml:5585(para)
+msgid ""
+"Your message is automatically sent to anyone who sends you mail until you "
+"return and select I Am in the office."
 msgstr ""
 
-#: C/evolution.xml:5372(para)
-msgid "Evolution helps you fix a convenient time for a meeting according to the availability of the attendees.It's Free/Busy feature allows you to perform a check on other user's Exchange calendar to find whether they are busy according to their Exchange calendars, if so, you can reschedule the meeting altogether."
+#: C/evolution.xml:5591(para)
+msgid ""
+"Evolution helps you fix a convenient time for a meeting according to the "
+"availability of the attendees.It's Free/Busy feature allows you to perform a "
+"check on other user's Exchange calendar to find whether they are busy "
+"according to their Exchange calendars, if so, you can reschedule the meeting "
+"altogether."
 msgstr ""
 
-#: C/evolution.xml:5376(para)
+#: C/evolution.xml:5595(para)
 msgid "Create a new appointment in the calendar."
 msgstr ""
 
-#: C/evolution.xml:5379(para)
-msgid "Right-click the appointment, then select Schedule Meeting to appear Evolution Meeting editor."
+#: C/evolution.xml:5598(para)
+msgid ""
+"Right-click the appointment, then select Schedule Meeting to appear "
+"Evolution Meeting editor."
 msgstr ""
 
-#: C/evolution.xml:5382(para)
+#: C/evolution.xml:5601(para)
 msgid "Click the Add tab to enter the email addresses into the list."
 msgstr ""
 
-#: C/evolution.xml:5385(para)
-msgid "Click the Attendees tab to select the participants from Global Address List (GAL)."
+#: C/evolution.xml:5604(para)
+msgid ""
+"Click the Attendees tab to select the participants from Global Address List "
+"(GAL)."
 msgstr ""
 
-#: C/evolution.xml:5386(para)
-msgid "You can directly select the participants from the following address lists."
+#: C/evolution.xml:5605(para)
+msgid ""
+"You can directly select the participants from the following address lists."
 msgstr ""
 
-#: C/evolution.xml:5392(para)
+#: C/evolution.xml:5611(para)
 msgid "Global Address List"
 msgstr ""
 
-#: C/evolution.xml:5398(para)
-msgid "You can also specify the category as Anniversary, Birthday, Business etc. from the drop-down list for each address list given."
+#: C/evolution.xml:5617(para)
+msgid ""
+"You can also specify the category as Anniversary, Birthday, Business etc. "
+"from the drop-down list for each address list given."
 msgstr ""
 
-#: C/evolution.xml:5401(para)
+#: C/evolution.xml:5620(para)
 msgid "Add the participants to the following categories of attendees."
 msgstr ""
 
-#: C/evolution.xml:5404(para)
+#: C/evolution.xml:5623(para)
 msgid "Chair Persons"
 msgstr ""
 
-#: C/evolution.xml:5407(para)
+#: C/evolution.xml:5626(para)
 msgid "Required Participants"
 msgstr ""
 
-#: C/evolution.xml:5410(para)
+#: C/evolution.xml:5629(para)
 msgid "Optional Participants"
 msgstr ""
 
-#: C/evolution.xml:5413(para)
+#: C/evolution.xml:5632(para)
 msgid "Resources"
 msgstr ""
 
-#: C/evolution.xml:5418(para)
+#: C/evolution.xml:5637(para)
 msgid "Click Free/Busy tool at the top right corner."
 msgstr ""
 
-#: C/evolution.xml:5421(para)
-msgid "Click Options &gt; Update Free/Busy to check participant schedules and, if possible, update the meeting in all participants' calendars"
+#: C/evolution.xml:5640(para)
+msgid ""
+"Click Options &gt; Update Free/Busy to check participant schedules and, if "
+"possible, update the meeting in all participants' calendars"
 msgstr ""
 
-#: C/evolution.xml:5424(para)
-msgid "If meeting attendees are not available during the times you have scheduled a meeting, you can <quote>nudge</quote> the meeting forward or backward to the nearest available time. To do so, just click the arrows to the left or right of the Autopick button. The Autopick tool lets you move the meeting to the nearest time during which all attendees are available. If you are not satisfied with those results, you can also drag the edges of the area marked as meeting time to the hours that you want to select."
+#: C/evolution.xml:5643(para)
+msgid ""
+"If meeting attendees are not available during the times you have scheduled a "
+"meeting, you can <quote>nudge</quote> the meeting forward or backward to the "
+"nearest available time. To do so, just click the arrows to the left or right "
+"of the Autopick button. The Autopick tool lets you move the meeting to the "
+"nearest time during which all attendees are available. If you are not "
+"satisfied with those results, you can also drag the edges of the area marked "
+"as meeting time to the hours that you want to select."
 msgstr ""
 
-#: C/evolution.xml:5430(para)
-msgid "<trademark>Evolution</trademark> can access accounts on <trademark class=\"registered\">Novell</trademark><trademark class=\"registered\">GroupWise</trademark> 7 system."
+#: C/evolution.xml:5649(para)
+msgid ""
+"<trademark>Evolution</trademark> can access accounts on <trademark class="
+"\"registered\">Novell</trademark><trademark class=\"registered\">GroupWise</"
+"trademark> 7 system."
 msgstr ""
 
-#: C/evolution.xml:5433(link)
-#: C/evolution.xml:5456(title)
+#: C/evolution.xml:5652(link) C/evolution.xml:5675(title)
 msgid "GroupWise Features"
 msgstr ""
 
-#: C/evolution.xml:5436(link)
-#: C/evolution.xml:5545(title)
+#: C/evolution.xml:5655(link) C/evolution.xml:5764(title)
 msgid "GroupWise Terminology vs. Evolution Terminology"
 msgstr ""
 
-#: C/evolution.xml:5439(link)
-#: C/evolution.xml:5616(title)
+#: C/evolution.xml:5658(link) C/evolution.xml:5835(title)
 msgid "Adding your GroupWise Account to Evolution"
 msgstr ""
 
-#: C/evolution.xml:5442(link)
-#: C/evolution.xml:5755(title)
+#: C/evolution.xml:5661(link) C/evolution.xml:5976(title)
 msgid "Scheduling Appointments with Free/Busy"
 msgstr ""
 
-#: C/evolution.xml:5445(link)
-#: C/evolution.xml:5777(title)
+#: C/evolution.xml:5664(link) C/evolution.xml:5998(title)
 msgid "Managing Sent Items"
 msgstr ""
 
-#: C/evolution.xml:5448(link)
-#: C/evolution.xml:5957(title)
+#: C/evolution.xml:5667(link) C/evolution.xml:6179(title)
 msgid "Giving Other People Access to Your Mailbox or Calendar"
 msgstr ""
 
-#: C/evolution.xml:5451(link)
-#: C/evolution.xml:6127(title)
+#: C/evolution.xml:5670(link) C/evolution.xml:6350(title)
 msgid "Junk Mail Handling"
 msgstr ""
 
-#: C/evolution.xml:5457(para)
-msgid "GroupWise connectivity in Evolution supports the following basic Novell GroupWise features:"
+#: C/evolution.xml:5676(para)
+msgid ""
+"GroupWise connectivity in Evolution supports the following basic Novell "
+"GroupWise features:"
 msgstr ""
 
-#: C/evolution.xml:5463(para)
+#: C/evolution.xml:5682(para)
 msgid "Viewing mail and folders stored on the GroupWise system."
 msgstr ""
 
-#: C/evolution.xml:5466(para)
+#: C/evolution.xml:5685(para)
 msgid "Sending mail from you GroupWise account."
 msgstr ""
 
-#: C/evolution.xml:5469(para)
+#: C/evolution.xml:5688(para)
 msgid "Converting mail to a task or meeting."
 msgstr ""
 
-#: C/evolution.xml:5472(para)
+#: C/evolution.xml:5691(para)
 msgid "Tracking the status of a message."
 msgstr ""
 
-#: C/evolution.xml:5475(para)
-msgid "Marking a message as junk mail adds the sender to your GroupWise junk mail list."
+#: C/evolution.xml:5694(para)
+msgid ""
+"Marking a message as junk mail adds the sender to your GroupWise junk mail "
+"list."
 msgstr ""
 
-#: C/evolution.xml:5478(para)
+#: C/evolution.xml:5697(para)
 msgid "Improved Status Tracking."
 msgstr ""
 
-#: C/evolution.xml:5486(para)
-msgid "You can send and receive appointment and meeting requests. Allows Evolution users to schedule meetings and view attendee availability for other users on GroupWise."
+#: C/evolution.xml:5705(para)
+msgid ""
+"You can send and receive appointment and meeting requests. Allows Evolution "
+"users to schedule meetings and view attendee availability for other users on "
+"GroupWise."
 msgstr ""
 
-#: C/evolution.xml:5489(para)
-msgid "You can receive an iCalendar meeting request and add it to your GroupWise calendar."
+#: C/evolution.xml:5708(para)
+msgid ""
+"You can receive an iCalendar meeting request and add it to your GroupWise "
+"calendar."
 msgstr ""
 
-#: C/evolution.xml:5497(para)
-msgid "Address Completion is supported for your GroupWise address books, including the System address book, the Frequent Contacts address book, and your personal address book."
+#: C/evolution.xml:5716(para)
+msgid ""
+"Address Completion is supported for your GroupWise address books, including "
+"the System address book, the Frequent Contacts address book, and your "
+"personal address book."
 msgstr ""
 
-#: C/evolution.xml:5500(para)
-msgid "If you receive a card attachment and click Save in Address Book, it is saved to your Personal address book. New Address Book entries can also be added to your personal address book from received E-mail messages."
+#: C/evolution.xml:5719(para)
+msgid ""
+"If you receive a card attachment and click Save in Address Book, it is saved "
+"to your Personal address book. New Address Book entries can also be added to "
+"your personal address book from received Email messages."
 msgstr ""
 
-#: C/evolution.xml:5503(para)
-msgid "To create your GroupWise Frequent contacts and Personal address books, you need to access your GroupWise account once through GroupWise Java client because Evolution currently does not support creating them.The GroupWise system address book is marked for offline use by default.This boosts performance."
+#: C/evolution.xml:5722(para)
+msgid ""
+"To create your GroupWise Frequent contacts and Personal address books, you "
+"need to access your GroupWise account once through GroupWise Java client "
+"because Evolution currently does not support creating them. The GroupWise "
+"system address book is marked for offline use by default.This boosts "
+"performance."
 msgstr ""
 
-#: C/evolution.xml:5508(para)
-#: C/evolution.xml:5580(para)
+#: C/evolution.xml:5727(para) C/evolution.xml:5799(para)
 msgid "Reminder Note"
 msgstr ""
 
-#: C/evolution.xml:5511(para)
-msgid "GroupWise Reminder Note is integrated into Memo component. You can view the Reminder notes listed under Memos at the bottom right of the Calendar view given that you have selected them under the Memos component."
+#: C/evolution.xml:5730(para)
+msgid ""
+"GroupWise Reminder Note is integrated into Memo component. You can view the "
+"Reminder notes listed under Memos at the bottom right of the Calendar view "
+"given that you have selected them under the Memos component."
 msgstr ""
 
-#: C/evolution.xml:5516(para)
+#: C/evolution.xml:5735(para)
 msgid "Proxy"
 msgstr ""
 
-#: C/evolution.xml:5519(para)
+#: C/evolution.xml:5738(para)
 msgid "You can assign Proxy access to other users."
 msgstr ""
 
-#: C/evolution.xml:5522(para)
+#: C/evolution.xml:5741(para)
 msgid "You can view other users' accounts through Proxy access."
 msgstr ""
 
-#: C/evolution.xml:5527(para)
+#: C/evolution.xml:5746(para)
 msgid "There are, however, some features that are not available:"
 msgstr ""
 
-#: C/evolution.xml:5530(para)
+#: C/evolution.xml:5749(para)
 msgid "Resending items"
 msgstr ""
 
-#: C/evolution.xml:5533(para)
+#: C/evolution.xml:5752(para)
 msgid "Retracting items"
 msgstr ""
 
-#: C/evolution.xml:5536(para)
+#: C/evolution.xml:5755(para)
 msgid "Accepting appointments or meetings in offline mode"
 msgstr ""
 
-#: C/evolution.xml:5539(para)
+#: C/evolution.xml:5758(para)
 msgid "Archive"
 msgstr ""
 
-#: C/evolution.xml:5546(para)
-msgid "GroupWise and Evolution sometimes uses different terminology for different types of items. The following table compares GroupWise terminology to Evolution terminology."
+#: C/evolution.xml:5765(para)
+msgid ""
+"GroupWise and Evolution sometimes uses different terminology for different "
+"types of items. The following table compares GroupWise terminology to "
+"Evolution terminology."
 msgstr ""
 
-#: C/evolution.xml:5554(para)
+#: C/evolution.xml:5773(para)
 msgid "GroupWise"
 msgstr ""
 
-#: C/evolution.xml:5564(para)
-#: C/evolution.xml:5575(para)
+#: C/evolution.xml:5783(para) C/evolution.xml:5794(para)
 msgid "Appointment"
 msgstr ""
 
-#: C/evolution.xml:5567(para)
+#: C/evolution.xml:5786(para)
 msgid "Meeting"
 msgstr ""
 
-#: C/evolution.xml:5572(para)
+#: C/evolution.xml:5791(para)
 msgid "Posted Appointment"
 msgstr ""
 
-#: C/evolution.xml:5583(para)
-#: C/evolution.xml:5607(para)
+#: C/evolution.xml:5802(para) C/evolution.xml:5826(para)
 msgid "None; use a task"
 msgstr ""
 
-#: C/evolution.xml:5588(para)
+#: C/evolution.xml:5807(para)
 msgid "Discussion Note"
 msgstr ""
 
-#: C/evolution.xml:5591(para)
+#: C/evolution.xml:5810(para)
 msgid "None; use an assigned task"
 msgstr ""
 
-#: C/evolution.xml:5596(para)
+#: C/evolution.xml:5815(para)
 msgid "Phone Message"
 msgstr ""
 
-#: C/evolution.xml:5599(para)
+#: C/evolution.xml:5818(para)
 msgid "None; use a message"
 msgstr ""
 
-#: C/evolution.xml:5604(para)
+#: C/evolution.xml:5823(para)
 msgid "Checklist"
 msgstr ""
 
-#: C/evolution.xml:5619(link)
-#: C/evolution.xml:5627(title)
+#: C/evolution.xml:5838(link) C/evolution.xml:5846(title)
 msgid "Creating a New GroupWise Account"
 msgstr ""
 
-#: C/evolution.xml:5622(link)
-#: C/evolution.xml:5642(title)
+#: C/evolution.xml:5841(link) C/evolution.xml:5861(title)
 msgid "Changing an Existing Account to Work with GroupWise"
 msgstr ""
 
-#: C/evolution.xml:5636(para)
-msgid "Create the account following the procedure in <link linkend=\"usage-mainwindow-starting\">Starting Evolution for the First Time</link>."
+#: C/evolution.xml:5855(para)
+msgid ""
+"Create the account following the procedure in <link linkend=\"usage-"
+"mainwindow-starting\">Starting Evolution for the First Time</link>."
 msgstr ""
 
-#: C/evolution.xml:5643(para)
-msgid "If you have an existing e-mail account, and want to convert it to use with GroupWise:"
+#: C/evolution.xml:5862(para)
+msgid ""
+"If you have an existing email account, and want to convert it to use with "
+"GroupWise:"
 msgstr ""
 
-#: C/evolution.xml:5649(para)
+#: C/evolution.xml:5868(para)
 msgid "Select the account you want to convert, then click Edit."
 msgstr ""
 
-#: C/evolution.xml:5652(para)
+#: C/evolution.xml:5871(para)
 msgid "Click the Identity tab."
 msgstr ""
 
-#: C/evolution.xml:5660(para)
-msgid "Click the Receiving Email tab, then select Novell GroupWise as your server type."
-msgstr ""
-
-#: C/evolution.xml:5665(para)
-msgid "Type the name of your mail server, your user name, and select whether to use SSL."
-msgstr ""
-
-#: C/evolution.xml:5667(para)
-msgid "Select SSL for a highly secured connection between your client and server. Contact your administrator for further details."
+#: C/evolution.xml:5879(para)
+msgid ""
+"Click the Receiving Email tab, then select Novell GroupWise as your server "
+"type."
 msgstr ""
 
-#: C/evolution.xml:5671(para)
-msgid "Click the Receiving Options tab, then select if you want Evolution to automatically check for new mail."
+#: C/evolution.xml:5884(para)
+msgid ""
+"Type the name of your mail server, your user name, and select whether to use "
+"SSL."
 msgstr ""
 
-#: C/evolution.xml:5691(para)
-msgid "Select if you want to automatically synchronize your remote calendar and contacts locally."
+#: C/evolution.xml:5886(para)
+msgid ""
+"Select Use SSL to enable a secure connection between Evolution and the "
+"server."
 msgstr ""
 
-#: C/evolution.xml:5692(para)
-msgid "It fetches the remote calendar and contact information and stores it on your local drive."
+#: C/evolution.xml:5911(para)
+msgid ""
+"Select if you want to automatically synchronize your remote calendar and "
+"contacts locally."
 msgstr ""
 
-#: C/evolution.xml:5694(para)
-msgid "Remote calendar and contacts are typically stored remotely on servers rather than on local hard disk."
+#: C/evolution.xml:5912(para)
+msgid ""
+"It fetches the remote calendar and contact information and stores it on your "
+"local drive."
 msgstr ""
 
-#: C/evolution.xml:5698(para)
-msgid "Specify your Post Office Agent SOAP port in the Post Office Agent SOAP Port field."
+#: C/evolution.xml:5914(para)
+msgid ""
+"Remote calendar and contacts are typically stored remotely on servers rather "
+"than on local hard disk."
 msgstr ""
 
-#: C/evolution.xml:5702(para)
-msgid "(Optional) Click the Proxy tab, then click Add to add any Proxy users to your account."
+#: C/evolution.xml:5918(para)
+msgid ""
+"Specify your Post Office Agent SOAP port in the Post Office Agent SOAP Port "
+"field."
 msgstr ""
 
-#: C/evolution.xml:5705(para)
-#: C/evolution.xml:6081(para)
-msgid "Click OK, then click Close."
+#: C/evolution.xml:5922(para)
+msgid ""
+"(Optional) Click the Proxy tab, then click Add to add any Proxy users to "
+"your account."
 msgstr ""
 
-#: C/evolution.xml:5712(title)
+#: C/evolution.xml:5933(title)
 msgid "Reminder Notes"
 msgstr ""
 
-#: C/evolution.xml:5713(para)
-msgid "GroupWise Reminder notes are like mail messages except they are scheduled for a particular day and appear on the Calendar for that date. You can use reminder notes to show vacations, holidays, pay days, birthdays, and so forth.Posted reminder notes are placed in your Calendar on the date you specify. They are not placed in your Mailbox or in any other user's Mailbox."
+#: C/evolution.xml:5934(para)
+msgid ""
+"GroupWise Reminder notes are like mail messages except they are scheduled "
+"for a particular day and appear on the Calendar for that date. You can use "
+"reminder notes to show vacations, holidays, pay days, birthdays, and so "
+"forth.Posted reminder notes are placed in your Calendar on the date you "
+"specify. They are not placed in your Mailbox or in any other user's Mailbox."
 msgstr ""
 
-#: C/evolution.xml:5714(para)
-msgid "Evolution integrates this feature into its Memo component so that you can view the Reminder notes listed under Memo at the right bottom side of the calender view."
+#: C/evolution.xml:5935(para)
+msgid ""
+"Evolution integrates this feature into its Memo component so that you can "
+"view the Reminder notes listed under Memo at the right bottom side of the "
+"calender view."
 msgstr ""
 
-#: C/evolution.xml:5716(para)
-msgid "Select the memo or the Reminder notes under the Memo component to display it on the Calendar view."
+#: C/evolution.xml:5937(para)
+msgid ""
+"Select the memo or the Reminder notes under the Memo component to display it "
+"on the Calendar view."
 msgstr ""
 
-#: C/evolution.xml:5719(para)
-msgid "To create a new Reminder Note follow <link linkend=\"b1012vde\">Step 1</link> through <link linkend=\"b10fqh6r\">Step 8</link> under <link linkend=\"b1012vdd\">Memos</link>."
+#: C/evolution.xml:5940(para)
+msgid ""
+"To create a new Reminder Note follow <link linkend=\"b1012vde\">Step 1</"
+"link> through <link linkend=\"b10fqh6r\">Step 8</link> under <link linkend="
+"\"b1012vdd\">Memos</link>."
 msgstr ""
 
-#: C/evolution.xml:5720(para)
+#: C/evolution.xml:5941(para)
 msgid "To send a Reminder Note,"
 msgstr ""
 
-#: C/evolution.xml:5723(para)
-msgid "Click New &gt; Shared Memo to open the new window."
-msgstr ""
-
-#: C/evolution.xml:5726(para)
-msgid "Select the Organizer's account name from the drop-down list given next to the Organizer field."
-msgstr ""
-
-#: C/evolution.xml:5729(para)
-msgid "In the To field, type a username, then press Enter. Repeat for additional users."
-msgstr ""
+#: C/evolution.xml:5944(para)
+msgid "Click File &gt; New &gt; Shared Memo."
+msgstr "Klikněte na Soubor &gt; Nová &gt; Sdílená poznámka."
 
-#: C/evolution.xml:5732(para)
-msgid "Select the Group in which you would create the entry."
+#: C/evolution.xml:5947(para)
+msgid ""
+"Select the Organizer's account name from the drop-down list given next to "
+"the Organizer field."
 msgstr ""
 
-#: C/evolution.xml:5735(para)
-msgid "Enter a brief description about the Reminder Note in the Summary field."
+#: C/evolution.xml:5950(para)
+msgid ""
+"In the To field, type a username, then press Enter. Repeat for additional "
+"users."
 msgstr ""
 
-#: C/evolution.xml:5741(para)
+#: C/evolution.xml:5962(para)
 msgid "Specify the category that the Reminder note falls under."
 msgstr ""
 
-#: C/evolution.xml:5744(para)
-msgid "Enter the description for the Reminder Note."
-msgstr ""
-
-#: C/evolution.xml:5747(para)
+#: C/evolution.xml:5968(para)
 msgid "Click Save."
 msgstr ""
 
-#: C/evolution.xml:5756(para)
-msgid "When you schedule a meeting with your calendar on GroupWise, you can check when other local GroupWise users are busy according to their GroupWise calendars."
+#: C/evolution.xml:5977(para)
+msgid ""
+"When you schedule a meeting with your calendar on GroupWise, you can check "
+"when other local GroupWise users are busy according to their GroupWise "
+"calendars."
 msgstr ""
 
-#: C/evolution.xml:5758(para)
-msgid "Reminders for appointments in your GroupWise calendar do not work until you have run Evolution at least once after logging in. This is different from locally stored reminders, which work from the moment you log in, regardless of whether you have run Evolution in the session."
+#: C/evolution.xml:5979(para)
+msgid ""
+"Reminders for appointments in your GroupWise calendar do not work until you "
+"have run Evolution at least once after logging in. This is different from "
+"locally stored reminders, which work from the moment you log in, regardless "
+"of whether you have run Evolution in the session."
 msgstr ""
 
-#: C/evolution.xml:5761(para)
+#: C/evolution.xml:5982(para)
 msgid "Open a new appointment in the calendar."
 msgstr ""
 
-#: C/evolution.xml:5764(para)
+#: C/evolution.xml:5985(para)
 msgid "Click Actions &gt; Schedule Meeting."
 msgstr ""
 
-#: C/evolution.xml:5767(para)
-msgid "Add attendees, either by entering their e-mail addresses into the list, or by clicking the Invite Others button."
+#: C/evolution.xml:5988(para)
+msgid ""
+"Add attendees, either by entering their email addresses into the list, or by "
+"clicking the Invite Others button."
 msgstr ""
 
-#: C/evolution.xml:5770(para)
-msgid "Click Options, then click Update Free/Busy to check participant schedules and, if possible, update the meeting in all participants' calendars."
+#: C/evolution.xml:5991(para)
+msgid ""
+"Click Options, then click Update Free/Busy to check participant schedules "
+"and, if possible, update the meeting in all participants' calendars."
 msgstr ""
 
-#: C/evolution.xml:5773(para)
-msgid "If meeting attendees are not available during the times you have scheduled a meeting, you can <quote>nudge</quote> the meeting forward or backward to the nearest available time. To do so, just click the arrows to the left or right of the Autopick button. The Autopick tool moves the meeting to the nearest time during which all attendees are available. If you aren't satisfied with those results, you can drag the edges of the meeting time to the hours that you want to select."
+#: C/evolution.xml:5994(para)
+msgid ""
+"If meeting attendees are not available during the times you have scheduled a "
+"meeting, you can <quote>nudge</quote> the meeting forward or backward to the "
+"nearest available time. To do so, just click the arrows to the left or right "
+"of the Autopick button. The Autopick tool moves the meeting to the nearest "
+"time during which all attendees are available. If you aren't satisfied with "
+"those results, you can drag the edges of the meeting time to the hours that "
+"you want to select."
 msgstr ""
 
-#: C/evolution.xml:5780(link)
-#: C/evolution.xml:5800(title)
+#: C/evolution.xml:6001(link) C/evolution.xml:6021(title)
 msgid "Confirming Delivery of Items You have Sent"
 msgstr ""
 
-#: C/evolution.xml:5783(link)
-#: C/evolution.xml:5905(title)
+#: C/evolution.xml:6004(link) C/evolution.xml:6127(title)
 msgid "Displaying Sent Items"
 msgstr ""
 
-#: C/evolution.xml:5786(link)
-#: C/evolution.xml:5844(title)
+#: C/evolution.xml:6007(link) C/evolution.xml:6066(title)
 msgid "Checking the Status of an Item You Have Sent"
 msgstr ""
 
-#: C/evolution.xml:5789(link)
-#: C/evolution.xml:5792(link)
-#: C/evolution.xml:5871(title)
+#: C/evolution.xml:6010(link) C/evolution.xml:6013(link)
+#: C/evolution.xml:6093(title)
 msgid "Requesting a Reply for Items You Send"
 msgstr ""
 
-#: C/evolution.xml:5796(para)
-msgid "You can manage your sent items for GroupWise e-mail only if the recipient is located on the same GroupWise system as you."
+#: C/evolution.xml:6017(para)
+msgid ""
+"You can manage your sent items for GroupWise email only if the recipient is "
+"located on the same GroupWise system as you."
 msgstr ""
 
-#: C/evolution.xml:5801(para)
-msgid "Evolution provides several ways for you to confirm that your item was delivered. You can easily track message status of any message you have sent. For example, you can see when an e-mail was delivered and when the recipient opened or deleted the e-mail."
+#: C/evolution.xml:6022(para)
+msgid ""
+"Evolution provides several ways for you to confirm that your item was "
+"delivered. You can easily track message status of any message you have sent. "
+"For example, you can see when an email was delivered and when the recipient "
+"opened or deleted the email."
 msgstr ""
 
-#: C/evolution.xml:5803(title)
+#: C/evolution.xml:6024(title)
 msgid "Track an Item You Sent:"
 msgstr ""
 
-#: C/evolution.xml:5804(para)
-msgid "You can check the status in the Message Status window of an e-mail you have sent."
+#: C/evolution.xml:6025(para)
+msgid ""
+"You can check the status in the Message Status window of an email you have "
+"sent."
 msgstr ""
 
-#: C/evolution.xml:5807(title)
+#: C/evolution.xml:6028(title)
 msgid "Receive Notification When the Item is Opened or Deleted:"
 msgstr ""
 
-#: C/evolution.xml:5808(para)
-msgid "You can receive notification when the recipient opens or deletes a message. For information, see <link linkend=\"Ak05sv1\">Requesting a Reply for Items You Send</link>."
+#: C/evolution.xml:6029(para)
+msgid ""
+"You can receive notification when the recipient opens or deletes a message. "
+"For information, see <link linkend=\"Ak05sv1\">Requesting a Reply for Items "
+"You Send</link>."
 msgstr ""
 
-#: C/evolution.xml:5811(title)
+#: C/evolution.xml:6032(title)
 msgid "Request a Reply:"
 msgstr ""
 
-#: C/evolution.xml:5812(para)
-msgid "You can inform the recipient that you need a reply to an e-mail. Evolution adds a sentence to the item stating that a reply is requested and changes the icon in the recipient's Mailbox to a double arrow. For information, see <link linkend=\"Ak05sv1\">Requesting a Reply for Items You Send</link>."
+#: C/evolution.xml:6033(para)
+msgid ""
+"You can inform the recipient that you need a reply to an email. Evolution "
+"adds a sentence to the item stating that a reply is requested and changes "
+"the icon in the recipient's Mailbox to a double arrow. For information, see "
+"<link linkend=\"Ak05sv1\">Requesting a Reply for Items You Send</link>."
 msgstr ""
 
-#: C/evolution.xml:5816(title)
-#: C/evolution.xml:5929(title)
+#: C/evolution.xml:6037(title) C/evolution.xml:6151(title)
 msgid "Enabling Status Tracking"
 msgstr ""
 
-#: C/evolution.xml:5819(para)
-msgid "In the Compose Message window, click Insert &gt; Send Options &gt; Status Tracking"
+#: 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 ""
 
-#: C/evolution.xml:5824(para)
-#: C/evolution.xml:5936(para)
+#: C/evolution.xml:6041(para)
+msgid "Select Status Tracking."
+msgstr "Vyberte Sledování stavu."
+
+#: C/evolution.xml:6046(para) C/evolution.xml:6158(para)
 msgid "Select the check box next to Create a sent item to track information."
 msgstr ""
 
-#: C/evolution.xml:5827(para)
-#: C/evolution.xml:5939(para)
-msgid "Select any of the options given (Delivered, Delivered and opened, All information)"
+#: C/evolution.xml:6049(para) C/evolution.xml:6161(para)
+msgid ""
+"Select any of the options given (Delivered, Delivered and opened, All "
+"information)"
 msgstr ""
 
-#: C/evolution.xml:5828(para)
-#: C/evolution.xml:5940(para)
-msgid "Based on this selection, you can view the status of the send message in the Sent Items folder."
+#: C/evolution.xml:6050(para) C/evolution.xml:6162(para)
+msgid ""
+"Based on this selection, you can view the status of the send message in the "
+"Sent Items folder."
 msgstr ""
 
-#: C/evolution.xml:5829(para)
-msgid "For more information, see <link linkend=\"Aal54a9\">Checking the Status of an Item You Have Sent</link>."
+#: C/evolution.xml:6051(para)
+msgid ""
+"For more information, see <link linkend=\"Aal54a9\">Checking the Status of "
+"an Item You Have Sent</link>."
 msgstr ""
 
-#: C/evolution.xml:5832(para)
-#: C/evolution.xml:5943(para)
-msgid "(Optional)Select the check box next to Auto-delete sent item to automatically delete the sent item from the Sent folder."
+#: C/evolution.xml:6054(para) C/evolution.xml:6165(para)
+msgid ""
+"(Optional)Select the check box next to Auto-delete sent item to "
+"automatically delete the sent item from the Sent folder."
 msgstr ""
 
-#: C/evolution.xml:5835(para)
-#: C/evolution.xml:5946(para)
+#: C/evolution.xml:6057(para) C/evolution.xml:6168(para)
 msgid "Under Return Notification, specify the type of return receipt you want."
 msgstr ""
 
-#: C/evolution.xml:5847(para)
-msgid "Right-click an e-mail in your Sent folder, then click Track Message Status."
-msgstr ""
-
-#: C/evolution.xml:5848(para)
-msgid "With Message Tracking, you know when the item reaches the recipients or is read by them. You also know exactly who received your message, who read your message, and who deleted it and when."
+#: C/evolution.xml:6069(para)
+msgid ""
+"Right-click an email in your Sent folder, then click Track Message Status."
 msgstr ""
+"Klik pravým tlačítkem myši na složku Odeslané a potom na Sledovat stav "
+"zprávy."
 
-#: C/evolution.xml:5855(title)
-msgid "Changing the Priority of an E-Mail"
+#: C/evolution.xml:6070(para)
+msgid ""
+"With Message Tracking, you know when the item reaches the recipients or is "
+"read by them. You also know exactly who received your message, who read your "
+"message, and who deleted it and when."
 msgstr ""
 
-#: C/evolution.xml:5858(para)
-#: C/evolution.xml:5874(para)
-msgid "In the Compose Message window, click Insert &gt; Send Options."
+#: C/evolution.xml:6077(title)
+msgid "Changing the Priority of an Email"
 msgstr ""
 
-#: C/evolution.xml:5861(para)
+#: C/evolution.xml:6083(para)
 msgid "Select High Priority, Standard Priority, Low Priority, or Undefined."
 msgstr ""
 
-#: C/evolution.xml:5862(para)
-msgid "The small icon next to an item in the Mailbox is red when the priority is high."
+#: C/evolution.xml:6084(para)
+msgid ""
+"The small icon next to an item in the Mailbox is red when the priority is "
+"high."
 msgstr ""
 
-#: C/evolution.xml:5878(para)
+#: C/evolution.xml:6100(para)
 msgid "Click Reply Requested, then specify when you want to receive the reply."
 msgstr ""
 
-#: C/evolution.xml:5879(para)
-msgid "If you select When Convenient, then Reply Requested: When Convenient appears at the top of the message. If you select Within x Days, then Reply Requested: By <varname>day month numeric day time year</varname> appears at the top of the message."
+#: C/evolution.xml:6101(para)
+msgid ""
+"If you select When Convenient, then Reply Requested: When Convenient appears "
+"at the top of the message. If you select Within x Days, then Reply "
+"Requested: By <varname>day month numeric day time year</varname> appears at "
+"the top of the message."
 msgstr ""
 
-#: C/evolution.xml:5882(para)
-msgid "Click Set Expiration Date, then specify the number of days for this message to remain in the recipient's Inbox."
+#: C/evolution.xml:6104(para)
+msgid ""
+"Click Set Expiration Date, then specify the number of days for this message "
+"to remain in the recipient's Inbox."
 msgstr ""
 
-#: C/evolution.xml:5890(title)
+#: C/evolution.xml:6112(title)
 msgid "Setting Message Delivery Options"
 msgstr ""
 
-#: C/evolution.xml:5891(para)
-msgid "You can delay the delivery of an individual message by having it held in the Outbox for a specified time."
+#: C/evolution.xml:6113(para)
+msgid ""
+"You can delay the delivery of an individual message by having it held in the "
+"Outbox for a specified time."
 msgstr ""
 
-#: C/evolution.xml:5894(para)
+#: C/evolution.xml:6116(para)
 msgid "Click Delay message delivery."
 msgstr ""
 
-#: C/evolution.xml:5897(para)
-msgid "Use the Date and Time options to specify how long the message should remain in the Outbox before it is sent to the recipient."
+#: C/evolution.xml:6119(para)
+msgid ""
+"Use the Date and Time options to specify how long the message should remain "
+"in the Outbox before it is sent to the recipient."
 msgstr ""
 
-#: C/evolution.xml:5908(para)
+#: C/evolution.xml:6130(para)
 msgid "Click the Sent Items folder in the Folder List."
 msgstr ""
 
-#: C/evolution.xml:5911(para)
-msgid "All sent items reside in this folder unless you select a different folder for sent e-mail in the account editor default settings. For more information, refer to <link linkend=\"b17s9qmz\">Changing Default Folder for Sent and Draft Items</link> under <link linkend=\"b13uhy6r\">Default Settings</link>."
+#: C/evolution.xml:6133(para)
+msgid ""
+"All sent items reside in this folder unless you select a different folder "
+"for sent email in the account editor default settings. For more information, "
+"refer to <link linkend=\"b17s9qmz\">Changing Default Folder for Sent and "
+"Draft Items</link> under <link linkend=\"b13uhy6r\">Default Settings</link>."
 msgstr ""
 
-#: C/evolution.xml:5914(title)
+#: C/evolution.xml:6136(title)
 msgid "Delegating an Item"
 msgstr ""
 
-#: C/evolution.xml:5917(para)
-msgid "In the Calendar, right-click the meeting or appointment you want to delegate."
+#: C/evolution.xml:6139(para)
+msgid ""
+"In the Calendar, right-click the meeting or appointment you want to delegate."
 msgstr ""
 
-#: C/evolution.xml:5920(para)
-msgid "Select Delegate Meeting, then select the contacts you want to delegate the meeting/appointment for."
+#: C/evolution.xml:6142(para)
+msgid ""
+"Select Delegate Meeting, then select the contacts you want to delegate the "
+"meeting/appointment for."
 msgstr ""
 
-#: C/evolution.xml:5926(para)
+#: C/evolution.xml:6148(para)
 msgid "Each contact gets a copy of the appointment or meeting."
 msgstr ""
 
-#: C/evolution.xml:5932(para)
-msgid "In the Compose Meeting window, click Insert &gt; Send Options &gt; Status Tracking"
+#: C/evolution.xml:6154(para)
+msgid ""
+"In the Compose Meeting window, click Insert &gt; Send Options &gt; Status "
+"Tracking"
 msgstr ""
 
-#: C/evolution.xml:5958(para)
-msgid "Use Proxy to manage another user's Mailbox and Calendar. Proxy lets you perform various actions, such as reading, accepting, and declining items on behalf of another user, within the restrictions the other user sets."
+#: C/evolution.xml:6180(para)
+msgid ""
+"Use Proxy to manage another user's Mailbox and Calendar. Proxy lets you "
+"perform various actions, such as reading, accepting, and declining items on "
+"behalf of another user, within the restrictions the other user sets."
 msgstr ""
 
-#: C/evolution.xml:5960(para)
-msgid "You can proxy for a user in a different post office or domain, as long as that person is in the same GroupWise system. You cannot proxy for a user in a different GroupWise system."
+#: C/evolution.xml:6182(para)
+msgid ""
+"You can proxy for a user in a different post office or domain, as long as "
+"that person is in the same GroupWise system. You cannot proxy for a user in "
+"a different GroupWise system."
 msgstr ""
 
-#: C/evolution.xml:5965(link)
-#: C/evolution.xml:5982(title)
+#: C/evolution.xml:6187(link) C/evolution.xml:6204(title)
 msgid "Receiving Proxy Rights"
 msgstr ""
 
-#: C/evolution.xml:5968(link)
-#: C/evolution.xml:5987(title)
+#: C/evolution.xml:6190(link) C/evolution.xml:6209(title)
 msgid "Assigning Proxy Rights to Another User"
 msgstr ""
 
-#: C/evolution.xml:5971(link)
-#: C/evolution.xml:6058(title)
+#: C/evolution.xml:6193(link) C/evolution.xml:6280(title)
 msgid "Adding and Removing Proxy Names and Rights in Your Proxy List"
 msgstr ""
 
-#: C/evolution.xml:5974(link)
-#: C/evolution.xml:6088(title)
+#: C/evolution.xml:6196(link) C/evolution.xml:6311(title)
 msgid "Managing Someone Else's Mailbox or Calendar"
 msgstr ""
 
-#: C/evolution.xml:5977(link)
-#: C/evolution.xml:6112(title)
+#: C/evolution.xml:6199(link) C/evolution.xml:6335(title)
 msgid "Marking an Item Private"
 msgstr ""
 
-#: C/evolution.xml:5983(para)
-msgid "Two steps must be completed before you can act as someone's proxy. First, the person for whom you plan to act as proxy must grant you rights in the Proxy List in Preferences. Second, you must proxy to the user so you can access his or her Mailbox or Calendar."
+#: C/evolution.xml:6205(para)
+msgid ""
+"Two steps must be completed before you can act as someone's proxy. First, "
+"the person for whom you plan to act as proxy must grant you rights in the "
+"Proxy List in Preferences. Second, you must proxy to the user so you can "
+"access his or her Mailbox or Calendar."
 msgstr ""
 
-#: C/evolution.xml:5988(para)
-msgid "Use the Proxy List in the Preferences Account Editor to give other users rights to proxy for you. You can assign each user different rights to your calendaring and messaging information. If you want to let users view specific information about your appointments when they do a Busy Search on your Calendar, give them Read access for appointments. The following table describes the rights you can grant to users:"
+#: C/evolution.xml:6210(para)
+msgid ""
+"Use the Proxy List in the Preferences Account Editor to give other users "
+"rights to proxy for you. You can assign each user different rights to your "
+"calendaring and messaging information. If you want to let users view "
+"specific information about your appointments when they do a Busy Search on "
+"your Calendar, give them Read access for appointments. The following table "
+"describes the rights you can grant to users:"
 msgstr ""
 
-#: C/evolution.xml:5996(para)
+#: C/evolution.xml:6218(para)
 msgid "This Right"
 msgstr ""
 
-#: C/evolution.xml:5999(para)
+#: C/evolution.xml:6221(para)
 msgid "Lets your proxy do this"
 msgstr ""
 
-#: C/evolution.xml:6006(para)
+#: C/evolution.xml:6228(para)
 msgid "Read"
 msgstr ""
 
-#: C/evolution.xml:6009(para)
-msgid "Read items you receive. Proxies cannot see your Contacts folder with this or any other proxy right."
+#: C/evolution.xml:6231(para)
+msgid ""
+"Read items you receive. Proxies cannot see your Contacts folder with this or "
+"any other proxy right."
 msgstr ""
 
-#: C/evolution.xml:6014(para)
+#: C/evolution.xml:6236(para)
 msgid "Write"
 msgstr ""
 
-#: C/evolution.xml:6017(para)
-msgid "Create and send items in your name, including applying your signature if you have one defined. Assign categories to items, and change the subject of items."
+#: C/evolution.xml:6239(para)
+msgid ""
+"Create and send items in your name, including applying your signature if you "
+"have one defined. Assign categories to items, and change the subject of "
+"items."
 msgstr ""
 
-#: C/evolution.xml:6022(para)
+#: C/evolution.xml:6244(para)
 msgid "Subscribe to my alarms"
 msgstr ""
 
-#: C/evolution.xml:6025(para)
-msgid "Receive the same alarms you receive. Receiving alarms is supported only if the proxy is on the same post office you are."
+#: C/evolution.xml:6247(para)
+msgid ""
+"Receive the same alarms you receive. Receiving alarms is supported only if "
+"the proxy is on the same post office you are."
 msgstr ""
 
-#: C/evolution.xml:6030(para)
+#: C/evolution.xml:6252(para)
 msgid "Subscribe to my notifications"
 msgstr ""
 
-#: C/evolution.xml:6033(para)
-msgid "Receive notification when you receive items. Receiving notifications is supported only if the proxy is on the same post office you are."
+#: C/evolution.xml:6255(para)
+msgid ""
+"Receive notification when you receive items. Receiving notifications is "
+"supported only if the proxy is on the same post office you are."
 msgstr ""
 
-#: C/evolution.xml:6038(para)
+#: C/evolution.xml:6260(para)
 msgid "Modify options/rules/folders"
 msgstr ""
 
-#: C/evolution.xml:6041(para)
-msgid "Change the options in your Mailbox. The proxy can edit any of your Options settings, including the access given to other users. If the proxy also has Mail rights, he or she can create or modify rules and folders. This right allows a proxy to add, delete, and modify categories."
+#: C/evolution.xml:6263(para)
+msgid ""
+"Change the options in your Mailbox. The proxy can edit any of your Options "
+"settings, including the access given to other users. If the proxy also has "
+"Mail rights, he or she can create or modify rules and folders. This right "
+"allows a proxy to add, delete, and modify categories."
 msgstr ""
 
-#: C/evolution.xml:6046(para)
+#: C/evolution.xml:6268(para)
 msgid "Read items marked Private"
 msgstr ""
 
-#: C/evolution.xml:6049(para)
-msgid "Read the items you marked Private. If you don't give a proxy Private rights, all items marked Private in your Mailbox are hidden from that proxy."
+#: C/evolution.xml:6271(para)
+msgid ""
+"Read the items you marked Private. If you don't give a proxy Private rights, "
+"all items marked Private in your Mailbox are hidden from that proxy."
 msgstr ""
 
-#: C/evolution.xml:6064(para)
+#: C/evolution.xml:6286(para)
 msgid "Select the GroupWise account to edit, then click Edit."
 msgstr ""
 
-#: C/evolution.xml:6067(para)
+#: C/evolution.xml:6289(para)
 msgid "Click the Proxy tab, then click Add."
 msgstr ""
 
-#: C/evolution.xml:6070(para)
-msgid "To add a user to the list, type the name in the Name box or import the contact from Contact list."
+#: C/evolution.xml:6292(para)
+msgid ""
+"To add a user to the list, type the name in the Name box or import the "
+"contact from Contact list."
 msgstr ""
 
-#: C/evolution.xml:6073(para)
+#: C/evolution.xml:6295(para)
 msgid "Select the rights you want to give to the user."
 msgstr ""
 
-#: C/evolution.xml:6078(para)
-msgid "Repeat <link linkend=\"Aai4sat\">Step 4</link> and <link linkend=\"Aai4sll\">Step 5</link> to assign rights to each user in the Proxy List."
+#: C/evolution.xml:6300(para)
+msgid ""
+"Repeat <link linkend=\"Aai4sat\">Step 4</link> and <link linkend=\"Aai4sll"
+"\">Step 5</link> to assign rights to each user in the Proxy List."
 msgstr ""
 
-#: C/evolution.xml:6084(para)
-msgid "To delete a user from the Proxy List, select the user, then click Remove User."
+#: C/evolution.xml:6307(para)
+msgid ""
+"To delete a user from the Proxy List, select the user, then click Remove "
+"User."
 msgstr ""
 
-#: C/evolution.xml:6089(para)
-msgid "Before you can act as a proxy for someone, that person must give you proxy rights in his or her Proxy List in Preferences. The amount of access you have depends on the rights you have been given."
+#: C/evolution.xml:6312(para)
+msgid ""
+"Before you can act as a proxy for someone, that person must give you proxy "
+"rights in his or her Proxy List in Preferences. The amount of access you "
+"have depends on the rights you have been given."
 msgstr ""
 
-#: C/evolution.xml:6092(para)
+#: C/evolution.xml:6315(para)
 msgid "Right-click on the GroupWise account in the folder list."
 msgstr ""
 
-#: C/evolution.xml:6095(para)
+#: C/evolution.xml:6318(para)
 msgid "Click Proxy Login."
 msgstr ""
 
-#: C/evolution.xml:6100(para)
-msgid "Type the user name of the person who has given you Proxy access, or select from the list."
+#: C/evolution.xml:6323(para)
+msgid ""
+"Type the user name of the person who has given you Proxy access, or select "
+"from the list."
 msgstr ""
 
-#: C/evolution.xml:6104(para)
+#: C/evolution.xml:6327(para)
 msgid "The user's data appears in the respective components."
 msgstr ""
 
-#: C/evolution.xml:6106(para)
-msgid "You can set different colors to each user to distinguish between each users' appointments. You can also select whether to display the appointments of a particular user or not."
+#: C/evolution.xml:6329(para)
+msgid ""
+"You can set different colors to each user to distinguish between each users' "
+"appointments. You can also select whether to display the appointments of a "
+"particular user or not."
 msgstr ""
 
-#: C/evolution.xml:6113(para)
-msgid "You can limit a proxy's access to individual items in your Mailbox or Calendar by marking items Private."
+#: C/evolution.xml:6336(para)
+msgid ""
+"You can limit a proxy's access to individual items in your Mailbox or "
+"Calendar by marking items Private."
 msgstr ""
 
-#: C/evolution.xml:6114(para)
-msgid "When you mark an item Private, you prevent unauthorized proxies from opening it. Proxies cannot access items marked Private unless you give them those rights in your Access List."
+#: C/evolution.xml:6337(para)
+msgid ""
+"When you mark an item Private, you prevent unauthorized proxies from opening "
+"it. Proxies cannot access items marked Private unless you give them those "
+"rights in your Access List."
 msgstr ""
 
-#: C/evolution.xml:6115(para)
-msgid "If you mark an item Private when you send it, neither your proxies nor the recipient's proxies can open the item without rights. If you mark an item Private when you receive it, it cannot be read by your unauthorized proxies, but it can be read by the sender's proxies. Appointments marked Private display in Busy Search according to the status you selected when you accepted the appointment."
+#: C/evolution.xml:6338(para)
+msgid ""
+"If you mark an item Private when you send it, neither your proxies nor the "
+"recipient's proxies can open the item without rights. If you mark an item "
+"Private when you receive it, it cannot be read by your unauthorized proxies, "
+"but it can be read by the sender's proxies. Appointments marked Private "
+"display in Busy Search according to the status you selected when you "
+"accepted the appointment."
 msgstr ""
 
-#: C/evolution.xml:6118(para)
+#: C/evolution.xml:6341(para)
 msgid "In an open item, click Actions, then click Mark Private."
 msgstr ""
 
-#: C/evolution.xml:6120(para)
-msgid "In your Calendar, click an item in the Appointments, Reminder Notes, or Tasks List, click Actions, then click Mark Private."
+#: C/evolution.xml:6343(para)
+msgid ""
+"In your Calendar, click an item in the Appointments, Reminder Notes, or "
+"Tasks List, click Actions, then click Mark Private."
 msgstr ""
 
-#: C/evolution.xml:6128(para)
-msgid "Junk mail handling for GroupWise accounts is a little different then other junk mail handling. When you mark an item as junk mail in GroupWise, the item is added to your junk list in the GroupWise system. Because these settings are on the GroupWise system, your junk list follows you from computer to computer."
+#: C/evolution.xml:6351(para)
+msgid ""
+"Junk mail handling for GroupWise accounts is a little different than other "
+"junk mail handling. When you mark an item as junk mail in GroupWise, the "
+"item is added to your junk list in the GroupWise system. Because these "
+"settings are on the GroupWise system, your junk list follows you from "
+"computer to computer."
 msgstr ""
 
-#: C/evolution.xml:6131(link)
-#: C/evolution.xml:6148(title)
+#: C/evolution.xml:6354(link) C/evolution.xml:6371(title)
 msgid "Marking a Message As Junk Mail"
 msgstr ""
 
-#: C/evolution.xml:6134(link)
-#: C/evolution.xml:6158(title)
+#: C/evolution.xml:6357(link) C/evolution.xml:6381(title)
 msgid "Marking a Message As Not Junk Mail"
 msgstr ""
 
-#: C/evolution.xml:6137(link)
-#: C/evolution.xml:6172(title)
+#: C/evolution.xml:6360(link) C/evolution.xml:6395(title)
 msgid "Enabling or Disabling Your Junk Mail List"
 msgstr ""
 
-#: C/evolution.xml:6140(link)
-#: C/evolution.xml:6187(title)
-msgid "Adding an E-Mail Address to Your Junk List"
+#: C/evolution.xml:6363(link) C/evolution.xml:6410(title)
+msgid "Adding an Email Address to Your Junk List"
 msgstr ""
 
-#: C/evolution.xml:6143(link)
-#: C/evolution.xml:6202(title)
-msgid "Removing an E-Mail Address from Your Junk List"
+#: C/evolution.xml:6366(link) C/evolution.xml:6425(title)
+msgid "Removing an Email Address from Your Junk List"
 msgstr ""
 
-#: C/evolution.xml:6151(para)
-msgid "Select the message to mark as junk, then click the Junk icon or press Ctrl+J."
+#: C/evolution.xml:6374(para)
+msgid ""
+"Select the message to mark as junk, then click the Junk icon or press Ctrl+J."
 msgstr ""
 
-#: C/evolution.xml:6152(para)
-msgid "The message is moved to your Junk Mail folder and the user is added to your junk list."
+#: C/evolution.xml:6375(para)
+msgid ""
+"The message is moved to your Junk Mail folder and the user is added to your "
+"junk list."
 msgstr ""
 
-#: C/evolution.xml:6161(para)
+#: C/evolution.xml:6384(para)
 msgid "Select the message to mark as not junk in your Junk Mail folder."
 msgstr ""
 
-#: C/evolution.xml:6164(para)
+#: C/evolution.xml:6387(para)
 msgid "Right-click the message, then click Mark as Not Junk."
 msgstr ""
 
-#: C/evolution.xml:6165(para)
+#: C/evolution.xml:6388(para)
 msgid "Or select the message and press Shift+Ctrl+J"
 msgstr ""
 
-#: C/evolution.xml:6166(para)
-msgid "The message is moved to your Mailbox folder and the name is removed from your junk list."
+#: C/evolution.xml:6389(para)
+msgid ""
+"The message is moved to your Mailbox folder and the name is removed from "
+"your junk list."
 msgstr ""
 
-#: C/evolution.xml:6175(para)
-#: C/evolution.xml:6190(para)
-#: C/evolution.xml:6205(para)
+#: C/evolution.xml:6398(para) C/evolution.xml:6413(para)
+#: C/evolution.xml:6428(para)
 msgid "Right-click a message, then click Junk Mail Settings."
 msgstr ""
 
-#: C/evolution.xml:6178(para)
+#: C/evolution.xml:6401(para)
 msgid "Select if you want to enable or disable junk mail handling."
 msgstr ""
 
-#: C/evolution.xml:6193(para)
-msgid "Type the e-mail address to block in the Email field."
+#: C/evolution.xml:6416(para)
+msgid "Type the email address to block in the Email field."
 msgstr ""
+"Napište svou e-mailovou adresu, kterou blokovat, do pole E-mailová adresa."
 
-#: C/evolution.xml:6196(para)
+#: C/evolution.xml:6419(para)
 msgid "Click Add, then click OK."
 msgstr ""
 
-#: C/evolution.xml:6208(para)
-msgid "Select the e-mail address to remove, then click Remove."
-msgstr ""
-
-#: C/evolution.xml:6220(para)
-msgid "<trademark>Evolution</trademark> supports mail connectivity to <trademark class=\"registered\">Hula</trademark> servers through IMAP and calendaring support through CalDAV."
-msgstr ""
-
-#: C/evolution.xml:6221(para)
-msgid "To add your Hula account to Evolution, you must create a new Hula account by performing the following steps:"
-msgstr ""
-
-#: C/evolution.xml:6224(para)
-msgid "Click Edit, click Preferences, then click Mail Accounts."
-msgstr ""
-
-#: C/evolution.xml:6227(para)
-msgid "In the Preferences window, click Add."
-msgstr ""
-
-#: C/evolution.xml:6230(para)
-msgid "Follow the procedure explained in <link linkend=\"usage-mainwindow-starting\">Starting Evolution for the First Time</link>."
+#: C/evolution.xml:6431(para)
+msgid "Select the email address to remove, then click Remove."
 msgstr ""
+"Vyberte e-mailovou adresu, kterou chcete odstranit, a klikněte na tlačítko "
+"Odstranit."
 
-#: C/evolution.xml:6237(para)
-msgid "Perhaps your mail server has changed names. Or you have grown tired of a certain layout for your appointments. Whatever the reason, you can change your <trademark>Evolution</trademark> settings."
+#: C/evolution.xml:6443(para)
+msgid ""
+"Perhaps your mail server has changed names. Or you have grown tired of a "
+"certain layout for your appointments. Whatever the reason, you can change "
+"your <trademark>Evolution</trademark> settings."
 msgstr ""
 
-#: C/evolution.xml:6240(link)
-#: C/evolution.xml:6294(title)
+#: C/evolution.xml:6446(link) C/evolution.xml:6500(title)
 msgid "Working with Mail Accounts"
-msgstr ""
+msgstr "Práce s poštovními účty"
 
-#: C/evolution.xml:6243(link)
-#: C/evolution.xml:6337(title)
+#: C/evolution.xml:6449(link) C/evolution.xml:6543(title)
 msgid "Autocompletion"
 msgstr ""
 
-#: C/evolution.xml:6246(link)
-#: C/evolution.xml:6399(title)
+#: C/evolution.xml:6452(link) C/evolution.xml:6598(title)
 msgid "Mail Preferences"
 msgstr ""
 
-#: C/evolution.xml:6249(link)
-#: C/evolution.xml:6568(title)
+#: C/evolution.xml:6455(link) C/evolution.xml:6767(title)
 msgid "Composer Preferences"
 msgstr ""
 
-#: C/evolution.xml:6252(link)
-#: C/evolution.xml:6626(title)
+#: C/evolution.xml:6458(link) C/evolution.xml:6826(title)
 msgid "Calendar and Tasks Settings"
 msgstr ""
 
-#: C/evolution.xml:6255(link)
-#: C/evolution.xml:6745(title)
+#: C/evolution.xml:6461(link) C/evolution.xml:7069(title)
 msgid "Contact Management"
-msgstr ""
+msgstr "Správa kontaktů"
 
-#: C/evolution.xml:6258(link)
-#: C/evolution.xml:6728(title)
+#: C/evolution.xml:6464(link) C/evolution.xml:7052(title)
 msgid "Certificates"
 msgstr ""
 
-#: C/evolution.xml:6261(link)
-#: C/evolution.xml:6878(title)
+#: C/evolution.xml:6467(link) C/evolution.xml:7202(title)
 msgid "Debug Logs"
 msgstr ""
 
-#: C/evolution.xml:6264(para)
-msgid "You reach the Evolution settings window by clicking Edit &gt; Preferences. In the left part of the settings window is a column, similar to the Evolution switcher, that lets you choose which portion of Evolution to customize. The right part of the window is where you make your actual changes."
+#: C/evolution.xml:6470(para)
+msgid ""
+"You reach the Evolution settings window by clicking Edit &gt; Preferences. "
+"In the left part of the settings window is a column, similar to the "
+"Evolution switcher, that lets you choose which portion of Evolution to "
+"customize. The right part of the window is where you make your actual "
+"changes."
 msgstr ""
 
-#: C/evolution.xml:6266(para)
+#: C/evolution.xml:6472(para)
 msgid "There are six items you can customize."
 msgstr ""
 
-#: C/evolution.xml:6268(title)
+#: C/evolution.xml:6474(title)
 msgid "Mail Accounts:"
 msgstr ""
 
-#: C/evolution.xml:6269(para)
-msgid "Add or change information about your e-mail accounts, such as the servers you connect to, the way you download mail, and your password authentication mode. This is the most complex item in the list, and is covered in <link linkend=\"config-prefs-mail-identity\">Working with Mail Accounts</link>."
+#: C/evolution.xml:6475(para)
+msgid ""
+"Add or change information about your email accounts, such as the servers you "
+"connect to, the way you download mail, and your password authentication "
+"mode. This is the most complex item in the list, and is covered in <link "
+"linkend=\"config-prefs-mail-identity\">Working with Mail Accounts</link>."
 msgstr ""
 
-#: C/evolution.xml:6272(title)
+#: C/evolution.xml:6478(title)
 msgid "Autocompletion:"
 msgstr ""
 
-#: C/evolution.xml:6273(para)
-msgid "Set the contact groups to be used when completing e-mail addresses in the message composer. For more information, see <link linkend=\"bshoq5l\">Autocompletion</link>."
+#: C/evolution.xml:6479(para)
+msgid ""
+"Set the address books to be used when completing email addresses in the "
+"message composer. For more information, see <link linkend=\"bshoq5l"
+"\">Autocompletion</link>."
 msgstr ""
 
-#: C/evolution.xml:6276(title)
+#: C/evolution.xml:6482(title)
 msgid "Mail Preferences:"
 msgstr ""
 
-#: C/evolution.xml:6277(para)
-msgid "These are overall mail reading preferences, such as display settings, notification options, and security. Settings that vary per account are in the Mail Accounts tool, described in <link linkend=\"config-prefs-mail-identity\">Working with Mail Accounts</link>, but most of the mail settings are in <link linkend=\"config-prefs-mail\">Mail Preferences</link>."
+#: C/evolution.xml:6483(para)
+msgid ""
+"These are overall mail reading preferences, such as display settings, "
+"notification options, and security. Settings that vary per account are in "
+"the Mail Accounts tool, described in <link linkend=\"config-prefs-mail-"
+"identity\">Working with Mail Accounts</link>, but most of the mail settings "
+"are in <link linkend=\"config-prefs-mail\">Mail Preferences</link>."
 msgstr ""
 
-#: C/evolution.xml:6280(title)
+#: C/evolution.xml:6486(title)
 msgid "Composer Preferences:"
 msgstr ""
 
-#: C/evolution.xml:6281(para)
-msgid "These are settings for the way that you use the mail composer, such as shortcuts, signatures, and spelling. This includes the ability to substitute graphical emoticons for <quote>emoticons</quote> such as : ) that many people use in e-mail. This tool is covered in <link linkend=\"config-prefs-mail-composer\">Composer Preferences</link>."
+#: C/evolution.xml:6487(para)
+msgid ""
+"These are settings for the way that you use the mail composer, such as "
+"signatures, and spelling. This includes the ability to substitute graphical "
+"emoticons for <quote>emoticons</quote> such as : ) that many people use in "
+"email. This tool is covered in <link linkend=\"config-prefs-mail-composer"
+"\">Composer Preferences</link>."
 msgstr ""
 
-#: C/evolution.xml:6284(title)
+#: C/evolution.xml:6490(title)
 msgid "Calendar and Tasks:"
 msgstr ""
 
-#: C/evolution.xml:6285(para)
-msgid "Use these settings to control how the calendar behaves, including your time zone and the length of your work week. For more information, see <link linkend=\"config-prefs-cal\">Calendar and Tasks Settings</link>."
+#: C/evolution.xml:6491(para)
+msgid ""
+"Use these settings to control how the calendar behaves, including your time "
+"zone and the length of your work week. For more information, see <link "
+"linkend=\"config-prefs-cal\">Calendar and Tasks Settings</link>."
 msgstr ""
 
-#: C/evolution.xml:6288(title)
+#: C/evolution.xml:6494(title)
 msgid "Certificates:"
 msgstr ""
 
-#: C/evolution.xml:6289(para)
-msgid "Use these settings for certificate handling for S/MIME security systems. For more information, see <link linkend=\"bshoty0\">Certificates</link>."
+#: C/evolution.xml:6495(para)
+msgid ""
+"Use these settings for certificate handling for S/MIME security systems. For "
+"more information, see <link linkend=\"bshoty0\">Certificates</link>."
 msgstr ""
 
-#: C/evolution.xml:6291(para)
-msgid "Previous versions of Evolution included directory servers, folder settings, and Exchange delegation in the settings tool. Directory servers can now be set up as contacts groups in the Contacts tool, you can change folder settings in the folder right-click menu, and Exchange delegation is available in the Message Menu of the Exchange tool."
+#: C/evolution.xml:6497(para)
+msgid ""
+"Previous versions of Evolution included directory servers, folder settings, "
+"and Exchange delegation in the settings tool. Directory servers can now be "
+"set up as contacts groups in the Contacts tool, you can change folder "
+"settings in the folder right-click menu, and Exchange delegation is "
+"available in the Message Menu of the Exchange tool."
 msgstr ""
 
-#: C/evolution.xml:6295(para)
-msgid "Evolution allows you to maintain multiple accounts, or identities. When you are writing an e-mail message, you can choose which account to use by selecting from the drop-down list next to the From field in the message composer."
+#: C/evolution.xml:6501(para)
+msgid ""
+"Evolution allows you to maintain multiple accounts, or identities. When you "
+"are writing an email message, you can choose which account to use by "
+"selecting from the drop-down list next to the From field in the message "
+"composer."
 msgstr ""
 
-#: C/evolution.xml:6296(para)
-msgid "Click Send/Receive to select all mail sources that are not disabled. If you don't want to check mail for a given account, select the account in the Mail Accounts tab and click the Disable button.."
+#: C/evolution.xml:6502(para)
+msgid ""
+"Click Send/Receive to update all mail sources that are not disabled. If you "
+"don't want to check mail for a given account, select the account in Edit "
+"&gt; Preferences &gt; Mail Accounts page and click the Disable button."
 msgstr ""
 
-#: C/evolution.xml:6297(para)
-msgid "To add a new account, click Add to open the Evolution configuration assistant. To alter an existing account, select it in the Preferences window, then click Edit to open the account editor dialog box."
+#: C/evolution.xml:6503(para)
+msgid ""
+"To add a new account, click Add to open the Evolution configuration "
+"assistant. To alter an existing account, select it in the Preferences "
+"window, then click Edit to open the account editor dialog box."
 msgstr ""
 
-#: C/evolution.xml:6298(para)
+#: C/evolution.xml:6504(para)
 msgid "The account editor dialog box has seven sections:"
 msgstr ""
 
-#: C/evolution.xml:6300(title)
+#: C/evolution.xml:6506(title)
 msgid "Identity:"
 msgstr ""
 
-#: C/evolution.xml:6301(para)
-msgid "Specify the name and e-mail address for this account. You can also choose a default signature to insert into messages sent from this account."
+#: C/evolution.xml:6507(para)
+msgid ""
+"Specify the name and email address for this account. You can also choose a "
+"default signature to insert into messages sent from this account."
 msgstr ""
 
-#: C/evolution.xml:6304(title)
+#: C/evolution.xml:6510(title)
 msgid "Receiving Email:"
 msgstr ""
 
-#: C/evolution.xml:6305(para)
-msgid "Select the way you receive e-mail. You can download e-mail from a <link linkend=\"pop\">POP server</link>, read and keep it on the server (Microsoft Exchange, <trademark class=\"registered\">Novell</trademark><trademark class=\"registered\">GroupWise</trademark>, or IMAP<link linkend=\"imap\">IMAP</link>), or read it from files that already exist on your desktop computer. Your server requires you to use a Secure Socket Layer (SSL) connection. You can select from the given three options: No encryption, TLS encryption or SSL encryption."
+#: C/evolution.xml:6511(para)
+msgid ""
+"Select the way you receive email. You can download email from a <link "
+"linkend=\"pop\">POP server</link>, read and keep it on the server (Microsoft "
+"Exchange, <trademark class=\"registered\">Novell</trademark><trademark class="
+"\"registered\">GroupWise</trademark>, or IMAP<link linkend=\"imap\">IMAP</"
+"link>), or read it from files that already exist on your desktop computer. "
+"If your server requires you to use a secure connection, you can select from "
+"the given three options: No encryption, TLS encryption or SSL encryption."
 msgstr ""
 
-#: C/evolution.xml:6307(para)
-msgid "Your system administrator might ask you to connect to a specific port on a mail server. To specify which port you use, just type a colon and the port number after the server name. For example, to connect to port 143 on the server smtp.example.com, specify smtp.example.com:143 as the server name."
+#: C/evolution.xml:6513(para)
+msgid ""
+"Your system administrator might ask you to connect to a specific port on a "
+"mail server. To specify which port you use, just type a colon and the port "
+"number after the server name. For example, to connect to port 143 on the "
+"server smtp.example.com, specify smtp.example.com:143 as the server name."
 msgstr ""
 
-#: C/evolution.xml:6308(para)
-msgid "For additional information, see <link linkend=\"second-step\">Receiving Mail</link>."
+#: C/evolution.xml:6514(para)
+msgid ""
+"For additional information, see <link linkend=\"second-step\">Receiving "
+"Mail</link>."
 msgstr ""
 
-#: C/evolution.xml:6310(title)
+#: C/evolution.xml:6516(title)
 msgid "Receiving Options:"
 msgstr ""
 
-#: C/evolution.xml:6311(para)
-msgid "Decide if you want to check for mail automatically and how often, as well as setting other message retrieval options."
+#: C/evolution.xml:6517(para)
+msgid ""
+"Decide if you want to check for mail automatically and how often, as well as "
+"setting other message retrieval options."
 msgstr ""
 
-#: C/evolution.xml:6313(para)
-msgid "For additional information, see <link linkend=\"more-mail-options\">Receiving Mail Options</link>."
+#: C/evolution.xml:6519(para)
+msgid ""
+"For additional information, see <link linkend=\"more-mail-options"
+"\">Receiving Mail Options</link>."
 msgstr ""
 
-#: C/evolution.xml:6315(title)
+#: C/evolution.xml:6521(title)
 msgid "Sending Mail:"
 msgstr ""
 
-#: C/evolution.xml:6316(para)
-msgid "Use this section to choose and configure a method for sending mail. You can choose <link linkend=\"smtp\">SMTP</link>, Microsoft Exchange (if you have installed the Evolution Connector for Microsoft Exchange), or <link linkend=\"sendmail\">Sendmail</link>."
+#: C/evolution.xml:6522(para)
+msgid ""
+"Use this section to choose and configure a method for sending mail. You can "
+"choose <link linkend=\"smtp\">SMTP</link>, Microsoft Exchange (if you have "
+"installed the Evolution Connector for Microsoft Exchange), <link linkend="
+"\"sendmail\">Sendmail</link> or many other options."
 msgstr ""
 
-#: C/evolution.xml:6318(para)
-msgid "For additional information, see <link linkend=\"third-step\">Sending Mail</link>."
+#: C/evolution.xml:6524(para)
+msgid ""
+"For additional information, see <link linkend=\"third-step\">Sending Mail</"
+"link>."
 msgstr ""
 
-#: C/evolution.xml:6320(title)
+#: C/evolution.xml:6526(title)
 msgid "Defaults:"
 msgstr ""
 
-#: C/evolution.xml:6321(para)
-msgid "Use this section to set where this account stores the messages that it has sent, and the messages that you save as drafts. If you want to revert to the default settings, click Restore Defaults."
+#: C/evolution.xml:6527(para)
+msgid ""
+"Use this section to set where this account stores the messages that it has "
+"sent, and the messages that you save as drafts. If you want to revert to the "
+"default settings, click Restore."
 msgstr ""
 
-#: C/evolution.xml:6323(para)
-msgid "If you want to send someone a copy of every message from this account, select either Always Carbon-Copy (Cc) To: or Always Blind Carbon-Copy (Bcc) To:, and specify one or more addresses."
+#: C/evolution.xml:6529(para)
+msgid ""
+"If you want to send someone a copy of every message from this account, "
+"select either Always Carbon-Copy (Cc) To: or Always Blind Carbon-Copy (Bcc) "
+"To:, and specify one or more addresses."
 msgstr ""
 
-#: C/evolution.xml:6324(para)
-msgid "You can specify the way you want to receive message receipts. You can set Send message receipts to Never, Always or Ask for each message. For more information refer <link linkend=\"b13uhy6r\">Default Settings</link>."
+#: C/evolution.xml:6530(para)
+msgid ""
+"You can specify the way you want to receive message receipts. You can set "
+"Send message receipts to Never, Always or Ask for each message. For more "
+"information refer <link linkend=\"b13uhy6r\">Default Settings</link>."
 msgstr ""
 
-#: C/evolution.xml:6325(para)
-msgid "You can change the default settings of your sent items. Click Advanced Send Options to prioritize, classify your send messages. You can also set the date for reply request so that recipient will know the immediacy and can accordingly response to your message. Enable status tracking and set Return Notification for Mail, Calendar and Task."
+#: C/evolution.xml:6531(para)
+msgid ""
+"You can change the default settings of your sent items. Click Advanced Send "
+"Options to prioritize, classify your send messages. You can also set the "
+"date for reply request so that recipient will know the immediacy and can "
+"accordingly response to your message. Enable status tracking and set Return "
+"Notification for Mail, Calendar and Task."
 msgstr ""
 
-#: C/evolution.xml:6327(title)
+#: C/evolution.xml:6533(title)
 msgid "Security:"
 msgstr ""
 
-#: C/evolution.xml:6328(para)
-msgid "Use this section to set the security options for this account. If you use encryption, enter your PGP key ID (see <link linkend=\"encryption\">Encryption</link> for more information) and select among the four options to determine key and signature handling."
+#: C/evolution.xml:6534(para)
+msgid ""
+"Use this section to set the security options for this account. If you use "
+"encryption, enter your PGP key ID (see <link linkend=\"encryption"
+"\">Encryption</link> for more information) and select among the four options "
+"to determine key and signature handling."
 msgstr ""
 
-#: C/evolution.xml:6331(title)
+#: C/evolution.xml:6537(title)
 msgid "Proxy:"
 msgstr ""
 
-#: C/evolution.xml:6332(para)
-msgid "This only displays if you have a GroupWise account. Use this section to set proxy access for other users to access your mailbox or calendar."
+#: C/evolution.xml:6538(para)
+msgid ""
+"This only displays if you have a GroupWise account. Use this section to set "
+"proxy access for other users to access your mailbox or calendar."
 msgstr ""
 
-#: C/evolution.xml:6338(para)
-msgid "The Autocompletion tool lets you choose address books to auto-complete names for you. This functionality requires accessibility to each of the address books you want to use. To enable autocompletion, select each of the address books that you want to use auto completion in the Autocompletion page."
+#: C/evolution.xml:6544(para)
+msgid ""
+"The Autocompletion tool lets you choose address books to auto-complete names "
+"for you in the mail composer. This functionality requires accessibility to "
+"each of the address books you want to use. To enable autocompletion, select "
+"each of the address books that you want to use auto completion in the "
+"Autocompletion page."
 msgstr ""
 
-#: C/evolution.xml:6342(title)
+#: C/evolution.xml:6548(title)
 msgid "IMAP Mail Headers"
 msgstr ""
 
-#: C/evolution.xml:6343(para)
-msgid "Evolution allow you to choose the headers that you want to download so that you can reduce the download time and at the same time having control as to filter or move your mails around the way you like it. Evolution help you customize your IMAP Mail header preferences and thus save the download time. The IMAP Mail headers are as follows:"
+#: C/evolution.xml:6549(para)
+msgid ""
+"Evolution allows you to choose the headers that you want to download so that "
+"you can reduce the download time and filter or move your mail around the way "
+"you like it. Evolution help you customize your IMAP Mail header preferences "
+"and thus save the download time. The IMAP Mail header options are as follows:"
 msgstr ""
 
-#: C/evolution.xml:6345(title)
+#: C/evolution.xml:6551(title)
 msgid "All Headers:"
 msgstr ""
 
-#: C/evolution.xml:6346(para)
-msgid "This include all the available IMAP Mail headers. By choosing this option, Evolution will download all the Headers for all the messages."
+#: C/evolution.xml:6552(para)
+msgid ""
+"This includes all the available IMAP Mail headers. By choosing this option, "
+"Evolution will download all the headers for all the messages."
 msgstr ""
 
-#: C/evolution.xml:6349(title)
+#: C/evolution.xml:6555(title)
 msgid "Basic Headers:"
 msgstr ""
 
-#: C/evolution.xml:6350(para)
-msgid "This will include Date, From, To, CC, Subject, Preferences, In-Reply-To, Message-ID, Mime-Version, and Content-Type. If you want to just fetch and see messages without having to categorically filter messages based on your mailing lists, choose this option. This will make Evolution work faster and is generally recommended for common users."
+#: C/evolution.xml:6556(para)
+msgid ""
+"This will include Date, From, To, CC, Subject, Preferences, In-Reply-To, "
+"Message-ID, Mime-Version, and Content-Type. If you want to just fetch and "
+"see messages without having to categorically filter messages based on your "
+"mailing lists, choose this option. This will make Evolution work faster and "
+"is generally recommended for common users."
 msgstr ""
 
-#: C/evolution.xml:6353(title)
+#: C/evolution.xml:6559(title)
 msgid "Mailing List Headers:"
 msgstr ""
 
-#: C/evolution.xml:6354(para)
-msgid "Enable this option to have filters based on mailing list headers (like list ID) so that in addition to the basic headers, the headers that correspond to mailing-lists are also fetched. Mailing list headers will have the informations such as the mailing list ID, owner of the mailing list, and so on with which you can create mailing list filters."
-msgstr ""
-
-#: C/evolution.xml:6356(para)
-msgid "This is the default Header preferences that comes with Evolution. When this option is chosen, Evolution will download a basic set of headers (as described above) along with a set of headers that are needed for client-side filters based on mailing lists. If you do not have any filters on Evolution, it is recommended to switch to the \"Basic Headers Only\"option."
-msgstr ""
-
-#: C/evolution.xml:6358(title)
-msgid "Custom Headers:"
-msgstr ""
-
-#: C/evolution.xml:6359(para)
-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."
+#: C/evolution.xml:6560(para)
+msgid ""
+"Enable this option to have filters based on mailing list headers (like list "
+"ID) so that in addition to the basic headers, the headers that correspond to "
+"mailing-lists are also fetched. Mailing list headers will have the "
+"informations such as the mailinglist-ID, owner of the mailing list, and so "
+"on with which you can create mailing list filters."
 msgstr ""
 
-#: C/evolution.xml:6362(para)
-msgid "This option may not be needed if you have chosen to download ALL Headers."
+#: C/evolution.xml:6562(para)
+msgid ""
+"This is the default Header preference that comes with Evolution. When this "
+"option is chosen, Evolution will download a basic set of headers (as "
+"described above) along with a set of headers that are needed for client-side "
+"filters based on mailing lists. If you do not have any filters on Evolution, "
+"it is recommended to switch to the \"Basic Headers Only\" option."
 msgstr ""
 
-#: C/evolution.xml:6364(para)
+#: C/evolution.xml:6563(para)
 msgid "To set the IMAP Mail headers:"
 msgstr ""
 
-#: C/evolution.xml:6367(para)
-msgid "Select Edit &gt; Preferences."
-msgstr ""
-
-#: C/evolution.xml:6370(para)
+#: C/evolution.xml:6569(para)
 msgid "Select the IMAP account and click Edit to open the Account Editor."
 msgstr ""
 
-#: C/evolution.xml:6373(para)
-msgid "On the Account Editor, click IMAP Headers tab to open IMAP Headers to the Account Editor."
+#: C/evolution.xml:6572(para)
+msgid ""
+"On the Account Editor, click IMAP Headers tab to open IMAP Headers to the "
+"Account Editor."
 msgstr ""
 
-#: C/evolution.xml:6378(para)
-msgid "Click Fetch All Headers to download all the available header information."
+#: C/evolution.xml:6577(para)
+msgid ""
+"Click Fetch All Headers to download all the available header information."
 msgstr ""
 
-#: C/evolution.xml:6380(para)
-msgid "The more headers you have, the more time it will consume to download. This option is not recommended."
+#: C/evolution.xml:6579(para)
+msgid ""
+"The more headers you have, the more time it will consume to download. This "
+"option is not recommended."
 msgstr ""
 
-#: C/evolution.xml:6384(para)
+#: C/evolution.xml:6583(para)
 msgid "Click Basic Headers to download basic headers."
 msgstr ""
 
-#: C/evolution.xml:6387(para)
+#: C/evolution.xml:6586(para)
 msgid "Click Basic and Mailing Headers to download both."
 msgstr ""
 
-#: C/evolution.xml:6390(para)
+#: C/evolution.xml:6589(para)
 msgid "Click Add to add any predefined custom headers."
 msgstr ""
 
-#: C/evolution.xml:6393(para)
+#: C/evolution.xml:6592(para)
 msgid "Click Remove to remove the custom headers."
 msgstr ""
 
-#: C/evolution.xml:6400(para)
-msgid "The Mail Preferences tool lets you choose how to display citations, how long to wait before marking a message as read, and other mail display settings."
+#: C/evolution.xml:6599(para)
+msgid ""
+"The Mail Preferences tool lets you choose how to display citations, how long "
+"to wait before marking a message as read, and other mail display settings."
 msgstr ""
 
-#: C/evolution.xml:6403(link)
-#: C/evolution.xml:6427(title)
+#: C/evolution.xml:6602(link) C/evolution.xml:6626(title)
 msgid "General Mail Settings"
 msgstr ""
 
-#: C/evolution.xml:6406(link)
-#: C/evolution.xml:6449(title)
+#: C/evolution.xml:6605(link) C/evolution.xml:6648(title)
 msgid "HTML Mail Preferences"
 msgstr ""
 
-#: C/evolution.xml:6409(link)
-#: C/evolution.xml:6467(title)
+#: C/evolution.xml:6608(link) C/evolution.xml:6666(title)
 msgid "Label Preferences"
 msgstr ""
 
-#: C/evolution.xml:6412(link)
-#: C/evolution.xml:6501(title)
+#: C/evolution.xml:6611(link) C/evolution.xml:6700(title)
 msgid "Mail Header Preferences"
 msgstr "Nastavení hlavičky e-mailu"
 
-#: C/evolution.xml:6415(link)
-#: C/evolution.xml:6513(title)
+#: C/evolution.xml:6614(link) C/evolution.xml:6712(title)
 msgid "Junk Mail Preferences"
 msgstr ""
 
-#: C/evolution.xml:6418(link)
-#: C/evolution.xml:6556(title)
+#: C/evolution.xml:6617(link) C/evolution.xml:6755(title)
 msgid "Automatic Contacts Preferences"
 msgstr ""
 
-#: C/evolution.xml:6421(link)
-#: C/evolution.xml:6562(title)
+#: C/evolution.xml:6620(link) C/evolution.xml:6761(title)
 msgid "Calendar and Tasks Preferences"
 msgstr ""
 
-#: C/evolution.xml:6424(para)
-msgid "For information on individual e-mail account settings, see <link linkend=\"config-prefs-mail-identity\">Working with Mail Accounts</link>."
+#: C/evolution.xml:6623(para)
+msgid ""
+"For information on individual email account settings, see <link linkend="
+"\"config-prefs-mail-identity\">Working with Mail Accounts</link>."
 msgstr ""
+"Informace o nastavení jednotlivých poštovních účtů naleznete v <link linkend="
+"\"more-mail-options\">Práci s poštovními účty</link>."
 
-#: C/evolution.xml:6428(para)
+#: C/evolution.xml:6627(para) C/evolution.xml:6783(para)
 msgid "The General page has the following options:"
 msgstr ""
 
-#: C/evolution.xml:6430(title)
+#: C/evolution.xml:6629(title)
 msgid "Message Fonts:"
 msgstr ""
 
-#: C/evolution.xml:6431(para)
-msgid "Normally, Evolution uses the same fonts as other GNOME applications. To choose different fonts, deselect Use the same fonts as other applications and select one font for standard typefaces and a second for monospace, terminal, or display."
+#: C/evolution.xml:6630(para)
+msgid ""
+"Normally, Evolution uses the same fonts as other GNOME applications. To "
+"choose different fonts, deselect Use the same fonts as other applications "
+"and select one font for standard typefaces and a second for monospace."
 msgstr ""
 
-#: C/evolution.xml:6434(title)
+#: C/evolution.xml:6633(title)
 msgid "Message Display:"
 msgstr ""
 
-#: C/evolution.xml:6435(para)
-msgid "Choose how long you want to wait before marking a message read, how to highlight quotations, and the default encoding. Enable <guilabel>Fall back to threading message by subject</guilabel> to group the messages as message threads. You can also set the limit to the number of addresses displayed in the message header by enabling <guilabel>Shrink To/CC/BCC header to</guilabel> option.You can also set the limit for rendering text content in the message you recive.By default, when you receive a message with text content more than 4096 Kilo Bytes, Evolution will not render the message in the preview pane. You can view unformatted text either inline or using an external application. You can also enable Magic spacebar and search folders."
-msgstr ""
-
-#: C/evolution.xml:6437(para)
-msgid "To group the messages as threads select View &gt; Group By threads or press Ctrl +T."
+#: C/evolution.xml:6634(para)
+msgid ""
+"Choose how long you want to wait before marking a message read, how to "
+"highlight quotations, and the default encoding. Enable <guilabel>Fall back "
+"to threading message by subject</guilabel> to group the messages as message "
+"threads. You can also set the limit to the number of addresses displayed in "
+"the message header by enabling <guilabel>Shrink To/CC/BCC header to</"
+"guilabel> option.You can also set the limit for rendering text content in "
+"the message you receive. By default, when you receive a message with text "
+"content more than 4096 Kilo Bytes, Evolution will not render the message in "
+"the preview pane. You can view unformatted text either inline or using an "
+"external application. You can also enable Magic spacebar and search folders."
+msgstr ""
+
+#: C/evolution.xml:6636(para)
+msgid ""
+"To group the messages as threads select View &gt; Group By threads or press "
+"Ctrl+T."
 msgstr ""
 
-#: C/evolution.xml:6439(title)
+#: C/evolution.xml:6638(title)
 msgid "Deleting Mail:"
 msgstr ""
 
-#: C/evolution.xml:6440(para)
-msgid "Choose whether to delete messages automatically when quitting Evolution and how frequently, and whether you want to explicitly confirm the final deletion of messages.Select Confirm when expunging a folder to confirm the final deletion. You can have four different options to set the frequency for deletion: Everytime, Once per day, Once per week, and Once per month."
+#: C/evolution.xml:6639(para)
+msgid ""
+"Choose whether to delete messages automatically when quitting Evolution and "
+"how frequently, and whether you want to explicitly confirm the final "
+"deletion of messages. Select Confirm when expunging a folder to confirm the "
+"final deletion. You can have four different options to set the frequency for "
+"deletion: Everytime, Once per day, Once per week, and Once per month."
 msgstr ""
 
-#: C/evolution.xml:6443(title)
+#: C/evolution.xml:6642(title)
 msgid "New Mail Notifications:"
 msgstr ""
 
-#: C/evolution.xml:6444(para)
-msgid "Evolution can alert you to the arrival of new mail with a beep or by playing a sound file. Choose your alert noise, or select none, as you prefer. You can choose not to notify on new mail arrival."
+#: C/evolution.xml:6643(para)
+msgid ""
+"Evolution can alert you to the arrival of new mail with a beep or by playing "
+"a sound file. Choose your alert noise, or select none, as you prefer. You "
+"can choose not to notify on new mail arrival."
 msgstr ""
 
-#: C/evolution.xml:6450(para)
+#: C/evolution.xml:6649(para)
 msgid "The HTML Mail page has the following options:"
 msgstr ""
 
-#: C/evolution.xml:6452(title)
+#: C/evolution.xml:6651(title)
 msgid "Show Image Animations:"
 msgstr ""
 
-#: C/evolution.xml:6453(para)
-msgid "Turns animation on or off."
+#: C/evolution.xml:6652(para)
+msgid "Turns image animation (e.g. GIF files) on or off."
 msgstr ""
 
-#: C/evolution.xml:6456(title)
+#: C/evolution.xml:6655(title)
 msgid "Prompt When Sending HTML Messages to Contacts That Don't Want Them:"
 msgstr ""
 
-#: C/evolution.xml:6457(para)
-msgid "Some people do not like HTML mail, and you can set Evolution to warn you of this preference. This warning appears only when you send HTML mail to people in your contacts who are listed as disliking HTML."
+#: C/evolution.xml:6656(para)
+msgid ""
+"Some people do not like HTML mail, and you can set Evolution to warn you of "
+"this preference. This warning appears only when you send HTML mail to people "
+"in your contacts who are listed as disliking HTML."
 msgstr ""
 
-#: C/evolution.xml:6460(title)
+#: C/evolution.xml:6659(title)
 msgid "Loading Images:"
 msgstr ""
 
-#: C/evolution.xml:6461(para)
-msgid "You can embed a image in an e-mail and have it load only when the message arrives. However, spammers can use image loading patterns to confirm <quote>live</quote> addresses and invade your privacy. You can elect to never load images automatically, to load images only if the sender is in your contacts, or always load images."
+#: C/evolution.xml:6660(para)
+msgid ""
+"You can embed a image in an email and have it load only when the message "
+"arrives. However, spammers can use image loading patterns to confirm "
+"<quote>valid</quote> addresses and invade your privacy. You can elect to "
+"never load images automatically, to load images only if the sender is in "
+"your contacts, or always load images."
 msgstr ""
 
-#: C/evolution.xml:6463(para)
-msgid "If you have chosen not to load images automatically, you can choose to see the images in one message at a time by selecting View &gt; Load Images or press Ctrl +I."
+#: C/evolution.xml:6662(para)
+msgid ""
+"If you have chosen not to load images automatically, you can choose to see "
+"the images in one message at a time by selecting View &gt; Load Images or "
+"press Ctrl+I."
 msgstr ""
 
-#: C/evolution.xml:6468(para)
-msgid "The Label preferences option lets you add color labels for different kinds of messages. You can add, edit, or remove the labels. You can also assign colors to each label you create. You cannot remove the default labels."
+#: C/evolution.xml:6667(para)
+msgid ""
+"The Label preferences option lets you add color labels for different kinds "
+"of messages. You can add, edit, or remove the labels. You can also assign "
+"colors to each label you create. You cannot remove the default labels."
 msgstr ""
 
-#: C/evolution.xml:6470(para)
+#: C/evolution.xml:6669(para)
 msgid "To create a label:"
 msgstr "Pro vytvoření štítku:"
 
-#: C/evolution.xml:6473(para)
+#: C/evolution.xml:6672(para)
 msgid "Click Add and specify the name in the Label Name dialog box."
 msgstr ""
 
-#: C/evolution.xml:6476(para)
+#: C/evolution.xml:6675(para)
 msgid "Click the color tab and select a color, then click OK."
 msgstr ""
 
-#: C/evolution.xml:6479(para)
+#: C/evolution.xml:6678(para)
 msgid "To edit label properties:"
 msgstr ""
 
-#: C/evolution.xml:6482(para)
+#: C/evolution.xml:6681(para)
 msgid "Select the label and click Edit."
 msgstr ""
 
-#: C/evolution.xml:6485(para)
+#: C/evolution.xml:6684(para)
 msgid "Edit name and color, then click OK."
 msgstr ""
 
-#: C/evolution.xml:6488(para)
-msgid "To assign a label to a specific e-mail message:"
+#: C/evolution.xml:6687(para)
+msgid "To assign a label to a specific email message:"
 msgstr ""
 
-#: C/evolution.xml:6491(para)
+#: C/evolution.xml:6690(para)
 msgid "Right-click the message from the message preview."
 msgstr ""
 
-#: C/evolution.xml:6494(para)
+#: C/evolution.xml:6693(para)
 msgid "Click Label and select the desired label for the message."
 msgstr ""
 
-#: C/evolution.xml:6502(para)
-msgid "The headers on an incoming message are the information about the message that isn't the content of the message itself, such as the sender and the time it was sent. Select the options here to show or hide different amounts of information about the messages you read. You can also add or remove new mail headers to the list. The default mail headers cannot be removed."
+#: C/evolution.xml:6701(para)
+msgid ""
+"The headers on an incoming message are the information about the message "
+"that isn't the content of the message itself, such as the sender and the "
+"time it was sent. Select the options here to show or hide different amounts "
+"of information about the messages you read. You can also add or remove new "
+"mail headers to the list. The default mail headers cannot be removed."
 msgstr ""
 
-#: C/evolution.xml:6504(title)
+#: C/evolution.xml:6703(title)
 msgid "Sender Photograph:"
 msgstr ""
 
-#: C/evolution.xml:6505(para)
-msgid "This feature adds support for viewing the photograph of the sender at the right side of the preview pane."
+#: C/evolution.xml:6704(para)
+msgid ""
+"This feature adds support for viewing the photograph of the sender at the "
+"right side of the preview pane."
 msgstr ""
 
-#: C/evolution.xml:6507(para)
-msgid "To enable this feature, select Edit &gt; Preferences &gt; Mail Preferences &gt; Headers &gt; Show the photograph of sender in the email preview. Deselect this option to disable this feature."
+#: C/evolution.xml:6706(para)
+msgid ""
+"To enable this feature, select Edit &gt; Preferences &gt; Mail Preferences "
+"&gt; Headers &gt; Show the photograph of sender in the email preview. "
+"Deselect this option to disable this feature."
 msgstr ""
 
-#: C/evolution.xml:6508(para)
-msgid "By default it searches only in the local addressbooks enabled for autocompletion. If you deselect the option <guilabel>Search for sender photograph only in the local addressbook</guilabel>, it searches in all the addressbooks enabled for autocompletion. If there are multiple matches for the same contact, it always takes the first one. Consider a contact that has multiple matches - the first one with a photograph and the second without a photo. Here, Evolution takes the first contact regardless of it not having a photograph."
+#: C/evolution.xml:6707(para)
+msgid ""
+"By default it searches only in the local addressbooks enabled for "
+"autocompletion. If you deselect the option <guilabel>Search for sender "
+"photograph only in the local addressbook</guilabel>, it searches in all the "
+"addressbooks enabled for autocompletion. If there are multiple matches for "
+"the same contact, it always takes the first one. Consider a contact that has "
+"multiple matches - the first one with a photograph and the second without a "
+"photo. Here, Evolution takes the first contact regardless of it not having a "
+"photograph."
 msgstr ""
 
-#: C/evolution.xml:6509(para)
-msgid "This feature is disabled by default as it causes delay in fetching the messages."
+#: C/evolution.xml:6708(para)
+msgid ""
+"This feature is disabled by default as it causes delay in fetching the "
+"messages."
 msgstr ""
 
-#: C/evolution.xml:6514(para)
-msgid "You can check your incoming messages for junk content by using Bogofilter and SpamAssassin* tools, which have trainable Bayesian filters. You need to enable the Junk plugins to start filtering junk mail."
+#: C/evolution.xml:6713(para)
+msgid ""
+"You can check your incoming messages for junk content by using Bogofilter "
+"and SpamAssassin* tools, which have trainable Bayesian filters. You need to "
+"enable the Junk plugins to start filtering junk mail."
 msgstr ""
 
-#: C/evolution.xml:6515(para)
+#: C/evolution.xml:6714(para)
 msgid "To enable Junk plugins:"
 msgstr ""
 
-#: C/evolution.xml:6518(para)
-msgid "Select Edit &gt; Plugins"
-msgstr ""
-
-#: C/evolution.xml:6521(para)
-msgid "Select the junk plugins you want. You can select either Bogofilter or SpamAssassin, or you can select both."
+#: C/evolution.xml:6720(para)
+msgid ""
+"Select the junk plugins you want. You can select either Bogofilter or "
+"SpamAssassin, or you can select both."
 msgstr ""
 
-#: C/evolution.xml:6525(title)
+#: C/evolution.xml:6724(title)
 msgid "General:"
 msgstr ""
 
-#: C/evolution.xml:6526(para)
-msgid "You can check incoming e-mail for junk contents and also decide how often you want to delete junk mail. You also have the option to choose either SpamAssassin or Bogofilter, or you can select both."
+#: C/evolution.xml:6725(para)
+msgid ""
+"You can check incoming email for junk contents and also decide how often you "
+"want to delete junk mail. You also have the option to choose either "
+"SpamAssassin or Bogofilter, or you can select both."
 msgstr ""
 
-#: C/evolution.xml:6529(title)
+#: C/evolution.xml:6728(title)
 msgid "Checking Incoming Mail for Junk:"
 msgstr ""
 
-#: C/evolution.xml:6530(para)
+#: C/evolution.xml:6729(para)
 msgid "This option turns automatic junk mail filtering on or off."
 msgstr ""
 
-#: C/evolution.xml:6533(title)
-msgid "Delete junk mails on exit:"
+#: C/evolution.xml:6732(title)
+msgid "Delete junk mail on exit:"
 msgstr ""
 
-#: C/evolution.xml:6534(para)
-msgid "This option deletes junk messages when you exit. You can also specify when to delete the junk messages (every time, once per day, once per week, once per month)."
+#: C/evolution.xml:6733(para)
+msgid ""
+"This option deletes junk messages when you exit. You can also specify when "
+"to delete the junk messages (every time, once per day, once per week, once "
+"per month)."
 msgstr ""
 
-#: C/evolution.xml:6537(title)
+#: C/evolution.xml:6736(title)
 msgid "Default junk plugin:"
 msgstr ""
 
-#: C/evolution.xml:6538(para)
-msgid "Select either SpamAssassin or Bogofilter, or both, as your junk filter. You can view them only if you have enabled the respective plugins. When you select any option, it also reports if the underlying binary is available or not."
+#: C/evolution.xml:6737(para)
+msgid ""
+"Select either SpamAssassin or Bogofilter, or both, as your junk filter. You "
+"can view them only if you have enabled the respective plugins. When you "
+"select any option, it also reports if the underlying binary is available or "
+"not."
 msgstr ""
 
-#: C/evolution.xml:6542(title)
+#: C/evolution.xml:6741(title)
 msgid "SpamAssassin Options:"
 msgstr ""
 
-#: C/evolution.xml:6543(para)
-msgid "Remote Test performs junk mail filtering on remote servers. It also includes online tests, like checking for blacklisted message senders and ISPs."
+#: C/evolution.xml:6742(para)
+msgid ""
+"Remote Test performs junk mail filtering on remote servers. It also includes "
+"online tests, like checking for blacklisted message senders and ISPs."
 msgstr ""
 
-#: C/evolution.xml:6545(para)
-msgid "This option uses tests that require a network connection, such as checking to see if a message is in a list of known junk messages, or if the sender or gateway are blacklisted by anti-spam organizations. Online tests can make filtering slower, because remote tests add to the amount of time it takes to check for junk mail, but they increase accuracy. When you select this option, you do not need to do any additional setup."
+#: C/evolution.xml:6744(para)
+msgid ""
+"This option uses tests that require a network connection, such as checking "
+"to see if a message is in a list of known junk messages, or if the sender or "
+"gateway are blacklisted by anti-spam organizations. Online tests can make "
+"filtering slower, because remote tests add to the amount of time it takes to "
+"check for junk mail, but they increase accuracy. When you select this "
+"option, you do not need to do any additional setup."
 msgstr ""
 
-#: C/evolution.xml:6547(title)
+#: C/evolution.xml:6746(title)
 msgid "Bogofilter Options:"
 msgstr ""
 
-#: C/evolution.xml:6548(para)
-msgid "Select Convert mail text to Unicode to enable Unicode* filtering. For more information on Bogofilter, see the <ulink url=\"http://bogofilter.sourceforge.net/\">Bogofilter site</ulink>."
+#: C/evolution.xml:6747(para)
+msgid ""
+"Select Convert mail text to Unicode to enable Unicode* filtering. For more "
+"information on Bogofilter, see the <ulink url=\"http://bogofilter."
+"sourceforge.net/\">Bogofilter site</ulink>."
 msgstr ""
 
-#: C/evolution.xml:6551(para)
-msgid "Check new messages for junk contents option under Edit &gt; Preferences &gt; Mail Accounts &gt; Edit &gt; Receiving option is enabled only for IMAP. Check incoming mail for junk option under Edit &gt; Prefernces &gt; Mail Preferences &gt; Junk &gt; General refers only to POP and Local Delivery."
+#: C/evolution.xml:6750(para)
+msgid ""
+"Check new messages for junk contents option under Edit &gt; Preferences &gt; "
+"Mail Accounts &gt; Edit &gt; Receiving options is enabled only for IMAP. "
+"Check incoming mail for junk option under Edit &gt; Preferences &gt; Mail "
+"Preferences &gt; Junk &gt; General refers only to POP and Local Delivery."
 msgstr ""
 
-#: C/evolution.xml:6557(para)
-msgid "There are two items in this section: Automatic Contacts automatically adds people that you respond to into your address book. You can select the default address book for automatic contacts from the list."
+#: C/evolution.xml:6756(para)
+msgid ""
+"There are two items in this section: Automatic Contacts automatically adds "
+"people that you respond to into your address book. You can select the "
+"default address book for automatic contacts from the list."
 msgstr ""
 
-#: C/evolution.xml:6558(para)
-msgid "Instant Messaging Contacts periodically synchronizes contact information and images with your instant messaging program. Currently this only works with Pidgin. Your address book must not be a read-only one for both these features to function properly."
+#: C/evolution.xml:6757(para)
+msgid ""
+"Instant Messaging Contacts periodically synchronizes contact information and "
+"images with your instant messaging program. Currently this only works with "
+"Pidgin. Your address book must not be a read-only one for both these "
+"features to function properly."
 msgstr ""
 
-#: C/evolution.xml:6563(para)
-msgid "Allows you to delete messages after you have acted on an appointment. It also allows you to select calendars to search for meeting conflicts."
+#: C/evolution.xml:6762(para)
+msgid ""
+"Allows you to delete messages after you have acted on an appointment. It "
+"also allows you to select calendars to search for meeting conflicts."
 msgstr ""
 
-#: C/evolution.xml:6569(para)
-msgid "There are three tabs for message composer settings where you can set the composer preferences. The General tab covers shortcuts and assorted behavior, the Signature tab sets your signature, and the Spell Checking tab controls spell checking."
+#: C/evolution.xml:6768(para)
+msgid ""
+"There are three tabs for message composer settings where you can set the "
+"composer preferences. The General tab covers assorted behavior, the "
+"Signature tab sets your signature, and the Spell Checking tab controls spell "
+"checking."
 msgstr ""
 
-#: C/evolution.xml:6575(link)
-#: C/evolution.xml:6615(title)
+#: C/evolution.xml:6774(link) C/evolution.xml:6814(title)
 msgid "Signature"
 msgstr ""
 
-#: C/evolution.xml:6578(link)
-#: C/evolution.xml:6620(title)
+#: C/evolution.xml:6777(link) C/evolution.xml:6819(title)
 msgid "Spell Checking"
 msgstr ""
 
-#: C/evolution.xml:6584(para)
-msgid "In the General tab, you can set the following options:"
-msgstr ""
-
-#: C/evolution.xml:6586(title)
+#: C/evolution.xml:6785(title)
 msgid "Default Behavior:"
 msgstr ""
 
-#: C/evolution.xml:6587(para)
-msgid "Choose how to normally forward and reply to messages, what character set they will use, whether they are in HTML, and whether that HTML can contain graphic emoticons."
+#: C/evolution.xml:6786(para)
+msgid ""
+"Choose how to normally forward and reply to messages, what character set "
+"they will use, whether they are in HTML, and whether that HTML can contain "
+"graphic emoticons."
 msgstr ""
 
-#: C/evolution.xml:6589(para)
-msgid "You can forward messages either as an attachment or inline, or else as quoted. Choose reply style from the drop-down list: Quote original message, Do not quote original message, Attach original message."
+#: C/evolution.xml:6788(para)
+msgid ""
+"You can forward messages either as an attachment or inline, or else as "
+"quoted. Choose reply style from the drop-down list: Quote original message, "
+"Do not quote original message, Attach original message."
 msgstr ""
 
-#: C/evolution.xml:6591(title)
+#: C/evolution.xml:6790(title)
 msgid "Top Posting Options:"
 msgstr ""
 
-#: C/evolution.xml:6592(para)
-msgid "When replying, you can choose where to place your signature in the message. You can place the signature either above the original message or at the end of the composer window. Top Posting is not recommended because placing the signature other than at the end of the message is against the mailing standards."
+#: C/evolution.xml:6791(para)
+msgid ""
+"When replying, you can choose where to place your signature in the message. "
+"You can place the signature either above the original message or at the end "
+"of the composer window. Top Posting is not recommended because placing the "
+"signature other than at the end of the message is against the mailing "
+"standards."
 msgstr ""
 
-#: C/evolution.xml:6595(title)
-#: C/evolution.xml:6667(title)
+#: C/evolution.xml:6794(title) C/evolution.xml:6867(title)
 msgid "Alerts:"
 msgstr ""
 
-#: C/evolution.xml:6596(para)
+#: C/evolution.xml:6795(para)
 msgid "There are two optional alerts you can select:"
 msgstr ""
 
-#: C/evolution.xml:6601(title)
+#: C/evolution.xml:6800(title)
 msgid "Prompt When Sending Messages With an Empty Subject Line:"
 msgstr ""
 
-#: C/evolution.xml:6602(para)
+#: C/evolution.xml:6801(para)
 msgid "The composer warns you if you try to send a message without a subject."
 msgstr ""
 
-#: C/evolution.xml:6607(title)
+#: C/evolution.xml:6806(title)
 msgid "Prompt When Sending Messages with Only Bcc Recipients Defined:"
 msgstr ""
 
-#: C/evolution.xml:6608(para)
-msgid "The composer warns you if you try to send a message that has only Bcc recipients. This is important because some mail servers fail to transmit blind carbon copy if you do not have at least one recipient that is visible to all readers."
+#: C/evolution.xml:6807(para)
+msgid ""
+"The composer warns you if you try to send a message that has only Bcc "
+"recipients. This is important because some mail servers fail to transmit "
+"blind carbon copy if you do not have at least one recipient that is visible "
+"to all readers."
 msgstr ""
 
-#: C/evolution.xml:6616(para)
-msgid "The signature editor allows you to create several different signatures in plain text or in HTML, and to specify which of them will be added to e-mail you create in the message composer. If you prefer to use an alternate signature or none at all, you can select it from the mail composer itself."
+#: C/evolution.xml:6815(para)
+msgid ""
+"The signature editor allows you to create several different signatures in "
+"plain text or in HTML, and to specify which of them will be added to email "
+"you create in the message composer. If you prefer to use an alternate "
+"signature or none at all, you can select it from the mail composer itself."
 msgstr ""
 
-#: C/evolution.xml:6621(para)
-msgid "To choose a spell-checking language, select it here. You must install the gnome-spell package, for spell-checking to be available in Evolution. Additional dictionaries are also available through <trademark class=\"registered\">Red Carpet</trademark> and are detected automatically if you have installed them. You must also install the aspell package. If this is the case, please contact your packager. To have the composer automatically check your spelling while you type, select Check Spelling While I Type. You can set the color for misspelled words."
+#: C/evolution.xml:6820(para)
+msgid ""
+"To choose a spell-checking language, select it here. You must install gnome-"
+"spell, aspell, and an aspell language package (like for example aspell-en "
+"for english language) for spell-checking to be available in Evolution. "
+"Additional dictionaries are available through your package manager and are "
+"detected automatically if you have installed them. To have the composer "
+"automatically check your spelling while you type, select Check Spelling "
+"While I Type. You can set the color for misspelled words."
 msgstr ""
 
-#: C/evolution.xml:6627(para)
-msgid "The calendar configuration tool has four pages:"
+#: C/evolution.xml:6827(para)
+msgid "The calendar configuration tool has several pages:"
 msgstr ""
 
-#: C/evolution.xml:6633(link)
-#: C/evolution.xml:6673(title)
+#: C/evolution.xml:6833(link) C/evolution.xml:6873(title)
 msgid "Display"
 msgstr ""
 
-#: C/evolution.xml:6636(link)
-#: C/evolution.xml:6706(title)
+#: C/evolution.xml:6836(link) C/evolution.xml:6906(title)
 msgid "Alarms"
 msgstr ""
 
-#: C/evolution.xml:6639(link)
-#: C/evolution.xml:6719(title)
+#: C/evolution.xml:6839(link) C/evolution.xml:6919(title)
 msgid "Calendar Publishing"
 msgstr ""
 
-#: C/evolution.xml:6645(para)
+#: C/evolution.xml:6845(para)
 msgid "The General page lets you set the following options:"
 msgstr ""
 
-#: C/evolution.xml:6647(title)
+#: C/evolution.xml:6847(title)
 msgid "Time Zone:"
 msgstr ""
 
-#: C/evolution.xml:6648(para)
+#: C/evolution.xml:6848(para)
 msgid "The city you're located in, to specify your time zone."
 msgstr ""
 
-#: C/evolution.xml:6651(title)
+#: C/evolution.xml:6851(title)
 msgid "Time Format:"
 msgstr ""
 
-#: C/evolution.xml:6652(para)
+#: C/evolution.xml:6852(para)
 msgid "Choose between twelve-hour (AM/PM) and twenty-four-hour time formats."
 msgstr ""
 
-#: C/evolution.xml:6655(title)
+#: C/evolution.xml:6855(title)
 msgid "Week Starts:"
 msgstr ""
 
-#: C/evolution.xml:6656(para)
+#: C/evolution.xml:6856(para)
 msgid "Select the day to display as the first in each week."
 msgstr ""
 
-#: C/evolution.xml:6659(title)
+#: C/evolution.xml:6859(title)
 msgid "Day Begins:"
 msgstr ""
 
-#: C/evolution.xml:6660(para)
-msgid "For Evolution, a normal work day begins at 9 a.m. and ends at 5 p.m. You can select your preferred hours to make sure that all your events are displayed properly."
+#: C/evolution.xml:6860(para)
+msgid ""
+"For Evolution, a normal work day begins at 9 a.m. and ends at 5 p.m. You can "
+"select your preferred hours."
 msgstr ""
 
-#: C/evolution.xml:6663(title)
+#: C/evolution.xml:6863(title)
 msgid "Day Ends:"
 msgstr ""
 
-#: C/evolution.xml:6664(para)
+#: C/evolution.xml:6864(para)
 msgid "Sets the end of a normal workday."
 msgstr ""
 
-#: C/evolution.xml:6668(para)
-msgid "If you want to be warned before you delete any appointment, or to have a reminder automatically appear for each event, select the options here."
+#: C/evolution.xml:6868(para)
+msgid ""
+"If you want to be warned before you delete any appointment, or to have a "
+"reminder automatically appear for each event, select the options here."
 msgstr ""
 
-#: C/evolution.xml:6674(para)
-msgid "The Display page lets you choose how your appointments and tasks appear in your calendar."
+#: C/evolution.xml:6874(para)
+msgid ""
+"The Display page lets you choose how your appointments and tasks appear in "
+"your calendar."
 msgstr ""
 
-#: C/evolution.xml:6676(title)
+#: C/evolution.xml:6876(title)
 msgid "Time Divisions:"
 msgstr ""
 
-#: C/evolution.xml:6677(para)
-msgid "Sets the time increments shown as fine lines on the daily view in the calendar."
+#: C/evolution.xml:6877(para)
+msgid ""
+"Sets the time increments shown as fine lines on the daily view in the "
+"calendar."
 msgstr ""
 
-#: C/evolution.xml:6680(title)
+#: C/evolution.xml:6880(title)
 msgid "Show appointment end times in week and month views:"
 msgstr ""
 
-#: C/evolution.xml:6681(para)
-msgid "If there is space, Evolution shows the end times in the week and month views for each appointment."
+#: C/evolution.xml:6881(para)
+msgid ""
+"If there is space, Evolution shows the end times in the week and month views "
+"for each appointment."
 msgstr ""
 
-#: C/evolution.xml:6684(title)
+#: C/evolution.xml:6884(title)
 msgid "Compress weekends in month view:"
 msgstr ""
 
-#: C/evolution.xml:6685(para)
-msgid "Select this option to display weekends in one box instead of two in the month view."
+#: C/evolution.xml:6885(para)
+msgid ""
+"Select this option to display weekends in one box instead of two in the "
+"month view."
 msgstr ""
 
-#: C/evolution.xml:6688(title)
+#: C/evolution.xml:6888(title)
 msgid "Show week numbers in date navigator:"
 msgstr ""
 
-#: C/evolution.xml:6689(para)
+#: C/evolution.xml:6889(para)
 msgid "Shows the week numbers next to the respective weeks in the calendar."
 msgstr ""
 
-#: C/evolution.xml:6692(title)
+#: C/evolution.xml:6892(title)
 msgid "Tasks due today:"
 msgstr ""
 
-#: C/evolution.xml:6693(para)
+#: C/evolution.xml:6893(para)
 msgid "Select the color for tasks due today."
 msgstr ""
 
-#: C/evolution.xml:6696(title)
+#: C/evolution.xml:6896(title)
 msgid "Overdue tasks:"
 msgstr ""
 
-#: C/evolution.xml:6697(para)
+#: C/evolution.xml:6897(para)
 msgid "Select the color for overdue tasks."
 msgstr ""
 
-#: C/evolution.xml:6700(title)
+#: C/evolution.xml:6900(title)
 msgid "Hide completed tasks after:"
 msgstr ""
 
-#: C/evolution.xml:6701(para)
-msgid "Select this option to have completed tasks hidden after a period of time measured in days, hours, or minutes. If you don't select this option, completed tasks remain in your task list, marked as complete."
+#: C/evolution.xml:6901(para)
+msgid ""
+"Select this option to have completed tasks hidden after a period of time "
+"measured in days, hours, or minutes. If you don't select this option, "
+"completed tasks remain in your task list, marked as complete."
 msgstr ""
 
-#: C/evolution.xml:6708(title)
+#: C/evolution.xml:6908(title)
 msgid "Select the Calendars for Alarm Notification:"
 msgstr ""
 
-#: C/evolution.xml:6709(para)
-msgid "Select the calendars for which you want an alarm notification. If you don't select the calendar, you will not have an alarm notification for any event in this calendar."
+#: C/evolution.xml:6909(para)
+msgid ""
+"Select the calendars for which you want an alarm notification. If you don't "
+"select the calendar, you will not have an alarm notification for any event "
+"in this calendar."
 msgstr ""
 
-#: C/evolution.xml:6714(title)
+#: C/evolution.xml:6914(title)
 msgid "Free/Busy"
 msgstr ""
 
-#: C/evolution.xml:6715(para)
-msgid "Allows you to specify a template to use while posting your Free/Buy information to a server."
+#: C/evolution.xml:6921(title)
+msgid "Publishing:"
 msgstr ""
 
-#: C/evolution.xml:6721(title)
-msgid "Publishing:"
+#: C/evolution.xml:6922(para)
+msgid ""
+"Allows you to select a URL to post your calendar information to. When you "
+"add a URL, you can specify the publishing location, the frequency of "
+"publishing, which calendar to publish, and who to authenticate as."
 msgstr ""
 
-#: C/evolution.xml:6722(para)
-msgid "Allows you to select a URL to post your calendar information to. When you add a URL, you can specify the publishing location, the frequency of publishing, which calendar to publish, and who to authenticate as."
+#: C/evolution.xml:6928(title)
+msgid "Network Preferences"
+msgstr "Nastavení sítě"
+
+#: C/evolution.xml:6929(para)
+msgid "This interface lets you configure your network proxy settings."
 msgstr ""
 
-#: C/evolution.xml:6729(para)
-msgid "Evolution allows you to add certificates for yourself as well as for contacts. This allows you to communicate with others securely over an encrypted connection, or sign a message confirming your identity to the contact. These settings only apply to S/MIME encryption."
+#: C/evolution.xml:6931(para)
+msgid "Use the following four options to configure the proxy settings:"
+msgstr ""
+
+#: C/evolution.xml:6933(title)
+msgid "Use system defaults:"
+msgstr ""
+
+#: C/evolution.xml:6934(para)
+msgid ""
+"Select this option to use the system wide proxy settings configured through "
+"Control Center &gt; Network Proxies in GNOME. When this option is selected, "
+"Evolution uses the proxy settings in the /system/http_proxy and /system/"
+"proxy/gconf keys."
+msgstr ""
+
+#: C/evolution.xml:6937(para)
+msgid ""
+"If these keys do not reflect the settings configured through Control Center "
+"&gt; Network Proxies, Evolution does not work with the proxy and you must "
+"either update these gconf keys or choose Manual proxy configuration."
+msgstr ""
+
+#: C/evolution.xml:6940(title)
+msgid "Direct connection to the Internet:"
+msgstr ""
+
+#: C/evolution.xml:6941(para)
+msgid "Select this option to connect directly to the internet."
+msgstr "Vyberte tuto možnost pro přímé připojení do internetu."
+
+#: C/evolution.xml:6944(title)
+msgid "Manual proxy configuration:"
+msgstr "Ruční nastavení proxy:"
+
+#: C/evolution.xml:6945(para)
+msgid ""
+"This option helps you costomize proxy settings regardless of the desktop you "
+"use. Specify hosts and ports for HTTP and optionally for other protocols. In "
+"the No Proxy Domain field, specify that comma-separated domain names do not "
+"go through the configured proxy server. You can specify patterns like *."
+"example.com or .example.com in the No Proxy Domain list. Specify a username "
+"and password, and if the proxy server requires authentication, select Use "
+"Authentication to enable the username and password fields. The customized "
+"proxy settings are as follows:"
+msgstr ""
+
+#: C/evolution.xml:6954(para)
+msgid "Proxy Configuration Settings"
+msgstr "Nastavení proxy"
+
+#: C/evolution.xml:6964(para)
+msgid "HTTP Proxy"
+msgstr ""
+
+#: C/evolution.xml:6967(para)
+msgid "The machine name to proxy HTTP through."
 msgstr ""
 
-#: C/evolution.xml:6731(title)
+#: C/evolution.xml:6972(para) C/evolution.xml:6988(para)
+#: C/evolution.xml:7004(para)
+msgid "Port"
+msgstr "Port"
+
+#: C/evolution.xml:6975(para)
+msgid ""
+"The port for the machine defined by the HTTP Proxy field that you proxy "
+"through."
+msgstr ""
+
+#: C/evolution.xml:6980(para)
+msgid "Secure HTTP Proxy"
+msgstr ""
+
+#: C/evolution.xml:6983(para)
+msgid "The machine name to proxy secure HTTP through."
+msgstr ""
+
+#: C/evolution.xml:6991(para)
+msgid "The port for the machine defined by the Secure HTTP Proxy port field."
+msgstr ""
+
+#: C/evolution.xml:6996(para)
+msgid "SOCKS Host"
+msgstr ""
+
+#: C/evolution.xml:6999(para)
+msgid "The machine name to proxy SOCKS through."
+msgstr ""
+
+#: C/evolution.xml:7007(para)
+msgid "The port for the machine defined by the SOCKS host."
+msgstr ""
+
+#: C/evolution.xml:7012(para)
+msgid "No proxy domain"
+msgstr ""
+
+#: C/evolution.xml:7015(para)
+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 "
+"(using an initial wildcard like *.example.com), IP host addresses (both IPv4 "
+"and IPv6) and network addresses with a netmask similar to 192.168.0.0/24."
+msgstr ""
+
+#: C/evolution.xml:7020(para)
+msgid "Use authentication"
+msgstr ""
+
+#: C/evolution.xml:7023(para)
+msgid ""
+"If this option is enabled, it uses authentication to connect via the proxy "
+"server."
+msgstr ""
+
+#: C/evolution.xml:7028(para)
+msgid "Username"
+msgstr "Jméno uživatele"
+
+#: C/evolution.xml:7031(para)
+msgid "Username used to authenticate when performing an HTTP proxying."
+msgstr ""
+
+#: C/evolution.xml:7036(para)
+msgid "Password"
+msgstr ""
+
+#: C/evolution.xml:7039(para)
+msgid "Password used to authenticate when performing an HTTP proxying."
+msgstr ""
+
+#: C/evolution.xml:7046(title)
+msgid "Automatic proxy configuration URL:"
+msgstr ""
+
+#: C/evolution.xml:7047(para)
+msgid ""
+"Specify the automatic proxy configuration URL for Evolution to use in the "
+"autoconfig script to configure the proxy."
+msgstr ""
+
+#: C/evolution.xml:7053(para)
+msgid ""
+"Evolution allows you to add certificates for yourself as well as for "
+"contacts. This allows you to communicate with others securely over an "
+"encrypted connection, or sign a message confirming your identity to the "
+"contact. These settings only apply to S/MIME encryption."
+msgstr ""
+
+#: C/evolution.xml:7055(title)
 msgid "Your Certificates:"
 msgstr ""
 
-#: C/evolution.xml:6732(para)
-msgid "Click the Your Certificates tab to display a list of certificates that you own. You can import, view, back up and delete your certificates from this page."
+#: C/evolution.xml:7056(para)
+msgid ""
+"Click the Your Certificates tab to display a list of certificates that you "
+"own. You can import, view and delete your certificates from this page."
 msgstr ""
 
-#: C/evolution.xml:6735(title)
+#: C/evolution.xml:7059(title)
 msgid "Contact Certificates:"
 msgstr ""
 
-#: C/evolution.xml:6736(para)
-msgid "Click the Contact Certificates tab to display a list of certificates that you have for contacts. These certificates allow you to decrypt messages as well verify signed messages. You can import, view, edit, and delete your contact certificates from this page."
+#: C/evolution.xml:7060(para)
+msgid ""
+"Click the Contact Certificates tab to display a list of certificates that "
+"you have for contacts. These certificates allow you to decrypt messages as "
+"well verify signed messages. You can import, view, edit, and delete your "
+"contact certificates from this page."
 msgstr ""
 
-#: C/evolution.xml:6739(title)
+#: C/evolution.xml:7063(title)
 msgid "Authorities:"
 msgstr ""
 
-#: C/evolution.xml:6740(para)
-msgid "Click the Authorities tab to display a list of trusted certificate authorities who verify that the certificate you have is valid. You can import, view, edit, and delete certificate authorities from this page."
+#: C/evolution.xml:7064(para)
+msgid ""
+"Click the Authorities tab to display a list of trusted certificate "
+"authorities who verify that the certificate you have is valid. You can "
+"import, view, edit, and delete certificate authorities from this page."
 msgstr ""
 
-#: C/evolution.xml:6746(para)
+#: C/evolution.xml:7070(para)
 msgid "There are two main tasks for configuring contact information:"
 msgstr ""
 
-#: C/evolution.xml:6749(link)
-#: C/evolution.xml:6757(title)
+#: C/evolution.xml:7073(link) C/evolution.xml:7081(title)
 msgid "Creating a Contact"
 msgstr ""
 
-#: C/evolution.xml:6752(link)
-#: C/evolution.xml:6779(title)
+#: C/evolution.xml:7076(link) C/evolution.xml:7103(title)
 msgid "Creating an Address Book"
 msgstr ""
 
-#: C/evolution.xml:6758(para)
+#: C/evolution.xml:7082(para)
 msgid "To add a new contact list, either local or remote:"
 msgstr ""
 
-#: C/evolution.xml:6761(para)
+#: C/evolution.xml:7085(para)
 msgid "Click Contacts in the Switcher."
 msgstr ""
 
-#: C/evolution.xml:6764(para)
+#: C/evolution.xml:7088(para)
 msgid "Click the down-arrow next to New."
 msgstr ""
 
-#: C/evolution.xml:6767(para)
+#: C/evolution.xml:7091(para)
 msgid "Select Contact List."
 msgstr ""
 
-#: C/evolution.xml:6770(para)
+#: C/evolution.xml:7094(para)
 msgid "Type a name and location for the Address Book."
 msgstr ""
 
-#: C/evolution.xml:6782(para)
+#: C/evolution.xml:7106(para)
 msgid "Click File &gt; New &gt; Address Book."
 msgstr ""
 
-#: C/evolution.xml:6785(para)
+#: C/evolution.xml:7109(para)
 msgid "Select the type of Address Book."
 msgstr ""
 
-#: C/evolution.xml:6787(title)
+#: C/evolution.xml:7111(title)
 msgid "On This Computer:"
 msgstr ""
 
-#: C/evolution.xml:6788(para)
+#: C/evolution.xml:7112(para)
 msgid "Creates a local address book on the computer."
 msgstr ""
 
-#: C/evolution.xml:6791(title)
+#: C/evolution.xml:7115(title)
 msgid "On LDAP Server:"
 msgstr ""
 
-#: C/evolution.xml:6792(para)
+#: C/evolution.xml:7116(para)
 msgid "Creates an address book on the LDAP server."
 msgstr ""
 
-#: C/evolution.xml:6795(title)
+#: C/evolution.xml:7119(title)
 msgid "Specific Account:"
 msgstr ""
 
-#: C/evolution.xml:6796(para)
-msgid "If you have an account that allows you to create an address book on that server, you can select that account."
+#: C/evolution.xml:7120(para)
+msgid ""
+"If you have an account that allows you to create an address book on that "
+"server, you can select that account."
 msgstr ""
 
-#: C/evolution.xml:6800(para)
-msgid "If you selected On This Computer, specify the name of the computer, and choose whether you want to the new address book as your default folder."
+#: C/evolution.xml:7124(para)
+msgid ""
+"If you selected On This Computer, specify the name of the address book, and "
+"choose whether you want to the new address book as your default folder."
 msgstr ""
 
-#: C/evolution.xml:6802(para)
-msgid "If you are creating an <link linkend=\"ldap\">LDAP</link> server, enter the server information as requested by the assistant:"
+#: C/evolution.xml:7126(para)
+msgid ""
+"If you are creating an address book on an <link linkend=\"ldap\">LDAP</link> "
+"server, enter the server information as requested by the assistant:"
 msgstr ""
 
-#: C/evolution.xml:6804(title)
+#: C/evolution.xml:7128(title)
 msgid "Server Name:"
 msgstr ""
 
-#: C/evolution.xml:6805(para)
+#: C/evolution.xml:7129(para)
 msgid "The Internet address of the contact server you are using."
 msgstr ""
 
-#: C/evolution.xml:6808(title)
+#: C/evolution.xml:7132(title)
 msgid "Login Method:"
 msgstr ""
 
-#: C/evolution.xml:6809(para)
-msgid "Specify whether your login is anonymous, uses an e-mail address, or uses a distinguished name. If the login is not anonymous, specify the e-mail address or distinguished name (DN) required by the server."
+#: C/evolution.xml:7133(para)
+msgid ""
+"Specify whether your login is anonymous, uses an email address, or uses a "
+"distinguished name. If the login is not anonymous, specify the email address "
+"or distinguished name (DN) required by the server."
 msgstr ""
 
-#: C/evolution.xml:6812(title)
+#: C/evolution.xml:7136(title)
 msgid "Port:"
 msgstr ""
 
-#: C/evolution.xml:6813(para)
-msgid "The Internet port Evolution connects to in order to access the LDAP database. This is normally 389."
+#: C/evolution.xml:7137(para)
+msgid ""
+"The Internet port Evolution connects to in order to access the LDAP "
+"database. This is normally 389."
 msgstr ""
 
-#: C/evolution.xml:6816(title)
+#: C/evolution.xml:7140(title)
 msgid "Use SSL/TLS:"
 msgstr ""
 
-#: C/evolution.xml:6817(para)
-msgid "SSL and TLS are security mechanisms. If you select Always, Evolution does not connect unless secure connections are available. The default value is Whenever Possible, which uses secure connections if they are available, but does not cause failure if they are not."
+#: C/evolution.xml:7141(para)
+msgid ""
+"SSL and TLS are security mechanisms. If you select No Encryption, Evolution "
+"will send your password unencrypted. By using SSL or TLS, a secure "
+"connection will be used and your password will be sent encrypted."
 msgstr ""
 
-#: C/evolution.xml:6820(title)
+#: C/evolution.xml:7144(title)
 msgid "Details: Search Base:"
 msgstr ""
 
-#: C/evolution.xml:6821(para)
-msgid "The <link linkend=\"search-base\">search base</link> is the starting point for a directory search. Contact your network administrator for information about the correct settings."
+#: C/evolution.xml:7145(para)
+msgid ""
+"The <link linkend=\"search-base\">search base</link> is the starting point "
+"for a directory search. Contact your network administrator for information "
+"about the correct settings."
 msgstr ""
 
-#: C/evolution.xml:6824(title)
+#: C/evolution.xml:7148(title)
 msgid "Search Scope:"
 msgstr ""
 
-#: C/evolution.xml:6825(para)
-msgid "The <link linkend=\"search-scope\">search scope</link> is the breadth of a given search. The following options are available:"
+#: C/evolution.xml:7149(para)
+msgid ""
+"The <link linkend=\"search-scope\">search scope</link> is the breadth of a "
+"given search. The following options are available:"
 msgstr ""
 
-#: C/evolution.xml:6830(title)
+#: C/evolution.xml:7154(title)
 msgid "One:"
 msgstr ""
 
-#: C/evolution.xml:6831(para)
+#: C/evolution.xml:7155(para)
 msgid "Searches the Search Base and one entry below it."
 msgstr ""
 
-#: C/evolution.xml:6836(title)
+#: C/evolution.xml:7160(title)
 msgid "Sub:"
 msgstr ""
 
-#: C/evolution.xml:6837(para)
+#: C/evolution.xml:7161(para)
 msgid "Searches the Search Base and all entries below it."
 msgstr ""
 
-#: C/evolution.xml:6842(title)
+#: C/evolution.xml:7166(title)
 msgid "Timeout (minutes):"
 msgstr ""
 
-#: C/evolution.xml:6843(para)
-msgid "The maximum time Evolution attempts to download data from the server before giving up."
+#: C/evolution.xml:7167(para)
+msgid ""
+"The maximum time Evolution attempts to download data from the server before "
+"giving up."
 msgstr ""
 
-#: C/evolution.xml:6848(title)
+#: C/evolution.xml:7172(title)
 msgid "Download Limit:"
 msgstr ""
 
-#: C/evolution.xml:6849(para)
-msgid "The maximum number of results for a given search. Most servers refuse to send more than 500, but you can set the number lower if you want to shorten downloads for very broad searches."
+#: C/evolution.xml:7173(para)
+msgid ""
+"The maximum number of results for a given search. Most servers refuse to "
+"send more than 500, but you can set the number lower if you want to shorten "
+"downloads for very broad searches."
 msgstr ""
 
-#: C/evolution.xml:6854(title)
+#: C/evolution.xml:7178(title)
 msgid "Display Name:"
 msgstr ""
 
-#: C/evolution.xml:6855(para)
-msgid "The name you want to use as a label for this folder. It can be any name you choose."
+#: C/evolution.xml:7179(para)
+msgid ""
+"The name you want to use as a label for this folder. It can be any name you "
+"choose."
 msgstr ""
 
-#: C/evolution.xml:6860(title)
+#: C/evolution.xml:7184(title)
 msgid "Search Filter:"
 msgstr ""
 
-#: C/evolution.xml:6861(para)
-msgid "The search filter can be set here for all the LDAP queries. For example:"
+#: C/evolution.xml:7185(para)
+msgid ""
+"The search filter can be set here for all the LDAP queries. For example:"
 msgstr ""
 
-#: C/evolution.xml:6863(para)
-msgid "ObjectClass=*: Lists all the objects from the server.ObjectClass=User: Lists only the user objects.Filter (|(ObjectClass=User)(ObjectClass=groupOfNames)): Retrieves the User and Contact List objects.(&amp;(mail=*)(ObjectClass=*)): Lists the objects associated with the e-mail addresses."
+#: C/evolution.xml:7187(para)
+msgid ""
+"ObjectClass=*: Lists all the objects from the server.ObjectClass=User: Lists "
+"only the users. Filter (|(ObjectClass=User)(ObjectClass=groupOfNames)): "
+"Retrieves the User and Contact List objects.(&amp;(mail=*)(ObjectClass=*)): "
+"Lists the objects associated with the email addresses."
 msgstr ""
 
-#: C/evolution.xml:6865(para)
-msgid "If you change any LDAP address book configurations, Evolution and the Evolution Data Server need to be restarted in order to see the changes."
+#: C/evolution.xml:7189(para)
+msgid ""
+"If you change any LDAP address book configurations, Evolution and the "
+"Evolution Data Server need to be restarted in order to see the changes."
 msgstr ""
 
-#: C/evolution.xml:6868(para)
-msgid "If you are creating the address book for a specific account, type the name of the address book if you want the address book stored locally when offline, and if you want the address book to be your default folder."
+#: C/evolution.xml:7192(para)
+msgid ""
+"If you are creating the address book for a specific account, type the name "
+"of the address book if you want the address book stored locally when "
+"offline, and if you want the address book to be your default folder."
 msgstr ""
 
-#: C/evolution.xml:6879(para)
-msgid "Evolution allows you to view the error logs and set the display duration for the error messages that appear in the statusbar. When an error occurs, statusbar displays the error message for the specified time, then it is moved to the debug file."
+#: C/evolution.xml:7203(para)
+msgid ""
+"Evolution allows you to view the error logs and set the display duration for "
+"the error messages that appear in the statusbar. When an error occurs, "
+"statusbar displays the error message for the specified time, then it is "
+"moved to the debug file."
 msgstr ""
 
-#: C/evolution.xml:6882(para)
+#: C/evolution.xml:7206(para)
 msgid "From the Help menu, select Debug Logs."
 msgstr ""
 
-#: C/evolution.xml:6886(para)
+#: C/evolution.xml:7210(para)
 msgid "Specify the display duration for the error messages."
 msgstr ""
 
-#: C/evolution.xml:6887(para)
+#: C/evolution.xml:7211(para)
 msgid "The messages remain in the statusbar for this specified time."
 msgstr ""
 
-#: C/evolution.xml:6891(para)
-msgid "The <inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-warning.png\"/> icon indicates that the error message is a warning. The <inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-info.png\"/> icon indicates an informational message."
-msgstr "Ikona <inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-warning.png\"/> signalizuje, že chybová zpráva je varováním. Ikona <inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-info.png\"/> signalizuje informační zprávu."
+#: C/evolution.xml:7215(para)
+msgid ""
+"The <inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-warning.png\"/"
+"> icon indicates that the error message is a warning. The <inlinegraphic "
+"format=\"PNG\" fileref=\"figures/evo_dialog-info.png\"/> icon indicates an "
+"informational message."
+msgstr ""
+"Ikona <inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-warning.png"
+"\"/> signalizuje, že chybová zpráva je varováním. Ikona <inlinegraphic "
+"format=\"PNG\" fileref=\"figures/evo_dialog-info.png\"/> signalizuje "
+"informační zprávu."
 
-#: C/evolution.xml:6898(para)
-msgid "Synchronization presents you with three issues you need to address. First, you need to enable synchronization. Second, your computer needs to recognize and access your handheld. At this time, <trademark>Evolution</trademark> only supports Palm OS devices like the PalmPilot* and the Handspring Visor. Third, you should decide what sort of synchronization behavior you want."
+#: C/evolution.xml:7222(para)
+msgid ""
+"Synchronization presents you with three issues you need to address. First, "
+"you need to enable synchronization. Second, your computer needs to recognize "
+"and access your handheld. At this time, <trademark>Evolution</trademark> "
+"only supports Palm OS devices like the PalmPilot* and the Handspring Visor. "
+"Third, you should decide what sort of synchronization behavior you want."
 msgstr ""
 
-#: C/evolution.xml:6901(link)
-#: C/evolution.xml:6912(title)
+#: C/evolution.xml:7225(link) C/evolution.xml:7236(title)
 msgid "Enabling Synchronization"
 msgstr ""
 
-#: C/evolution.xml:6904(link)
-#: C/evolution.xml:6917(title)
+#: C/evolution.xml:7228(link) C/evolution.xml:7241(title)
 msgid "Selecting Conduits"
 msgstr ""
 
-#: C/evolution.xml:6907(link)
-#: C/evolution.xml:6940(title)
+#: C/evolution.xml:7231(link) C/evolution.xml:7264(title)
 msgid "Synchronizing Information"
 msgstr ""
 
-#: C/evolution.xml:6913(para)
-msgid "If you haven't used a handheld device with your computer before, you need to run the GNOME Control Center by clicking System &gt; Settings, and make sure that Pilot Link is properly configured. Make sure that you have read and write permissions on the device, which is normally n /dev/pilot. If that does not work, check in /dev/ttyS0 if you have a serial connection, or in /dev/ttyUSB1 for a USB connection. You can do this by becoming root and adding your username to the group that owns this device node. For a USB device on sync, two device nodes are created, ttyUSB0 and ttyUSB1. The second node is the one to be used in configuring the device."
+#: C/evolution.xml:7237(para)
+msgid ""
+"If you haven't used a handheld device with your computer before, you need to "
+"run the GNOME Control Center by clicking System &gt; Settings, and make sure "
+"that Pilot Link is properly configured. Make sure that you have read and "
+"write permissions on the device, which is normally in /dev/pilot. If that "
+"does not work, check in /dev/ttyS0 if you have a serial connection, or in /"
+"dev/ttyUSB1 for a USB connection. You can do this by becoming root and "
+"adding your username to the group that owns this device node. For a USB "
+"device on sync, two device nodes are created, ttyUSB0 and ttyUSB1. The "
+"second node is the one to be used in configuring the device."
 msgstr ""
 
-#: C/evolution.xml:6918(para)
-msgid "After your computer and your Palm OS device are communicating, select the <link linkend=\"conduit\">conduits</link> you want under the Pilot Conduits section of the Control Center. You can use conduits to synchronize data with several applications; the Evolution conduits are labeled EAddress, for the contacts in your address book; ECalendar, for your calendar; and ETodo, for your task list."
+#: C/evolution.xml:7242(para)
+msgid ""
+"After your computer and your Palm OS device are communicating, select the "
+"<link linkend=\"conduit\">conduits</link> you want under the Pilot Conduits "
+"section of the Control Center. You can use conduits to synchronize data with "
+"several applications; the Evolution conduits are labeled EAddress, for the "
+"contacts in your address book; ECalendar, for your calendar; and ETodo, for "
+"your task list."
 msgstr ""
 
-#: C/evolution.xml:6919(para)
-msgid "Click Enable, then click Settings to change what the conduit does when activated. Your options can vary depending on the conduit, but typically they are as follows:"
+#: C/evolution.xml:7243(para)
+msgid ""
+"Click Enable, then click Settings to change what the conduit does when "
+"activated. Your options can vary depending on the conduit, but typically "
+"they are as follows:"
 msgstr ""
 
-#: C/evolution.xml:6921(title)
+#: C/evolution.xml:7245(title)
 msgid "Disabled:"
 msgstr ""
 
-#: C/evolution.xml:6922(para)
+#: C/evolution.xml:7246(para)
 msgid "Do nothing."
 msgstr ""
 
-#: C/evolution.xml:6925(title)
+#: C/evolution.xml:7249(title)
 msgid "Synchronize:"
 msgstr ""
 
-#: C/evolution.xml:6926(para)
-msgid "Copy new data from the computer to the handheld, and from the handheld to the computer. Remove items that were on both systems but have been deleted on one."
+#: C/evolution.xml:7250(para)
+msgid ""
+"Copy new data from the computer to the handheld, and from the handheld to "
+"the computer. Remove items that were on both systems but have been deleted "
+"on one."
 msgstr ""
 
-#: C/evolution.xml:6929(title)
+#: C/evolution.xml:7253(title)
 msgid "Copy From Pilot:"
 msgstr ""
 
-#: C/evolution.xml:6930(para)
-msgid "If there is any new data on the handheld device, copy it to the computer."
+#: C/evolution.xml:7254(para)
+msgid ""
+"If there is any new data on the handheld device, copy it to the computer."
 msgstr ""
 
-#: C/evolution.xml:6933(title)
+#: C/evolution.xml:7257(title)
 msgid "Copy To Pilot:"
 msgstr ""
 
-#: C/evolution.xml:6934(para)
+#: C/evolution.xml:7258(para)
 msgid "Copy new data from the computer to the handheld."
 msgstr ""
 
-#: C/evolution.xml:6936(para)
-msgid "Select the behavior you want for each conduit you choose to use. If you're not sure, use Synchronize."
+#: C/evolution.xml:7260(para)
+msgid ""
+"Select the behavior you want for each conduit you choose to use. If you're "
+"not sure, use Synchronize."
 msgstr ""
 
-#: C/evolution.xml:6941(para)
-msgid "Use the following procedure to synchronize the data on your Palm OS device with the data you store in Evolution."
+#: C/evolution.xml:7265(para)
+msgid ""
+"Use the following procedure to synchronize the data on your Palm OS device "
+"with the data you store in Evolution."
 msgstr ""
 
-#: C/evolution.xml:6942(para)
-msgid "If you want to back up your information before synchronizing, make a copy of the <command>evolution</command> directory inside your home directory."
+#: C/evolution.xml:7266(para)
+msgid ""
+"If you want to back up your information before synchronizing, make a copy of "
+"the <command>.evolution</command> directory inside your home directory."
 msgstr ""
 
-#: C/evolution.xml:6945(para)
+#: C/evolution.xml:7269(para)
 msgid "Put your handheld device in its cradle and press the HotSync button."
 msgstr ""
 
-#: C/evolution.xml:6946(para)
-msgid "If you use Palm OS v. 4.0 and have password protection turned on for your handheld device, you might encounter trouble synchronizing. If this happens, try turning off password protection on your handheld, synchronize it with your desktop computer, and then re-enable password protection on your handheld."
+#: C/evolution.xml:7270(para)
+msgid ""
+"If you use Palm OS v. 4.0 and have password protection turned on for your "
+"handheld device, you might encounter trouble synchronizing. If this happens, "
+"try turning off password protection on your handheld, synchronize it with "
+"your desktop computer, and then re-enable password protection on your "
+"handheld."
 msgstr ""
 
-#: C/evolution.xml:6949(para)
-msgid "If you have followed the setup instructions properly, your Palm OS device will synchronize data with Evolution."
+#: C/evolution.xml:7273(para)
+msgid ""
+"If you have followed the setup instructions properly, your Palm OS device "
+"will synchronize data with Evolution."
 msgstr ""
 
-#: C/evolution.xml:6955(para)
-msgid "If you are using Microsoft Outlook, but not Microsoft Exchange, this section helps you switch to <trademark>Evolution</trademark>."
+#: C/evolution.xml:7279(para)
+msgid ""
+"If you are using Microsoft Outlook, but not Microsoft Exchange, this section "
+"helps you switch to <trademark>Evolution</trademark>."
 msgstr ""
 
-#: C/evolution.xml:6958(title)
+#: C/evolution.xml:7282(title)
 msgid "Migrating Local Outlook Mail Folders"
 msgstr ""
 
-#: C/evolution.xml:6959(para)
-msgid "Exchange and IMAP mail is stored on the server, so you do not need to migrate it to your Linux* partition. However, if you have stored mail on your computer, you might want to make it accessible to Evolution."
+#: C/evolution.xml:7283(para)
+msgid ""
+"Exchange and IMAP mail is stored on the server, so you do not need to "
+"migrate it to your Linux* partition. However, if you have stored mail on "
+"your computer, you might want to make it accessible to Evolution."
 msgstr ""
 
-#: C/evolution.xml:6960(para)
+#: C/evolution.xml:7284(para)
 msgid "First, while using Windows, prepare your messages for import:"
 msgstr ""
 
-#: C/evolution.xml:6963(para)
-msgid "Clean up your mail. Delete messages and folders you do not need, and click File &gt; Folders &gt; Properties &gt; Advanced &gt; Compact to erase old, deleted messages from your PST file."
+#: C/evolution.xml:7287(para)
+msgid ""
+"Clean up your mail. Delete messages and folders you do not need, and click "
+"File &gt; Folders &gt; Properties &gt; Advanced &gt; Compact to erase old, "
+"deleted messages from your PST file."
 msgstr ""
 
-#: C/evolution.xml:6966(para)
-msgid "If you nest your folders one inside another, you might want to rename subfolders so that you can tell which folder they belong to. You must re-nest them after you load them into Evolution."
+#: C/evolution.xml:7290(para)
+msgid ""
+"If you nest your folders one inside another, you might want to rename "
+"subfolders so that you can tell which folder they belong to. You must re-"
+"nest them after you load them into Evolution."
 msgstr ""
 
-#: C/evolution.xml:6969(para)
-msgid "Import the files into Mozilla Mail (or another mailer, such as Netscape or Eudora, that uses the standard mbox format)."
+#: C/evolution.xml:7293(para)
+msgid ""
+"Import the files into Mozilla Mail (or another mailer, such as Netscape or "
+"Eudora, that uses the standard mbox format)."
 msgstr ""
 
-#: C/evolution.xml:6970(para)
-msgid "Linux mailers cannot do this task, because it requires a library available only under Windows. In Mozilla, import by selecting Window Mail &amp; Newsgroups Tools Import."
+#: C/evolution.xml:7294(para)
+msgid ""
+"Linux mailers cannot do this task, because it requires a library available "
+"only under Windows. In Mozilla, import by selecting Window Mail &amp; "
+"Newsgroups Tools Import."
 msgstr ""
 
-#: C/evolution.xml:6973(para)
-msgid "Mozilla creates a set of files in the directory<command> Windows\\Application_Data\\Mozilla\\Profiles\\(UserName)\\(Random Letters)\\Mail\\Local Folders\\OutlookMail\\</command>. The data files are those that have no file extension."
+#: C/evolution.xml:7297(para)
+msgid ""
+"Mozilla creates a set of files in the directory<command> Windows"
+"\\Application_Data\\Mozilla\\Profiles\\(UserName)\\(Random Letters)\\Mail"
+"\\Local Folders\\OutlookMail\\</command>. The data files are those that have "
+"no file extension."
 msgstr ""
 
-#: C/evolution.xml:6974(para)
-msgid "If you are using Windows XP or Windows 2000, your Windows hard drive is probably in the NTFS format, which some Linux systems cannot read without additional software. You might find it simpler to copy the mail folders to a different drive or to burn a CD."
+#: C/evolution.xml:7298(para)
+msgid ""
+"If you are using Windows Vista*, Windows XP* or Windows 2000*, your Windows "
+"hard drive is probably in the NTFS format, which some Linux systems cannot "
+"read without additional software. You might find it simpler to copy the mail "
+"folders to a different drive or to burn a CD."
 msgstr ""
 
-#: C/evolution.xml:6975(para)
-msgid "When you have your mail in a format Evolution can understand, reboot to Linux. Then continue with the following procedure. To create new folders for your files:"
+#: C/evolution.xml:7299(para)
+msgid ""
+"When you have your mail in a format Evolution can understand, reboot to "
+"Linux. Then continue with the following procedure. To create new folders for "
+"your files:"
 msgstr ""
 
-#: C/evolution.xml:6978(para)
+#: C/evolution.xml:7302(para)
 msgid "Mount your Windows drive or the disk where you saved the mail files."
-msgstr "Připojte váš disk s Windows nebo disk, kde máte uloženy soubory s poštou."
+msgstr ""
+"Připojte váš disk s Windows nebo disk, kde máte uloženy soubory s poštou."
 
-#: C/evolution.xml:6981(para)
-msgid "Copy all the mail files into your home directory or another convenient place."
-msgstr "Zkopírujte všechny soubory s poštou do vašeho domovského adresáře nebo do jiné příhodné složky."
+#: C/evolution.xml:7305(para)
+msgid ""
+"Copy all the mail files into your home directory or another convenient place."
+msgstr ""
+"Zkopírujte všechny soubory s poštou do vašeho domovského adresáře nebo do "
+"jiné příhodné složky."
 
-#: C/evolution.xml:6984(para)
+#: C/evolution.xml:7308(para)
 msgid "Start Evolution."
 msgstr "Zapněte Evolution."
 
-#: C/evolution.xml:6987(para)
-msgid "Select File &gt; New Folder to create the folders you want."
-msgstr "Vyberte Soubor &gt; Nový &gt; Nová složka pro vytvoření složek, které chcete."
+#: C/evolution.xml:7311(para)
+msgid "Select File &gt; New &gt; Mail Folder to create the folders you want."
+msgstr ""
+"Vyberte Soubor &gt; Nová &gt; Složka pošty pro vytvoření složek, které "
+"chcete."
 
-#: C/evolution.xml:6990(para)
+#: C/evolution.xml:7314(para)
 msgid "To import the data files:"
 msgstr "Importování datových souborů:"
 
-#: C/evolution.xml:6993(para)
-msgid "In Evolution, open the File Import assistant by clicking File &gt; Import."
-msgstr "V Evolutionu kliknutím na Soubor &gt; Importovat otevřete Asistenta importování souboru."
+#: C/evolution.xml:7317(para)
+msgid ""
+"In Evolution, open the File Import assistant by clicking File &gt; Import."
+msgstr ""
+"V Evolutionu kliknutím na Soubor &gt; Importovat otevřete Asistenta "
+"importování souboru."
 
-#: C/evolution.xml:6996(para)
-msgid "Click Next, then select Import A Single File."
+#: C/evolution.xml:7320(para)
+msgid "Click Next, then select Import a single file."
 msgstr "Klikněte na Vpřed, potom na Importovat jeden soubor."
 
-#: C/evolution.xml:6999(para)
-msgid "Leave the file type as Automatic, then click Browse to select the data file."
-msgstr "Nechte typ souboru jako Automatický a potom klikněte na prohlížení pro vybrání datového souboru."
+#: C/evolution.xml:7323(para)
+msgid "Click on the filechooser to select the data file."
+msgstr "Klikněte na výběr soubor pro zvolení datového souboru. "
 
-#: C/evolution.xml:7000(para)
+#: C/evolution.xml:7324(para)
 msgid "Remember, the data files are the files that have no file extension."
 msgstr "Pamatujte, datové soubory jsou soubory, které nemají příponu."
 
-#: C/evolution.xml:7003(para)
+#: C/evolution.xml:7327(para)
 msgid "Select the folder where you want to put the imported data file."
 msgstr "Vyberte složku, kde chcete umístit importovaný datový soubor."
 
-#: C/evolution.xml:7009(para)
+#: C/evolution.xml:7333(para)
 msgid "Repeat the import steps until you have imported all your mail."
-msgstr "Opakujte kroky importu, dokud nebudete mít importovánu celou vaši poštu."
+msgstr ""
+"Opakujte kroky importu, dokud nebudete mít importovánu celou vaši poštu."
 
-#: C/evolution.xml:7017(para)
-msgid "You can print this section to use it as a quick reference for most of the things you want to do with <trademark>Evolution</trademark>. You can also find this information by selecting Help &gt; Quick Reference in the Menubar."
-msgstr "Tuto sekci si můžete vytisknout jako stručnou příručku pro většinu operací, které chcete s <trademark>Evolutionem</trademark> dělat. Tyto informace naleznete také tak, že vyberete Nápověda &gt; Stručná příručka v nabídce."
+#: C/evolution.xml:7341(para)
+msgid ""
+"You can print this section to use it as a quick reference for most of the "
+"things you want to do with <trademark>Evolution</trademark>. You can also "
+"find this information by selecting Help &gt; Quick Reference in the Menubar."
+msgstr ""
+"Tuto sekci si můžete vytisknout jako stručnou příručku pro většinu operací, "
+"které chcete s <trademark>Evolutionem</trademark> dělat. Tyto informace "
+"naleznete také tak, že vyberete Nápověda &gt; Stručná příručka v nabídce."
 
-#: C/evolution.xml:7020(link)
-#: C/evolution.xml:7034(title)
+#: C/evolution.xml:7344(link) C/evolution.xml:7358(title)
 msgid "Opening or Creating Items"
 msgstr "Otevírání a vytváření položek"
 
-#: C/evolution.xml:7023(link)
-#: C/evolution.xml:7059(title)
+#: C/evolution.xml:7347(link) C/evolution.xml:7383(title)
 msgid "Mail Tasks"
 msgstr "Úkoly pošty"
 
-#: C/evolution.xml:7029(link)
-#: C/evolution.xml:7109(title)
+#: C/evolution.xml:7353(link) C/evolution.xml:7433(title)
 msgid "Address Book"
 msgstr "Adresář"
 
-#: C/evolution.xml:7037(title)
+#: C/evolution.xml:7361(title)
 msgid "New Item:"
 msgstr "Nová položka:"
 
-#: C/evolution.xml:7038(para)
-msgid "Press Ctrl+N to open a new item for whatever part of Evolution you're working in. In mail, this means you create a new message. If you're looking at your address book, Ctrl+N creates a new contact card, and in the calendar, a new appointment."
-msgstr "Pro otevření nové položky klikněte na Ctrl+N, je jedno, v jaké části Evolutionu pracujete. V poště to znamená, že otevřete novou zprávu. Pokud se podíváte do vašeho adresáře, Ctrl+N otevře kartu nového kontaktu, a v kalendáři pak novou událost."
-
-#: C/evolution.xml:7041(title)
-msgid "Creating a New E-mail Message:"
+#: C/evolution.xml:7362(para)
+msgid ""
+"Press Ctrl+N to open a new item for whatever part of Evolution you're "
+"working in. In mail, this means you create a new message. If you're looking "
+"at your address book, Ctrl+N creates a new contact card, and in the "
+"calendar, a new appointment."
+msgstr ""
+"Pro otevření nové položky klikněte na Ctrl+N, je jedno, v jaké části "
+"Evolutionu pracujete. V poště to znamená, že otevřete novou zprávu. Pokud se "
+"podíváte do vašeho adresáře, Ctrl+N otevře kartu nového kontaktu, a v "
+"kalendáři pak novou událost."
+
+#: C/evolution.xml:7365(title)
+msgid "Creating a New Email Message:"
 msgstr "Vytvoření nové e-mailové zprávy:"
 
-#: C/evolution.xml:7042(para)
-msgid "Use File &gt; New &gt; Mail Message or Shift+Ctrl+M."
-msgstr "Použijte Soubor &gt; Nový &gt; Zpráva nebo Shift+Ctrl+M."
+#: C/evolution.xml:7366(para)
+msgid "Select File &gt; New &gt; Mail Message or Shift+Ctrl+M."
+msgstr "Použijte Soubor &gt; Nová &gt; Zpráva nebo Shift+Ctrl+M."
 
-#: C/evolution.xml:7045(title)
-#: C/evolution.xml:7098(title)
+#: C/evolution.xml:7369(title) C/evolution.xml:7422(title)
 msgid "Creating a New Appointment:"
 msgstr "Vytvoření nové události:"
 
-#: C/evolution.xml:7046(para)
-#: C/evolution.xml:7099(para)
-msgid "Use File &gt; New Appointment or Shift+Ctrl+A."
+#: C/evolution.xml:7370(para) C/evolution.xml:7423(para)
+msgid "Click File &gt; New &gt; Appointment or Shift+Ctrl+A."
 msgstr "Použijte Soubor &gt; Nová &gt; Událost nebo Shift+Ctrl+A."
 
-#: C/evolution.xml:7049(title)
+#: C/evolution.xml:7373(title)
 msgid "Entering a New Contact:"
 msgstr "Vložení nového kontaktu:"
 
-#: C/evolution.xml:7050(para)
-msgid "Double-click in any blank space in the contact manager to create a new address card. You can also use File &gt; New Contact or Shift+Ctrl+C."
-msgstr "Dvojtým kliknutím kdekoliv do prázdného prostoru v manažeru kontaktů otevřete novou kartu adresáře. Taktéž můžete použít Soubor &gt; Nový &gt; Kontakt nebo Shift+Ctrl+C. "
+#: C/evolution.xml:7374(para)
+msgid ""
+"Double-click in any blank space in the contact manager to create a new "
+"address card. You can also click File &gt; New &gt; Contact or Shift+Ctrl+C."
+msgstr ""
+"Dvojtým kliknutím kdekoliv do prázdného prostoru ve správci kontaktů "
+"otevřete novou kartu adresáře. Taktéž můžete použít Soubor &gt; Nová &gt; "
+"Kontakt nebo Shift+Ctrl+C. "
 
-#: C/evolution.xml:7053(title)
-#: C/evolution.xml:7103(title)
+#: C/evolution.xml:7377(title) C/evolution.xml:7427(title)
 msgid "Creating a New Task:"
 msgstr "Vytvoření nového úkolu:"
 
-#: C/evolution.xml:7054(para)
-msgid "File &gt; New Task or Shift+Ctrl+T."
-msgstr "Soubor &gt; Nový &gt; Úkol nebo Shift+Ctrl+T."
+#: C/evolution.xml:7378(para) C/evolution.xml:7428(para)
+msgid "Click File &gt; New &gt; Task or Shift+Ctrl+T."
+msgstr "Klikněte na Soubor &gt; Nová &gt; Úkol nebo Shift+Ctrl+T."
 
-#: C/evolution.xml:7061(title)
+#: C/evolution.xml:7385(title)
 msgid "Send and Receive Mail:"
 msgstr "Posílání a přijímání pošty:"
 
-#: C/evolution.xml:7062(para)
-msgid "Press F9, click the Send/Receive button in the toolbar, or click File &gt; Send/Receive."
-msgstr "Stiskněte F9, klikněte na Odeslat/Přijmout v liště nástrojů nebo klikněte na Soubor &gt; Odeslat/Přijmout"
+#: C/evolution.xml:7386(para)
+msgid ""
+"Press F9, click the Send/Receive button in the toolbar, or click File &gt; "
+"Send/Receive."
+msgstr ""
+"Stiskněte F9, klikněte na Odeslat/Přijmout v liště nástrojů nebo klikněte na "
+"Soubor &gt; Odeslat/Přijmout"
 
-#: C/evolution.xml:7065(title)
+#: C/evolution.xml:7389(title)
 msgid "Navigating the Message List with the Keyboard:"
 msgstr "Pohybování se v seznamu zpráv pomocí klávesnice:"
 
-#: C/evolution.xml:7066(para)
-msgid "Press (]) or (.) to jump to the next unread message. ([) or (,) goes to the previous unread message. Use the arrow keys to move up and down in the list of all messages."
-msgstr "Stiskněte (]) nebo (.) pro přeskočení na další nepřečtenou zprávu. ([) nebo (,) posouvá na předchozí nepřečtenou zprávu. Pro pohyb nahorů a dolů v seznamu všech zpráv použijte klávesy se šipkami."
+#: C/evolution.xml:7390(para)
+msgid ""
+"Press (]) or (.) to jump to the next unread message. ([) or (,) goes to the "
+"previous unread message. Use the arrow keys to move up and down in the list "
+"of all messages."
+msgstr ""
+"Stiskněte (]) nebo (.) pro přeskočení na další nepřečtenou zprávu. ([) nebo "
+"(,) posouvá na předchozí nepřečtenou zprávu. Pro pohyb nahorů a dolů v "
+"seznamu všech zpráv použijte klávesy se šipkami."
 
-#: C/evolution.xml:7069(title)
+#: C/evolution.xml:7393(title)
 msgid "Moving the Display Up and Down in the Preview Pane:"
 msgstr "Posouvání zobrazení nahorů a dolů v panelu náhledu."
 
-#: C/evolution.xml:7070(para)
-msgid "Press the Spacebar to move down a page. Press Backspace to move up a page."
-msgstr "Stiskněte mezerník pro posunutí stránky dolů. Stiskněte Backspace pro pusunutí stránky nahorů."
+#: C/evolution.xml:7394(para)
+msgid ""
+"Press the Spacebar to move down a page. Press Backspace to move up a page."
+msgstr ""
+"Stiskněte mezerník pro posunutí stránky dolů. Stiskněte Backspace pro "
+"pusunutí stránky nahorů."
 
-#: C/evolution.xml:7073(title)
+#: C/evolution.xml:7397(title)
 msgid "Replying To a Message:"
 msgstr "Odpověď na zprávu:"
 
-#: C/evolution.xml:7074(para)
-msgid "To reply only to the sender of the message, click Reply in the toolbar, or press Ctrl+R."
-msgstr "Chcete-li odpovědět odesílateli zprávy, klikněte na Odpovědět v liště nástrojů nebo stikněte Ctrl+R."
+#: C/evolution.xml:7398(para)
+msgid ""
+"To reply only to the sender of the message, click Reply in the toolbar, or "
+"press Ctrl+R."
+msgstr ""
+"Chcete-li odpovědět odesílateli zprávy, klikněte na Odpovědět v liště "
+"nástrojů nebo stikněte Ctrl+R."
 
-#: C/evolution.xml:7076(para)
-msgid "To reply to the sender and all the other visible recipients of the message, click Reply to All or select the message and press Shift+Ctrl+R."
-msgstr "Pro odpověď odesílateli a všem ostatním příjemcům zprávy, klikněte na Odpovědět všem nebo vyberte zprávu a stiskněte Shift+Ctrl+R."
+#: C/evolution.xml:7400(para)
+msgid ""
+"To reply to the sender and all the other visible recipients of the message, "
+"click Reply to All or select the message and press Shift+Ctrl+R."
+msgstr ""
+"Pro odpověď odesílateli a všem ostatním příjemcům zprávy, klikněte na "
+"Odpovědět všem nebo vyberte zprávu a stiskněte Shift+Ctrl+R."
 
-#: C/evolution.xml:7078(title)
+#: C/evolution.xml:7402(title)
 msgid "Forwarding a Message:"
 msgstr "Přeposílání zprávy:"
 
-#: C/evolution.xml:7079(para)
-msgid "Select the message or messages you want to forward, then click Forward in the toolbar, or press Ctrl+F."
-msgstr "Vyberte zprávu nebo zprávy, které chcete přeposlat, potom klikněte na Přeposlat v liště nástrojů nebo stiskněte Ctrl+F."
+#: C/evolution.xml:7403(para)
+msgid ""
+"Select the message or messages you want to forward, then click Forward in "
+"the toolbar, or press Ctrl+F."
+msgstr ""
+"Vyberte zprávu nebo zprávy, které chcete přeposlat, potom klikněte na "
+"Přeposlat v liště nástrojů nebo stiskněte Ctrl+F."
 
-#: C/evolution.xml:7082(title)
+#: C/evolution.xml:7406(title)
 msgid "Opening a Message In a New Window:"
 msgstr "Otevírání zprávy v novém okně:"
 
-#: C/evolution.xml:7083(para)
-msgid "Double-click the message you want to view, or select it and press Enter or Ctrl+O."
-msgstr "Dvakrát klikněte na zprávu, kterou chcete vidět, nebo ji vyberte a stiskněte Enter nebo Ctrl+O."
+#: C/evolution.xml:7407(para)
+msgid ""
+"Double-click the message you want to view, or select it and press Enter or "
+"Ctrl+O."
+msgstr ""
+"Dvakrát klikněte na zprávu, kterou chcete vidět, nebo ji vyberte a stiskněte "
+"Enter nebo Ctrl+O."
 
-#: C/evolution.xml:7086(title)
+#: C/evolution.xml:7410(title)
 msgid "Creating Filters and Search Folders:"
 msgstr "Vytváření filtrů a složek hledání:"
 
-#: C/evolution.xml:7087(para)
-msgid "Right-click a message and select Create Rule From Message. You can also create filters and Search folders in the Edit menu."
-msgstr "Klikněte pravým tlačítkem na zprávu a vyberte Vytvořit pravidlo ze zprávy.  Filtry a složky hledání můžete také vytvořit přes nabídku Upravit. "
+#: C/evolution.xml:7411(para)
+msgid ""
+"Right-click a message and select Create Rule From Message. You can also "
+"create filters and Search folders in the Edit menu."
+msgstr ""
+"Klikněte pravým tlačítkem na zprávu a vyberte Vytvořit pravidlo ze zprávy.  "
+"Filtry a složky hledání můžete také vytvořit přes nabídku Upravit. "
 
-#: C/evolution.xml:7090(title)
+#: C/evolution.xml:7414(title)
 msgid "Adding a Sender to the Address Book:"
 msgstr "Přidání odesílatele do adresáře:"
 
-#: C/evolution.xml:7091(para)
-msgid "Right-click a message and select Add Sender to Address Book. You can also right-click on any e-mail address to add it to your address book."
-msgstr "Kliknutí pravým tlačítkem a vybrání Přidat odesílatele do adresáře."
-
-#: C/evolution.xml:7101(para)
-msgid "You can also click in any blank spot in the calendar and start typing to create a new appointment entry."
-msgstr "Můžete také kliknout na libovolný prázdný bod v kalendáři a začít psát záznam o nové události."
+#: C/evolution.xml:7415(para)
+msgid "Right-click on any email address to add it to your address book."
+msgstr ""
+"Klikněte pravým tlačítkem myši na libovolnou e-mailovou adresu, abyste ji "
+"přidali do adresáře."
 
-#: C/evolution.xml:7104(para)
-msgid "Use File &gt; New Task or Shift+Ctrl+T."
-msgstr "Vyberte Soubor &gt; Nový úkol nebo tiskněte Shift+Ctrl+T."
+#: C/evolution.xml:7425(para)
+msgid ""
+"You can also click in any blank spot in the calendar and start typing to "
+"create a new appointment entry."
+msgstr ""
+"Můžete také kliknout na libovolný prázdný bod v kalendáři a začít psát "
+"záznam o nové události."
 
-#: C/evolution.xml:7111(title)
+#: C/evolution.xml:7435(title)
 msgid "Editing a Contact:"
 msgstr "Úprava kontaktu:"
 
-#: C/evolution.xml:7112(para)
+#: C/evolution.xml:7436(para)
 msgid "Double-click the contact's address card to change details."
 msgstr "Pro změnu podrobností klikněte dvakrát na kartu kontaktu."
 
-#: C/evolution.xml:7115(title)
+#: C/evolution.xml:7439(title)
 msgid "Deleting a Contact:"
 msgstr "Smazání kontaktu:"
 
-#: C/evolution.xml:7116(para)
-msgid "Right-click a contact, then click Delete; or select a contact, then click Delete on the toolbar."
-msgstr "Kliknutí pravým tlačítkem na kontakt a potom kliknutí na Odstranit nebo vybrání kontaktu a potom kliknutí na Odstranit na liště nástrojů. "
+#: C/evolution.xml:7440(para)
+msgid ""
+"Right-click a contact, then click Delete; or select a contact, then click "
+"Delete on the toolbar."
+msgstr ""
+"Kliknutí pravým tlačítkem na kontakt a potom kliknutí na Odstranit nebo "
+"vybrání kontaktu a potom kliknutí na Odstranit na liště nástrojů. "
 
-#: C/evolution.xml:7119(title)
-msgid "Sending E-mails to a Contact:"
+#: C/evolution.xml:7443(title)
+msgid "Sending Emails to a Contact:"
 msgstr "Posílání e-mailů kontaktu:"
 
-#: C/evolution.xml:7120(para)
+#: C/evolution.xml:7444(para)
 msgid "Right-click a contact, then click Send Message to Contact."
-msgstr "Klik pravým tlačítkem myši na kontakt a kliknutí na Poslat kontaktu zprávu. "
+msgstr ""
+"Klik pravým tlačítkem myši na kontakt a kliknutí na Poslat kontaktu zprávu. "
 
-#: C/evolution.xml:7123(title)
+#: C/evolution.xml:7447(title)
 msgid "Creating a New Contact:"
 msgstr "Vytvoření nového kontaktu:"
 
-#: C/evolution.xml:7124(para)
-msgid "Double-click in any blank space in the contact manager to create a new address card, or right-click anywhere in the address book and select New Contact. You can also click File &gt; New Contact or press Shift+Ctrl+C."
-msgstr "Dvojitý klik kdekoliv v prázdném místě správce kontaktů vyvolá okno s dialogem pro vytvoření nového kontaktu. Nebo klik pravým tlačítkem kdekoliv v adresáři a vybrání Nový kontakt. Taktéž můžete kliknout na Soubor &gt; Nový kontakt nebo stisknout Shift+Ctrl+C."
-
-#: C/evolution.xml:7131(para)
-msgid "<trademark>Evolution</trademark> bug tracking is done at the <ulink url=\"http://bugzilla.gnome.org\">GNOME bug tracking System</ulink>. You can use that, or the GNOME Bug Report Tool (known as bug-buddy at the command line) if you find bugs or want to request new features."
-msgstr "Systém pro hlášení chyb v aplikaci <trademark>Evolution</trademark> je vytvořen v <ulink url=\"http://bugzilla.gnome.org\">Systému pro hlášení chyb v GNOME</ulink>. Pokud naleznete nějakou chybu nebo chcete novou funkci, můžete použít jej nebo nástroj pro nahlášení chyb v GNOME (v příkazové řádce známý jako bug-buddy)."
-
-#: C/evolution.xml:7132(para)
-msgid "A complete list of feature requests and other issues with Evolution is available online in the GNOME bug tracking system. You can learn more about the Evolution development process at the <ulink url=\"http://gnome.org/projects/evolution/developer.shtml\">Evolution Developer site</ulink>."
-msgstr "Kompletní seznam požadovaných funkcí a ostatních problémů s aplikací Evolution je k dispozici v systému pro hlášení chyb v GNOME. O procesu vývoje Evolutionu se můžete více dozvědět na <ulink url=\"http://gnome.org/projects/evolution/developer.shtml\">stránkách vývoje Evolutionu.</ulink>."
+#: C/evolution.xml:7448(para)
+msgid ""
+"Double-click in any blank space in the contact manager to create a new "
+"address card, or right-click anywhere in the address book and select New "
+"Contact. You can also click File &gt; New Contact or press Shift+Ctrl+C."
+msgstr ""
+"Dvojitý klik kdekoliv v prázdném místě správce kontaktů vyvolá okno s "
+"dialogem pro vytvoření nového kontaktu. Nebo klik pravým tlačítkem kdekoliv "
+"v adresáři a vybrání Nový kontakt. Taktéž můžete kliknout na Soubor &gt; "
+"Nový kontakt nebo stisknout Shift+Ctrl+C."
 
-#: C/evolution.xml:7137(para)
-msgid "Evolution was written by the <trademark>Evolution</trademark> team and numerous other dedicated GNOME programmers. You can see their names by clicking Help &gt; About from any Evolution window."
-msgstr "Evolution byl napsán týmem <trademark>Evolution</trademark> a mnoha dalšími nadšenými vývojáři GNOME. Jejich jména můžete vidět tak, že kliknete na Pomoc &gt; O programu v jakémkoliv okně aplikace Evolution."
+#: C/evolution.xml:7455(para)
+msgid ""
+"<trademark>Evolution</trademark> bug tracking is done at the <ulink url="
+"\"http://bugzilla.gnome.org\">GNOME bug tracking System</ulink>. You can use "
+"that, or the GNOME Bug Report Tool (known as bug-buddy at the command line) "
+"if you find bugs or want to request new features."
+msgstr ""
+"Systém pro hlášení chyb v aplikaci <trademark>Evolution</trademark> je "
+"vytvořen v <ulink url=\"http://bugzilla.gnome.org\">Systému pro hlášení chyb "
+"v GNOME</ulink>. Pokud naleznete nějakou chybu nebo chcete novou funkci, "
+"můžete použít jej nebo nástroj pro nahlášení chyb v GNOME (v příkazové řádce "
+"známý jako bug-buddy)."
+
+#: C/evolution.xml:7456(para)
+msgid ""
+"A complete list of feature requests and other issues with Evolution is "
+"available online in the GNOME bug tracking system. You can learn more about "
+"the Evolution development process at the <ulink url=\"http://gnome.org/"
+"projects/evolution/developer.shtml\">Evolution Developer site</ulink>."
+msgstr ""
+"Kompletní seznam požadovaných funkcí a ostatních problémů s aplikací "
+"Evolution je k dispozici v systému pro hlášení chyb v GNOME. O procesu "
+"vývoje Evolutionu se můžete více dozvědět na <ulink url=\"http://gnome.org/"
+"projects/evolution/developer.shtml\">stránkách vývoje Evolutionu.</ulink>."
 
-#: C/evolution.xml:7138(para)
-msgid "The Evolution code owes a great debt to the GNOME-pim and GNOME-Calendar applications, and to KHTMLW. The developers of Evolution acknowledge the efforts and contributions of all who worked on those projects."
-msgstr "Kód Evolutionu vděčí za mnohé aplikacím GNOME-pim,  GNOME-Calendar a KHTMLW. Vývojáři Evolutionu kvitují snahu a příspěvky všech, kteří na těchto projektech pracovali."
+#: C/evolution.xml:7461(para)
+msgid ""
+"Evolution was written by the <trademark>Evolution</trademark> team and "
+"numerous other dedicated GNOME programmers. You can see their names by "
+"clicking Help &gt; About from the main Evolution window."
+msgstr ""
+"Evolution byl napsán týmem <trademark>Evolution</trademark> a mnoha dalšími "
+"nadšenými vývojáři GNOME. Jejich jména můžete vidět tak, že kliknete na "
+"Pomoc &gt; O programu v hlavním okně Evolutionu."
 
-#: C/evolution.xml:7139(para)
-msgid "For more information please visit the Evolution <ulink url=\"http://www.novell.com/products/desktop/features/evolution.html\">Web page</ulink>. Please send all comments, suggestions, and bug reports to the <ulink url=\"http://bugzilla.gnome.com\">bug tracking database</ulink>. Instructions for submitting bug reports can be found on-line at the same location. You can also use the GNOME bug report tool, bug-buddy, to submit your defect reports."
-msgstr "Pro více informací navštivte <ulink url=\"http://www.novell.com/products/desktop/features/evolution.html\">webové stránky</ulink> aplikace Evolution. Prosím pošlete všechny komentáře, návrhy a nahlášení chyb do <ulink url=\"http://bugzilla.gnome.com\">databáze nahlášených chyb</ulink>. Instrukce pro vložení chyby naleznete na stejném místě. Pro nahlášení chyb můžete využít také nástroj pro nahlašování chyb v GNOME (bug-buddy)."
+#: C/evolution.xml:7462(para)
+msgid ""
+"The Evolution code owes a great debt to the GNOME-pim and GNOME-Calendar "
+"applications, and to KHTMLW. The developers of Evolution acknowledge the "
+"efforts and contributions of all who worked on those projects."
+msgstr ""
+"Kód Evolutionu vděčí za mnohé aplikacím GNOME-pim,  GNOME-Calendar a KHTMLW. "
+"Vývojáři Evolutionu kvitují snahu a příspěvky všech, kteří na těchto "
+"projektech pracovali."
 
-#: C/evolution.xml:7140(para)
+#: C/evolution.xml:7463(para)
+msgid ""
+"For more information please visit the Evolution <ulink url=\"http://www."
+"gnome.org/projects/evolution\">Web page</ulink>. Please send all comments, "
+"suggestions, and bug reports to the <ulink url=\"http://bugzilla.gnome.org"
+"\">bug tracking database</ulink>. Instructions for submitting bug reports "
+"can be found on-line at the same location. You can also use the GNOME bug "
+"report tool, bug-buddy, to submit your defect reports."
+msgstr ""
+"Více informací naleznete na <ulink url=\"http://www.novell.com/products/"
+"desktop/features/evolution.html\">webových stránkách</ulink> aplikace "
+"Evolution. Prosím pošlete všechny komentáře, návrhy a nahlášení chyb do "
+"<ulink url=\"http://bugzilla.gnome.com\">databáze nahlášených chyb</ulink>. "
+"Instrukce pro vložení chyby naleznete na stejném místě. Pro nahlášení chyb "
+"můžete využít také nástroj pro nahlašování chyb v GNOME (bug-buddy)."
+
+#: C/evolution.xml:7464(para)
 msgid "This manual was written by:"
 msgstr "Tento manuál byl napsán těmito lidmi:"
 
-#: C/evolution.xml:7143(para)
+#: C/evolution.xml:7467(para)
 msgid "Radhika PC (pradhika@novell.com)"
 msgstr "Radhika PC (pradhika@novell.com)"
 
-#: C/evolution.xml:7146(para)
+#: C/evolution.xml:7470(para)
 msgid "Srinivasa Ragavan (sragavan@novell.com)"
 msgstr "Srinivasa Ragavan (sragavan@novell.com)"
 
-#: C/evolution.xml:7149(para)
+#: C/evolution.xml:7473(para)
 msgid "Andre Klapper (ak-47@gmx.net)"
 msgstr "Andre Klapper (ak-47@gmx.net)"
 
-#: C/evolution.xml:7152(para)
+#: C/evolution.xml:7476(para)
 msgid "Francisco Javier F. Serrador (serrador@tecknolabs.com)"
 msgstr "Francisco Javier F. Serrador (serrador@tecknolabs.com)"
 
-#: C/evolution.xml:7155(para)
+#: C/evolution.xml:7479(para)
 msgid "Mark Moulder (mmoulder@novell.com)"
 msgstr "Mark Moulder (mmoulder@novell.com)"
 
-#: C/evolution.xml:7158(para)
+#: C/evolution.xml:7482(para)
 msgid "Jessica Prabhakar (jprabhakar@novell.com)"
 msgstr "Jessica Prabhakar (jprabhakar@novell.com)"
 
-#: C/evolution.xml:7161(para)
+#: C/evolution.xml:7485(para)
 msgid "Aaron Weber (aaron@ximian.com)"
 msgstr "Aaron Weber (aaron@ximian.com)"
 
-#: C/evolution.xml:7164(para)
+#: C/evolution.xml:7488(para)
 msgid "Kevin Breit (mrproper@ximian.com)"
 msgstr "Kevin Breit (mrproper@ximian.com)"
 
-#: C/evolution.xml:7167(para)
+#: C/evolution.xml:7491(para)
 msgid "Duncan Mak (duncan@ximian.com)"
 msgstr "Duncan Mak (duncan@ximian.com)"
 
-#: C/evolution.xml:7170(para)
+#: C/evolution.xml:7494(para)
 msgid "Ettore Perazzoli (ettore@ximian.com)"
 msgstr "Ettore Perazzoli (ettore@ximian.com)"
 
-#: C/evolution.xml:7173(para)
-msgid "With the help of the application programmers and the GNOME Documentation Project."
+#: C/evolution.xml:7497(para)
+msgid ""
+"With the help of the application programmers and the GNOME Documentation "
+"Project."
 msgstr "S pomocí vývojářů aplikace a GNOME Documentation Project."
 
-#: C/evolution.xml:7176(para)
-msgid "Please file comments and suggestions for this manual as bugs in the GNOME bug tracking system. If you contributed to this project but do not see your name here, please contact Radhika PC (pradhika@novell.com) or Sreenivasa Ragavan (sragavan@novell.com) and either of them will list you."
-msgstr "Prosím pošlete komentáře a návrhy k tomuto manuálu jako chyby v systému pro hlášení chyb v GNOME. Pokud jste přispěli k tomuto projektu a nevidíte své jméno, prosím kontaktujte Radhika PC (pradhika@novell.com) nebo Sreenivasa Ragavan (sragavan@novell.com) a jeden z nich vás zařadí do seznamu."
+#: C/evolution.xml:7500(para)
+msgid ""
+"Please file comments and suggestions for this manual as bugs in the GNOME "
+"bug tracking system. If you contributed to this project but do not see your "
+"name here, please contact Radhika PC (pradhika@novell.com) or Srinivasa "
+"Ragavan (sragavan@novell.com) and either of them will list you."
+msgstr ""
+"Prosím pošlete komentáře a návrhy k tomuto manuálu jako chyby v systému pro "
+"hlášení chyb v GNOME. Pokud jste přispěli k tomuto projektu a nevidíte své "
+"jméno, prosím kontaktujte Radhika PC (pradhika@novell.com) nebo Sreenivasa "
+"Ragavan (sragavan@novell.com) a jeden z nich vás zařadí do seznamu."
 
-#: C/evolution.xml:7177(para)
-msgid "Partial list of Documentation Translators (application translated to numerous additional languages):"
-msgstr "Dílčí seznam překladatelů dokumentace (aplikace je přeložena do množství dalších jazyků):"
+#: C/evolution.xml:7501(para)
+msgid ""
+"Partial list of Documentation Translators (application translated to "
+"numerous additional languages):"
+msgstr ""
+"Dílčí seznam překladatelů dokumentace (aplikace je přeložena do množství "
+"dalších jazyků):"
 
-#: C/evolution.xml:7180(para)
+#: C/evolution.xml:7504(para)
 msgid "Daniel Persson for Swedish (.se)"
 msgstr "Daniel Persson pro švédštinu (.se)"
 
-#: C/evolution.xml:7183(para)
-msgid "Hector Garcia Alvarez and Francisco Javier F. Serrador for Spanish (.es)"
-msgstr "Hector Garcia Alvarez a Francisco Javier F. Serrador pro španělštinu (.es)"
+#: C/evolution.xml:7507(para)
+msgid ""
+"Hector Garcia Alvarez and Francisco Javier F. Serrador for Spanish (.es)"
+msgstr ""
+"Hector Garcia Alvarez a Francisco Javier F. Serrador pro španělštinu (.es)"
 
-#: C/evolution.xml:7186(para)
+#: C/evolution.xml:7510(para)
 msgid "Kjartan Maraas for Norwegian (.no)"
 msgstr "Kjartan Maraas pro norštinu (.no)"
 
-#: C/evolution.xml:7189(para)
+#: C/evolution.xml:7513(para)
 msgid "Sergey V. Mironov for Russian (.ru)"
 msgstr "Sergey V. Mironov pro ruštinu (.ru)"
 
-#: C/evolution.xml:7196(para)
-msgid "This glossary contains terms that are frequently used in this guide as well as in <trademark>Evolution</trademark>."
-msgstr "Tento rejstřík obsahuje výrazy, které jsou často používány v této příručce stejně jako v aplikaci <trademark>Evolution</trademark>."
+#: C/evolution.xml:7520(para)
+msgid ""
+"This glossary contains terms that are frequently used in this guide as well "
+"as in <trademark>Evolution</trademark>."
+msgstr ""
+"Tento rejstřík obsahuje výrazy, které jsou často používány v této příručce "
+"stejně jako v aplikaci <trademark>Evolution</trademark>."
 
-#: C/evolution.xml:7198(glossterm)
+#: C/evolution.xml:7522(glossterm)
 msgid "Assistant"
 msgstr "Asistent"
 
-#: C/evolution.xml:7200(para)
-msgid "A tool that guides a user through a series of steps, usually to configure or set up a program. Equivalent to Wizard and Druid."
-msgstr "Nástroj, který uživatele provede skrz sérii kroků, zpravidla při nastavení programu. Ekvivalent k Průvodci."
+#: C/evolution.xml:7524(para)
+msgid ""
+"A tool that guides a user through a series of steps, usually to configure or "
+"set up a program. Equivalent to Wizard and Druid."
+msgstr ""
+"Nástroj, který uživatele provede skrz sérii kroků, zpravidla při nastavení "
+"programu. Ekvivalent k Průvodci."
 
-#: C/evolution.xml:7204(glossterm)
+#: C/evolution.xml:7528(glossterm)
 msgid "attachment"
 msgstr "příloha"
 
-#: C/evolution.xml:7206(para)
-msgid "Any file sent with an e-mail. Attachments can be embedded in a message or appended to it."
-msgstr "Jakýkoliv soubor poslaný s e-mailem. Přílohy mohou být vloženy do zprávy nebo k ní připojeny."
+#: C/evolution.xml:7530(para)
+msgid ""
+"Any file sent with an email. Attachments can be embedded in a message or "
+"appended to it."
+msgstr ""
+"Jakýkoliv soubor poslaný s e-mailem. Přílohy mohou být vloženy do zprávy "
+"nebo k ní připojeny."
 
-#: C/evolution.xml:7210(glossterm)
+#: C/evolution.xml:7534(glossterm)
 msgid "automatic indexing"
 msgstr "automatická indexace"
 
-#: C/evolution.xml:7212(para)
-msgid "A pre-downloading procedure that allows Evolution to quickly refer to data. It enables faster searches and decreases memory usage for data displays."
-msgstr "Procedura před stahováním, která aplikaci Evolution umožňuje podívat se rychle na data. Umožňuje to rychlejší vyhledávání a snížení využití paměti při zobrazení dat."
+#: C/evolution.xml:7536(para)
+msgid "A feature which allows Evolution to quickly find and sort data."
+msgstr ""
 
-#: C/evolution.xml:7216(glossterm)
+#: C/evolution.xml:7540(glossterm)
 msgid "Bcc (Blind Carbon Copy)"
 msgstr "Bcc (skrytá kopie)"
 
-#: C/evolution.xml:7218(para)
-msgid "Blind copy recipients (Bcc) receive a copy of an item. Other recipients receive no information about blind copies. Only the sender and the blind copy recipient know that a blind copy was sent. If a recipient replies and chooses Reply to All, the blind copy recipient does not receive the reply."
-msgstr "Adresáti skrytých kopií (Bcc) přijímají kopii zprávy, ostatní adresáti o tom ovšem nezískají žádnou informaci. Pouze odesílatel a adresát skryté kopie o odeslání této kopie ví. Pokud adresát odpoví a zvolí Odpovědět všem, tak adresát skryté kopie odpověď neobdrží."
+#: C/evolution.xml:7542(para)
+msgid ""
+"Blind copy recipients (Bcc) receive a copy of an item. Other recipients "
+"receive no information about blind copies. Only the sender and the blind "
+"copy recipient know that a blind copy was sent. If a recipient replies and "
+"chooses Reply to All, the blind copy recipient does not receive the reply."
+msgstr ""
+"Adresáti skrytých kopií (Bcc) přijímají kopii zprávy, ostatní adresáti o tom "
+"ovšem nezískají žádnou informaci. Pouze odesílatel a adresát skryté kopie o "
+"odeslání této kopie ví. Pokud adresát odpoví a zvolí Odpovědět všem, tak "
+"adresát skryté kopie odpověď neobdrží."
 
-#: C/evolution.xml:7222(glossterm)
+#: C/evolution.xml:7546(glossterm)
 msgid "Cc (Carbon Copy)"
 msgstr "Kopie"
 
-#: C/evolution.xml:7224(para)
-msgid "Carbon copy recipients (CC) receive a copy of an item. CC recipients are users who would benefit from the information in an item, but are not affected by or directly responsible for it. All recipients can see that a carbon copy was sent. They can also see the names of the CC recipients."
-msgstr "Adresáti kopie (CC) přijímají kopii zprávy. CC adresáti jsou uživatelé, kteří by mohli mít užitek z informací obsažených ve zprávě, ale přímo se jich netýká a nejsou za ni zodpovědni. Všichni adresáti mohou vidět, že byla odeslána také kopie. Mohou také vidět jména příjemců kopie."
+#: C/evolution.xml:7548(para)
+msgid ""
+"Carbon copy recipients (CC) receive a copy of an item. CC recipients are "
+"users who would benefit from the information in an item, but are not "
+"affected by or directly responsible for it. All recipients can see that a "
+"carbon copy was sent. They can also see the names of the CC recipients."
+msgstr ""
+"Adresáti kopie (CC) přijímají kopii zprávy. CC adresáti jsou uživatelé, "
+"kteří by mohli mít užitek z informací obsažených ve zprávě, ale přímo se "
+"jich netýká a nejsou za ni zodpovědni. Všichni adresáti mohou vidět, že byla "
+"odeslána také kopie. Mohou také vidět jména příjemců kopie."
 
-#: C/evolution.xml:7228(glossterm)
+#: C/evolution.xml:7552(glossterm)
 msgid "conduit"
 msgstr "conduit"
 
-#: C/evolution.xml:7230(para)
-msgid "A small application that controls the transfer of data between a handheld device and a desktop computer."
-msgstr "Malá aplikace, která kontroluje přenos dat mezi přenosným zařízením a počítačem."
+#: C/evolution.xml:7554(para)
+msgid ""
+"A small application that controls the transfer of data between a handheld "
+"device and a desktop computer."
+msgstr ""
+"Malá aplikace, která kontroluje přenos dat mezi přenosným zařízením a "
+"počítačem."
 
-#: C/evolution.xml:7236(para)
+#: C/evolution.xml:7560(para)
 msgid "The GNOME groupware application."
 msgstr "Groupware aplikace GNOME"
 
-#: C/evolution.xml:7240(glossterm)
+#: C/evolution.xml:7564(glossterm)
 msgid "execute"
 msgstr "spustit"
 
-#: C/evolution.xml:7242(para)
-msgid "To run a program. Any file that can be run is called an executable. Evolution can download executable attachments, but before they can be run, the files must be marked as executable with a shell or file manager. This security precaution prevents the automatic or accidental execution of malicious programs. For more information on executables and file permissions, see the documentation for your file manager or shell."
-msgstr "Spustit program. Jakýkoliv soubor, který může být spuštěn se nazývá spustitelný. Evolution umí stahovat spustitelné přílohy ale před tím, než může být takovýto soubor spuštěn, musí být v shellu nebo správci souborů označen jako spustitelný. Toto bezpečnostní opatření zabraňuje automatickému nebo náhodnému spuštění škodlivých programů. Více informací o spouštění a právech souborů dozvíte v dokumentaci vašeho správce souborů nebo shellu."
-
-#: C/evolution.xml:7246(glossterm)
+#: C/evolution.xml:7566(para)
+msgid ""
+"To run a program. Any file that can be run is called an executable. "
+"Evolution can download executable attachments, but before they can be run, "
+"the files must be marked as executable with a shell or file manager. This "
+"security precaution prevents the automatic or accidental execution of "
+"malicious programs. For more information on executables and file "
+"permissions, see the documentation for your file manager or shell."
+msgstr ""
+"Spustit program. Jakýkoliv soubor, který může být spuštěn se nazývá "
+"spustitelný. Evolution umí stahovat spustitelné přílohy ale před tím, než "
+"může být takovýto soubor spuštěn, musí být v shellu nebo správci souborů "
+"označen jako spustitelný. Toto bezpečnostní opatření zabraňuje automatickému "
+"nebo náhodnému spuštění škodlivých programů. Více informací o spouštění a "
+"právech souborů dozvíte v dokumentaci vašeho správce souborů nebo shellu."
+
+#: C/evolution.xml:7570(glossterm)
 msgid "expunge"
 msgstr "vyčistit"
 
-#: C/evolution.xml:7248(para)
-msgid "When messages are marked for deletion, they remain until they are expunged. When a message is expunged, it is permanently deleted, as long as it was marked for deletion."
-msgstr "Když jsou zprávy označené pro vymazání, zůstávají dokud nejsou vyčistěny. Když je zpráva vyčistěna, je nadobro smazána, pokud byla označena pro vymazání."
+#: C/evolution.xml:7572(para)
+msgid ""
+"When messages are marked for deletion, they remain until they are expunged. "
+"When a message is expunged, it is permanently deleted, as long as it was "
+"marked for deletion."
+msgstr ""
+"Když jsou zprávy označené pro vymazání, zůstávají dokud nejsou vyčistěny. "
+"Když je zpráva vyčistěna, je nadobro smazána, pokud byla označena pro "
+"vymazání."
 
-#: C/evolution.xml:7252(glossterm)
+#: C/evolution.xml:7576(glossterm)
 msgid "file tree"
 msgstr "strom souborů"
 
-#: C/evolution.xml:7254(para)
-msgid "A way of describing a group of files on a computer. The top of the tree is called the root directory, and is denoted by <command>/</command>. The rest of the branches spread downward from the root. Don't confuse the root directory with the root account or root's home directory, normally <command>/root</command>."
-msgstr "Způsob zobrazení skupin souborů na počítači. Vrchol stromu se nazývá kořenový adresář a značí se <command>/</command>. Ostatní větve se rozšiřují směrem dolů z kořenu. Nepleťte si kořenový adresář (root directory) s účtem roota nebo domovským adresářem roota (<command>/root</command>) "
-
-#: C/evolution.xml:7258(glossterm)
+#: C/evolution.xml:7578(para)
+msgid ""
+"A way of describing a group of files on a computer. The top of the tree is "
+"called the root directory, and is denoted by <command>/</command>. The rest "
+"of the branches spread downward from the root. Don't confuse the root "
+"directory with the root account or root's home directory, normally <command>/"
+"root</command>."
+msgstr ""
+"Způsob zobrazení skupin souborů na počítači. Vrchol stromu se nazývá "
+"kořenový adresář a značí se <command>/</command>. Ostatní větve se rozšiřují "
+"směrem dolů z kořenu. Nepleťte si kořenový adresář (root directory) s účtem "
+"roota nebo domovským adresářem roota (<command>/root</command>) "
+
+#: C/evolution.xml:7582(glossterm)
 msgid "filter"
 msgstr "filtr"
 
-#: C/evolution.xml:7260(para)
-msgid "Within Evolution, a filter is a method of sorting mail automatically when it is downloaded. You can create filters to perform one or more actions on a message that meets any (or all) of a wide range of criteria."
-msgstr "V Evolutionu je filtr metoda, pomocí které jsou e-maily rozřarovány při stahování. Můžete vytvořit filtry, které budou vykonávat jednu nebo více akcí se zprávami, které splní jedno nebo všechna kritéria."
+#: C/evolution.xml:7584(para)
+msgid ""
+"Within Evolution, a filter is a method of sorting mail automatically when it "
+"is downloaded. You can create filters to perform one or more actions on a "
+"message that meets any (or all) of a wide range of criteria."
+msgstr ""
+"V Evolutionu je filtr metoda, pomocí které jsou e-maily rozřarovány při "
+"stahování. Můžete vytvořit filtry, které budou vykonávat jednu nebo více "
+"akcí se zprávami, které splní jedno nebo všechna kritéria."
 
-#: C/evolution.xml:7264(glossterm)
+#: C/evolution.xml:7588(glossterm)
 msgid "forward"
 msgstr "přeposlat"
 
-#: C/evolution.xml:7266(para)
-msgid "Forwards a copy of the message and any additional comments to a different e-mail address."
+#: C/evolution.xml:7590(para)
+msgid ""
+"Forwards a copy of the message and any additional comments to a different "
+"email address."
 msgstr "Přeposílá kopii zprávy a dalším komentářů na jinou e-mailovou adresu."
 
-#: C/evolution.xml:7270(glossterm)
+#: C/evolution.xml:7594(glossterm)
 msgid "groupware"
 msgstr "groupware"
 
-#: C/evolution.xml:7272(para)
-msgid "A term describing an application that helps groups of people work together. Typically, a groupware application has several productivity features built into one program, including e-mail, calendar, and address book tools."
-msgstr "Výraz, který popisuje aplikaci, která pomáhá skupinám lidi při společné práci. Typicky má groupwarová aplikace několik funkcí na podporu produktivity začleněných do jednoho programu, včetně e-mailu, kalendáře a nástrojů adresáře. "
+#: C/evolution.xml:7596(para)
+msgid ""
+"A term describing an application that helps groups of people work together. "
+"Typically, a groupware application has several productivity features built "
+"into one program, including email, calendar, and address book tools."
+msgstr ""
+"Výraz, který popisuje aplikaci, která pomáhá skupinám lidi při společné "
+"práci. Typicky má groupwarová aplikace několik funkcí na podporu "
+"produktivity začleněných do jednoho programu, včetně e-mailu, kalendáře a "
+"nástrojů adresáře. "
 
-#: C/evolution.xml:7276(glossterm)
+#: C/evolution.xml:7600(glossterm)
 msgid "HTML"
 msgstr "HTML"
 
-#: C/evolution.xml:7278(para)
-msgid "Hypertext Markup Language (HTML) is a language for describing page layout in electronic documents such as Web pages, help files, and e-mail messages. HTML can be used in e-mail and news posts to insert images and apply text treatments."
-msgstr "Hypertext Markup Language (HTML) je jazyk pro popsání rozvržení stránek v elektronických dokumentech jako jsou webové stránky, soubory nápovědy a e-mailové zprávy. HTML může být použito v e-mailech pro vkládání obrázků a zpracování textu."
+#: C/evolution.xml:7602(para)
+msgid ""
+"Hypertext Markup Language (HTML) is a language for describing page layout in "
+"electronic documents such as Web pages, help files, and email messages. HTML "
+"can be used in email and news posts to insert images and apply text "
+"treatments."
+msgstr ""
+"Hypertext Markup Language (HTML) je jazyk pro popsání rozvržení stránek v "
+"elektronických dokumentech jako jsou webové stránky, soubory nápovědy a e-"
+"mailové zprávy. HTML může být použito v e-mailech pro vkládání obrázků a "
+"upravování textu."
 
-#: C/evolution.xml:7282(glossterm)
+#: C/evolution.xml:7606(glossterm)
 msgid "iCal"
 msgstr "iCal"
 
-#: C/evolution.xml:7284(para)
+#: C/evolution.xml:7608(para)
 msgid "iCal is a protocol that Evolution uses to manage the calendar section."
 msgstr "iCal je protokol, který Evolution používá pro správu kalendáře."
 
-#: C/evolution.xml:7288(glossterm)
+#: C/evolution.xml:7612(glossterm)
 msgid "IMAP"
 msgstr "IMAP"
 
-#: C/evolution.xml:7290(para)
-msgid "Internet Mail Access Protocol. It allows access to e-mail that is typically stored remotely on a server rather than on a local hard disk. Often contrasted with POP."
-msgstr "Internet Mail Access Protocol. Umožňuje přístup k e-mailu tak, že jsou uloženy vzdáleně na serveru spíše než lokálně na haddisku. Často označován za opak POP."
+#: C/evolution.xml:7614(para)
+msgid ""
+"Internet Mail Access Protocol. It allows access to email that is typically "
+"stored remotely on a server rather than on a local hard disk. Often "
+"contrasted with POP."
+msgstr ""
+"Internet Mail Access Protocol. Umožňuje přístup k e-mailu tak, že jsou "
+"uloženy vzdáleně na serveru a ne lokálně na haddisku. Často označován za "
+"opak POP."
 
-#: C/evolution.xml:7294(glossterm)
+#: C/evolution.xml:7618(glossterm)
 msgid "inline"
 msgstr "vložený"
 
-#: C/evolution.xml:7296(para)
-msgid "Displayed as part of a message or other document, rather than attached as a separate file. Contrast with <emphasis>attachment</emphasis>."
-msgstr "zobrazený jako část zprávy nebo jiného dokumenty, místo přilozený jako samostatný soubor. Opak <emphasis>přílohy</emphasis>."
+#: C/evolution.xml:7620(para)
+msgid ""
+"Displayed as part of a message or other document, rather than attached as a "
+"separate file. Contrast with <emphasis>attachment</emphasis>."
+msgstr ""
+"zobrazený jako část zprávy nebo jiného dokumenty, místo přilozený jako "
+"samostatný soubor. Opak <emphasis>přílohy</emphasis>."
 
-#: C/evolution.xml:7300(glossterm)
+#: C/evolution.xml:7624(glossterm)
 msgid "LDAP"
 msgstr "LDAP"
 
-#: C/evolution.xml:7302(para)
-msgid "Lightweight Directory Access Protocol. Allows a client to search through a large database of addresses, phone numbers, and people stored on a server."
-msgstr "Lightweight Directory Access Protocol. Umožňuje klientům prohledávat velké databáze adres, telefonních čísel a lidi uložených na serveru."
+#: C/evolution.xml:7626(para)
+msgid ""
+"Lightweight Directory Access Protocol. Allows a client to search through a "
+"large database of addresses, phone numbers, and people stored on a server."
+msgstr ""
+"Lightweight Directory Access Protocol. Umožňuje klientům prohledávat velké "
+"databáze adres, telefonních čísel a lidi uložených na serveru."
 
-#: C/evolution.xml:7306(glossterm)
+#: C/evolution.xml:7630(glossterm)
 msgid "mail client"
 msgstr "e-mailový klient"
 
-#: C/evolution.xml:7308(para)
-msgid "The application with which a person reads and sends e-mail. Its counterparts are the various types of mail servers, which handle user authentication and direct messages from the sender to the recipient."
-msgstr "Aplikace, pomocí které může uživatel číst a posílat e-maily. Jejím protějškem jsou různé typy mail serverů, které manipulují s autentizací uživatele a posílají zprávy od odesílatele k adresátovi."
+#: C/evolution.xml:7632(para)
+msgid ""
+"The application with which a person reads and sends email. Its counterparts "
+"are the various types of mail servers, which handle user authentication and "
+"direct messages from the sender to the recipient."
+msgstr ""
+"Aplikace, pomocí které může uživatel číst a posílat e-maily. Jejím "
+"protějškem jsou různé typy mail serverů, které pracují s autentizací "
+"uživatele a posílají zprávy od odesílatele k adresátovi."
 
-#: C/evolution.xml:7312(glossterm)
+#: C/evolution.xml:7636(glossterm)
 msgid "POP"
 msgstr "POP"
 
-#: C/evolution.xml:7314(para)
-msgid "Post Office Protocol. A mechanism for e-mail transport. In contrast to IMAP, it is used only to get mail from a server and store it locally on your hard disk."
-msgstr "Post Office Protocol. Mechanismus pro přenos e-mailů. Narozdíl od IMAPu je používán pouze pro získání e-mailu ze serveru a uložení lokalně na vašem haddisku."
+#: C/evolution.xml:7638(para)
+msgid ""
+"Post Office Protocol. A mechanism for email transport. In contrast to IMAP, "
+"it is used only to get mail from a server and store it locally on your hard "
+"disk."
+msgstr ""
+"Post Office Protocol. Mechanismus pro přenos e-mailů. Narozdíl od IMAPu je "
+"používán pouze pro získání e-mailu ze serveru a uložení lokalně na vašem "
+"harddisku."
 
-#: C/evolution.xml:7318(glossterm)
+#: C/evolution.xml:7642(glossterm)
 msgid "protocol"
 msgstr "protokol"
 
-#: C/evolution.xml:7320(para)
-msgid "An agreed-upon method of communication, especially one for sending particular types of information between computer systems. Examples include POP (Post Office Protocol), for e-mail, and HTTP (HypterText Transfer Protocol) for Web pages."
-msgstr "Široce přijímaná metoda komunikace, především pro posílání určitých typů informací mezi počítačovými systémy. Příkladem může být POP (Post Office Protocol) pro e-maily a HTTP (HypterText Transfer Protocol) pro webové stránky."
+#: C/evolution.xml:7644(para)
+msgid ""
+"An agreed-upon method of communication, especially one for sending "
+"particular types of information between computer systems. Examples include "
+"POP (Post Office Protocol), for email, and HTTP (HyperText Transfer "
+"Protocol) for Web pages."
+msgstr ""
+"Široce přijímaná metoda komunikace, především pro posílání určitých typů "
+"informací mezi počítačovými systémy. Příkladem může být POP (Post Office "
+"Protocol) pro e-maily a HTTP (HypterText Transfer Protocol) pro webové "
+"stránky."
 
-#: C/evolution.xml:7324(glossterm)
+#: C/evolution.xml:7648(glossterm)
 msgid "public key encryption"
 msgstr "Šifrování veřejným klíčem"
 
-#: C/evolution.xml:7326(para)
-msgid "A strong encryption method that uses a set of two keys, one of which is made public, and one of which is kept private. Data encrypted using the public key can only be decrypted using the private key. The longer the keys, the more difficult it is to break the encryption."
-msgstr "Silná šifrovací metoda, která používá dva klíče, jeden je veřejný a druhý zůstává privátní. Data zašifrovaná veřejným klíčem mohou být rozšifrována pouze privátním klíčem. Čím delší klíče, tím obtížnější je prolomit šifrování."
+#: C/evolution.xml:7650(para)
+msgid ""
+"A strong encryption method that uses a set of two keys, one of which is made "
+"public, and one of which is kept private. Data encrypted using the public "
+"key can only be decrypted using the private key. The longer the keys, the "
+"more difficult it is to break the encryption."
+msgstr ""
+"Silná šifrovací metoda, která používá dva klíče, jeden je veřejný a druhý "
+"zůstává privátní. Data zašifrovaná veřejným klíčem mohou být rozšifrována "
+"pouze privátním klíčem. Čím delší klíče, tím obtížnější je prolomit "
+"šifrování."
 
-#: C/evolution.xml:7330(glossterm)
+#: C/evolution.xml:7654(glossterm)
 msgid "regular expression"
 msgstr "regulární výraz"
 
-#: C/evolution.xml:7332(para)
-msgid "A regular expression (regex) is a way of describing a string of text using metacharacters or wildcard symbols. For example, the statement fly.*so[au]p means any phrase beginning with <quote>fly</quote> and ending in <quote>soup</quote> or <quote>soap.</quote> If you searched for that expression, you'd find both <quote>fly in my soup</quote> and <quote>fly in my soap.</quote> For more information, enter <command>man grep</command> from the command line."
-msgstr "regulární výraz je způsob, jakým lze popsat řetězec použitím speciálních znaků a symbolů. Např. sdělení fly.*so[au]p znamená jakoukoliv frázi začínající na <quote>fly</quote> a končící na <quote>soup</quote> nebo <quote>soap.</quote> Pokud byste hledali tento výraz, nalezli byste <quote>fly in my soup</quote> a <quote>fly in my soap.</quote> Pokud chcete získat více informací, vložte <command>man grep</command> z příkazové řádky."
-
-#: C/evolution.xml:7336(glossterm)
+#: C/evolution.xml:7656(para)
+msgid ""
+"A regular expression (regex) is a way of describing a string of text using "
+"metacharacters or wildcard symbols. For example, the statement fly.*so[au]p "
+"means any phrase beginning with <quote>fly</quote> and ending in "
+"<quote>soup</quote> or <quote>soap.</quote> If you searched for that "
+"expression, you'd find both <quote>fly in my soup</quote> and <quote>fly in "
+"my soap.</quote> For more information, enter <command>man grep</command> "
+"from the command line."
+msgstr ""
+"regulární výraz je způsob, jakým lze popsat řetězec použitím speciálních "
+"znaků a symbolů. Např. sdělení fly.*so[au]p znamená jakoukoliv frázi "
+"začínající na <quote>fly</quote> a končící na <quote>soup</quote> nebo "
+"<quote>soap.</quote> Pokud byste hledali tento výraz, nalezli byste "
+"<quote>fly in my soup</quote> a <quote>fly in my soap.</quote> Pokud chcete "
+"získat více informací, vložte <command>man grep</command> z příkazové řádky."
+
+#: C/evolution.xml:7660(glossterm)
 msgid "script"
 msgstr "skript"
 
-#: C/evolution.xml:7338(para)
-msgid "A program written in an interpreted (rather than compiled) language. Often used as a synonym for macro, to denote a series of prerecorded commands or actions within an application. Scripts are used to accomplish repetitive and tedious tasks, to save the user time."
-msgstr "Program napsaný v interpretovaném (spíše než kompilovaném) jazyku. Často používáno jako synonymum pro makro, označení série příkazů nebo akce v rámci aplikace. Skripty jsou používány pro to, aby vykonaly opakující se, zdlouhavé úlohy a ušetřily tak čas."
+#: C/evolution.xml:7662(para)
+msgid ""
+"A program written in an interpreted (rather than compiled) language. Often "
+"used as a synonym for macro, to denote a series of prerecorded commands or "
+"actions within an application. Scripts are used to accomplish repetitive and "
+"tedious tasks, to save the user time."
+msgstr ""
+"Program napsaný v interpretovaném (spíše než kompilovaném) jazyku. Často "
+"používáno jako synonymum pro makro, označení série příkazů nebo akce v rámci "
+"aplikace. Skripty jsou používány pro to, aby vykonaly opakující se, "
+"zdlouhavé úlohy a ušetřily tak čas."
 
-#: C/evolution.xml:7342(glossterm)
+#: C/evolution.xml:7666(glossterm)
 msgid "search base"
 msgstr "základna pro hledání"
 
-#: C/evolution.xml:7344(para)
-msgid "LDAP can break contact lists into many groups. The search base tells LDAP the top group to use. How much of the Search Base to search is set by the Search Scope option."
-msgstr "LDAP může rozbít seznam kontaktů do mnoha skupin. Základna pro hledání řekne LDAP, kterou top skupinu použít. Volbou rozsahu hledání se nastavuje, jak velká základna má být prohledávána."
+#: C/evolution.xml:7668(para)
+msgid ""
+"LDAP can break contact lists into many groups. The search base tells LDAP "
+"the top group to use. How much of the Search Base to search is set by the "
+"Search Scope option."
+msgstr ""
+"LDAP může rozbít seznam kontaktů do mnoha skupin. Základna pro hledání řekne "
+"LDAP, kterou top skupinu použít. Volbou rozsahu hledání se nastavuje, jak "
+"velká základna má být prohledávána."
 
-#: C/evolution.xml:7348(glossterm)
+#: C/evolution.xml:7672(glossterm)
 msgid "search folder"
 msgstr "složka hledání"
 
-#: C/evolution.xml:7350(para)
-msgid "An e-mail organization tool. Search folders allow you to create a folder that contains the results of a complex search. Search folder contents are updated dynamically."
-msgstr "Nástroj pro organizaci e-mailů. Složky vyhledávání vám umožňují vytvořit složku, která bude obsahovat výsledky komplexního vyhledávání. Složka hledání je dynamicky aktualizována."
+#: C/evolution.xml:7674(para)
+msgid ""
+"An email organization tool. Search folders allow you to create a folder that "
+"contains the results of a complex search. Search folder contents are updated "
+"dynamically."
+msgstr ""
+"Nástroj pro organizaci e-mailů. Složky hledání vám umožňují vytvořit složku, "
+"která bude obsahovat výsledky komplexního vyhledávání. Složka hledání je "
+"dynamicky aktualizována."
 
-#: C/evolution.xml:7354(glossterm)
+#: C/evolution.xml:7678(glossterm)
 msgid "search scope"
 msgstr "rozsah hledání"
 
-#: C/evolution.xml:7356(para)
+#: C/evolution.xml:7680(para)
 msgid "Search Scope states how much of the search base to search."
 msgstr "rozsah hledání uvádí, jak velká je základna pro hledání."
 
-#: C/evolution.xml:7360(glossterm)
+#: C/evolution.xml:7684(glossterm)
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: C/evolution.xml:7362(para)
-msgid "A program that sends mail. Evolution can use it instead of SMTP; some people prefer it because it offers more flexibility; however, it is more difficult to set up."
-msgstr "Program, který odesílá e-maily. Evolution ho může používat místo SMTP. Někteří lidé ho preferují, protože nabízí lepší flexibilitu, nicméně se hůře nastavuje."
+#: C/evolution.xml:7686(para)
+msgid ""
+"A program that sends mail. Evolution can use it instead of SMTP; some people "
+"prefer it because it offers more flexibility; however, it is more difficult "
+"to set up."
+msgstr ""
+"Program, který odesílá e-maily. Evolution ho může používat místo SMTP. "
+"Někteří lidé ho preferují, protože nabízí lepší flexibilitu, nicméně se hůře "
+"nastavuje."
 
-#: C/evolution.xml:7366(glossterm)
+#: C/evolution.xml:7690(glossterm)
 msgid "switcher"
 msgstr "přepínač"
 
-#: C/evolution.xml:7368(para)
-msgid "An area of Evolution that offers users fast access to the most frequently used features of the application."
-msgstr "Oblast Evolutionu, která uživatelům nabízí rychlý přístup k nejčastěji používaným funkcím aplikace."
+#: C/evolution.xml:7692(para)
+msgid ""
+"An area of Evolution that offers users fast access to the most frequently "
+"used features of the application."
+msgstr ""
+"Oblast Evolutionu, která uživatelům nabízí rychlý přístup k nejčastěji "
+"používaným funkcím aplikace."
 
-#: C/evolution.xml:7372(glossterm)
+#: C/evolution.xml:7696(glossterm)
 msgid "signature"
 msgstr "podpis"
 
-#: C/evolution.xml:7374(para)
-msgid "Text placed at the end of every e-mail sent, similar to a hand-written signature at the bottom of a written letter. A signature can be anything from a favorite quotation to a link to a Web page; courtesy dictates that it be fewer than four lines long."
-msgstr "Text umístěný na konci každého odeslaného e-mailu, podobný ručně psanému podpisu v dolní části psaného dopisu. Podpisem může být cokoliv od oblíbeného citátu po odkaz na webovou stránku. Podpis by neměl být delší než čtyři řádky."
+#: C/evolution.xml:7698(para)
+msgid ""
+"Text placed at the end of every email sent, similar to a hand-written "
+"signature at the bottom of a written letter. A signature can be anything "
+"from a favorite quotation to a link to a Web page; courtesy dictates that it "
+"be fewer than four lines long."
+msgstr ""
+"Text umístěný na konci každého odeslaného e-mailu, podobný ručně psanému "
+"podpisu v dolní části psaného dopisu. Podpisem může být cokoliv od "
+"oblíbeného citátu po odkaz na webovou stránku. Etiketa říká, že, podpis by "
+"neměl být delší než čtyři řádky."
 
-#: C/evolution.xml:7378(glossterm)
+#: C/evolution.xml:7702(glossterm)
 msgid "SMTP"
 msgstr "SMTP"
 
-#: C/evolution.xml:7380(para)
-msgid "Simple Mail Transfer Protocol. The most common way of transporting mail messages from your computer to the server."
-msgstr "Simple Mail Transfer Protocol. Nejobvyklejší způsob přenosu e-mailových zpráv z vašeho počítače na server."
+#: C/evolution.xml:7704(para)
+msgid ""
+"Simple Mail Transfer Protocol. The most common way of transporting mail "
+"messages from your computer to the server."
+msgstr ""
+"Simple Mail Transfer Protocol. Nejobvyklejší způsob přenosu e-mailových "
+"zpráv z vašeho počítače na server."
 
-#: C/evolution.xml:7384(glossterm)
+#: C/evolution.xml:7708(glossterm)
 msgid "tooltip"
 msgstr "Nástrojový tip"
 
-#: C/evolution.xml:7386(para)
-msgid "A small box of explanatory text that appears when the mouse pointer is held over a button or other interface element."
-msgstr "Malé pole s vysvětlujícím textem, které se zobrazí, když kurzor myši zůstane nad tlačítkem nebo jiným prvkem rozhraní."
+#: C/evolution.xml:7710(para)
+msgid ""
+"A small box of explanatory text that appears when the mouse pointer is held "
+"over a button or other interface element."
+msgstr ""
+"Malé pole s vysvětlujícím textem, které se zobrazí, když kurzor myši zůstane "
+"nad tlačítkem nebo jiným prvkem rozhraní."
 
-#: C/evolution.xml:7390(glossterm)
+#: C/evolution.xml:7714(glossterm)
 msgid "virus"
 msgstr "virus"
 
-#: C/evolution.xml:7392(para)
-msgid "A program that inserts itself into other files or programs. When executed, it spreads to more programs and other computers. A virus can cause substantial damage by clogging networks or disk drives, deleting files, or opening security holes."
-msgstr "Program, který sám sebe vkládá do jiných souborů nebo programů. Když je spuštěn, rozšiřuje se do více programů a jiných počítačů. Virus může způsobit významné škody zablokováním sítě nebo pevných disků, vymazáním souborů nebo otevřením bezpečnostních děr."
+#: C/evolution.xml:7716(para)
+msgid ""
+"A program that inserts itself into other files or programs. When executed, "
+"it spreads to more programs and other computers. A virus can cause "
+"substantial damage by clogging networks or disk drives, deleting files, or "
+"opening security holes."
+msgstr ""
+"Program, který sám sebe vkládá do jiných souborů nebo programů. Když je "
+"spuštěn, rozšiřuje se do více programů a jiných počítačů. Virus může "
+"způsobit významné škody zablokováním sítě nebo pevných disků, vymazáním "
+"souborů nebo otevřením bezpečnostních děr."
 
-#: C/evolution.xml:7396(glossterm)
+#: C/evolution.xml:7720(glossterm)
 msgid "vCard"
 msgstr "vCard"
 
-#: C/evolution.xml:7398(para)
-msgid "A file format for the exchange of contact information. When you get an address card attached to an e-mail, it is probably in vCard format."
-msgstr "Formát souboru pro výměnu kontaktních informací. Když dostanete kartu adresáře přiloženou k e-mailu, bude pravděpodobně ve formátu vCard."
+#: C/evolution.xml:7722(para)
+msgid ""
+"A file format for the exchange of contact information. When you get an "
+"address card attached to an email, it is probably in vCard format."
+msgstr ""
+"Formát souboru pro výměnu kontaktních informací. Když dostanete kartu "
+"adresáře přiloženou k e-mailu, bude pravděpodobně ve formátu vCard."
 
-#: C/evolution.xml:7404(title)
+#: C/evolution.xml:7728(title)
 msgid "Legal Notices"
 msgstr "Právní poznámky"
 
-#: C/evolution.xml:7406(member)
-msgid "Novell, Inc. makes no representations or warranties with respect to the contents or use of this documentation, and specifically disclaims any express or implied warranties of merchantability or fitness for any particular purpose. Further, Novell, Inc. reserves the right to revise this publication and to make changes to its content, at any time, without obligation to notify any person or entity of such revisions or changes."
-msgstr "Novell, Inc. neprovádí žádné zastoupení nebo záruky vzhledem k obsahu a použití tohoto dokumentu a především se zříká jakýchkoliv výslovných nebo odvozených záruk prodejnosti nebo vhodnosti pro jakýkoliv účel. Dále si Novell, Inc. zachovává právo revidovat tuto publikaci a měnit její obsah kdykoliv bez nutnosti informovat o tom jakoukoliv osobu nebo předmět revizí a změn."
-
-#: C/evolution.xml:7407(member)
-msgid "Further, Novell, Inc. makes no representations or warranties with respect to any software, and specifically disclaims any express or implied warranties of merchantability or fitness for any particular purpose. Further, Novell, Inc. reserves the right to make changes to any and all parts of Novell software, at any time, without any obligation to notify any person or entity of such changes."
-msgstr "Dále společnost Novell, Inc. nedělá zastoupení nebo záruky s ohledem na jakýkoliv software a  zříká se jakýchkoliv rychlých a implikovaných záruk prodejnosti nebo způsobilosti pro jakýkoliv účel. Dále si společnost Novell, Inc. vyhrazuje právo dělat změny ve všech částech softwaru od společnosti Novell, kdykoliv a bez povinnosti oznámit to jakékoliv osobě nebo objektu těchto změn."
-
-#: C/evolution.xml:7410(member)
-msgid "You may not use, export, or re-export this product in violation of any applicable laws or regulations including, without limitation, U.S. export regulations or the laws of the country in which you reside."
-msgstr "Nemůžete tento produkt používat, exportovat a reexportovat v rozporu s jakýmkoliv použitelným zákonem, včetně nařízení, exportními nařízeními Spojených států nebo zákony země, v které sídlíte."
-
-#: C/evolution.xml:7413(year)
-msgid "2007"
-msgstr "2007"
-
-#: C/evolution.xml:7413(holder)
-#: C/evolution.xml:7419(member)
-msgid "Novell, Inc."
-msgstr "Novell, Inc."
-
-#: C/evolution.xml:7413(member)
-msgid "<copyright><placeholder-1/><placeholder-2/></copyright> Permission is granted to copy, distribute, and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.2 or any later version, published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the GFDL can be found at http://www.fsf.org/licenses/fdl.html."
-msgstr "<copyright><placeholder-1/><placeholder-2/></copyright> Je povoleno kopírovat, šířit a/nebo upravovat tento dokument za podmínek GNU Free Documentation License, verze 1.2 nebo jakékoli další verze vydané nadací Free Software Foundation; bez neměnných oddílů, bez textů předních desek a bez textů zadních desek. Kopii GFDL můžete najít na http://www.fsf.org/licences/fdl.html"
-
-#: C/evolution.xml:7414(member)
-msgid "THIS DOCUMENT AND MODIFIED VERSIONS OF THIS DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT:"
+#: C/evolution.xml:7730(member)
+msgid ""
+"Novell, Inc. makes no representations or warranties with respect to the "
+"contents or use of this documentation, and specifically disclaims any "
+"express or implied warranties of merchantability or fitness for any "
+"particular purpose. Further, Novell, Inc. reserves the right to revise this "
+"publication and to make changes to its content, at any time, without "
+"obligation to notify any person or entity of such revisions or changes."
+msgstr ""
+"Novell, Inc. neprovádí žádné zastoupení nebo záruky vzhledem k obsahu a "
+"použití tohoto dokumentu a především se zříká jakýchkoliv výslovných nebo "
+"odvozených záruk prodejnosti nebo vhodnosti pro jakýkoliv účel. Dále si "
+"Novell, Inc. zachovává právo revidovat tuto publikaci a měnit její obsah "
+"kdykoliv bez nutnosti informovat o tom jakoukoliv osobu nebo předmět revizí "
+"a změn."
+
+#: C/evolution.xml:7731(member)
+msgid ""
+"Further, Novell, Inc. makes no representations or warranties with respect to "
+"any software, and specifically disclaims any express or implied warranties "
+"of merchantability or fitness for any particular purpose. Further, Novell, "
+"Inc. reserves the right to make changes to any and all parts of Novell "
+"software, at any time, without any obligation to notify any person or entity "
+"of such changes."
+msgstr ""
+"Dále společnost Novell, Inc. nedělá zastoupení nebo záruky s ohledem na "
+"jakýkoliv software a  zříká se jakýchkoliv rychlých a implikovaných záruk "
+"prodejnosti nebo způsobilosti pro jakýkoliv účel. Dále si společnost Novell, "
+"Inc. vyhrazuje právo dělat změny ve všech částech softwaru od společnosti "
+"Novell, kdykoliv a bez povinnosti oznámit to jakékoliv osobě nebo objektu "
+"těchto změn."
+
+#: C/evolution.xml:7734(member)
+msgid ""
+"You may not use, export, or re-export this product in violation of any "
+"applicable laws or regulations including, without limitation, U.S. export "
+"regulations or the laws of the country in which you reside."
 msgstr ""
+"Nemůžete tento produkt používat, exportovat a reexportovat v rozporu s "
+"jakýmkoliv použitelným zákonem, včetně nařízení, exportními nařízeními "
+"Spojených států nebo zákony země, v které sídlíte."
 
-#: C/evolution.xml:7415(member)
-msgid "1. THE DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
+#: C/evolution.xml:7737(member)
+msgid ""
+"Copyright 2007 Novell, Inc. Permission is granted to copy, distribute, and/"
+"or modify this document under the terms of the GNU Free Documentation "
+"License (GFDL), Version 1.2 or any later version, published by the Free "
+"Software Foundation with no Invariant Sections, no Front-Cover Texts, and no "
+"Back-Cover Texts. A copy of the GFDL can be found at http://www.fsf.org/"
+"licenses/fdl.html."
+msgstr ""
+"Copyright 2007 Novell, Inc. Je povoleno kopírovat, šířit a/nebo upravovat "
+"tento dokument za podmínek GNU Free Documentation License, verze 1.2 nebo "
+"jakékoli další verze vydané nadací Free Software Foundation; bez neměnných "
+"oddílů, bez textů předních desek a bez textů zadních desek. Kopii GFDL "
+"můžete najít na http://www.fsf.org/licences/fdl.html"
+
+#: C/evolution.xml:7738(member)
+msgid ""
+"THIS DOCUMENT AND MODIFIED VERSIONS OF THIS DOCUMENT ARE PROVIDED UNDER THE "
+"TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING "
+"THAT:"
 msgstr ""
 
-#: C/evolution.xml:7416(member)
-msgid "2. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES."
-msgstr ""
+#: C/evolution.xml:7739(member)
+msgid ""
+"1. THE DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY "
+"KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES "
+"THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS, "
+"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. THE ENTIRE "
+"RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR "
+"MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR "
+"MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL "
+"WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY "
+"SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN "
+"ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION "
+"OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
+msgstr ""
+
+#: C/evolution.xml:7740(member)
+msgid ""
+"2. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT "
+"(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL "
+"WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED "
+"VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE "
+"TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR "
+"CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, "
+"DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR "
+"MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR "
+"RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN "
+"IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES."
+msgstr ""
+
+#: C/evolution.xml:7743(member)
+msgid "Novell, Inc."
+msgstr "Novell, Inc."
 
-#: C/evolution.xml:7420(member)
+#: C/evolution.xml:7744(member)
 msgid "404 Wyman Street, Suite 500"
 msgstr "404 Wyman Street, Suite 500"
 
-#: C/evolution.xml:7421(member)
+#: C/evolution.xml:7745(member)
 msgid "Waltham, MA 02451"
 msgstr "Waltham, MA 02451"
 
-#: C/evolution.xml:7422(member)
+#: C/evolution.xml:7746(member)
 msgid "U.S.A."
 msgstr "U.S.A."
 
-#: C/evolution.xml:7423(member)
+#: C/evolution.xml:7747(member)
 msgid "www.novell.com"
 msgstr "www.novell.com"
 
-#: C/evolution.xml:7426(para)
+#: C/evolution.xml:7750(para)
 msgid "July 2007"
 msgstr "Červen 2007"
 
-#: C/evolution.xml:7428(member)
-msgid "To access the online documentation for this and other Novell products, and to get updates, see www.novell.com/documentation"
-msgstr "Pro přístup k online dokumentaci pro tento nebo jiný produkt Novellu a pro aktualizace navštivte www.novell.com/documentation "
+#: C/evolution.xml:7752(member)
+msgid ""
+"To access the online documentation for this and other Novell products, and "
+"to get updates, see www.novell.com/documentation"
+msgstr ""
+"Pro přístup k online dokumentaci pro tento nebo jiný produkt Novellu a pro "
+"aktualizace navštivte www.novell.com/documentation "
 
-#: C/evolution.xml:7431(member)
+#: C/evolution.xml:7755(member)
 msgid "Evolution is a trademark of Novell, Inc."
 msgstr "Evolution je obchodní známka společnosti Novell, Inc."
 
-#: C/evolution.xml:7432(member)
-msgid "GroupWise is a registered trademark of Novell, Inc. in the United States and other countries."
-msgstr "GroupWise je registrovaná obchodní známka společnosti Novell, Inc. ve Spojených státech a ostatních zemích."
+#: C/evolution.xml:7756(member)
+msgid ""
+"GroupWise is a registered trademark of Novell, Inc. in the United States and "
+"other countries."
+msgstr ""
+"GroupWise je registrovaná obchodní známka společnosti Novell, Inc. ve "
+"Spojených státech a ostatních zemích."
 
-#: C/evolution.xml:7433(member)
-msgid "Novell is a registered trademark of Novell, Inc. in the United States and other countries."
-msgstr "Novell je registrovaná obchodní známka společnosti Novell, Inc. ve Spojených státech a ostatních zemích."
+#: C/evolution.xml:7757(member)
+msgid ""
+"Novell is a registered trademark of Novell, Inc. in the United States and "
+"other countries."
+msgstr ""
+"Novell je registrovaná obchodní známka společnosti Novell, Inc. ve Spojených "
+"státech a ostatních zemích."
 
-#: C/evolution.xml:7434(member)
+#: C/evolution.xml:7758(member)
 msgid "SUSE is a registered trademark of SUSE AG, a Novell company."
 msgstr "SUSE je registrovaná obchodní známka SUSE AG, společnost Novell."
 
-#: C/evolution.xml:7435(member)
-msgid "Ximian is a registered trademark of Novell, Inc. in the United States and other countries."
-msgstr "Ximian je registrovaná obchodní známka společnosti Novell, Inc. ve Spojených státech a ostatních zemích."
+#: C/evolution.xml:7759(member)
+msgid ""
+"Ximian is a registered trademark of Novell, Inc. in the United States and "
+"other countries."
+msgstr ""
+"Ximian je registrovaná obchodní známka společnosti Novell, Inc. ve Spojených "
+"státech a ostatních zemích."
 
-#: C/evolution.xml:7438(member)
+#: C/evolution.xml:7762(member)
 msgid "All third-party trademarks are the property of their respective owners."
-msgstr "Všechny obchodní známky třetích stran jsou majetkem příslušných vlastníků."
+msgstr ""
+"Všechny obchodní známky třetích stran jsou majetkem příslušných vlastníků."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
 #: C/evolution.xml:0(None)
 msgid "translator-credits"
 msgstr "Jiří Eischmann <jiri@eischmann.cz>, 2008."
 
+#~ msgid ""
+#~ "@@image: 'figures/evo_crash_recovery.png'; "
+#~ "md5=6bfa921910f94e5845f893a6308169a6"
+#~ msgstr ""
+#~ "@@image: 'figures/evo_crash_recovery.png'; "
+#~ "md5=6bfa921910f94e5845f893a6308169a6"
+
+#~ msgid "Connecting to Hula"
+#~ msgstr "Spojení s Hula"
+
+#~ msgid "Hula:"
+#~ msgstr "Hula:"
+
+#~ msgid ""
+#~ "Select this option if you want Hula account. Evolution provide you "
+#~ "connectivity to <trademark class=\"registered\">Hula</trademark> servers "
+#~ "through IMAP and calendaring support through CalDAV. For more information "
+#~ "refer <link linkend=\"b1012tkg\">Connecting to Hula</link>"
+#~ msgstr ""
+#~ "Vyberte tuto možnost, pokud chcete účet Hula. Evolution poskytuje "
+#~ "připojení k serverům <trademark class=\"registered\">Hula</trademark> "
+#~ "pomocí IMAPu a podporuje kalendář pomocí CalDAV. Více informací se "
+#~ "dozvíte na <link linkend=\"b1012tkg\">Připojení k Hula</link>"
+
+#~ msgid "If you don't know the Server, contact your administrator."
+#~ msgstr "Pokud neznáte jméno serveru, kontaktujte svého administrátora."
+
+#~ msgid "Type your username for the account in the Username field."
+#~ msgstr "Napište uživatelské jméno do pole Uživatelské jméno."
+
+#~ msgid "Select to use a secure (SSL) connection."
+#~ msgstr "Vyberte použití zabezpečeného připojení (SSL)."
+
+#~ msgid ""
+#~ "If your server supports secure connections, you should enable this "
+#~ "security option. If you are unsure if your server supports a secure "
+#~ "connection, contact your system administrator."
+#~ msgstr ""
+#~ "Pokud váš server podporuje zabezpečená připojení, měli byste tuto volbu "
+#~ "aktivovat. Pokud si nejste jistí, zda váš server tuto možnost podporuje, "
+#~ "kontaktujte svého administrátora."
+
+#~ msgid ""
+#~ "If you are unsure what authentication type you need, contact your system "
+#~ "administrator."
+#~ msgstr ""
+#~ "Pokud si nejste jistí, který druh autentizace potřebujete, kontaktujte "
+#~ "svého administrátora."
+
+#~ msgid ""
+#~ "Select if you want to apply filters to new messages in the Inbox on the "
+#~ "server."
+#~ msgstr ""
+#~ "Zvolte, pokud chcete aplikovat filtry na nové zprávy v Příchozích na "
+#~ "serveru."
+
+#~ msgid "Select if you want to automatically synchronize remote mail locally."
+#~ msgstr ""
+#~ "Zvolte, pokud chcete automaticky synchronizovat vzdálenou poštu lokálně."
+
+#~ msgid ""
+#~ "Select check new messages for junk contents to filter new messages for "
+#~ "spam messages."
+#~ msgstr ""
+#~ "Zvolením \"kontrolovat nevyžádanou poštu v nových zprávách\" vyfiltrujete "
+#~ "z nových zpráv spam."
+
+#~ msgid ""
+#~ "For more information refer <link linkend=\"usage-mail-organize-spam"
+#~ "\">Stopping Junk Mail (Spam)</link>"
+#~ msgstr ""
+#~ "Více informací získáte na <link linkend=\"usage-mail-organize-spam\">Boj "
+#~ "proti spamu</link>"
+
+#~ msgid "Select if you want to apply filters to new messages in the Inbox."
+#~ msgstr ""
+#~ "Zvolte, pokud chcete použít filtry na nové zprávy ve složce Příchozí."
+
+#~ msgid ""
+#~ "Select if you want Evolution to automatically check for new mail.If you "
+#~ "select this option, you need to specify how often Evolution should check "
+#~ "for new messages."
+#~ msgstr ""
+#~ "Zvolte, pokud chcete, aby Evolution automaticky kontroloval novou poštu. "
+#~ "Pokud zvolíte tuto volbu, musíte zadat, jak často má Evolution nové "
+#~ "zprávy kontrolovat."
+
+#~ msgid "Type the Server address in the Server field."
+#~ msgstr "Napište adresu serveru do pole Server."
+
+#~ msgid ""
+#~ "Before importing e-mail from Netscape*, make sure you have selected File "
+#~ "&gt; Compact All Folders. If you don't, Evolution will import and "
+#~ "undelete the messages in your Trash folders."
+#~ msgstr ""
+#~ "Před importem pošty z Netscape* se ujistěte, že jste vybrali Soubor &gt; "
+#~ "Provést údržbu všech složek. Pokud ne, Evolution importuje a obnoví "
+#~ "smazané zprávy ve vaší složce Koše."
+
+#~ msgid "This is where your e-mail is displayed."
+#~ msgstr "Zde jsou vaše e-maily zobrazovány."
+
+#~ msgid "Crash Recovery"
+#~ msgstr "Zotavení po pádu"
+
+#~ msgid ""
+#~ "Evolution displays a crash detection message when you restart it after a "
+#~ "crash."
+#~ msgstr ""
+#~ "Evolution zobrazí zprávu o detekci pádu, když ho po pádu restartujete."
+
+#~ msgid ""
+#~ "Click Ignore to restore the preview pane displayed when Evolution "
+#~ "crashed. If you click Recover, Evolution opens with all preview panes "
+#~ "hidden."
+#~ msgstr ""
+#~ "Klikněte na Ignorovat, pokud chcete obnovit panel náhledu, který byl "
+#~ "zobrazený, když Evolution spadl. Pokud kliknete na Obnovit, Evolution se "
+#~ "otevře se všemi panely náhledu skrytými. "
+
+#~ msgid ""
+#~ "Evolution has a number of command line options that you can use. You can "
+#~ "find the full list by entering the command <command>man evolution</"
+#~ "command> or <command>evolution --help</command>. The most important "
+#~ "command line options are:"
+#~ msgstr ""
+#~ "Evolution má pro příkazovou řádku velké množství voleb, které můžete "
+#~ "použít. Kompletní seznam získáte příkazem <command>man evolution</"
+#~ "command> nebo <command>evolution --help</command>. Nejdůležitějšími "
+#~ "volbami pro příkazovou řádku jsou:"
+
+#~ msgid ""
+#~ "Click Edit &gt; Preferences &gt; Mail Preferences and select the Enable "
+#~ "Magic Spacebar check box."
+#~ msgstr ""
+#~ "Klikněte na Upravit &gt; Nastavení &gt; Účty e-mailu a zaškrtněte Povolit "
+#~ "Magický mezerník."
+
+#~ msgid "Click Edit &gt; Preferences"
+#~ msgstr "Klikněte na Upravit &gt; Nastavení"
+
+#~ msgid ""
+#~ "Click the down-arrow on the attachment icon, or right-click the "
+#~ "attachment icon in the attachment bar, then click Save As."
+#~ msgstr ""
+#~ "Klikněte na šipku směřující dolů na ikoně přílohy nebo klikněte pravým "
+#~ "tlačítkem na ikonu přílohy v liště příloh, potom klikněte na Uložit jako."
+
+#~ msgid ""
+#~ "When you have finished making your selections, click Close to exit the "
+#~ "Plugin Manager."
+#~ msgstr ""
+#~ "Jste-li hotovi s výběrem, zavřete Správce zasuvných modulů kliknutím na "
+#~ "Zavřít."
+
+#~ msgid "Click Image."
+#~ msgstr "Klikněte na Obrázek."
+
+#~ msgid "Click Rule."
+#~ msgstr "Klikněte na Čáru."
+
+#~ msgid "Click Table."
+#~ msgstr "Klikněte na Tabulku:"
+
+#~ msgid "RSVP:"
+#~ msgstr "RSVP:"
+
+#~ msgid ""
+#~ "GPG uses two keys: public and private. You can give your public key to "
+#~ "anyone you want to receive encrypted messages, or put it on a public key "
+#~ "server so that people can look it up before contacting you. Your private "
+#~ "key lets you decrypt any message encrypted with your public key. Never "
+#~ "give your private key to anyone."
+#~ msgstr ""
+#~ "GPG používá dva klíče: veřejný a privátní. Můžete dát váš veřejný klíč "
+#~ "všem, kteří by měli přijímat vaše zašifrované zprávy, nebo dát veřejný "
+#~ "klíč na server tak, aby si jej mohli lidé vyhledat před tím, než vás "
+#~ "budou kontaktovat. Váš privátní klíč vám umožňuje dešifrovat jakoukoliv "
+#~ "zprávu zašifrovanou vašim veřejným klíčem. Nikdy nedávejte nikomu váš "
+#~ "privátní klíč."
+
+#~ msgid ""
+#~ "When you send a message that is encrypted, you must encrypt it using your "
+#~ "intended recipient's public key. To receive an encrypted message, you "
+#~ "must make sure that the sender has your public key in advance. For "
+#~ "signing messages, you encrypt the signature with your private key, so "
+#~ "only your public key can unlock it. When you send the message, the "
+#~ "recipient gets your public key and unlocks the signature, verifying your "
+#~ "identity."
+#~ msgstr ""
+#~ "Když posíláte zprávu, která je zašifrovaná, musíte ji zašifrovat k tomu "
+#~ "určeným veřejným klíčem příjemce. Chcete-li přijímat zašifrované zprávy, "
+#~ "musíte se ujistit, že má odesílatel váš veřejný klíč v předstihu. Pro "
+#~ "podpis zpráv zašifrujte váš podpis vaším privátním klíčem tak, že pouze "
+#~ "váš veřejný klíč jej může odemčít. Když pošlete zprávu, příjemce dostane "
+#~ "váš veřejný klíč a odemče podpis a tím si ověří vaši identitu."
+
+#~ msgid "Click Edit &gt; Preferences, then click Mail Accounts."
+#~ msgstr "Klikněte na Upravit &gt; Nastavení a potom na Účty e-mailu."
+
+#~ msgid "Click Edit &gt; Preferences, then click Certificate."
+#~ msgstr "Klikněte na Upravit &gt; Nastavení, potom klikněte na Certifikáty."
+
+#~ msgid ""
+#~ "Click Edit &gt; Preferences, then select the account to encrypt the "
+#~ "messages in."
+#~ msgstr ""
+#~ "Klikněte na Upravit &gt; Nastavení, potom vyberte účet, v kterém chcete "
+#~ "šifrovat zprávy."
+
+#~ msgid "Select the search criteria."
+#~ msgstr "Vyberte kritérium vyhledávání"
+
+#~ msgid "Click Show to expand the drop-down list."
+#~ msgstr "Klikněte na Zobrazit pro rozbalení seznamu."
+
+#~ msgid "To perform advanced search,"
+#~ msgstr "Chcete-li provést pokročilé hledání,"
+
+#~ msgid "The sender's address."
+#~ msgstr "Adresa odesílatele."
+
+#~ msgid ""
+#~ "Messages can have labels of Important, Work, Personal, To Do, or Later. "
+#~ "You can set tables with other filters or by hand."
+#~ msgstr ""
+#~ "Zprávy mohou mít štítky Důležité, Pracovní, Osobní, Zpracovávané a "
+#~ "Později. Můžete nastavit tabulky s jinými filtry nebo ručně."
+
+#~ msgid ""
+#~ "Moves the message into a folder you specify. Click Here to select the "
+#~ "destination folder."
+#~ msgstr ""
+#~ "Přesune zprávu do složky, kterou uvedete. Kliknutím zde vyberete složku."
+
+#~ msgid ""
+#~ "To change your junk mail filtering preferences, click Edit &gt; "
+#~ "Preferences, then click Mail Preferences. For more information on this "
+#~ "see, <link linkend=\"mail-prefs-junk\">Junk Mail Preferences</link>."
+#~ msgstr ""
+#~ "Pro změnu vašeho nastavení filtrování nevyžádané pošty klikněte na "
+#~ "Upravit &gt; Nastavení, potom na Nastavení pošty. Více informací najdete "
+#~ "v <link linkend=\"mail-prefs-junk\">Nastavení nevyžádané pošty</link>."
+
+#~ msgid ""
+#~ "From the Contact Editor toolbar, you can save and close, print, close, or "
+#~ "delete the contact."
+#~ msgstr ""
+#~ "Z nástrojové lišty editoru kontaktů můžete ukládat, zavírat, tisknout "
+#~ "nebo mazat kontakt."
+
+#~ msgid "Use File &gt; New Task or Shift+Ctrl+T."
+#~ msgstr "Vyberte Soubor &gt; Nový úkol nebo tiskněte Shift+Ctrl+T."
+
+#~ msgid ""
+#~ "A pre-downloading procedure that allows Evolution to quickly refer to "
+#~ "data. It enables faster searches and decreases memory usage for data "
+#~ "displays."
+#~ msgstr ""
+#~ "Procedura před stahováním, která aplikaci Evolution umožňuje podívat se "
+#~ "rychle na data. Umožňuje to rychlejší vyhledávání a snížení využití "
+#~ "paměti při zobrazení dat."
+
+#~ msgid "2007"
+#~ msgstr "2007"
+
 #~ msgid "Evolution™"
 #~ msgstr "Evolution™"
+
 #~ msgid "evolution ‘%s’"
 #~ msgstr "evolution ‘%s’"
+
 #~ msgid "@@image: 'figures/evo_label_a.png'; md5=THIS FILE DOESN'T EXIST"
 #~ msgstr "@@image: 'figures/evo_label_a.png'; md5=THIS FILE DOESN'T EXIST"
+
 #~ msgid ""
 #~ "For support, late-breaking news, and errata, visit the Novell® support "
 #~ "center at <ulink url=\"http://support.novell.com\">support.novell.com</"
@@ -9988,6 +14557,7 @@ msgstr "Jiří Eischmann <jiri@eischmann.cz>, 2008."
 #~ "Pro informace o posledních novinkách a erratech navštivte centrum podpory "
 #~ "společnosti Novell® na <ulink url=\"http://support.novell.com\">support."
 #~ "novell.com</ulink>."
+
 #~ msgid ""
 #~ "Evolution™ makes the tasks of storing, organizing, and retrieving your "
 #~ "personal information easy, so you can work and communicate more "
@@ -9999,6 +14569,7 @@ msgstr "Jiří Eischmann <jiri@eischmann.cz>, 2008."
 #~ "osobních informací, takže můžete pracovat a komunikovat s ostatními "
 #~ "efektivněji. Je to velmi vyvinutý <link linkend=\"groupware\">groupware</"
 #~ "link> program, nedílná součást k internetu připojeného počítače."
+
 #~ msgid ""
 #~ "Evolution can help you work in a group by handling e-mail, address, and "
 #~ "other contact information, and one or more calendars. It can do that on "
@@ -10008,6 +14579,7 @@ msgstr "Jiří Eischmann <jiri@eischmann.cz>, 2008."
 #~ "Evolution vám může pomoci pracovat ve skupině tak, že bude vést vaše e-"
 #~ "maily, kontakty a jeden nebo více kalendářů. Může to dělat na jednom nebo "
 #~ "více počítačích spojených po síti, pro jednu osobu nebo velkou skupinu."
+
 #~ msgid ""
 #~ "With Evolution, you can accomplish your most common daily tasks quickly. "
 #~ "For example, it takes only one or two clicks to enter appointment or "
@@ -10023,6 +14595,7 @@ msgstr "Jiří Eischmann <jiri@eischmann.cz>, 2008."
 #~ "funkce jako <link linkend=\"vfolder\">složky vyhledávání</link>, které  "
 #~ "vám umožní uložit výsledky hledání, jakoby byly obyčejnými složkami e-"
 #~ "mailů."
+
 #~ msgid ""
 #~ "If you check this option, evolution fetches the headers as well as the "
 #~ "body of the message simultaneously. In this case, the time taken to open "
@@ -10033,18 +14606,23 @@ msgstr "Jiří Eischmann <jiri@eischmann.cz>, 2008."
 #~ "tělo zprávy. V tomto případě otevření zprávy nevyžaduje relativně tolik "
 #~ "času. K tomu můžete stáhnout všechny maily pro čtení offline, pokud "
 #~ "zatrhnete tuto volbu."
+
 #~ msgid "To take the backup,"
 #~ msgstr "Pro vytvoření zálohy"
+
 #~ msgid "To restore Evolution,"
 #~ msgstr "Pro obnovu Evolutionu"
+
 #~ msgid ""
 #~ "‘Get Mail' in the Evolution toolbar replaced with Send/Receive tool in "
 #~ "SLED."
 #~ msgstr ""
 #~ "\"Získat poštu\" bylo v liště nástrojů Evolutionu nahrazeno v SLED "
 #~ "položkou Přijmout/Odeslat."
+
 #~ msgid "Click Configure to add the keywords."
 #~ msgstr "Klikněte na Configure pro přidání klíčových slov."
+
 #~ msgid ""
 #~ "If you need additional help with Evolution, visit the <ulink url=\"http://"
 #~ "support.novell.com\">Novell® support site at</ulink>."
@@ -10052,5 +14630,3 @@ msgstr "Jiří Eischmann <jiri@eischmann.cz>, 2008."
 #~ "Jestliže potřebujete další pomoc s aplikací Evolution, navštivte <ulink "
 #~ "url=\"http://support.novell.com\">stránku podpory společnosti Novell®</"
 #~ "ulink>."
-
-
diff --git a/help/de/figures/Screenshot-Evolution -mailer-Preferences.png b/help/de/figures/Screenshot-Evolution-mailer-Preferences.png
index 63d88f626f..63d88f626f 100755
--- a/help/de/figures/Screenshot-Evolution -mailer-Preferences.png
+++ b/help/de/figures/Screenshot-Evolution-mailer-Preferences.png
diff --git a/help/es/es.po b/help/es/es.po
index d1893ceaa8..ef5174d5b7 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-08-20 17:24+0000\n"
-"PO-Revision-Date: 2008-08-22 14:26+0200\n"
+"POT-Creation-Date: 2008-09-16 05:27+0000\n"
+"PO-Revision-Date: 2008-09-17 19:27+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,8 +22,10 @@ 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.
@@ -38,14 +40,18 @@ 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.
@@ -60,20 +66,26 @@ 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.
@@ -98,14 +110,18 @@ 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.
@@ -121,7 +137,8 @@ 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.
@@ -147,7 +164,8 @@ 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.
@@ -172,42 +190,81 @@ 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:1177(None)
-msgid "@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
-msgstr "@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
+#: C/evolution.xml:1181(None)
+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.
-#: C/evolution.xml:1194(None)
+#: C/evolution.xml:1183(None)
+msgid ""
+"@@image: 'figures/evo_mailnotification.png'; "
+"md5=3ec09c3f9b49aee5be6f5fc2df69350d"
+msgstr ""
+"@@image: 'figures/evo_mailnotification.png'; "
+"md5=3ec09c3f9b49aee5be6f5fc2df69350d"
+
+#. 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: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"
+
+#. 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"
 
 #. 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:1209(None)
-msgid "@@image: 'figures/collap_head_a.png'; md5=82c5d5ae3f5499f17bdb08eebfe9c557"
-msgstr "@@image: 'figures/collap_head_a.png'; md5=82c5d5ae3f5499f17bdb08eebfe9c557"
+#: C/evolution.xml:1506(None)
+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.
-#: C/evolution.xml:1384(None)
-msgid "@@image: 'figures/evo_newmess_a.png'; md5=3bd7f656fa4d7fa3d5b337241e56f575"
-msgstr "@@image: 'figures/evo_newmess_a.png'; md5=3bd7f656fa4d7fa3d5b337241e56f575"
+#: C/evolution.xml:1514(None)
+msgid ""
+"@@image: 'figures/evo_custom_header.png'; "
+"md5=10dfa4db26e3354551653fffb9ec23de"
+msgstr ""
+"@@image: 'figures/evo_custom_header.png'; "
+"md5=10dfa4db26e3354551653fffb9ec23de"
 
 #. 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:1472(None)
-msgid "@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb"
-msgstr "@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb"
+#: C/evolution.xml:1560(None)
+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.
-#: C/evolution.xml:1526(None)
+#: C/evolution.xml:1614(None)
 msgid ""
 "@@image: 'figures/attach_reminder_a.png'; "
 "md5=66e32d56d961c67ff24d8b1c4ac6c9eb"
@@ -217,7 +274,7 @@ 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:1539(None)
+#: C/evolution.xml:1627(None)
 msgid ""
 "@@image: 'figures/evo_attachreminder_plugin.png'; "
 "md5=25f7db7cd7d310110847354c62702ecf"
@@ -227,7 +284,7 @@ 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:1867(None)
+#: C/evolution.xml:1955(None)
 msgid ""
 "@@image: 'figures/evo_account_editor_a.png'; "
 "md5=39b83104a4e6ecb9473cbb84121e6be3"
@@ -237,13 +294,15 @@ 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:1907(None)
-msgid "@@image: 'figures/account_editor_a.png'; md5=cd9c4e71a53f8f03424c1432d7d46e30"
-msgstr "@@image: 'figures/account_editor_a.png'; md5=cd9c4e71a53f8f03424c1432d7d46e30"
+#: C/evolution.xml:1995(None)
+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.
-#: C/evolution.xml:2348(None)
+#: C/evolution.xml:2537(None)
 msgid ""
 "@@image: 'figures/evo_import_asst_a.png'; "
 "md5=e86638d0b3a01478fd4f12e33781a8a0"
@@ -253,13 +312,15 @@ 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:2375(None)
-msgid "@@image: 'figures/mail-threaded.png'; md5=ab1b9eb0f0735f4fcc4c51ead5ce1ff2"
-msgstr "@@image: 'figures/mail-threaded.png'; md5=ab1b9eb0f0735f4fcc4c51ead5ce1ff2"
+#: C/evolution.xml:2564(None)
+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.
-#: C/evolution.xml:2526(None)
+#: C/evolution.xml:2715(None)
 msgid ""
 "@@image: 'figures/evo_flag_follow_up_a.png'; "
 "md5=6a4790a789cf4b3b8b73cb43aa8d065b"
@@ -269,7 +330,7 @@ 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:2543(None)
+#: C/evolution.xml:2732(None)
 msgid ""
 "@@image: 'figures/evo_select_folder.png'; "
 "md5=7b99ef6be9990bc1c1d869512ae2f617"
@@ -279,7 +340,7 @@ 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:2546(None)
+#: C/evolution.xml:2735(None)
 msgid ""
 "@@image: 'figures/evo_message_filters_a.png'; "
 "md5=3b7067638063c6aad2c316db838d2273"
@@ -289,37 +350,46 @@ 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:2709(None)
-msgid "@@image: 'figures/evo_adv_search_a.png'; md5=676d35d686745650c9bcfa832763362c"
-msgstr "@@image: 'figures/evo_adv_search_a.png'; md5=676d35d686745650c9bcfa832763362c"
+#: 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"
 
 #. 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:2739(None)
-msgid "@@image: 'figures/evo_edit_search.png'; md5=2ce150b3eb63cc4ec0f0292e13167be8"
-msgstr "@@image: 'figures/evo_edit_search.png'; md5=2ce150b3eb63cc4ec0f0292e13167be8"
+#: C/evolution.xml:2928(None)
+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:2745(None)
-msgid "@@image: 'figures/evo_edit_rule_a.png'; md5=0ae423517b27dfd34cfcb54550335fbb"
-msgstr "@@image: 'figures/evo_edit_rule_a.png'; md5=0ae423517b27dfd34cfcb54550335fbb"
+#: 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"
 
 #. 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:2772(None)
-msgid "@@image: 'figures/filter-new-fig.png'; md5=75a2b8ccfe0f7a4982859827c867d578"
-msgstr "@@image: 'figures/filter-new-fig.png'; md5=75a2b8ccfe0f7a4982859827c867d578"
+#: C/evolution.xml:2961(None)
+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:3020(None)
+#: 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.
-#: C/evolution.xml:3111(None)
+#: C/evolution.xml:3300(None)
 msgid ""
 "@@image: 'figures/evo_select_add_folder.png'; "
 "md5=01d57d01ff1650d91c1d73de1f4301ab"
@@ -329,7 +399,7 @@ 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:3204(None)
+#: C/evolution.xml:3393(None)
 msgid ""
 "@@image: 'figures/evo_contacteditor_a.png'; "
 "md5=4f188bd5d34a9fea7d91fdf5fb943f28"
@@ -339,37 +409,55 @@ 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:3242(None)
-msgid "@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252"
-msgstr "@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252"
+#: C/evolution.xml:3431(None)
+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.
-#: C/evolution.xml:3498(None)
-msgid "@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77"
-msgstr "@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77"
+#: C/evolution.xml:3452(None)
+msgid ""
+"@@image: 'figures/evo_googlecontacts.png'; "
+"md5=2357233124d1191cdbb2279f6f998207"
+msgstr ""
+"@@image: 'figures/evo_googlecontacts.png'; "
+"md5=2357233124d1191cdbb2279f6f998207"
 
 #. 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:3653(None)
+#: C/evolution.xml:3744(None)
+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.
+#: C/evolution.xml:3899(None)
 msgid "@@image: 'figures/evo_cal_a.png'; md5=08a60dd21a8c52bace4a9d1d606b3ff5"
 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:3676(None)
-msgid "@@image: 'figures/evo_cal_prop_a.png'; md5=f28511f098847b4fc9278ba6c54c9c3d"
-msgstr "@@image: 'figures/evo_cal_prop_a.png'; md5=f28511f098847b4fc9278ba6c54c9c3d"
+#: 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"
 
 #. 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:3708(None)
-msgid "@@image: 'figures/google_cal_view.png'; md5=6574c207d4b219a80da96982ee650ce2"
-msgstr "@@image: 'figures/google_cal_view.png'; md5=6574c207d4b219a80da96982ee650ce2"
+#: C/evolution.xml:3954(None)
+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.
-#: C/evolution.xml:3807(None)
+#: C/evolution.xml:4053(None)
 msgid ""
 "@@image: 'figures/evo_calender_appointmnt.png'; "
 "md5=730ed74addbca4b0638f03cbcde99e71"
@@ -379,21 +467,23 @@ 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:3875(None)
-msgid "@@image: 'figures/evo_allday_a.png'; md5=3641b70c5110bb275d553c00d559636f"
-msgstr "@@image: 'figures/evo_allday_a.png'; md5=3641b70c5110bb275d553c00d559636f"
+#: C/evolution.xml:4121(None)
+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.
-#: C/evolution.xml:4071(None) C/evolution.xml:5346(None)
-#: C/evolution.xml:5732(None)
+#: C/evolution.xml:4317(None) C/evolution.xml:5592(None)
+#: C/evolution.xml:5978(None)
 msgid "@@image: 'figures/free_busy.png'; md5=e9401be3e2c00fa9389a81aa438bc67d"
 msgstr "@@image: 'figures/free_busy.png'; md5=e9401be3e2c00fa9389a81aa438bc67d"
 
 #. 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:4167(None) C/evolution.xml:4481(None)
-#: C/evolution.xml:4719(None)
+#: C/evolution.xml:4413(None) C/evolution.xml:4727(None)
+#: C/evolution.xml:4965(None)
 msgid ""
 "@@image: 'figures/evo_cal_advsearch.png'; "
 "md5=a99f9f9f5c13ba8cf237b7a79a5af7f1"
@@ -403,25 +493,30 @@ 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:4630(None)
+#: 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:5026(None)
-msgid "@@image: 'figures/exchng-identity.png'; md5=51fef803bd3083b0b2c2583221d1c151"
-msgstr "@@image: 'figures/exchng-identity.png'; md5=51fef803bd3083b0b2c2583221d1c151"
+#: C/evolution.xml:5272(None)
+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:5031(None)
-msgid "@@image: 'figures/exchng-rec-mails.png'; md5=29dcaf684be7ea3554afe4f96885bc4e"
-msgstr "@@image: 'figures/exchng-rec-mails.png'; md5=29dcaf684be7ea3554afe4f96885bc4e"
+#: C/evolution.xml:5277(None)
+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.
-#: C/evolution.xml:5038(None)
+#: C/evolution.xml:5284(None)
 msgid ""
 "@@image: 'figures/exchng-rec-options.png'; "
 "md5=c3c759f902c2584ee218dc40d6e46806"
@@ -431,19 +526,23 @@ 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:5052(None)
-msgid "@@image: 'figures/exchg-identity.png'; md5=3733884734da6765870c652f1651bbd2"
-msgstr "@@image: 'figures/exchg-identity.png'; md5=3733884734da6765870c652f1651bbd2"
+#: C/evolution.xml:5298(None)
+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:5060(None)
-msgid "@@image: 'figures/exchng-rec-mail.png'; md5=fe7f5e7b758b0306998ec477abf790f3"
-msgstr "@@image: 'figures/exchng-rec-mail.png'; md5=fe7f5e7b758b0306998ec477abf790f3"
+#: C/evolution.xml:5306(None)
+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.
-#: C/evolution.xml:5068(None)
+#: C/evolution.xml:5314(None)
 msgid ""
 "@@image: 'figures/exchng-rec-option.png'; "
 "md5=6c0f84b7541a044e900d9d7c5fc4a49b"
@@ -453,13 +552,15 @@ 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:5101(None) C/evolution.xml:5338(None)
-msgid "@@image: 'figures/exchng-settings.png'; md5=7e82c0934afd2de5fca76c164d6342f4"
-msgstr "@@image: 'figures/exchng-settings.png'; md5=7e82c0934afd2de5fca76c164d6342f4"
+#: 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"
 
 #. 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:5143(None)
+#: C/evolution.xml:5389(None)
 msgid ""
 "@@image: 'figures/evo_send_option_a.png'; "
 "md5=c1cca904625d1a7de13c851cd15235f6"
@@ -469,13 +570,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:5223(None)
+#: C/evolution.xml:5469(None)
 msgid "@@image: 'figures/delgt-add.png'; md5=9bf1f22c67551ad910cd3749f216c2b7"
 msgstr "@@image: 'figures/delgt-add.png'; md5=9bf1f22c67551ad910cd3749f216c2b7"
 
 #. 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:5232(None)
+#: C/evolution.xml:5478(None)
 msgid ""
 "@@image: 'figures/evo_delegate_permission_a.png'; "
 "md5=05df38ad69b20f9bd7c1e14044ca10fd"
@@ -485,7 +586,7 @@ 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:5267(None)
+#: C/evolution.xml:5513(None)
 msgid ""
 "@@image: 'figures/sub-others-folder.png'; "
 "md5=5e385ee9524f93b65b307f83e1888138"
@@ -495,13 +596,15 @@ 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:5297(None)
-msgid "@@image: 'figures/sub-pub-fold.png'; md5=e8e8b7d0b6ae8214ca1ef51dac06a1f7"
-msgstr " @@image: 'figures/filter-new-fig.png'; md5=8816e3bdeb3a4e936b7cf877f51c033c"
+#: C/evolution.xml:5543(None)
+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.
-#: C/evolution.xml:5626(None)
+#: C/evolution.xml:5872(None)
 msgid ""
 "@@image: 'figures/evo_identityedit_a.png'; "
 "md5=78418c3f6214b7494c323df12bc6921f"
@@ -511,7 +614,7 @@ 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:5634(None)
+#: C/evolution.xml:5880(None)
 msgid ""
 "@@image: 'figures/evo_gwreceiveedit_a.png'; "
 "md5=3f5fc5b802eba3ef1a68e6ff675577b0"
@@ -521,7 +624,7 @@ 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:5647(None)
+#: C/evolution.xml:5893(None)
 msgid ""
 "@@image: 'figures/evo_gwreceiveoptedit_a.png'; "
 "md5=1c9e818bb39bb288511cf1cebdd83569"
@@ -531,21 +634,24 @@ 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:5693(None)
-msgid "@@image: 'figures/evo_rmdrnotes_a.png'; md5=ae24ed3554b8359af96ef2374ccd261a"
-msgstr "@@image: 'figures/evo_rmdrnotes_a.png'; md5=ae24ed3554b8359af96ef2374ccd261a"
+#: C/evolution.xml:5939(None)
+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:5725(None)
-msgid "@@image: 'figures/evo_shd_memo_a.png'; md5=dd7069c9f52641dd13101c1dd935feb8"
+#: C/evolution.xml:5971(None)
+msgid ""
+"@@image: 'figures/evo_shd_memo_a.png'; md5=dd7069c9f52641dd13101c1dd935feb8"
 msgstr ""
 " @@image: 'figures/evo_send_setup_a.png'; "
 "md5=956fcc991274e17196342801de1f55a4"
 
 #. 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:5796(None)
+#: C/evolution.xml:6042(None)
 msgid ""
 "@@image: 'figures/evo_gwstatustrack.png'; "
 "md5=d4eb84e2d55870af1408c430ce8c0e66"
@@ -555,85 +661,111 @@ 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:5851(None)
-msgid "@@image: 'figures/evo_sendstatus_a.png'; md5=36ca2211056c859eb776124bfc364705"
-msgstr "@@image: 'figures/evo_sendstatus_a.png'; md5=36ca2211056c859eb776124bfc364705"
+#: C/evolution.xml:6097(None)
+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:5909(None)
-msgid "@@image: 'figures/evo_calstatus_a.png'; md5=99fb98faa3e644f6433c078ba71a0353"
-msgstr "@@image: 'figures/evo_calstatus_a.png'; md5=99fb98faa3e644f6433c078ba71a0353"
+#: C/evolution.xml:6155(None)
+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:6050(None)
-msgid "@@image: 'figures/evo_proxyadd_a.png'; md5=51357617967f0610eb95dab5814540ad"
+#: C/evolution.xml:6296(None)
+msgid ""
+"@@image: 'figures/evo_proxyadd_a.png'; md5=51357617967f0610eb95dab5814540ad"
 msgstr ""
 " @@image: 'figures/evo_imapreceive_a.png'; "
 "md5=0b35b1fc693bb79aefe7dcfb5f354faf"
 
 #. 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:6073(None)
-msgid "@@image: 'figures/proxy-login.png'; md5=7adee93cffbeea4636df9bb1a8923b07"
-msgstr "@@image: 'figures/proxy-login.png'; md5=7adee93cffbeea4636df9bb1a8923b07"
+#: C/evolution.xml:6319(None)
+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.
-#: C/evolution.xml:6082(None)
+#: C/evolution.xml:6328(None)
 msgid "@@image: 'figures/proxy-cal.png'; md5=8e1f3438047198a963e7642d5ff9cac6"
 msgstr "@@image: 'figures/proxy-cal.png'; md5=8e1f3438047198a963e7642d5ff9cac6"
 
 #. 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:6225(None)
+#: C/evolution.xml:6471(None)
 msgid ""
 "@@image: 'figures/mailer_preferences.png'; "
-"md5=4141df4bf4b2dc4e82a0bad514714194"
+"md5=ad0be84fb36edefd01851653b69b65bb"
 msgstr ""
 "@@image: 'figures/mailer_preferences.png'; "
-"md5=4141df4bf4b2dc4e82a0bad514714194"
+"md5=ad0be84fb36edefd01851653b69b65bb"
 
 #. 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:6334(None)
-msgid "@@image: 'figures/evo_imapheader_a.png'; md5=b11aa6167ce03769ce3084d32f4b4459"
-msgstr "@@image: 'figures/evo_imapheader_a.png'; md5=b11aa6167ce03769ce3084d32f4b4459"
+#: C/evolution.xml:6573(None)
+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:6429(None)
-msgid "@@image: 'figures/evo_labels_a.png'; md5=847d1bebd5d64b9f63e14d6d88f741de"
-msgstr "@@image: 'figures/evo_labels_a.png'; md5=847d1bebd5d64b9f63e14d6d88f741de"
+#: C/evolution.xml:6668(None)
+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:6455(None)
-msgid "@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
-msgstr "@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
+#: C/evolution.xml:6694(None)
+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:6500(None)
+#: 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:6844(None)
-msgid "@@image: 'figures/evo_debuglogs_a.png'; md5=07f28e4574670558cf11897915b2ce7e"
-msgstr "@@image: 'figures/evo_debuglogs_a.png'; md5=07f28e4574670558cf11897915b2ce7e"
+#: C/evolution.xml:6930(None)
+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"
 
 #. 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:6996(None)
-msgid "@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
-msgstr "@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
+#: C/evolution.xml:7359(None)
+msgid ""
+"@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
+msgstr ""
+"@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
 
-#: C/evolution.xml:15(title) C/evolution.xml:7386(para)
-msgid "Evolution 2.22 User Guide"
-msgstr "Guía de usuario de Evolution 2.22"
+#: C/evolution.xml:15(title) C/evolution.xml:7749(para)
+msgid "Evolution 2.24 User Guide"
+msgstr "Guía de usuario de Evolution 2.24"
 
 #: C/evolution.xml:20(firstname) C/evolution.xml:22(corpauthor)
 #: C/evolution.xml:38(para) C/evolution.xml:46(para) C/evolution.xml:54(para)
@@ -652,8 +784,8 @@ msgid "2002-2008"
 msgstr "2002-2008"
 
 #: C/evolution.xml:34(revnumber) C/evolution.xml:77(productnumber)
-msgid "2.22"
-msgstr "2.22"
+msgid "2.24"
+msgstr "2.24"
 
 #: C/evolution.xml:35(date)
 msgid "March 2008"
@@ -692,8 +824,8 @@ msgid "October 5, 2006"
 msgstr "5 de octubre de 2006"
 
 #: C/evolution.xml:67(releaseinfo)
-msgid "This manual describes version 2.22 of Evolution"
-msgstr "Este manual describe la versión 2.22 de Evolution"
+msgid "This manual describes version 2.24 of Evolution"
+msgstr "Este manual describe la versión 2.24 de Evolution"
 
 #: C/evolution.xml:71(para)
 msgid ""
@@ -703,8 +835,8 @@ msgstr ""
 "Una guía de usuario para Evolution que explica como usar sus características "
 "de correo, calendario, libreta de direcciones y listas de tareas."
 
-#: C/evolution.xml:76(productname) C/evolution.xml:5530(para)
-#: C/evolution.xml:7195(glossterm)
+#: C/evolution.xml:76(productname) C/evolution.xml:5776(para)
+#: C/evolution.xml:7558(glossterm)
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -723,11 +855,11 @@ msgstr "Acerca de esta guía"
 #: C/evolution.xml:85(para)
 msgid ""
 "This guide describes how to use and manage <trademark>Evolution</trademark> "
-"2.22 client software. This guide is intended for users and is divided into "
+"2.24 client software. This guide is intended for users and is divided into "
 "the following sections:"
 msgstr ""
 "Esta guía describe cómo usar y gestionar el cliente de <trademark>Evolution</"
-"trademark> 2.22. Esta guía está dirigida a los usuarios y se divide en las "
+"trademark> 2.24. Esta guía está dirigida a los usuarios y se divide en las "
 "siguientes secciones:"
 
 #: C/evolution.xml:88(link) C/evolution.xml:149(title)
@@ -738,53 +870,53 @@ msgstr "Inicio"
 msgid "Sending and Receiving Email"
 msgstr "Enviar y recibir correo"
 
-#: C/evolution.xml:94(link) C/evolution.xml:2251(title)
+#: C/evolution.xml:94(link) C/evolution.xml:2440(title)
 msgid "Organizing Your Email"
 msgstr "Organizar su correo electrónico"
 
 # index.docbook:88, index.docbook:89
-#: C/evolution.xml:97(link) C/evolution.xml:3145(title)
+#: C/evolution.xml:97(link) C/evolution.xml:3334(title)
 msgid "Evolution Contacts: the Address Book"
 msgstr "Contactos de Evolution: la libreta de direcciones"
 
 # index.docbook:88, index.docbook:89
-#: C/evolution.xml:100(link) C/evolution.xml:3554(title)
+#: C/evolution.xml:100(link) C/evolution.xml:3800(title)
 msgid "Evolution Calendar"
 msgstr "Calendario de Evolution"
 
-#: C/evolution.xml:103(link) C/evolution.xml:4847(title)
+#: C/evolution.xml:103(link) C/evolution.xml:5093(title)
 msgid "Connecting to Exchange Servers"
 msgstr "Conexión a servidores Exchange"
 
-#: C/evolution.xml:106(link) C/evolution.xml:5402(title)
+#: C/evolution.xml:106(link) C/evolution.xml:5648(title)
 msgid "Connecting to GroupWise"
 msgstr "Conexión a GroupWise"
 
-#: C/evolution.xml:109(link) C/evolution.xml:6196(title)
+#: C/evolution.xml:109(link) C/evolution.xml:6442(title)
 msgid "Advanced Configuration"
 msgstr "Configuración avanzada"
 
-#: C/evolution.xml:112(link) C/evolution.xml:6858(title)
+#: C/evolution.xml:112(link) C/evolution.xml:7221(title)
 msgid "Synchronizing Your Handheld Device"
 msgstr "Sincronización de Evolution con dispositivos portátiles"
 
-#: C/evolution.xml:115(link) C/evolution.xml:6915(title)
+#: C/evolution.xml:115(link) C/evolution.xml:7278(title)
 msgid "Migration from Outlook to Evolution"
 msgstr "Migrar de Outlook a Evolution"
 
-#: C/evolution.xml:118(link) C/evolution.xml:6977(title)
+#: C/evolution.xml:118(link) C/evolution.xml:7340(title)
 msgid "Quick Reference"
 msgstr "Referencia rápida"
 
-#: C/evolution.xml:121(link) C/evolution.xml:7091(title)
+#: C/evolution.xml:121(link) C/evolution.xml:7454(title)
 msgid "Known Bugs and Limitations"
 msgstr "Fallos conocidos y limitaciones"
 
-#: C/evolution.xml:124(link) C/evolution.xml:7097(title)
+#: C/evolution.xml:124(link) C/evolution.xml:7460(title)
 msgid "Authors"
 msgstr "Autores"
 
-#: C/evolution.xml:127(link) C/evolution.xml:7156(title)
+#: C/evolution.xml:127(link) C/evolution.xml:7519(title)
 msgid "Glossary"
 msgstr "Glosario"
 
@@ -992,14 +1124,16 @@ 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 ""
@@ -1015,8 +1149,8 @@ msgstr ""
 #: C/evolution.xml:550(para) C/evolution.xml:565(para)
 #: C/evolution.xml:583(para) C/evolution.xml:604(para)
 #: C/evolution.xml:626(para) C/evolution.xml:649(para)
-#: C/evolution.xml:705(para) C/evolution.xml:2318(para)
-#: C/evolution.xml:2340(para)
+#: C/evolution.xml:705(para) C/evolution.xml:2507(para)
+#: C/evolution.xml:2529(para)
 msgid "Click Forward."
 msgstr "Pulse «Adelante»."
 
@@ -1042,7 +1176,8 @@ 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:"
@@ -1208,7 +1343,7 @@ msgstr ""
 "instrucciones de configuración, consulte <link linkend=\"bstgbqn\">Opciones "
 "de configuración locales</link>."
 
-#: C/evolution.xml:307(title) C/evolution.xml:5238(title)
+#: C/evolution.xml:307(title) C/evolution.xml:5484(title)
 msgid "None:"
 msgstr "Ninguno:"
 
@@ -1234,7 +1369,8 @@ 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 ""
@@ -1268,27 +1404,27 @@ msgstr ""
 "su sistema para obtener más información."
 
 #: C/evolution.xml:330(para) C/evolution.xml:689(para)
-#: C/evolution.xml:5067(para)
+#: C/evolution.xml:5313(para)
 msgid "Select your authentication type in the Authentication list."
 msgstr "Seleccione su tipo de autenticación en la lista «Autenticación»."
 
 #: C/evolution.xml:331(para) C/evolution.xml:690(para)
-#: C/evolution.xml:723(para) C/evolution.xml:1933(para)
-#: C/evolution.xml:2057(para) C/evolution.xml:2065(para)
-#: C/evolution.xml:2232(para) C/evolution.xml:3010(para)
-#: C/evolution.xml:3015(para) C/evolution.xml:3441(para)
-#: C/evolution.xml:3456(para) C/evolution.xml:3464(para)
-#: C/evolution.xml:3797(para) C/evolution.xml:3799(para)
-#: C/evolution.xml:3801(para) C/evolution.xml:3821(para)
-#: C/evolution.xml:3832(para) C/evolution.xml:3837(para)
-#: C/evolution.xml:3858(para) C/evolution.xml:3866(para)
-#: C/evolution.xml:3982(para) C/evolution.xml:3993(para)
-#: C/evolution.xml:3998(para) C/evolution.xml:4009(para)
-#: C/evolution.xml:4017(para) C/evolution.xml:4022(para)
-#: C/evolution.xml:4368(para) C/evolution.xml:4387(para)
-#: C/evolution.xml:4419(para) C/evolution.xml:4432(para)
-#: C/evolution.xml:4654(para) C/evolution.xml:6096(para)
-#: C/evolution.xml:6762(para) C/evolution.xml:6828(para)
+#: C/evolution.xml:723(para) C/evolution.xml:2021(para)
+#: C/evolution.xml:2246(para) C/evolution.xml:2254(para)
+#: C/evolution.xml:2421(para) C/evolution.xml:3199(para)
+#: C/evolution.xml:3204(para) C/evolution.xml:3687(para)
+#: C/evolution.xml:3702(para) C/evolution.xml:3710(para)
+#: C/evolution.xml:4043(para) C/evolution.xml:4045(para)
+#: C/evolution.xml:4047(para) C/evolution.xml:4067(para)
+#: C/evolution.xml:4078(para) C/evolution.xml:4083(para)
+#: C/evolution.xml:4104(para) C/evolution.xml:4112(para)
+#: C/evolution.xml:4228(para) C/evolution.xml:4239(para)
+#: C/evolution.xml:4244(para) C/evolution.xml:4255(para)
+#: C/evolution.xml:4263(para) C/evolution.xml:4268(para)
+#: C/evolution.xml:4614(para) C/evolution.xml:4633(para)
+#: C/evolution.xml:4665(para) C/evolution.xml:4678(para)
+#: C/evolution.xml:4900(para) C/evolution.xml:6342(para)
+#: C/evolution.xml:7125(para) C/evolution.xml:7191(para)
 msgid "or"
 msgstr "o"
 
@@ -1408,16 +1544,17 @@ msgstr ""
 #: C/evolution.xml:538(para) C/evolution.xml:561(para)
 #: C/evolution.xml:576(para) C/evolution.xml:596(para)
 #: C/evolution.xml:616(para) C/evolution.xml:639(para)
-#: C/evolution.xml:5645(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)
 #: C/evolution.xml:539(para) C/evolution.xml:562(para)
 #: C/evolution.xml:577(para) C/evolution.xml:597(para)
 #: C/evolution.xml:617(para) C/evolution.xml:640(para)
-#: C/evolution.xml:5646(para)
+#: C/evolution.xml:5892(para)
 msgid ""
 "If you select this option, you need to specify how often Evolution should "
 "check for new messages."
@@ -1426,14 +1563,15 @@ msgstr ""
 "debe comprobar si hay mensajes nuevos."
 
 #: C/evolution.xml:394(para) C/evolution.xml:435(para)
-#: C/evolution.xml:5651(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)
 #: C/evolution.xml:620(para) C/evolution.xml:643(para)
-#: C/evolution.xml:5654(para)
+#: C/evolution.xml:5900(para)
 msgid ""
 "Select Apply filters to new messages in inbox on this server if you want to "
 "apply filters."
@@ -1442,7 +1580,7 @@ msgstr ""
 "este servidor si desea aplicar los filtros."
 
 #: C/evolution.xml:398(para) C/evolution.xml:489(para)
-#: C/evolution.xml:601(para) C/evolution.xml:5655(para)
+#: C/evolution.xml:601(para) C/evolution.xml:5901(para)
 msgid ""
 "For additional information on filtering, see <link linkend=\"usage-mail-org-"
 "filters-new\">Creating New Filter Rules</link>."
@@ -1451,7 +1589,7 @@ msgstr ""
 "org-filters-new\">Creación de reglas de filtrado nuevas</link>."
 
 #: C/evolution.xml:401(para) C/evolution.xml:456(para)
-#: C/evolution.xml:492(para) C/evolution.xml:5658(para)
+#: C/evolution.xml:492(para) C/evolution.xml:5904(para)
 msgid "Select if you want to check new messages for junk content."
 msgstr "Seleccione si quiere comprobar si los mensajes nuevos son basura."
 
@@ -1466,9 +1604,10 @@ msgstr ""
 "linkend=\"usage-mail-organize-spam\">Parar el correo basura (SPAM)</link> y "
 "<link linkend=\"mail-prefs-junk\">SPAM</link>."
 
-#: C/evolution.xml:405(para) C/evolution.xml:5662(para)
+#: 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)
@@ -1514,7 +1653,7 @@ msgstr ""
 "Teclee su puerto de Agente SOAP de Oficina de correos en el campo Puerto del "
 "Agente SOAP de Oficina de Correos."
 
-#: C/evolution.xml:414(para) C/evolution.xml:5673(para)
+#: C/evolution.xml:414(para) C/evolution.xml:5919(para)
 msgid ""
 "If you are unsure what your Post Office Agent SOAP port is, contact your "
 "system administrator."
@@ -1623,7 +1762,8 @@ 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."
@@ -1657,7 +1797,8 @@ 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 ""
@@ -1710,7 +1851,8 @@ 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>."
@@ -1724,14 +1866,16 @@ 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 ""
@@ -1867,7 +2011,7 @@ msgstr ""
 "descripción de la característica de importación, consulte <link linkend="
 "\"importing-mail\">Importación de archivos aislados</link>."
 
-#: C/evolution.xml:739(para) C/evolution.xml:2349(para)
+#: C/evolution.xml:739(para) C/evolution.xml:2538(para)
 msgid ""
 "Microsoft Outlook* and versions of Outlook Express after version 4 use "
 "proprietary formats that Evolution cannot read or import."
@@ -1885,7 +2029,7 @@ msgstr ""
 "bajo Windows*. Vea las instrucciones en <link linkend=\"outlook-migration-"
 "mail\">Migrar carpetas de correo locales de Outlook</link>."
 
-#: C/evolution.xml:741(para) C/evolution.xml:2354(para)
+#: C/evolution.xml:741(para) C/evolution.xml:2543(para)
 msgid ""
 "Before importing email from Netscape*, Mozilla and Netscape users need to "
 "click File &gt; Compact &gt; All Folders from within the Netscape or Mozilla "
@@ -2231,30 +2375,31 @@ msgstr "Teclee el nombre de la carpeta en el campo «Nombre de la carpeta»."
 msgid "Select the location of the new folder."
 msgstr "Seleccione la ubicación de la carpeta nueva."
 
-#: C/evolution.xml:841(para) C/evolution.xml:1244(para)
-#: C/evolution.xml:1270(para) C/evolution.xml:1282(para)
-#: C/evolution.xml:1517(para) C/evolution.xml:1799(para)
-#: C/evolution.xml:1901(para) C/evolution.xml:1917(para)
-#: C/evolution.xml:2134(para) C/evolution.xml:2173(para)
-#: C/evolution.xml:2239(para) C/evolution.xml:2719(para)
-#: C/evolution.xml:2752(para) C/evolution.xml:2948(para)
-#: C/evolution.xml:2990(para) C/evolution.xml:3123(para)
-#: C/evolution.xml:3217(para) C/evolution.xml:3232(para)
-#: C/evolution.xml:3250(para) C/evolution.xml:3297(para)
-#: C/evolution.xml:3511(para) C/evolution.xml:3515(para)
-#: C/evolution.xml:3742(para) C/evolution.xml:4111(para)
-#: C/evolution.xml:4177(para) C/evolution.xml:4299(para)
-#: C/evolution.xml:4342(para) C/evolution.xml:4674(para)
-#: C/evolution.xml:4729(para) C/evolution.xml:5180(para)
-#: C/evolution.xml:5255(para) C/evolution.xml:5277(para)
-#: C/evolution.xml:5301(para) C/evolution.xml:5335(para)
-#: C/evolution.xml:5679(para) C/evolution.xml:5814(para)
-#: C/evolution.xml:5841(para) C/evolution.xml:5861(para)
-#: C/evolution.xml:5876(para) C/evolution.xml:5899(para)
-#: C/evolution.xml:5925(para) C/evolution.xml:6057(para)
-#: C/evolution.xml:6080(para) C/evolution.xml:6158(para)
-#: C/evolution.xml:6188(para) C/evolution.xml:6734(para)
-#: C/evolution.xml:6832(para) C/evolution.xml:6967(para)
+#: C/evolution.xml:841(para) C/evolution.xml:1308(para)
+#: C/evolution.xml:1334(para) C/evolution.xml:1346(para)
+#: C/evolution.xml:1521(para) C/evolution.xml:1605(para)
+#: C/evolution.xml:1887(para) C/evolution.xml:1989(para)
+#: C/evolution.xml:2005(para) C/evolution.xml:2323(para)
+#: C/evolution.xml:2362(para) C/evolution.xml:2428(para)
+#: C/evolution.xml:2908(para) C/evolution.xml:2941(para)
+#: C/evolution.xml:3137(para) C/evolution.xml:3179(para)
+#: C/evolution.xml:3312(para) C/evolution.xml:3406(para)
+#: C/evolution.xml:3421(para) C/evolution.xml:3439(para)
+#: C/evolution.xml:3497(para) C/evolution.xml:3543(para)
+#: C/evolution.xml:3757(para) C/evolution.xml:3761(para)
+#: C/evolution.xml:3988(para) C/evolution.xml:4357(para)
+#: C/evolution.xml:4423(para) C/evolution.xml:4545(para)
+#: C/evolution.xml:4588(para) C/evolution.xml:4920(para)
+#: C/evolution.xml:4975(para) C/evolution.xml:5426(para)
+#: C/evolution.xml:5501(para) C/evolution.xml:5523(para)
+#: C/evolution.xml:5547(para) C/evolution.xml:5581(para)
+#: C/evolution.xml:5925(para) C/evolution.xml:6060(para)
+#: C/evolution.xml:6087(para) C/evolution.xml:6107(para)
+#: C/evolution.xml:6122(para) C/evolution.xml:6145(para)
+#: C/evolution.xml:6171(para) C/evolution.xml:6303(para)
+#: C/evolution.xml:6326(para) C/evolution.xml:6404(para)
+#: C/evolution.xml:6434(para) C/evolution.xml:7097(para)
+#: C/evolution.xml:7195(para) C/evolution.xml:7330(para)
 msgid "Click OK."
 msgstr "Pulse «Aceptar»."
 
@@ -2362,7 +2507,7 @@ msgstr "Carpeta nueva:"
 msgid "Creates another folder in the same location."
 msgstr "Crea otra carpeta en el mismo lugar."
 
-#: C/evolution.xml:890(title) C/evolution.xml:2878(title)
+#: C/evolution.xml:890(title) C/evolution.xml:3067(title)
 msgid "Delete:"
 msgstr "Borrar:"
 
@@ -2401,7 +2546,8 @@ 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."
@@ -2785,7 +2931,8 @@ msgstr "Las opciones para la línea de comandos más importantes son:"
 msgid "Command"
 msgstr "Orden"
 
-#: C/evolution.xml:1030(para) C/evolution.xml:1704(para)
+#: C/evolution.xml:1030(para) C/evolution.xml:1792(para)
+#: C/evolution.xml:6957(para)
 msgid "Description"
 msgstr "Descripción"
 
@@ -2803,7 +2950,8 @@ 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 ""
@@ -2821,7 +2969,8 @@ 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."
@@ -2888,29 +3037,33 @@ msgstr ""
 
 # #-#-#-#-#  usage-exchange.po  #-#-#-#-#
 # index.docbook:342, index.docbook:514
-#: C/evolution.xml:1111(link) C/evolution.xml:1128(title)
+#: C/evolution.xml:1111(link) C/evolution.xml:1131(title)
 msgid "Reading Mail"
 msgstr "Lectura de correo"
 
-#: C/evolution.xml:1114(link) C/evolution.xml:1380(title)
+#: C/evolution.xml:1114(link) C/evolution.xml:1444(title)
 msgid "Composing New Email Messages"
 msgstr "Redacción de mensajes de correo-e nuevos"
 
+#: C/evolution.xml:1117(link) C/evolution.xml:2064(title)
+msgid "Templates"
+msgstr "Plantillas"
+
 # #-#-#-#-#  usage-exchange.po  #-#-#-#-#
 # index.docbook:342, index.docbook:514
-#: C/evolution.xml:1117(link) C/evolution.xml:1976(title)
+#: C/evolution.xml:1120(link) C/evolution.xml:2165(title)
 msgid "Sending Invitations by Mail"
 msgstr "Envío de invitaciones por correo"
 
-#: C/evolution.xml:1120(link) C/evolution.xml:1999(title)
+#: C/evolution.xml:1123(link) C/evolution.xml:2188(title)
 msgid "IMAP Subscriptions Manager"
 msgstr "Gestor de suscripciones IMAP"
 
-#: C/evolution.xml:1123(link) C/evolution.xml:2023(title)
+#: C/evolution.xml:1126(link) C/evolution.xml:2212(title)
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: C/evolution.xml:1129(para)
+#: C/evolution.xml:1132(para)
 msgid ""
 "If you are not already viewing mail, switch to the mail tool by clicking the "
 "Mail shortcut button, or press Ctrl+1. To read a message, select it in the "
@@ -2922,7 +3075,7 @@ msgstr ""
 "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."
 
-#: C/evolution.xml:1131(para)
+#: C/evolution.xml:1134(para)
 msgid ""
 "To read mail with the keyboard, you can click the Spacebar to page down and "
 "press Backspace to page up while reading an email. Ensure that you use the "
@@ -2933,7 +3086,7 @@ msgstr ""
 "lee un correo-e. Asegúrese de que usa las teclas cuando la lista de mensajes "
 "está activada."
 
-#: C/evolution.xml:1132(para)
+#: C/evolution.xml:1135(para)
 msgid ""
 "Navigate the message list by using the arrow keys on the keyboard. To go to "
 "the next and previous unread messages, press the period (.) or comma (,) "
@@ -2951,11 +3104,11 @@ msgstr ""
 "corchete derecho (]) para el siguiente mensaje no leído y el corchete "
 "izquierdo ([) para el mensaje anterior no leído."
 
-#: C/evolution.xml:1136(title)
+#: C/evolution.xml:1139(title)
 msgid "Magic Spacebar For Reading Mail"
 msgstr "Barra espaciadora mágica para leer correos"
 
-#: C/evolution.xml:1137(para)
+#: C/evolution.xml:1140(para)
 msgid ""
 "With Magic Spacebar, you can easily read the unread messages in all the mail "
 "folders. You can read mail, scroll through mail and switch folders by using "
@@ -2965,29 +3118,29 @@ msgstr ""
 "en todas las carpetas de correo. Puede leer correo, deslizar el correo y "
 "cambiar entre las carpetas usando la barra espaciadora de su teclado."
 
-#: C/evolution.xml:1138(para)
+#: C/evolution.xml:1141(para)
 msgid "To enable Magic Spacebar:"
 msgstr "Activar la Barra espaciadora mágica:"
 
-#: C/evolution.xml:1141(para) C/evolution.xml:1237(para)
-#: C/evolution.xml:2122(para) C/evolution.xml:2161(para)
-#: C/evolution.xml:2222(para) C/evolution.xml:5047(para)
-#: C/evolution.xml:5320(para) C/evolution.xml:5603(para)
-#: C/evolution.xml:5619(para) C/evolution.xml:6037(para)
+#: C/evolution.xml:1144(para) C/evolution.xml:1301(para)
+#: C/evolution.xml:2311(para) C/evolution.xml:2350(para)
+#: C/evolution.xml:2411(para) C/evolution.xml:5293(para)
+#: C/evolution.xml:5566(para) C/evolution.xml:5849(para)
+#: C/evolution.xml:5865(para) C/evolution.xml:6283(para)
 msgid "Select Edit &gt; Preferences, then select Mail Accounts."
 msgstr "Pulse Editar &gt; Preferencias, después seleccione Cuentas de correo."
 
-#: C/evolution.xml:1144(para)
+#: C/evolution.xml:1147(para)
 msgid "Select the Enable Magic Spacebar check box."
 msgstr "Activar la casilla de verificación de la Barra espaciadora mágica."
 
-#: C/evolution.xml:1147(para)
+#: C/evolution.xml:1150(para)
 msgid "When you are in the Mail view, the Spacebar has the following behavior:"
 msgstr ""
 "Cuando esté en la vista de correo, la barra espaciadora se comportará de la "
 "siguiente manera:"
 
-#: C/evolution.xml:1150(para)
+#: C/evolution.xml:1153(para)
 msgid ""
 "When you press the Spacebar for the first time, it takes you to the next "
 "unread message."
@@ -2995,7 +3148,7 @@ msgstr ""
 "Al pulsar la barra espaciadora la primera vez, le llevará al siguiente "
 "correo no leído."
 
-#: C/evolution.xml:1153(para)
+#: C/evolution.xml:1156(para)
 msgid ""
 "If the message is more than one screen long, the Spacebar works as Page Down "
 "key."
@@ -3003,7 +3156,7 @@ msgstr ""
 "Si el mensaje es más largo que la pantalla, la barra espaciadora funciona "
 "como avance de página."
 
-#: C/evolution.xml:1156(para)
+#: C/evolution.xml:1159(para)
 msgid ""
 "If you press the Spacebar after you reach the bottom of the page, it takes "
 "you to the next unread message."
@@ -3011,7 +3164,7 @@ msgstr ""
 "Si pulsa la barra espaciadora cuando ha llegado al final de la página, le "
 "lleva al siguiente mensaje no leído."
 
-#: C/evolution.xml:1159(para)
+#: C/evolution.xml:1162(para)
 msgid ""
 "If there are no more unread messages in the mailbox, pressing the Spacebar "
 "takes you to the next unread message in the next folder."
@@ -3019,7 +3172,7 @@ msgstr ""
 "Si no hay más mensajes sin leer en el buzón de correo, la barra espaciadora "
 "le lleva al siguiente mensaje sin leer en la siguiente carpeta."
 
-#: C/evolution.xml:1162(para)
+#: C/evolution.xml:1165(para)
 msgid ""
 "If new messages arrive in a number of folders, the Spacebar toggles between "
 "those folders. This feature allows you to switch to the next unread message "
@@ -3030,11 +3183,11 @@ msgstr ""
 "siguiente mensaje no leído en una carpeta diferente sin tener que pulsar "
 "sobre la carpeta."
 
-#: C/evolution.xml:1168(title)
+#: C/evolution.xml:1171(title)
 msgid "Checking for New Mail"
 msgstr "Comprobación de correo nuevo"
 
-#: C/evolution.xml:1169(para)
+#: C/evolution.xml:1172(para)
 msgid ""
 "To check your mail, click Send/Receive in the toolbar. If you haven't "
 "created any mail accounts yet, the setup assistant asks you for the "
@@ -3048,7 +3201,7 @@ msgstr ""
 "información acerca de crear cuentas de correo consulte <link linkend=\"usage-"
 "mainwindow-starting\">Iniciar Evolution por primera vez</link>."
 
-#: C/evolution.xml:1170(para)
+#: C/evolution.xml:1173(para)
 msgid ""
 "If this is your first time checking mail, or you haven't asked Evolution to "
 "store your password, you are prompted for the password. Enter your password "
@@ -3058,7 +3211,7 @@ msgstr ""
 "Evolution que almacena su contraseña, se le pedirá la contraseña. Introduzca "
 "su contraseña para descargar su correo."
 
-#: C/evolution.xml:1171(para)
+#: C/evolution.xml:1174(para)
 msgid ""
 "If you get an error message instead of mail, you probably need to check your "
 "network settings. To learn how to do that, see <link linkend=\"mail-prefs-"
@@ -3069,37 +3222,163 @@ msgstr ""
 "linkend=\"mail-prefs-headers\">Opciones de las cabeceras del correo</link> o "
 "pregunte al administrador del sistema."
 
-#: C/evolution.xml:1175(title)
+#: C/evolution.xml:1178(title)
 msgid "New Mail Notification"
 msgstr "Notificaciones de correo nuevo"
 
-#: C/evolution.xml:1176(para)
+#: C/evolution.xml:1179(para)
 msgid ""
-"Evolution notifies you of new email. When you receive a new mail in your "
-"inbox, a blinking icon appears on the Switcher."
+"Evolution can notify you of new messages. When you receive a new message in "
+"your inbox, a blinking icon appears on the Switcher."
 msgstr ""
-"Evolution le notifica la llegada de nuevo correo-e. Cuando reciba un nuevo "
-"correo en su buzón, aparecerá un icono parpadeante en el Selector."
+"Evolution puede notificarle la llegada de nuevo correo-e. Cuando reciba un "
+"nuevo correo en su buzón aparecerá un icono parpadeante en el Selector."
 
-#: C/evolution.xml:1178(para)
+#: C/evolution.xml:1180(para)
 msgid ""
-"You can also see a blinking icon <inlinegraphic format=\"PNG\" fileref="
+"You can also view a blinking icon<inlinegraphic format=\"PNG\" fileref="
 "\"figures/evo_blink.png\"/> in the notification area that disappears when "
-"you open the new email. You can keep the mouse over the <inlinegraphic "
-"format=\"PNG\" fileref=\"figures/evo_blink.png\"/> icon to view the "
-"notification message."
+"you open the new message. Mouse over the icon to view the notification "
+"message."
 msgstr ""
 "También puede ver un icono que parpadea <inlinegraphic format=\"PNG\" "
 "fileref=\"figures/evo_blink.png\"/> en el área de notificación y que "
 "desaparece cuando abre el correo nuevo. Mantener el ratón sobre el icono "
-"<inlinegraphic format=\"PNG\" fileref=\"figures/evo_blink.png\"/> mostrará "
-"el mensaje de notificación."
+"mostrará el mensaje de notificación."
+
+#: C/evolution.xml:1182(para)
+msgid ""
+"To enable this feature, select Edit &gt; Plugins, then select the Mail "
+"Notification check box. You can configure the plugin by specifing the "
+"following in the Plugin Manager."
+msgstr ""
+"Para activar esta característica seleccione Editar &gt; Complementos, "
+"después seleccione la casilla de selección Notificación de correo. Puede "
+"configurar el complemento especificando lo siguiente en el Gestor de "
+"complementos."
+
+#: C/evolution.xml:1185(title)
+msgid "Notify new messages for Inbox only:"
+msgstr "Notificar nuevos mensajes sólo para la bandeja de entrada:"
+
+#: C/evolution.xml:1186(para)
+msgid ""
+"Select this option to restrict the mail notification to Inbox. With this "
+"option enabled, you are notified of each new message arrival in the Inbox."
+msgstr ""
+"Seleccione esta opción para restringir la notificación de correo a la "
+"bandeja de entrada. Con esta opción activada se le notificará cada mensaje "
+"nuevo que llegue a la bandeja de entrada."
+
+#: C/evolution.xml:1189(title)
+msgid "Generate D-Bus message:"
+msgstr "Generar un mensaje D-Bus:"
+
+#: C/evolution.xml:1190(para)
+msgid ""
+"D-Bus is a fast, lightweight message bus system that allows applications to "
+"communicate with each other. Select this option to generate a D-Bus message "
+"on the session bus whenever a new message arrives."
+msgstr ""
+"D-Bus es un bus de mensaje del sistema de bajo peso que permite a las "
+"aplicaciones comunicarse entre ellas. Seleccione esta opción para generar un "
+"mensaje D-Bus en el bus de sesión siempre que llegue un mensaje nuevo."
+
+#: C/evolution.xml:1193(title)
+msgid "Show icon in the notification area:"
+msgstr "Mostrar icono en el área de notificación:"
+
+#: C/evolution.xml:1194(para)
+msgid ""
+"Select this option to display a new mail icon in the notification area when "
+"a new message arrives. You have two options to select from:"
+msgstr ""
+"Seleccione esta opción para mostrar un icono de correo nuevo en el área de "
+"notificación cuando llegue un mensaje nuevo. Tiene dos opciones para "
+"seleccionar:"
+
+#: C/evolution.xml:1199(title)
+msgid "Blinking icon in the notification area:"
+msgstr "Icono parpadeante en el área de notificación:"
+
+#: C/evolution.xml:1200(para)
+msgid ""
+"Select this option to make the new mail icon blink in the notification area "
+"on arrival of a new message."
+msgstr ""
+"Seleccione esta opción para hacer que el icono de correo nuevo parpadee en "
+"el área de notificación al llegar un mensaje nuevo."
+
+#: C/evolution.xml:1205(title)
+msgid "Popup message together with the icon:"
+msgstr "Mensaje emergente junto con el icono:"
+
+#: C/evolution.xml:1206(para)
+msgid ""
+"Select this option to make the new message pop up along with the new mail "
+"icon."
+msgstr ""
+"Seleccione esta opción para hacer que aparezca un mensaje emergente junto "
+"con el icono de correo nuevo."
+
+#: C/evolution.xml:1211(title)
+msgid "Play sound when new messages arrive:"
+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:"
+
+#: 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."
+msgstr ""
+"Seleccione esta opción para reproducir un pitido cuando llegue un mensaje de "
+"correo nuevo."
+
+#: C/evolution.xml:1223(title)
+msgid "Play sound file:"
+msgstr "Reproducir un archivo de sonido:"
+
+#: C/evolution.xml:1224(para)
+msgid ""
+"Select this option to play a sound file of your choice on the arrival of a "
+"new message."
+msgstr ""
+"Seleccione esta opción para reproducir un archivo de sonido a su elección "
+"cuando llegue un mensaje de coreo nuevo."
+
+#: C/evolution.xml:1228(para)
+msgid "To specify the sound file you want to play:"
+msgstr "Para especificar el archivo de sonido que quiere reproducir:"
+
+#: C/evolution.xml:1231(para)
+msgid "Click None to open the Select Sound File browser window."
+msgstr ""
+"Pulse Ninguno para abrir la ventana del explorador para Seleccionar un "
+"archivo de sonido."
+
+#: C/evolution.xml:1234(para)
+msgid "Browse to find the sound file of your choice."
+msgstr "Examine para buscar el archivo de sonido a su elección."
+
+#: C/evolution.xml:1237(para)
+msgid "Click Open to select the sound file."
+msgstr "Pulse Abrir para seleccionar el archivo de sonido."
+
+#: C/evolution.xml:1240(para)
+msgid "Click Play to confirm the selection."
+msgstr "Pulse Reproducir para confirmar la selección."
 
-#: C/evolution.xml:1182(title)
+#: C/evolution.xml:1246(title)
 msgid "Vertical View Versus Classical View"
 msgstr "Vista vertical y vista clásica"
 
-#: C/evolution.xml:1183(para)
+#: C/evolution.xml:1247(para)
 msgid ""
 "Evolution provides you vertical view in addition to the classical view. In "
 "the vertical view, message preview pane is located at the right side of the "
@@ -3114,19 +3393,19 @@ msgstr ""
 "vista vertical le permite usar la anchura extra en los monitores de pantalla "
 "panorámica."
 
-#: C/evolution.xml:1185(title)
+#: C/evolution.xml:1249(title)
 msgid "Vertical View:"
 msgstr "Vista vertical:"
 
-#: C/evolution.xml:1186(para)
+#: C/evolution.xml:1250(para)
 msgid "To switch to vertical view"
 msgstr "Para cambiar a la vista vertical"
 
-#: C/evolution.xml:1190(para)
+#: C/evolution.xml:1254(para)
 msgid "Click View &gt; Preview &gt; Vertical View"
 msgstr "Pulse Ver &gt; Vista previa &gt; Vista vertical"
 
-#: C/evolution.xml:1193(para)
+#: C/evolution.xml:1257(para)
 msgid ""
 "In Vertical view, default message list contains a double line compressed "
 "headers, which enables you to consume the extra width in the preview column. "
@@ -3139,23 +3418,23 @@ msgstr ""
 "correo electrónico del remitente, el icono de adjuntos, la fecha y el asunto "
 "en la segunda línea."
 
-#: C/evolution.xml:1196(title)
+#: C/evolution.xml:1260(title)
 msgid "Classical View:"
 msgstr "Vista clásica:"
 
-#: C/evolution.xml:1197(para)
+#: C/evolution.xml:1261(para)
 msgid "To switch to classical view,"
 msgstr "Para cambiar a la vista clásica,"
 
-#: C/evolution.xml:1201(para)
+#: C/evolution.xml:1265(para)
 msgid "Click View &gt; Preview &gt; Classical View"
 msgstr "Pulse Ver &gt; Vista previa &gt; Vista clásica"
 
-#: C/evolution.xml:1207(title)
+#: C/evolution.xml:1271(title)
 msgid "Collapsible Message Headers"
 msgstr "Cabeceras de mensajes contraíbles"
 
-#: C/evolution.xml:1208(para)
+#: C/evolution.xml:1272(para)
 msgid ""
 "Evolution compresses the TO, CC, BCC headers of received mail and shows only "
 "limited addresses. You can set the limit of the number of addresses to be "
@@ -3165,23 +3444,24 @@ msgstr ""
 "muestra sólo direcciones limitadas. Puede establecer un límite en el número "
 "de direcciones para mostrar en el panel de vista previa."
 
-#: C/evolution.xml:1210(para)
-msgid "Use the following procedure to set the limit of addresses to be displayed:"
+#: C/evolution.xml:1274(para)
+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:"
 
-#: C/evolution.xml:1213(para) C/evolution.xml:1871(para)
-#: C/evolution.xml:2198(para) C/evolution.xml:5022(para)
-#: C/evolution.xml:5216(para) C/evolution.xml:6327(para)
+#: C/evolution.xml:1277(para) C/evolution.xml:1959(para)
+#: C/evolution.xml:2387(para) C/evolution.xml:5268(para)
+#: C/evolution.xml:5462(para) C/evolution.xml:6566(para)
 msgid "Select Edit &gt; Preferences."
 msgstr "Seleccione Editar &gt; Preferencias."
 
-#: C/evolution.xml:1216(para)
+#: C/evolution.xml:1280(para)
 msgid "Select Mail Preferences."
 msgstr "Seleccione Opciones de correo."
 
-#: C/evolution.xml:1219(para)
+#: C/evolution.xml:1283(para)
 msgid ""
 "Check <guilabel>Shrink To/CC/Bcc headers to column</guilabel> to limit the "
 "address."
@@ -3189,11 +3469,11 @@ msgstr ""
 "Marque la columna <guilabel>Reducir las cabeceras Para / Cc / Cco a</"
 "guilabel> para limitar las direcciones"
 
-#: C/evolution.xml:1222(para)
+#: C/evolution.xml:1286(para)
 msgid "Enter the limit in the field."
 msgstr "Introduzca el límite en el campo."
 
-#: C/evolution.xml:1225(para)
+#: C/evolution.xml:1289(para)
 msgid ""
 "You can expand the message headers by clicking the <inlinegraphic format="
 "\"PNG\" fileref=\"figures/plus.png\"/> icon or the <guilabel>...</guilabel> "
@@ -3205,11 +3485,11 @@ msgstr ""
 "en el panel de vista previa. Para contraerlas pulse el icono <inlinegraphic "
 "format=\"PNG\" fileref=\"figures/minus.png\"/> en el panel de vista previa."
 
-#: C/evolution.xml:1229(title)
+#: C/evolution.xml:1293(title)
 msgid "Sharing Mailboxes with Other Mail Programs"
 msgstr "Compartir buzones con otros programas de correo"
 
-#: C/evolution.xml:1230(para)
+#: C/evolution.xml:1294(para)
 msgid ""
 "If you want to use Evolution and another email client, such as Mutt, at the "
 "same time, use the following procedure:"
@@ -3217,15 +3497,15 @@ msgstr ""
 "Si quiere usar Evolution y además otro cliente de correo electrónico, como "
 "Mutt, al mismo tiempo, use el siguiente procedimiento:"
 
-#: C/evolution.xml:1233(para)
+#: C/evolution.xml:1297(para)
 msgid "Download your mail in the other application as you would normally."
 msgstr "Descargue su correo en la otra aplicación como haría con normalidad."
 
-#: C/evolution.xml:1236(para)
+#: C/evolution.xml:1300(para)
 msgid "In Evolution:"
 msgstr "En Evolution:"
 
-#: C/evolution.xml:1238(para)
+#: C/evolution.xml:1302(para)
 msgid ""
 "Select the account you want to use to share mail and click Edit. Instead of "
 "Edit, you might want to create a new account just for this source of mail by "
@@ -3235,7 +3515,7 @@ msgstr ""
 "En lugar de Editar, quizá quiera crear una cuenta nueva sólo para esta "
 "fuente de correo pulsando Nuevo."
 
-#: C/evolution.xml:1241(para)
+#: C/evolution.xml:1305(para)
 msgid ""
 "Under the Receiving Mail tab, select the type of mail file that your other "
 "mail application uses, then specify the full path to that location. A "
@@ -3247,7 +3527,7 @@ msgstr ""
 "lugar. Una eleción habitual son los archivos mbox, con la ruta «/home/"
 "<varname>nombresdelusuario</varname>/Mail»."
 
-#: C/evolution.xml:1247(para)
+#: C/evolution.xml:1311(para)
 msgid ""
 "You can only use one mail client at a time. The mail files are locked by the "
 "mail program that is currently using them, so the mail files can't be "
@@ -3257,11 +3537,11 @@ msgstr ""
 "bloquean por el programa de correo que los esté usando en ese momento, así "
 "que los archivos no pueden accederse por otro programa de correo."
 
-#: C/evolution.xml:1251(title)
+#: C/evolution.xml:1315(title)
 msgid "Working with Attachments and HTML Mail"
 msgstr "Trabajar con adjuntos y correo HTML"
 
-#: C/evolution.xml:1252(para)
+#: C/evolution.xml:1316(para)
 msgid ""
 "If someone sends you an <link linkend=\"attachment\">attachment</link>, "
 "Evolution displays a file icon at the end of the message to which it is "
@@ -3280,11 +3560,11 @@ msgstr ""
 "de adjuntos. Para abrir un adjunto, pulse dos veces en él. pulse el botón "
 "Guardar todo para guardar todos los adjuntos."
 
-#: C/evolution.xml:1255(title)
+#: C/evolution.xml:1319(title)
 msgid "Saving or Opening Attachments"
 msgstr "Guardar o abrir adjuntos"
 
-#: C/evolution.xml:1256(para)
+#: C/evolution.xml:1320(para)
 msgid ""
 "If you get an email message with an attachment, Evolution can help you save "
 "the attachment or open it with the appropriate applications."
@@ -3292,7 +3572,7 @@ msgstr ""
 "Si recibe un adjunto dentro de un mensaje de correo electrónico, Evolution "
 "le ayuda a guardarlo o a abrirlo con las aplicaciones adecuadas."
 
-#: C/evolution.xml:1257(para)
+#: C/evolution.xml:1321(para)
 msgid ""
 "Evolution shows a right-arrow icon, the number of attachments, and a Save or "
 "Save All button to save all the attachments. Click the right-arrow icon to "
@@ -3303,11 +3583,11 @@ msgstr ""
 "adjuntos. Pulse en el icono de la flecha derecha para mostar la barra de "
 "adjuntos."
 
-#: C/evolution.xml:1258(para)
+#: C/evolution.xml:1322(para)
 msgid "To save an attachment to disk:"
 msgstr "Para guardar un adjunto en el disco:"
 
-#: C/evolution.xml:1261(para) C/evolution.xml:1276(para)
+#: C/evolution.xml:1325(para) C/evolution.xml:1340(para)
 msgid ""
 "Click the down-arrow on the attachment icon or right-click the attachment "
 "icon in the attachment bar."
@@ -3315,23 +3595,23 @@ msgstr ""
 "Pulse la flecha hacia abajo en el icono de adjunto o pulse con el botón "
 "derecho sobre el icono del adjunto en la barra de adjuntos."
 
-#: C/evolution.xml:1264(para)
+#: C/evolution.xml:1328(para)
 msgid "Click Save As."
 msgstr "Pulse Guardar como."
 
-#: C/evolution.xml:1267(para)
+#: 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."
 
-#: C/evolution.xml:1273(para)
+#: C/evolution.xml:1337(para)
 msgid "To open an attachment using another application:"
 msgstr "Para abrir un adjunto usando otra aplicación:"
 
-#: C/evolution.xml:1279(para)
+#: C/evolution.xml:1343(para)
 msgid "Select the application to open the attachment."
 msgstr "Seleccione la aplicación para abrir el adjunto."
 
-#: C/evolution.xml:1285(para)
+#: C/evolution.xml:1349(para)
 msgid ""
 "The options available for an attachment vary depending on the type of "
 "attachment and the applications your system has installed. For example, "
@@ -3345,11 +3625,11 @@ msgstr ""
 "org y cualquier otro procesador de textos, y archivos comprimidos se pueden "
 "abrir con la aplicación File Roller."
 
-#: C/evolution.xml:1289(title)
+#: C/evolution.xml:1353(title)
 msgid "Inline Images in HTML Mail"
 msgstr "Imágenes dentro de correos HTML"
 
-#: C/evolution.xml:1290(para)
+#: C/evolution.xml:1354(para)
 msgid ""
 "When someone sends you HTML mail that includes an image in the body of the "
 "message (for example, the welcome message in your Inbox), Evolution displays "
@@ -3364,7 +3644,7 @@ msgstr ""
 "compositor. Alternativamente, sólo arrastre una imagen dentro del área de "
 "composición del mensaje."
 
-#: C/evolution.xml:1291(para)
+#: C/evolution.xml:1355(para)
 msgid ""
 "Some images are links in a message, rather than being part of the message. "
 "Evolution can download those images from the Internet, but does not do so "
@@ -3380,27 +3660,27 @@ msgstr ""
 "lee los mensajes. No cargar automáticamente las imágenes ayuda a proteger su "
 "privacidad."
 
-#: C/evolution.xml:1292(para)
+#: C/evolution.xml:1356(para)
 msgid "To load the images for one message:"
 msgstr "Para cargar las imágenes de un mensaje:"
 
-#: C/evolution.xml:1295(para)
+#: C/evolution.xml:1359(para)
 msgid "Click View &gt; Load Images."
 msgstr "Pulse Ver &gt; Cargar imágenes."
 
-#: C/evolution.xml:1298(para)
+#: C/evolution.xml:1362(para)
 msgid "To set the default action for loading images:"
 msgstr "Para establecer la acción predeterminada para cargar imágenes:"
 
-#: C/evolution.xml:1301(para)
+#: C/evolution.xml:1365(para)
 msgid "Select Edit &gt; Preferences, then select Mail Preferences."
 msgstr "Seleccione Editar &gt; Preferencias, después pulse Opciones de correo."
 
-#: C/evolution.xml:1304(para)
+#: C/evolution.xml:1368(para)
 msgid "Click the HTML Mail tab."
 msgstr "Pulse sobre la solapa Correo en HTML."
 
-#: C/evolution.xml:1307(para)
+#: C/evolution.xml:1371(para)
 msgid ""
 "Select one of the items: Never Load Images Off the Net, Load Images in Mail "
 "From Contacts, or Always Load Images Off the Net."
@@ -3409,28 +3689,28 @@ msgstr ""
 "Cargar imágenes en el correo de los contactos o Siempre cargar las imágenes "
 "desde internet."
 
-#: C/evolution.xml:1310(para) C/evolution.xml:1358(para)
-#: C/evolution.xml:1549(para) C/evolution.xml:1784(para)
-#: C/evolution.xml:1818(para) C/evolution.xml:1841(para)
-#: C/evolution.xml:2137(para) C/evolution.xml:2176(para)
-#: C/evolution.xml:2210(para) C/evolution.xml:2242(para)
-#: C/evolution.xml:5680(para) C/evolution.xml:6058(para)
+#: C/evolution.xml:1374(para) C/evolution.xml:1422(para)
+#: C/evolution.xml:1637(para) C/evolution.xml:1872(para)
+#: C/evolution.xml:1906(para) C/evolution.xml:1929(para)
+#: C/evolution.xml:2326(para) C/evolution.xml:2365(para)
+#: C/evolution.xml:2399(para) C/evolution.xml:2431(para)
+#: C/evolution.xml:5926(para) C/evolution.xml:6304(para)
 msgid "Click Close."
 msgstr "Pulse Cerrar."
 
-#: C/evolution.xml:1313(para)
+#: C/evolution.xml:1377(para)
 msgid "To set your proxy in KDE:"
 msgstr "Para establecer su proxy en KDE:"
 
-#: C/evolution.xml:1316(para)
+#: C/evolution.xml:1380(para)
 msgid "Click the menu icon &gt; System &gt; Configuration &gt; Yast."
 msgstr "Pulse el icono de menú &gt; Sistema &gt; Configuración &gt; Yast."
 
-#: C/evolution.xml:1319(para) C/evolution.xml:1334(para)
+#: C/evolution.xml:1383(para) C/evolution.xml:1398(para)
 msgid "Click Network Services, then click Proxy."
 msgstr "Pulse Servicios de red, después Proxy."
 
-#: C/evolution.xml:1322(para) C/evolution.xml:1337(para)
+#: C/evolution.xml:1386(para) C/evolution.xml:1401(para)
 msgid ""
 "Specify your proxy settings (if you don't know your proxy settings, contact "
 "your ISP or system administrator)."
@@ -3438,15 +3718,15 @@ msgstr ""
 "Especifique la configuración de su proxy (si no conoce los ajustes de su "
 "proxy, contacte con su ISP o el administrador de su sistema)."
 
-#: C/evolution.xml:1325(para) C/evolution.xml:1340(para)
+#: C/evolution.xml:1389(para) C/evolution.xml:1404(para)
 msgid "Click Finish, then click Close."
 msgstr "Pulse Finalizar, después Cerrar."
 
-#: C/evolution.xml:1328(para)
+#: C/evolution.xml:1392(para)
 msgid "To set your proxy in GNOME:"
 msgstr "Para establecer su proxy en GNOME:"
 
-#: C/evolution.xml:1331(para)
+#: C/evolution.xml:1395(para)
 msgid ""
 "Click System &gt; Administrative Settings (enter your root password if "
 "needed)."
@@ -3454,11 +3734,11 @@ msgstr ""
 "Pulse Sistema &gt; Preferencias &gt; Proxy de la red (si es necesario "
 "introduzca su contraseña de superusuario)."
 
-#: C/evolution.xml:1347(title)
+#: C/evolution.xml:1411(title)
 msgid "Using Evolution for News"
 msgstr "Usar Evolution para noticias"
 
-#: C/evolution.xml:1348(para)
+#: C/evolution.xml:1412(para)
 msgid ""
 "USENET newsgroups are similar to mail, so it is often convenient to read "
 "news and mail side by side. You can add a news source, called an NNTP "
@@ -3476,7 +3756,7 @@ msgstr ""
 "una carpeta IMAP. Cuando pulse Enviar/Recibir, Evolution también comprueba "
 "mensajes de noticias."
 
-#: C/evolution.xml:1349(para)
+#: C/evolution.xml:1413(para)
 msgid ""
 "When you create a newsgroup account, you are not subscribed to any groups. "
 "To subscribe to a newsgroup:"
@@ -3484,11 +3764,11 @@ msgstr ""
 "Cuando crea una cuenta de grupo de noticias, no está suscrito a ningún "
 "grupo. Para suscribirse a un grupo de noticias:"
 
-#: C/evolution.xml:1352(para) C/evolution.xml:5290(para)
+#: C/evolution.xml:1416(para) C/evolution.xml:5536(para)
 msgid "Click Folder &gt; Subscriptions."
 msgstr "Pulse Carpeta &gt; Suscripciones."
 
-#: C/evolution.xml:1355(para)
+#: C/evolution.xml:1419(para)
 msgid ""
 "Select your NNTP account, select the groups you want to subscribe to, then "
 "click Subscribe."
@@ -3496,11 +3776,11 @@ msgstr ""
 "Seleccione su cuenta NNTP, seleccione los grupos a los que quiere "
 "suscribirse, después pulse Subscribir."
 
-#: C/evolution.xml:1364(title)
+#: C/evolution.xml:1428(title)
 msgid "Deleting Mail"
 msgstr "Borrado de correo"
 
-#: C/evolution.xml:1365(para)
+#: C/evolution.xml:1429(para)
 msgid ""
 "Evolution allows you to delete unwanted messages. To delete a message, "
 "select it and press the Delete key, or click the delete tool in the toolbar, "
@@ -3511,7 +3791,7 @@ msgstr ""
 "de herramientas, pulse Ctrl+D o pulse con el botón derecho del ratón sobre "
 "él y después pulse Borrar."
 
-#: C/evolution.xml:1366(para)
+#: C/evolution.xml:1430(para)
 msgid ""
 "When you press Delete or click the Trash folder, your mail is not actually "
 "deleted, but is marked for deletion. Your email is recoverable until you "
@@ -3529,7 +3809,7 @@ msgstr ""
 "Ver. Puede ver los mensajes marcados para ser borrados posteriormente. Puede "
 "además encontrar los mensajes borrados en la carpeta Papelera."
 
-#: C/evolution.xml:1367(para)
+#: C/evolution.xml:1431(para)
 msgid ""
 "To permanently erase all the deleted messages in a folder, click Folder &gt; "
 "Expunge or press Ctrl+E."
@@ -3537,7 +3817,7 @@ msgstr ""
 "Para borrar permanentemente todos los mensajes borrados en una carpeta, "
 "pulse Carpeta &gt; Compactar o pulse Ctrl+E."
 
-#: C/evolution.xml:1368(para)
+#: C/evolution.xml:1432(para)
 msgid ""
 "Trash folders in GroupWise, local and IMAP accounts are actually virtual "
 "search folders that display all messages you have marked for later deletion. "
@@ -3549,7 +3829,7 @@ msgstr ""
 "para un borrado posterior. De tal manera que vaciar la Papelera no es otra "
 "cosa que purgar los correos borrados de todas sus carpetas en la cuenta."
 
-#: C/evolution.xml:1369(para)
+#: C/evolution.xml:1433(para)
 msgid ""
 "However, this is not true for the Trash folder on Exchange servers, which "
 "behaves just the same as it does in Outlook. It is a normal folder with "
@@ -3562,11 +3842,11 @@ msgstr ""
 "acerca de carpetas de búsquedas, vea <link linkend=\"usage-mail-organize-"
 "vfolders\">Uso de carpetas de búsqueda</link>."
 
-#: C/evolution.xml:1373(title)
+#: C/evolution.xml:1437(title)
 msgid "Undeleting Messages"
 msgstr "Recuperar mensajes"
 
-#: C/evolution.xml:1374(para)
+#: C/evolution.xml:1438(para)
 msgid ""
 "You can undelete a message that has been deleted but not expunged. To "
 "undelete a message, select the message, click Edit &gt; Undelete. Note that "
@@ -3577,7 +3857,7 @@ msgstr ""
 "Note que Ver &gt; Ocultar mensajes borrados en la barra de menú debe estar "
 "desactivado para esto."
 
-#: C/evolution.xml:1375(para)
+#: C/evolution.xml:1439(para)
 msgid ""
 "If you have marked a message for deletion, undeleting it unmarks it, and the "
 "message is removed from the Trash folder."
@@ -3585,7 +3865,7 @@ msgstr ""
 "Si ha marcado un mensaje para su eliminación, recuperándolo eliminará la "
 "marca y el mensaje se borrará de la carpeta Papelera."
 
-#: C/evolution.xml:1381(para)
+#: C/evolution.xml:1445(para)
 msgid ""
 "You can start writing a new email message by clicking File &gt; New &gt; "
 "Mail Message, by pressing Ctrl+N when in the mailing tool, or by clicking "
@@ -3595,7 +3875,7 @@ msgstr ""
 "Nuevo &gt; Mensaje de correo, pulsando Ctrl+N cuando esté en la herramienta "
 "de correo o pulsando Nuevo en la barra de herramientas."
 
-#: C/evolution.xml:1382(para)
+#: C/evolution.xml:1446(para)
 msgid ""
 "Enter an address in the To field. If you want to enter multiple email "
 "addresses, type in the addresses separated by comma. You can also use a "
@@ -3610,65 +3890,65 @@ msgstr ""
 "la parte inferior, el texto del mensaje. Una vez que haya escrito su mensaje "
 "pulse Enviar."
 
-#: C/evolution.xml:1383(para)
+#: C/evolution.xml:1447(para)
 msgid "New mail message window look like this:"
 msgstr "La ventana de mensaje de correo nuevo es así:"
 
-#: C/evolution.xml:1385(para) C/evolution.xml:5938(para)
+#: C/evolution.xml:1449(para) C/evolution.xml:6184(para)
 msgid "This section contains the following topics:"
 msgstr "Esta sección contiene los siguientes temas:"
 
-#: C/evolution.xml:1388(link) C/evolution.xml:1426(title)
+#: C/evolution.xml:1452(link) C/evolution.xml:1490(title)
 msgid "Unicode, ASCII, and Non-Latin Alphabets"
 msgstr "Unicode, ASCII, y alfabetos no latinos"
 
-#: C/evolution.xml:1391(link) C/evolution.xml:1438(title)
+#: C/evolution.xml:1455(link) C/evolution.xml:1526(title)
 msgid "Sending Composed Messages Later"
 msgstr "Enviar los mensajes nuevos más tarde"
 
-#: C/evolution.xml:1394(link) C/evolution.xml:1454(title)
+#: C/evolution.xml:1458(link) C/evolution.xml:1542(title)
 msgid "Working Offline"
 msgstr "Trabar desconectado"
 
-#: C/evolution.xml:1397(link) C/evolution.xml:1507(title)
+#: C/evolution.xml:1461(link) C/evolution.xml:1595(title)
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#: C/evolution.xml:1400(link) C/evolution.xml:1554(title)
+#: C/evolution.xml:1464(link) C/evolution.xml:1642(title)
 msgid "Specifying Additional Recipients for Email"
 msgstr "Especificar destinatarios adicioneles para correo electrónico"
 
-#: C/evolution.xml:1403(link) C/evolution.xml:1579(title)
+#: C/evolution.xml:1467(link) C/evolution.xml:1667(title)
 msgid "Choosing Recipients Quickly"
 msgstr "Eligiendo los destinatarios rápidamente"
 
-#: C/evolution.xml:1406(link) C/evolution.xml:1587(title)
+#: C/evolution.xml:1470(link) C/evolution.xml:1675(title)
 msgid "Replying to Email Messages"
 msgstr "Responder a mensajes de correo-e"
 
-#: C/evolution.xml:1409(link) C/evolution.xml:1653(title)
+#: C/evolution.xml:1473(link) C/evolution.xml:1741(title)
 msgid "Searching and Replacing with the Composer"
 msgstr "Buscar y sustituir en el editor de mensajes"
 
-#: C/evolution.xml:1412(link) C/evolution.xml:1675(title)
+#: C/evolution.xml:1476(link) C/evolution.xml:1763(title)
 msgid "Enhancing Your Email with HTML"
 msgstr "Mejorar su correo electrónico con HTML"
 
-#: C/evolution.xml:1415(link) C/evolution.xml:1849(title)
+#: C/evolution.xml:1479(link) C/evolution.xml:1937(title)
 msgid "Mail Send Options"
 msgstr "Opciones de envío de correo"
 
 # #-#-#-#-#  usage-exchange.po  #-#-#-#-#
 # index.docbook:342, index.docbook:514
-#: C/evolution.xml:1418(link) C/evolution.xml:1927(title)
+#: C/evolution.xml:1482(link) C/evolution.xml:2015(title)
 msgid "Forwarding Mail"
 msgstr "Reenviar correo"
 
-#: C/evolution.xml:1421(link) C/evolution.xml:1948(title)
+#: C/evolution.xml:1485(link) C/evolution.xml:2036(title)
 msgid "Tips for Email Courtesy"
 msgstr "Consejos para correo electrónico de cortesía"
 
-#: C/evolution.xml:1427(para)
+#: C/evolution.xml:1491(para)
 msgid ""
 "If you want to write in a non-Latin alphabet while using a Latin keyboard, "
 "try selecting a different input method in the message composer. Right-click "
@@ -3691,7 +3971,7 @@ msgstr ""
 "cirílicas apropiadas, y la comilla simple (‘) proporciona un carácter de "
 "signo suave."
 
-#: C/evolution.xml:1428(para)
+#: C/evolution.xml:1492(para)
 msgid ""
 "For greater language display capabilities, click Edit &gt; Preferences, then "
 "select the character set choices in the Mail Preferences and Composer "
@@ -3705,11 +3985,11 @@ msgstr ""
 "seguro de cuáles usar, seleccione UTF-8, que ofrece el mayor rango de "
 "caracteres disponibles en el mayor número de idiomas."
 
-#: C/evolution.xml:1431(title)
+#: C/evolution.xml:1495(title)
 msgid "Using Character Sets"
 msgstr "Usar los juegos de codificaciones"
 
-#: C/evolution.xml:1432(para)
+#: C/evolution.xml:1496(para)
 msgid ""
 "A character set is a computer's version of an alphabet. In the past, the "
 "ASCII character set was used almost universally. However, it contains only "
@@ -3732,7 +4012,7 @@ msgstr ""
 "de estándares desarrollaron el juego de caracteres UTF-8 Unicode* para "
 "proporcionar un juego de caracteres único para todo el mundo."
 
-#: C/evolution.xml:1433(para)
+#: C/evolution.xml:1497(para)
 msgid ""
 "Most email messages state in advance which character set they use, so "
 "Evolution usually can display those messages correctly. However, if you find "
@@ -3756,7 +4036,73 @@ msgstr ""
 "mayoría de usuarios es UTF-8, que ofrece el rango más grande de caracteres "
 "para el rango más grande de idiomas."
 
-#: C/evolution.xml:1439(para)
+#: C/evolution.xml:1502(title)
+msgid "Custom Header"
+msgstr "Cabecera personalizada"
+
+#: C/evolution.xml:1503(para)
+msgid "To enable the Custom Header plugin:"
+msgstr "Para activar el complemento Cabecera personalizada:"
+
+#: C/evolution.xml:1504(para) C/evolution.xml:6717(para)
+msgid "Select Edit &gt; Plugins."
+msgstr "Seleccione Editar &gt; Complementos."
+
+#: C/evolution.xml:1505(para)
+msgid ""
+"Then select Custom Header. You can configure custom headers to set "
+"sensitivity and caveats to the outgoing messages."
+msgstr ""
+"Después seleccione Cabecera personalizada. Puede configurar las cabeceras "
+"personalizadas para ajustar la sensibilidad y advertencias para los mensajes "
+"salientes."
+
+#: C/evolution.xml:1507(para)
+msgid ""
+"In the Plugin Manager, select the Configuration tab to customize your header "
+"fields. You can add, edit, or remove the header fields. For every header "
+"field you add, you can specify the keys and values. The key is used as the "
+"title of the Custom Header. You can enter multiple values for the keys. You "
+"must use a semicolon to separate every value you enter."
+msgstr ""
+"En el Gestor de complementos seleccione la solapa Configuración para "
+"personalizar sus campos de cabeceras. Puede añadir, editar o quitar los "
+"campos de cabeceras. Para cada campo de cabecera que añada puede especificar "
+"las claves y los valores. La clave se usa como el título de la cabecera "
+"personalizada. Puede introducir múltiples valores para las claves. Debe usar "
+"un punto y coma para separar cada valor que introduzca."
+
+#: C/evolution.xml:1510(para)
+msgid ""
+"Select New &gt; Mail Message or Shift+Ctrl+M to open a Compose Message "
+"window."
+msgstr ""
+"Seleccione Nuevo &gt; Mensaje de correo o Mayús+Ctrl+M para abrir una "
+"ventana del Editor de mensajes."
+
+#: C/evolution.xml:1513(para)
+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."
+
+#: C/evolution.xml:1515(para)
+msgid ""
+"In the Email Custom Header window, you can view all the header fields and "
+"values you add."
+msgstr ""
+"En la ventana Cabeceras personalizadas del correo-e puede ver todos campos "
+"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."
+msgstr ""
+"Establezca los valores para los campos de cabecera usando la lista "
+"desplegable respectiva."
+
+#: C/evolution.xml:1527(para)
 msgid ""
 "Evolution normally sends mail as soon as you click Send. However, can save a "
 "message to be sent later:"
@@ -3765,7 +4111,7 @@ msgstr ""
 "Sin embargo hay unas cuantas maneras de guardar un mensaje para enviarlo más "
 "tarde:"
 
-#: C/evolution.xml:1442(para)
+#: C/evolution.xml:1530(para)
 msgid ""
 "If you are offline when you click Send, Evolution adds your message to the "
 "Outbox queue. The next time you connect to the Internet and send or receive "
@@ -3775,7 +4121,7 @@ msgstr ""
 "mensajes en la carpeta «Bandeja de salida». El mensaje se enviará la próxima "
 "vez que se conecte a Internet y envíe o reciba correo."
 
-#: C/evolution.xml:1445(para)
+#: C/evolution.xml:1533(para)
 msgid ""
 "Click File &gt; Save Draft to store your messages in the drafts folder for "
 "later revision."
@@ -3783,7 +4129,7 @@ msgstr ""
 "Pulse Archivo &gt; Guardar borrador para guardar sus mensajes en la carpeta "
 "de borradores y poder revisarlos después."
 
-#: C/evolution.xml:1448(para)
+#: C/evolution.xml:1536(para)
 msgid ""
 "If you prefer to save your message as a text file, click File &gt; Save As, "
 "then specify a filename."
@@ -3791,7 +4137,7 @@ msgstr ""
 "Si prefiere guardar el mensaje como un archivo de texto pulse Archivo &gt; "
 "Guardar como, y después especifique un nombre de archivo."
 
-#: C/evolution.xml:1455(para)
+#: C/evolution.xml:1543(para)
 msgid ""
 "Offline mode helps you communicate with remote mail storage systems like "
 "<trademark class=\"registered\">GroupWise</trademark>, IMAP or Exchange, in "
@@ -3806,7 +4152,7 @@ msgstr ""
 "permite crear nuevos mensajes, guardarlos en la Bandeja de salida y enviarlo "
 "en cuanto vuelva a conectarse."
 
-#: C/evolution.xml:1456(para)
+#: C/evolution.xml:1544(para)
 msgid ""
 "POP mail downloads all messages to your local system, but other connections "
 "usually download just the headers, and get the rest only when you want to "
@@ -3819,21 +4165,22 @@ msgstr ""
 "descargará todos los mensajes sin leer desde las carpetas que haya elegido "
 "almacenar."
 
-#: C/evolution.xml:1457(para)
+#: C/evolution.xml:1545(para)
 msgid "To mark a folder for offline use,"
 msgstr "Para marcar una carpeta para su uso desconectado,"
 
-#: C/evolution.xml:1460(para)
+#: C/evolution.xml:1548(para)
 msgid "Right-click the folder, then click Properties."
 msgstr ""
 "Pulse con el botón derecho del ratón sobre la carpeta, después elija "
 "Propiedades."
 
-#: C/evolution.xml:1463(para)
+#: 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:1466(para)
+#: C/evolution.xml:1554(para)
 msgid ""
 "Your connection status is shown by the small icon in the lower left border "
 "of the Evolution main window. When you are online, it displays two connected "
@@ -3844,11 +4191,11 @@ msgstr ""
 "mostrará dos cables enchufados. Cuando esté desconectado los cables estarán "
 "desenchufados."
 
-#: C/evolution.xml:1467(para)
+#: C/evolution.xml:1555(para)
 msgid "To cache your selected folders and disconnect from the network,"
 msgstr "Para cachear las carpetas seleccionadas y desconectar de la red,"
 
-#: C/evolution.xml:1470(para)
+#: C/evolution.xml:1558(para)
 msgid ""
 "Click File &gt; Work Offline, or click the connection status icon in the "
 "lower left of the screen."
@@ -3856,7 +4203,7 @@ msgstr ""
 "Pulse Archivo &gt; Trabajar desconectado o pulse el icono de estado de la "
 "conexión en la esquina inferior izquierda de la pantalla."
 
-#: C/evolution.xml:1471(para)
+#: C/evolution.xml:1559(para)
 msgid ""
 "A message pop-ups and asks you whether you want to go offline immediately or "
 "cache before you go offline."
@@ -3864,7 +4211,7 @@ msgstr ""
 "Un mensaje emergerá y le preguntará si quiere desconectarse inmediatamente o "
 "cachear antes de desconectarse."
 
-#: C/evolution.xml:1476(para)
+#: C/evolution.xml:1564(para)
 msgid ""
 "Click Synchronize to download all the messages to the folders marked for "
 "offline."
@@ -3872,11 +4219,11 @@ msgstr ""
 "Pulse Sincronizar para descargar todos los mensajes en las carpetas marcadas "
 "para trabajar desconectado."
 
-#: C/evolution.xml:1477(para) C/evolution.xml:3690(para)
+#: C/evolution.xml:1565(para) C/evolution.xml:3936(para)
 msgid "Or"
 msgstr "O"
 
-#: C/evolution.xml:1478(para)
+#: C/evolution.xml:1566(para)
 msgid ""
 "Click Do not synchronize to go offline immediately, without downloading the "
 "messages locally for offline operations."
@@ -3884,7 +4231,7 @@ msgstr ""
 "Pulse No sincronizar para desconectarse inmediatamente, sin descargar los "
 "mensajes localmente para trabajar desconectado."
 
-#: C/evolution.xml:1479(para)
+#: C/evolution.xml:1567(para)
 msgid ""
 "Select Do not show this message again to switch off this popup. The default "
 "is to not synchronize while going offline."
@@ -3892,21 +4239,21 @@ msgstr ""
 "Seleccione No mostrar otra vez este mensaje para desactivar este mensaje "
 "emergente. Lo predeterminado es no sincronizar al desconectar."
 
-#: C/evolution.xml:1482(para)
+#: C/evolution.xml:1570(para)
 msgid "When you want to reconnect,"
 msgstr "Cuando quiera reconectar,"
 
-#: C/evolution.xml:1485(para)
+#: C/evolution.xml:1573(para)
 msgid "Click File &gt; Work Online, or click the connection status icon again."
 msgstr ""
 "Pulse Archivo &gt; Trabajar conectado o pulse el icono de estado de la "
 "conexión de nuevo."
 
-#: C/evolution.xml:1490(title)
+#: C/evolution.xml:1578(title)
 msgid "Download Messages for Offline Operations"
 msgstr "Descargar los mensajes para trabajar desconectado"
 
-#: C/evolution.xml:1491(para)
+#: C/evolution.xml:1579(para)
 msgid ""
 "This features prepares you for going offline and for offline operations. It "
 "helps you download all the messages locally before you go offline. If "
@@ -3918,19 +4265,19 @@ msgstr ""
 "De otra manera y de forma predeterminada, se desconecta cuando pulsa el "
 "botón de desconexión sin descargar los mensajes."
 
-#: C/evolution.xml:1492(para)
+#: C/evolution.xml:1580(para)
 msgid "To download messages for offline operations,"
 msgstr "Para descargar mensajes para trabajar desconectado,"
 
-#: C/evolution.xml:1495(para)
+#: C/evolution.xml:1583(para)
 msgid "Select File &gt; Download messages for offline."
 msgstr "Seleccione Archivo &gt; Descargar mensajes para trabajar sin conexión."
 
-#: C/evolution.xml:1501(title)
+#: C/evolution.xml:1589(title)
 msgid "Automatic Network State Handling"
 msgstr "Gestión automática del estado de la red"
 
-#: C/evolution.xml:1502(para)
+#: C/evolution.xml:1590(para)
 msgid ""
 "Evolution automatically understands the network state and acts accordingly. "
 "For instance, Evolution switches to offline mode when the network goes down "
@@ -3943,19 +4290,19 @@ msgstr ""
 "esta característica, asegúrese de que su sistema tiene instalado Network "
 "Manager."
 
-#: C/evolution.xml:1508(para)
+#: C/evolution.xml:1596(para)
 msgid "To attach a file to your email:"
 msgstr "Para adjuntar un archivo a su correo-e:"
 
-#: C/evolution.xml:1511(para)
+#: C/evolution.xml:1599(para)
 msgid "Click the Attach icon in the composer toolbar."
 msgstr "Pulse el botón Adjuntar en la barra de herramientas del editor."
 
-#: C/evolution.xml:1514(para)
+#: C/evolution.xml:1602(para)
 msgid "Select the file you want to attach."
 msgstr "Seleccione el archivo que quiere adjuntar."
 
-#: C/evolution.xml:1520(para)
+#: C/evolution.xml:1608(para)
 msgid ""
 "You can also drag a file to the attachment bar of the composer window. If "
 "you want to send it as an inline attachment, right-click the attachment and "
@@ -3966,7 +4313,7 @@ msgstr ""
 "derecho del ratón sobre el adjunto y puse Propiedades, después seleccione "
 "Mostrado automático de los adjuntos."
 
-#: C/evolution.xml:1521(para)
+#: C/evolution.xml:1609(para)
 msgid ""
 "When you send the message, a copy of the attached file goes with it. Be "
 "aware that large attachments can take a long time to send and receive."
@@ -3975,11 +4322,11 @@ msgstr ""
 "presente que los adjuntos de gran tamaño pueden tomar mucho tiempo al ser "
 "enviados y recibidos."
 
-#: C/evolution.xml:1524(title)
+#: C/evolution.xml:1612(title)
 msgid "Attachment Reminder:"
 msgstr "Recuerdo de adjuntos:"
 
-#: C/evolution.xml:1525(para)
+#: C/evolution.xml:1613(para)
 msgid ""
 "Evolution has an Attachment Reminder plugin you can use to remind yourself "
 "to attach a file to an email. If it determines that you have not attached "
@@ -3989,7 +4336,7 @@ msgstr ""
 "recordarle que adjunte un archivo en un correo-e. Si determina que el "
 "archivo no está adjuntado, muestra el siguiente mensaje:"
 
-#: C/evolution.xml:1529(para)
+#: C/evolution.xml:1617(para)
 msgid ""
 "Click Continue Editing to attach the missing file, or click Send to send the "
 "message without any attachment."
@@ -3997,15 +4344,15 @@ msgstr ""
 "Pulse Continuar editando para adjuntar el archivo que se le está recordando "
 "que falta o pulse Enviar para enviar el mensaje sin ningún adjunto."
 
-#: C/evolution.xml:1532(para)
+#: C/evolution.xml:1620(para)
 msgid "To enable the Attachment Reminder:"
 msgstr "Para activar el Recuerdo de adjuntos:"
 
-#: C/evolution.xml:1535(para)
+#: C/evolution.xml:1623(para)
 msgid "Select Edit &gt; Plugins &gt; Attachment Reminder."
 msgstr "Seleccione Editar &gt; Complementos &gt; Recuerdo de adjuntos."
 
-#: C/evolution.xml:1538(para)
+#: C/evolution.xml:1626(para)
 msgid ""
 "Click Configuration, then make sure that Remind Missing Attachments is "
 "selected."
@@ -4013,7 +4360,7 @@ msgstr ""
 "Pulse Configuración, después asegúrese de que Recordar los adjuntos "
 "faltantes está seleccionado."
 
-#: C/evolution.xml:1542(para)
+#: C/evolution.xml:1630(para)
 msgid ""
 "Select keywords such as <quote>Attach</quote> or <quote>Attachment</quote> "
 "and click Add."
@@ -4021,7 +4368,7 @@ msgstr ""
 "Seleccione las palabras clave tales como <quote>Adjuntar</quote> o "
 "<quote>Adjunto</quote> y pulse Añadir."
 
-#: C/evolution.xml:1543(para)
+#: C/evolution.xml:1631(para)
 msgid ""
 "Based on the keywords you have added here, it searches every mail you are "
 "sending. If it finds the keywords such as <quote>attach</quote> in your mail "
@@ -4033,7 +4380,7 @@ msgstr ""
 "tales como <quote>adjuntar</quote> y no hay un archivo adjunto, se le "
 "recuerda que faltan adjuntos."
 
-#: C/evolution.xml:1546(para)
+#: C/evolution.xml:1634(para)
 msgid ""
 "To edit any of the existing keywords, select the keyword, click Edit, then "
 "modify the word as desired."
@@ -4041,7 +4388,7 @@ msgstr ""
 "Para editar cualquiera de las palabras clave existentes, seleccione la "
 "palabra clave y pulse Editar, después modifique la palabra como desee."
 
-#: C/evolution.xml:1555(para)
+#: C/evolution.xml:1643(para)
 msgid ""
 "<trademark>Evolution</trademark>, like most email programs, recognizes three "
 "types of addresses: primary recipients, secondary recipients, and hidden "
@@ -4056,7 +4403,7 @@ msgstr ""
 "electrónico en el campo Para:, que denota los destinatarios primarios. Use "
 "el campo Cc: para enviar un mensaje de correo a destinatarios secundarios."
 
-#: C/evolution.xml:1556(para)
+#: C/evolution.xml:1644(para)
 msgid ""
 "Addresses on the Bcc: list are hidden from the other recipients of the "
 "message. You can use it to send mail to large groups of people, especially "
@@ -4068,7 +4415,7 @@ msgstr ""
 "especialmente si no se conocen entre sí o si es importante mantener la "
 "privacidad. Si el campo Cco: no está a la vista pulse Ver &gt; Campo Cco."
 
-#: C/evolution.xml:1557(para)
+#: C/evolution.xml:1645(para)
 msgid ""
 "If you frequently write email to the same groups of people, you can create "
 "address lists in the contacts tool, and then send them mail as though they "
@@ -4081,7 +4428,7 @@ msgstr ""
 "cómo hacerlo consulte <link linkend=\"usage-contact-organize-group-list"
 "\">Crear una lista de contactos</link>."
 
-#: C/evolution.xml:1558(para)
+#: C/evolution.xml:1646(para)
 msgid ""
 "Evolution has the ability to let you specify the Reply-To in an email. Using "
 "this, you can set up a special Reply-To for an email. To do this:"
@@ -4090,15 +4437,15 @@ msgstr ""
 "en un correo-e. Usando esto, puede establecer un Responder a: especial para "
 "un correo-e. Para hacer esto:"
 
-#: C/evolution.xml:1561(para)
+#: C/evolution.xml:1649(para)
 msgid "Open a compose window."
 msgstr "Abra una ventana del editor."
 
-#: C/evolution.xml:1564(para)
+#: C/evolution.xml:1652(para)
 msgid "Open the Reply-To field by clicking View &gt; Reply To."
 msgstr "Abra el campo Responder a pulsando en Ver &gt; Responder a."
 
-#: C/evolution.xml:1567(para)
+#: C/evolution.xml:1655(para)
 msgid ""
 "Specify the address you want as the Reply-To address in the new Reply-To "
 "field."
@@ -4106,16 +4453,17 @@ msgstr ""
 "Especifique la dirección a la que quiere que le respondan en el nuevo campo "
 "«Responder a»."
 
-#: C/evolution.xml:1570(para)
+#: C/evolution.xml:1658(para)
 msgid "Complete the rest of your message."
 msgstr "Complete el resto de su mensaje."
 
-#: C/evolution.xml:1573(para) C/evolution.xml:1941(para)
-#: C/evolution.xml:2155(para) C/evolution.xml:5200(para)
+#: C/evolution.xml:1661(para) C/evolution.xml:2029(para)
+#: C/evolution.xml:2137(para) C/evolution.xml:2344(para)
+#: C/evolution.xml:5446(para)
 msgid "Click Send."
 msgstr "Pulse Enviar."
 
-#: C/evolution.xml:1580(para)
+#: C/evolution.xml:1668(para)
 msgid ""
 "Address auto completion is by default enabled in Evolution when you create "
 "contacts. Evolution makes it easy for you to quickly fill in the address "
@@ -4135,7 +4483,7 @@ msgstr ""
 "tarjeta, Evolution abrirá una caja de diálogo para preguntarle a qué persona "
 "se refiere."
 
-#: C/evolution.xml:1581(para)
+#: C/evolution.xml:1669(para)
 msgid ""
 "If Evolution does not complete addresses automatically, click Edit &gt; "
 "Preferences, then click Autocompletion. There, select the address book you "
@@ -4146,7 +4494,7 @@ msgstr ""
 "direcciones quequiere usar para el autocompletado de direcciones en el "
 "correo."
 
-#: C/evolution.xml:1582(para)
+#: C/evolution.xml:1670(para)
 msgid ""
 "Alternately, you can click the To:, Cc:, or Bcc: buttons to get a list of "
 "the email addresses in your contacts. Select addresses and click the arrows "
@@ -4157,7 +4505,7 @@ msgstr ""
 "Seleccione las direcciones y pulse las flechas para moverlas entre las "
 "columnas de direcciones apropiadas."
 
-#: C/evolution.xml:1583(para)
+#: C/evolution.xml:1671(para)
 msgid ""
 "For more information about using email with the contact manager and the "
 "calendar, see <link linkend=\"contact-automation-basic\">Send Me a Card: "
@@ -4170,7 +4518,7 @@ msgstr ""
 "link> y <link linkend=\"usage-calendar-apts\">Planificación con el "
 "calendario de Evolution</link>."
 
-#: C/evolution.xml:1588(para)
+#: C/evolution.xml:1676(para)
 msgid ""
 "To reply to a message, click the message to reply to in the message list and "
 "click the Reply button in the toolbar, or right-click within the message and "
@@ -4190,7 +4538,7 @@ msgstr ""
 "el carácter &gt; antes de cada línea (para el modo texto plano), para "
 "indicar que es parte del mensaje anterior."
 
-#: C/evolution.xml:1589(para)
+#: C/evolution.xml:1677(para)
 msgid ""
 "If you're reading a message with several recipients, you can use Reply to "
 "All instead of Reply. If there are large numbers of people in the Cc: or To: "
@@ -4200,11 +4548,11 @@ msgstr ""
 "Responder a todos en lugar de Responder. Si hay un gran número de personas "
 "en los campos Para: o Cc: esto puede ahorrar mucho tiempo."
 
-#: C/evolution.xml:1592(title)
+#: C/evolution.xml:1680(title)
 msgid "Using the Reply To All Feature"
 msgstr "Uso de la característica de Responder a todos"
 
-#: C/evolution.xml:1593(para)
+#: C/evolution.xml:1681(para)
 msgid ""
 "Susan sends an email to a client and sends copies to Tim and to an internal "
 "company mailing list of co-workers. If Tim wants to make a comment for all "
@@ -4220,7 +4568,7 @@ msgstr ""
 "respuesta no la recibirá nadie a quien Susana haya incluido en la lista de "
 "Cco: de su mensaje original porque tal lista no ha sido compartida con nadie."
 
-#: C/evolution.xml:1594(para)
+#: C/evolution.xml:1682(para)
 msgid ""
 "If you subscribe to a mailing list, and want your reply to go just to the "
 "list, rather than to the sender, select Reply to List instead of Reply or "
@@ -4230,71 +4578,72 @@ msgstr ""
 "la misma en lugar de al remitente pulse en Responder la lista en lugar de "
 "Responder o de Responder a todos."
 
-#: C/evolution.xml:1598(title)
+#: C/evolution.xml:1686(title)
 msgid "Keyboard shortcuts"
 msgstr "Atajos de teclado"
 
-#: C/evolution.xml:1606(para)
+#: C/evolution.xml:1694(para)
 msgid "Tools"
 msgstr "Herramientas"
 
-#: C/evolution.xml:1609(para)
+#: C/evolution.xml:1697(para)
 msgid "Shortcuts"
 msgstr "Atajos"
 
-#: C/evolution.xml:1616(para)
+#: C/evolution.xml:1704(para)
 msgid "Reply to sender"
 msgstr "Responder al remitente"
 
-#: C/evolution.xml:1619(para)
+#: C/evolution.xml:1707(para)
 msgid "Ctrl+R"
 msgstr "Ctrl+R"
 
-#: C/evolution.xml:1624(para)
+#: C/evolution.xml:1712(para)
 msgid "Reply to List"
 msgstr "Responder a la lista"
 
-#: C/evolution.xml:1627(para)
+#: C/evolution.xml:1715(para)
 msgid "Clrl+L"
 msgstr "Clrl+L"
 
-#: C/evolution.xml:1632(para)
+#: C/evolution.xml:1720(para)
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: C/evolution.xml:1635(para)
+#: C/evolution.xml:1723(para)
 msgid "Shift+Ctrl+R"
 msgstr "Shift+Ctrl+R"
 
 # #-#-#-#-#  usage-exchange.po  #-#-#-#-#
 # index.docbook:342, index.docbook:514
-#: C/evolution.xml:1640(para)
+#: C/evolution.xml:1728(para)
 msgid "Forward"
 msgstr "Reenviar"
 
-#: C/evolution.xml:1643(para)
+#: C/evolution.xml:1731(para)
 msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
-#: C/evolution.xml:1654(para)
-msgid "The message composer makes several text searching features available to you."
+#: C/evolution.xml:1742(para)
+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."
 
-#: C/evolution.xml:1656(title)
+#: C/evolution.xml:1744(title)
 msgid "Find:"
 msgstr "Buscar:"
 
-#: C/evolution.xml:1657(para)
+#: C/evolution.xml:1745(para)
 msgid "Enter a word or phrase, and Evolution finds it in your message."
 msgstr "Escriba una palabra o frase y Evolution la encontrará en el mensaje."
 
-#: C/evolution.xml:1660(title)
+#: C/evolution.xml:1748(title)
 msgid "Find Regex:"
 msgstr "Buscar expresión regular:"
 
-#: C/evolution.xml:1661(para)
+#: C/evolution.xml:1749(para)
 msgid ""
 "You can search for a complex pattern of characters, called a <link linkend="
 "\"regular-expression\">regular expression</link> or <quote>regex</quote> in "
@@ -4306,23 +4655,24 @@ msgstr ""
 "ventana de su editor. Si no está seguro de lo que es una expresión regular, "
 "debería ignorar esta característica."
 
-#: C/evolution.xml:1664(title)
+#: C/evolution.xml:1752(title)
 msgid "Find Again:"
 msgstr "Buscar de nuevo:"
 
-#: C/evolution.xml:1665(para)
+#: 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:1668(title)
+#: C/evolution.xml:1756(title)
 msgid "Replace:"
 msgstr "Reemplazar:"
 
-#: C/evolution.xml:1669(para)
+#: C/evolution.xml:1757(para)
 msgid "Find a word or phrase, and replace it with something else."
 msgstr "Buscar una palabra o una frase y sustituirla por otra cosa."
 
-#: C/evolution.xml:1671(para)
+#: C/evolution.xml:1759(para)
 msgid ""
 "For all of these menu items, you can choose whether to search backwards in "
 "the document from the point where your cursor is. You can also determine "
@@ -4332,7 +4682,7 @@ msgstr ""
 "punto el que se encuentra el cursor. También puede determinar si quiere que "
 "la búsqueda sea sensible a mayúsculas o no."
 
-#: C/evolution.xml:1676(para)
+#: C/evolution.xml:1764(para)
 msgid ""
 "Normally, you can't set text styles or insert pictures in email. However, "
 "most newer email programs can display images and text styles in addition to "
@@ -4345,7 +4695,7 @@ msgstr ""
 "básico y formateo de párrafos. Esto es posible al usar <glossterm linkend="
 "\"html\">HTML</glossterm> al igual que las páginas web."
 
-#: C/evolution.xml:1677(para)
+#: C/evolution.xml:1765(para)
 msgid ""
 "Some people do not have HTML-capable mail clients, or prefer not to receive "
 "HTML-enhanced mail because it is slower to download and display. Because of "
@@ -4356,11 +4706,11 @@ msgstr ""
 "descargar y de mostrar en pantalla. Por ello Evolution envía mensajes de "
 "texto plano a menos que le pida explícitamenteque los componga con HTML."
 
-#: C/evolution.xml:1680(title)
+#: C/evolution.xml:1768(title)
 msgid "Basic HTML Formatting"
 msgstr "Formateo básico de HTML"
 
-#: C/evolution.xml:1681(para)
+#: C/evolution.xml:1769(para)
 msgid ""
 "You can change the format of an email message from plain text to HTML by "
 "choosing Format &gt; HTML from the menu bar."
@@ -4368,7 +4718,7 @@ msgstr ""
 "Puede cambiar el formato de un mensaje de correo electrónico de texto plano "
 "a HTML eligiendo Formato &gt; HTML desde la barra de menú."
 
-#: C/evolution.xml:1682(para)
+#: C/evolution.xml:1770(para)
 msgid ""
 "To send all your mail as HTML by default, set your mail format preferences "
 "in the mail configuration dialog box. See <link linkend=\"config-prefs-mail-"
@@ -4379,7 +4729,7 @@ msgstr ""
 "de configuración del correo. Para obtener más información consulte la <xref "
 "linkend=\"config-prefs-mail-composer\"/>."
 
-#: C/evolution.xml:1683(para)
+#: C/evolution.xml:1771(para)
 msgid ""
 "HTML formatting tools are located in the toolbar just above the space where "
 "you actually compose the message. They also appear in the Insert and Format "
@@ -4389,7 +4739,7 @@ msgstr ""
 "justo encima del espacio en el que realmente compone su mensaje y también "
 "aparecen en los menús Insertar y Formato."
 
-#: C/evolution.xml:1684(para)
+#: C/evolution.xml:1772(para)
 msgid ""
 "The icons in the toolbar are explained in <link linkend=\"tooltip\">tool-"
 "tips</link>, which appear when you hold your mouse pointer over the buttons. "
@@ -4399,11 +4749,11 @@ msgstr ""
 "\"tooltip\">consejos</glossterm> que aparecen cuando mantiene el ratón sobre "
 "los botones. Estos se clasifican en cuatro categorías:"
 
-#: C/evolution.xml:1686(title)
+#: C/evolution.xml:1774(title)
 msgid "Headers and Lists:"
 msgstr "Cabeceras y listas:"
 
-#: C/evolution.xml:1687(para)
+#: C/evolution.xml:1775(para)
 msgid ""
 "At the left edge of the toolbar, you can choose Normal for a default text "
 "style or Header 1 through Header 6 for varying sizes of header from large "
@@ -4416,7 +4766,7 @@ msgstr ""
 "pequeño). Otros estilos disponibles para los más organizados son Preformato, "
 "la lista de puntos o los tres tipos de listas numeradas."
 
-#: C/evolution.xml:1689(para)
+#: C/evolution.xml:1777(para)
 msgid ""
 "For instance, instead of using asterisks to mark a bulleted list, you can "
 "use the Bulleted List style from the style drop-down list. Evolution uses "
@@ -4428,11 +4778,11 @@ msgstr ""
 "distintos estilos para las listas de topos y maneja varios niveles de "
 "sangría y de ajuste para las palabras."
 
-#: C/evolution.xml:1691(title)
+#: C/evolution.xml:1779(title)
 msgid "Text Styles:"
 msgstr "Estilos de texto:"
 
-#: C/evolution.xml:1692(para)
+#: C/evolution.xml:1780(para)
 msgid ""
 "Use these buttons to determine the way your email looks. If you have text "
 "selected, the style applies to the selected text. If you do not have text "
@@ -4442,15 +4792,15 @@ msgstr ""
 "seleccionado un texto, el estilo se aplicará sobre él. Si no, el estilo se "
 "aplicará a lo próximo que escriba."
 
-#: C/evolution.xml:1701(para)
+#: C/evolution.xml:1789(para)
 msgid "Button"
 msgstr "Botón"
 
-#: C/evolution.xml:1711(para)
+#: C/evolution.xml:1799(para)
 msgid "TT"
 msgstr "TT"
 
-#: C/evolution.xml:1714(para)
+#: C/evolution.xml:1802(para)
 msgid ""
 "Typewriter text, which is approximately the same as the Courier monospace "
 "font."
@@ -4458,43 +4808,43 @@ msgstr ""
 "Texto de máquina de escribir, es aproximadamente igual a la tipografía "
 "monoespaciadia Courier."
 
-#: C/evolution.xml:1719(para)
+#: C/evolution.xml:1807(para)
 msgid "Bold A"
 msgstr "A en negrita"
 
-#: C/evolution.xml:1722(para)
+#: C/evolution.xml:1810(para)
 msgid "Bolds the text."
 msgstr "Pone el texto en negrita."
 
-#: C/evolution.xml:1727(para)
+#: C/evolution.xml:1815(para)
 msgid "Italic A"
 msgstr "A en cursiva"
 
-#: C/evolution.xml:1730(para)
+#: C/evolution.xml:1818(para)
 msgid "Italicizes the text."
 msgstr "Pone el texto en cursiva."
 
-#: C/evolution.xml:1735(para)
+#: C/evolution.xml:1823(para)
 msgid "Underlined A"
 msgstr "A subrayada"
 
-#: C/evolution.xml:1738(para)
+#: C/evolution.xml:1826(para)
 msgid "Underlines the text."
 msgstr "Subraya el texto."
 
-#: C/evolution.xml:1743(para)
+#: C/evolution.xml:1831(para)
 msgid "Strike through A"
 msgstr "A tachada"
 
-#: C/evolution.xml:1746(para)
+#: C/evolution.xml:1834(para)
 msgid "Marks a line through the text."
 msgstr "Tacha el texto."
 
-#: C/evolution.xml:1753(title)
+#: C/evolution.xml:1841(title)
 msgid "Alignment:"
 msgstr "Alineación:"
 
-#: C/evolution.xml:1754(para)
+#: C/evolution.xml:1842(para)
 msgid ""
 "Located next to the text style buttons, the three paragraph icons should be "
 "familiar to users of most word processing software. The left most button "
@@ -4506,11 +4856,11 @@ msgstr ""
 "El que está más a la izquierda alinea el texto a la izquierda, el del "
 "centro, lo centra y el de la derecha lo alinea hacia el lado derecho."
 
-#: C/evolution.xml:1757(title)
+#: C/evolution.xml:1845(title)
 msgid "Indentation Rules:"
 msgstr "Reglas de sangrado:"
 
-#: C/evolution.xml:1758(para)
+#: C/evolution.xml:1846(para)
 msgid ""
 "The button with the arrow pointing left decreases a paragraph's indentation, "
 "and the right arrow increases its indentation."
@@ -4518,11 +4868,11 @@ msgstr ""
 "El botón con la flecha que apunta a la izquierda reducirá la sangría de un "
 "párrafo y el de la derecha la aumentará."
 
-#: C/evolution.xml:1761(title)
+#: C/evolution.xml:1849(title)
 msgid "Color Selection:"
 msgstr "Selección de color:"
 
-#: C/evolution.xml:1762(para)
+#: C/evolution.xml:1850(para)
 msgid ""
 "At the far right is the color section tool, where a box displays the current "
 "text color. To choose a new color, click the arrow button to the right. If "
@@ -4539,11 +4889,11 @@ msgstr ""
 "fondo pulsando con el botón derecho del ratón sobre el fondo del mensaje, "
 "para después seleccionar Estilo &gt; Estilo de la página."
 
-#: C/evolution.xml:1767(title)
+#: C/evolution.xml:1855(title)
 msgid "Advanced HTML Formatting"
 msgstr "Formato HTML avanzado"
 
-#: C/evolution.xml:1768(para)
+#: C/evolution.xml:1856(para)
 msgid ""
 "Under the Insert menu, there are several more items you can use to style "
 "your email. To use these and other HTML formatting tools, make sure you have "
@@ -4553,11 +4903,11 @@ msgstr ""
 "estilo a su correo-e. Para usar éstas y otras herramientas de formato HTML , "
 "asegúrese de que ha activado el modo HTML usando Formato &gt; HTML."
 
-#: C/evolution.xml:1771(title)
+#: C/evolution.xml:1859(title)
 msgid "Inserting a Link"
 msgstr "Insertar un enlace"
 
-#: C/evolution.xml:1772(para)
+#: C/evolution.xml:1860(para)
 msgid ""
 "Use the Insert a Link tool to put hyperlinks in your HTML messages. If you "
 "don't want special link text, you can just enter the address directly, and "
@@ -4567,77 +4917,79 @@ msgstr ""
 "HTML. Si no quiere escribir ningún texto en particular, sólo tiene que "
 "escribir la dirección directamente y Evolution la reconocerá como un enlace."
 
-#: C/evolution.xml:1775(para)
+#: C/evolution.xml:1863(para)
 msgid "Select the text you want to link from."
 msgstr "Seleccione el texto en el que quiere poner el enlace."
 
-#: C/evolution.xml:1778(para)
+#: C/evolution.xml:1866(para)
 msgid "Right-click in the text, then click Insert Link."
 msgstr ""
 "Pulse con el botón derecho del ratón sobre el texto, después elija Insertar "
 "enlace."
 
-#: C/evolution.xml:1781(para)
+#: C/evolution.xml:1869(para)
 msgid "Type the URL in the URL field."
 msgstr "Escriba el URL en el campo URL."
 
-#: C/evolution.xml:1790(title)
+#: C/evolution.xml:1878(title)
 msgid "Inserting an Image"
 msgstr "Insertar una imagen"
 
-#: C/evolution.xml:1793(para)
+#: C/evolution.xml:1881(para)
 msgid "Click Insert &gt; Image in the menubar."
 msgstr "Pulse Insertar &gt; Imagen en la barra del menú,"
 
-#: C/evolution.xml:1796(para)
+#: C/evolution.xml:1884(para)
 msgid "Browse to and select the image file."
 msgstr "Navegue y seleccione el archivo de la imagen."
 
-#: C/evolution.xml:1805(title)
+#: C/evolution.xml:1893(title)
 msgid "Inserting a Rule"
 msgstr "Insertar una regla"
 
-#: C/evolution.xml:1806(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:"
+#: 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:"
 
-#: C/evolution.xml:1809(para)
+#: C/evolution.xml:1897(para)
 msgid "Click Insert &gt; Rule in the menubar."
 msgstr "Pulse Insertar &gt; Regla en la barra de menú."
 
-#: C/evolution.xml:1812(para)
+#: C/evolution.xml:1900(para)
 msgid "Select the width, size, and alignment."
 msgstr "Seleccione la anchura, tamaño y el alineamiento."
 
-#: C/evolution.xml:1815(para)
+#: C/evolution.xml:1903(para)
 msgid "Select Shade if necessary."
 msgstr "Si es necesario, seleccione el sombreado."
 
-#: C/evolution.xml:1824(title)
+#: C/evolution.xml:1912(title)
 msgid "Inserting a Table"
 msgstr "Insertar una tabla"
 
-#: C/evolution.xml:1825(para)
+#: C/evolution.xml:1913(para)
 msgid "You can insert a table into the text:"
 msgstr "Para insertar una tabla en el texto:"
 
-#: C/evolution.xml:1828(para)
+#: C/evolution.xml:1916(para)
 msgid "Click Insert &gt; Table in the menubar."
 msgstr "Pulse Insertar &gt; Tabla en la barra de menú."
 
-#: C/evolution.xml:1831(para)
+#: C/evolution.xml:1919(para)
 msgid "Select the number of rows and columns."
 msgstr "Seleccione el número de filas y columnas."
 
-#: C/evolution.xml:1834(para)
+#: C/evolution.xml:1922(para)
 msgid "Select the type of layout for the table."
 msgstr "Seleccione el tipo de disposición para la tabla."
 
-#: C/evolution.xml:1837(para)
+#: C/evolution.xml:1925(para)
 msgid "Select a background for the table."
 msgstr "Seleccione un fondo para la tabla."
 
-#: C/evolution.xml:1838(para)
+#: C/evolution.xml:1926(para)
 msgid ""
 "To insert a picture for the background, click the filechooser button and "
 "select the desired image."
@@ -4645,15 +4997,16 @@ msgstr ""
 "Para introducir una imagen para el fondo de pantalla, pulse el botón del "
 "selector de archivos y seleccione la imagen que desee."
 
-#: C/evolution.xml:1850(para)
+#: 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:1852(title)
+#: C/evolution.xml:1940(title)
 msgid "Read Receipts:"
 msgstr "Confirmación de lectura:"
 
-#: C/evolution.xml:1853(para)
+#: C/evolution.xml:1941(para)
 msgid ""
 "Evolution allows you to request a receipt for your sent messages to indicate "
 "when your message is being viewed by the recipient. Receipts are useful when "
@@ -4666,11 +5019,11 @@ msgstr ""
 "importante. Para enviar una petición de lectura, pulse Insertar &gt; "
 "Solicitar confirmación de lectura en la ventana del editor."
 
-#: C/evolution.xml:1856(title)
+#: C/evolution.xml:1944(title)
 msgid "Prioritize Message:"
 msgstr "Priorizar mensaje:"
 
-#: C/evolution.xml:1857(para)
+#: C/evolution.xml:1945(para)
 msgid ""
 "You can prioritize a message to be sent, so that the recipient sees its "
 "relative importance.To prioritize a message, click Insert &gt; Prioritize "
@@ -4680,7 +5033,7 @@ msgstr ""
 "importancia relativa. Para priorizar un mensaje, pulse Insertar &gt; "
 "Priorizar mensaje en la ventana del editor."
 
-#: C/evolution.xml:1860(para)
+#: C/evolution.xml:1948(para)
 msgid ""
 "Evolution will ignore the message priority, because it assumes that the "
 "recipient should decide whether the message is important or not."
@@ -4689,11 +5042,11 @@ msgstr ""
 "debería decidir si el mensaje es importante o no."
 
 # index.docbook:29, index.docbook:30
-#: C/evolution.xml:1865(title)
+#: C/evolution.xml:1953(title)
 msgid "Default Settings"
 msgstr "Ajustes predeterminados"
 
-#: C/evolution.xml:1866(para)
+#: C/evolution.xml:1954(para)
 msgid ""
 "Evolution allows you to change the default settings. You can organize your "
 "draft folder and sent folder, set the addresses to which you want to sent "
@@ -4706,25 +5059,25 @@ msgstr ""
 "También puede cambiar los ajustes para los destinatarios de los mensajes "
 "desde la ventana Predeterminados."
 
-#: C/evolution.xml:1868(para)
+#: C/evolution.xml:1956(para)
 msgid "To change your default settings,"
 msgstr "Cambiar los ajustes predeterminados,"
 
-#: C/evolution.xml:1874(para)
+#: C/evolution.xml:1962(para)
 msgid "Select the mail account whose default settings you want to change."
 msgstr ""
 "Seleccione la cuenta de correo de la que quiere cambiar los ajustes "
 "predeterminados."
 
-#: C/evolution.xml:1877(para)
+#: C/evolution.xml:1965(para)
 msgid "Click Edit to open Account Editor window."
 msgstr "Pulse Editar para abrir la ventana del editor de cuentas."
 
-#: C/evolution.xml:1880(para)
+#: C/evolution.xml:1968(para)
 msgid "Click Default tab."
 msgstr "Pulse sobre la solapa Predeterminados."
 
-#: C/evolution.xml:1883(para)
+#: C/evolution.xml:1971(para)
 msgid ""
 "Click the respective check boxes and enter the email addresses you want CC "
 "and BCC to."
@@ -4732,17 +5085,19 @@ msgstr ""
 "Pulse las respectivas casillas de verificación e introduzca la dirección de "
 "correo-e que quiere usar para los campos Cc y Cco."
 
-#: C/evolution.xml:1886(para)
-msgid "Select the desired option for send message receipts from the drop-down list."
+#: C/evolution.xml:1974(para)
+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:1891(title)
+#: 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:1892(para)
+#: C/evolution.xml:1980(para)
 msgid ""
 "By default, all the sent messages directly goes to Sent folder and those "
 "messages marked as drafts are saved in Draft folder. To change the default "
@@ -4753,31 +5108,31 @@ msgstr ""
 "la carpeta Borradores. Para cambiar el ajuste predeterminado para los "
 "borradores,"
 
-#: C/evolution.xml:1895(para)
+#: C/evolution.xml:1983(para)
 msgid "Click Drafts button to open Folder view."
 msgstr "Pulse el botón Borradores para abrir la vista de carpeta."
 
-#: C/evolution.xml:1898(para)
+#: C/evolution.xml:1986(para)
 msgid "Select the folder you want to save the drafts to."
 msgstr "Seleccione la carpeta en la que quiere guardar los borradores."
 
-#: C/evolution.xml:1904(para) C/evolution.xml:1920(para)
+#: C/evolution.xml:1992(para) C/evolution.xml:2008(para)
 msgid "Click Revert button to revert back to previous settings."
 msgstr "Pulse el botón Revertir para revertir al ajuste anterior."
 
-#: C/evolution.xml:1908(para)
+#: C/evolution.xml:1996(para)
 msgid "To change the default folder for sent items,"
 msgstr "Para cambiar la carpeta predeterminada para los elementos enviados,"
 
-#: C/evolution.xml:1911(para)
+#: C/evolution.xml:1999(para)
 msgid "Click Sent button to open the Folder view."
 msgstr "Pulse el botón Correo enviado para abrir la vista de carpeta."
 
-#: C/evolution.xml:1914(para)
+#: C/evolution.xml:2002(para)
 msgid "Select the desired folder for sent items."
 msgstr "Seleccione la carpeta que desea para los elementos enviados."
 
-#: C/evolution.xml:1928(para)
+#: C/evolution.xml:2016(para)
 msgid ""
 "When you receive an email, you can forward it to other individuals or groups "
 "that might be interested. You can forward a message as an attachment to a "
@@ -4800,15 +5155,15 @@ msgstr ""
 "al autor original del mensaje y diferenciar claramente las partes del texto "
 "que ha modificado, borrado o añadido."
 
-#: C/evolution.xml:1929(para)
+#: C/evolution.xml:2017(para)
 msgid "To forward a message you are reading:"
 msgstr "Reenviar un mensaje que está leyendo:"
 
-#: C/evolution.xml:1932(para)
+#: C/evolution.xml:2020(para)
 msgid "Click Forward on the toolbar."
 msgstr "Pulse Reenviar en la barra de herramientas."
 
-#: C/evolution.xml:1934(para)
+#: C/evolution.xml:2022(para)
 msgid ""
 "If you prefer to forward the message <link linkend=\"inline\">inline</link> "
 "instead of attached, click Message &gt; Forward As &gt; Inline from the menu."
@@ -4817,7 +5172,7 @@ msgstr ""
 "lugar de como adjunto, pulse en el menú Mensaje &gt; Reenviar como &gt; "
 "Incluido en línea."
 
-#: C/evolution.xml:1937(para)
+#: C/evolution.xml:2025(para)
 msgid ""
 "Select an addressee as you would when sending a new message; the subject is "
 "already entered, although you can alter it if you want."
@@ -4825,11 +5180,11 @@ msgstr ""
 "Seleccione una dirección como lo haría al enviar un mensaje nuevo, el asunto "
 "ya está introducido, aunque puede cambiarlo si lo desea."
 
-#: C/evolution.xml:1940(para)
+#: C/evolution.xml:2028(para)
 msgid "Add your comments on the message in the composition frame"
 msgstr "Añada sus comentarios en el mensaje dentro del marco de edición"
 
-#: C/evolution.xml:1944(para)
+#: C/evolution.xml:2032(para)
 msgid ""
 "Attachments to a message you are forwarding are forwarded only when you send "
 "the original message as an attachment. Inline messages do not forward any "
@@ -4839,7 +5194,7 @@ msgstr ""
 "el mensaje original como un adjunto. Los mensajes incluidos no reenvían "
 "ningún adjunto."
 
-#: C/evolution.xml:1951(para)
+#: C/evolution.xml:2039(para)
 msgid ""
 "Don't forward chain letters. If you must, watch out for hoaxes and urban "
 "legends, and make sure the message doesn't have multiple layers of greater-"
@@ -4850,7 +5205,7 @@ msgstr ""
 "varias capas de signos de mayor que (&gt;) que indican sucesivos reenvíos "
 "descuidados."
 
-#: C/evolution.xml:1954(para)
+#: C/evolution.xml:2042(para)
 msgid ""
 "Always begin and close with a salutation. Say <quote>please</quote> and "
 "<quote>thank you,</quote> just like you do in real life. You can keep your "
@@ -4860,7 +5215,7 @@ msgstr ""
 "<quote>gracias</quote> de la misma manera que haría en la vida real. Puede "
 "ser breve en sus cumplidos pero sea educado."
 
-#: C/evolution.xml:1957(para)
+#: C/evolution.xml:2045(para)
 msgid ""
 "WRITING IN CAPITAL LETTERS MEANS YOU'RE SHOUTING! Don't write a whole "
 "message in capital letters. It hurts people's ears."
@@ -4868,7 +5223,7 @@ msgstr ""
 "CUANDO ESCRIBE CON MAYÚSCULAS SIGNIFICA QUE ESTÁ GRITANDO No escriba "
 "mensajes enteros con mayúsculas porque a la gente le dolerán los oídos."
 
-#: C/evolution.xml:1960(para)
+#: C/evolution.xml:2048(para)
 msgid ""
 "Check your spelling and use complete sentences. By default, Evolution puts a "
 "red line beneath words it doesn't recognize, as you type them."
@@ -4877,11 +5232,12 @@ msgstr ""
 "preconfigurado para destacar las palabras que no reconozca con una línea "
 "roja bajo las palabras conforme las vaya escribiendo."
 
-#: C/evolution.xml:1963(para)
+#: 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:1966(para)
+#: C/evolution.xml:2054(para)
 msgid ""
 "When you reply or forward, include enough of the previous message to provide "
 "context."
@@ -4889,11 +5245,188 @@ msgstr ""
 "Cuando conteste o reenvíe un mensaje incluya lo justo del mensaje anterior "
 "para proporcionar el contexto necesario."
 
-#: C/evolution.xml:1969(para)
+#: C/evolution.xml:2057(para)
 msgid "Don't send spam."
 msgstr "No envíe spam."
 
-#: C/evolution.xml:1977(para)
+#: C/evolution.xml:2065(para)
+msgid ""
+"A message template is a standard message that you can use at any time to "
+"send mail with the same pattern. Evolution allows you to create and edit "
+"message templates."
+msgstr ""
+"Una plantilla de mensaje es un mensaje estándar que puede usar en cualquier "
+"momento para enviar correos con el mismo patrón. Evolution le permite crear "
+"y editar plantillas de mensajes."
+
+#: C/evolution.xml:2068(link) C/evolution.xml:2088(title)
+msgid "Creating a Message Template from an Existing Message"
+msgstr "Crear un mensaje plantilla desde un mensaje existente"
+
+#: C/evolution.xml:2071(link) C/evolution.xml:2115(title)
+msgid "Saving a New Message as a Template"
+msgstr "Guardar un mensaje nuevo como plantilla"
+
+#: C/evolution.xml:2074(link) C/evolution.xml:2127(title)
+msgid "Using a Message Template as a Reply"
+msgstr "Usar una plantilla de mensaje como respuesta"
+
+#: C/evolution.xml:2077(link) C/evolution.xml:2144(title)
+msgid "Configuring Message Templates"
+msgstr "Configurar plantillas de mensajes"
+
+#: C/evolution.xml:2080(para)
+msgid "To enable the Message Template Plugin:"
+msgstr "Para activar el complemento Plantilla de mensaje:"
+
+#: C/evolution.xml:2083(para)
+msgid "Select Edit &gt; Plugins, then select Templates."
+msgstr "Seleccione Editar &gt; Complementos, después seleccione Plantillas."
+
+#: C/evolution.xml:2091(para)
+msgid "Select the message."
+msgstr "Seleccione el mensaje."
+
+#: C/evolution.xml:2094(para)
+msgid "Right-click &gt; Move to folder / Copy to folder."
+msgstr ""
+"Pulse con el botón derecho del ratón &gt; Mover a la carpeta / Copiar a la "
+"carpeta."
+
+#: C/evolution.xml:2097(para)
+msgid "Select the Template local folder."
+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."
+
+#: C/evolution.xml:2103(para)
+msgid "Open the message and click Reply."
+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."
+
+#: C/evolution.xml:2109(para) C/evolution.xml:2121(para)
+msgid "Select File &gt; Save as Template."
+msgstr "Seleccione Archivo &gt; Guardar como plantilla."
+
+#: C/evolution.xml:2118(para)
+msgid ""
+"Click New and enter the information in the New Message window, according to "
+"your requirements."
+msgstr ""
+"Pulse Nuevo e introduzca la información en la ventana Mensaje nuevo, de "
+"acuerdo con sus necesidades."
+
+#: C/evolution.xml:2130(para)
+msgid "Right-click the message you are replying to, then click Templates."
+msgstr ""
+"Pulse con el botón derecho del ratón sobre el mensaje al que está "
+"respondiendo, después pulse Plantillas."
+
+#: 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."
+
+#: C/evolution.xml:2134(para)
+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."
+
+#: C/evolution.xml:2138(para)
+msgid ""
+"When you select a message template for replying, the subject of the reply is "
+"preserved."
+msgstr ""
+"Al seleccionar una plantilla de mensaje para responder, el asunto de la "
+"respuesta se mantiene."
+
+#: C/evolution.xml:2145(para)
+msgid ""
+"In the Plugin Manager, select the Configuration tab to customize your "
+"message templates. You can add, edit or remove the key-value pairs. You can "
+"specify any number of key-value pairs."
+msgstr ""
+"En el Gestor de complementos seleccione la solapa Configuración para "
+"personalizar sus plantillas de mensajes. Puede añadir, editar o quitar pares "
+"de claves y valores. Puede especificar cualquier número de pares de claves y "
+"valores."
+
+#: C/evolution.xml:2146(para)
+msgid ""
+"In any template, the occurrence of every $key is replaced by the value it "
+"has in the configuration. For example, if you set the key to Manager and the "
+"value to Harry, any occurrence of $Manager is replaced by Harry in the "
+"message."
+msgstr ""
+"La aparición de la cada $key en cualquier plantilla se reemplaza con el "
+"valor que tiene en la configuración. Por ejemplo, si establece la clave a "
+"Director y el valor a Tomás, cualquier aparición de $Director se reemplaza "
+"con Tomás en el mensaje."
+
+#: C/evolution.xml:2147(para)
+msgid ""
+"Assume that you have 1000 message templates with your current manager's name "
+"has a reference in them. When the current manager is replaced by a new one, "
+"it's not easy for you to manually replace the manager's name in all the 1000 "
+"messages. If the messages have a $Manager key value, you can reset the value "
+"in the Configuration tab of this plugin."
+msgstr ""
+"Asuma que tiene 1.000 plantillas de mensajes con el nombre actual de su "
+"director como referencia en ellas. Cuando el director actual cambia, no es "
+"fácil reemplazar el nombre del director en las 1.000 plantillas. Si los "
+"mensajes tienen un valor de clave $Director, puede cambiar el valor en la "
+"solapa Configuración de este complemento."
+
+#: C/evolution.xml:2148(para)
+msgid ""
+"By default, the entire environment variables are used as a key-value pair. "
+"An occurrence of $env_variable is replaced by the value it carries. For "
+"example, an occurrence of $PATH in your template is replaced by its value "
+"when the template is used."
+msgstr ""
+"De forma predeterminada todas las variables de entorno se usan como pares de "
+"claves-valores. Una aparición de $env_variable se reemplaza por el valor que "
+"lleva. Por ejemplo, una aparición de $PATH en su plantilla se reemplaza por "
+"su valor al usar la plantilla."
+
+#: C/evolution.xml:2149(para)
+msgid "The replacement process uses the following order of precedence:"
+msgstr "El proceso de reemplazo usa el siguiente orden de precedencia:"
+
+#: C/evolution.xml:2152(para)
+msgid ""
+"$key is replaced by the value set for it in the Configuration tab of the "
+"Templates plugin."
+msgstr ""
+"$key se reemplaza por el valor ajustado para ello en la solapa Configuración "
+"del complemento Plantillas."
+
+#: C/evolution.xml:2155(para)
+msgid ""
+"If the key is not found, it is then replaced with the value of its "
+"environment variable."
+msgstr ""
+"Si no se encuentra la clave, se reemplaza con el valor de su variable de "
+"entorno."
+
+#: C/evolution.xml:2158(para)
+msgid ""
+"If key is neither a configuration option nor an environment variable, no "
+"changes are made."
+msgstr ""
+"Si la clave no es una opción de configuración ni una variable de entorno, "
+"entonces no se hacen cambios."
+
+#: C/evolution.xml:2166(para)
 msgid ""
 "If you create an event in the calendar component, you can then send "
 "invitations to the attendee list through the Evolution email tool. The "
@@ -4904,7 +5437,7 @@ msgstr ""
 "Evolution. La tarjeta de invitación se envía como archivo adjunto en formato "
 "iCal."
 
-#: C/evolution.xml:1978(para)
+#: C/evolution.xml:2167(para)
 msgid ""
 "To send an invitation, right click on the calendar item and click Forward as "
 "iCalendar."
@@ -4912,15 +5445,15 @@ msgstr ""
 "Para enviar una invitación pulse con el botón derecho sobre el elemento del "
 "calendario y pulse Reenviar como iCalendar."
 
-#: C/evolution.xml:1979(para)
+#: C/evolution.xml:2168(para)
 msgid "When you receive an invitation, you have several options:"
 msgstr "Cuando reciba una invitación, tiene varias opciones:"
 
-#: C/evolution.xml:1981(title)
+#: C/evolution.xml:2170(title)
 msgid "Accept:"
 msgstr "Aceptar:"
 
-#: C/evolution.xml:1982(para)
+#: C/evolution.xml:2171(para)
 msgid ""
 "Indicates you will attend the meeting. When you click the OK button, the "
 "meeting is entered into your calendar."
@@ -4928,11 +5461,11 @@ msgstr ""
 "Indica que asistirá a la reunión. Cuando pulse el botón Aceptar, la reunión "
 "se apuntará en su agenda."
 
-#: C/evolution.xml:1985(title)
+#: C/evolution.xml:2174(title)
 msgid "Tentatively Accept:"
 msgstr "Aceptado provisionalmente:"
 
-#: C/evolution.xml:1986(para)
+#: C/evolution.xml:2175(para)
 msgid ""
 "Indicates you will probably attend the meeting. When you click the OK "
 "button, the meeting is entered into your calendar, but is marked as "
@@ -4941,11 +5474,11 @@ msgstr ""
 "Indica que es probable que asista a la reunión. Cuando pulse el botón "
 "Aceptar la reunión se apuntará en su agenda, pero marcada como provisional."
 
-#: C/evolution.xml:1989(title)
+#: C/evolution.xml:2178(title)
 msgid "Decline:"
 msgstr "Rehusar:"
 
-#: C/evolution.xml:1990(para)
+#: C/evolution.xml:2179(para)
 msgid ""
 "Indicates you are unable to attend the meeting. The meeting is not entered "
 "into your calendar when you click OK, although your response is sent to the "
@@ -4955,17 +5488,18 @@ msgstr ""
 "calendario al pulsar Aceptar, aunque su respuesta se envía al organizador de "
 "la reunión si ha seleccionado la opción Responder al remitente."
 
-#: C/evolution.xml:1993(title)
+#: C/evolution.xml:2182(title)
 msgid "Send reply to sender:"
 msgstr "Responder al remitente:"
 
-#: C/evolution.xml:1994(para)
-msgid "Select this option if you want your response sent to the meeting organizers."
+#: C/evolution.xml:2183(para)
+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."
 
-#: C/evolution.xml:2000(para)
+#: C/evolution.xml:2189(para)
 msgid ""
 "Because IMAP folders exist on the server, and opening them or checking them "
 "takes time, you need fine-grained control over the way that you use IMAP "
@@ -4981,11 +5515,11 @@ msgstr ""
 "si quiere escoger elementos específicos y excluir el resto, puede usar la "
 "herramienta de gestión de suscripciones."
 
-#: C/evolution.xml:2003(para)
+#: C/evolution.xml:2192(para)
 msgid "Select Folder &gt; Subscriptions."
 msgstr "Seleccione Carpeta &gt; Suscripciones."
 
-#: C/evolution.xml:2006(para)
+#: C/evolution.xml:2195(para)
 msgid ""
 "If you have accounts on multiple IMAP servers, select the server where you "
 "want to manage your subscriptions."
@@ -4993,15 +5527,15 @@ msgstr ""
 "Si tiene cuentas en varios servidores IMAP, seleccione el servidor donde "
 "quiere gestionar sus suscripciones."
 
-#: C/evolution.xml:2007(para)
+#: C/evolution.xml:2196(para)
 msgid "Evolution displays a list of available files and folders."
 msgstr "Evolution mostrará la lista de carpetas y archivos disponibles."
 
-#: C/evolution.xml:2010(para)
+#: C/evolution.xml:2199(para)
 msgid "Select a file or folder by clicking it."
 msgstr "Seleccione un archivo o carpeta pulsando sobre él."
 
-#: C/evolution.xml:2011(para)
+#: C/evolution.xml:2200(para)
 msgid ""
 "You should select at least the Inbox folder. Depending upon the way your "
 "IMAP server is configured, the list of available files might include non-"
@@ -5012,17 +5546,18 @@ msgstr ""
 "puede incluir carpetas que no son de correo, que puede ignorar sin mayor "
 "problema."
 
-#: C/evolution.xml:2014(para)
-msgid "Enable the corresponding checkbox to add a folder to the subscribed list."
+#: C/evolution.xml:2203(para)
+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."
 
-#: C/evolution.xml:2017(para)
+#: C/evolution.xml:2206(para)
 msgid "When you have subscribed to the folders you want, close the window."
 msgstr "Cierre la ventana cuando se haya suscrito a las carpetas que desea."
 
-#: C/evolution.xml:2024(para)
+#: C/evolution.xml:2213(para)
 msgid ""
 "To protect and encode your email transmissions, Evolution offers two "
 "encryption methods:"
@@ -5030,15 +5565,15 @@ msgstr ""
 "Para proteger y codificar sus transmisiones de correos-e, Evolution ofrece "
 "dos métodos de cifrado:"
 
-#: C/evolution.xml:2027(para)
+#: C/evolution.xml:2216(para)
 msgid "GPG Encryption"
 msgstr "Cifrado GPG"
 
-#: C/evolution.xml:2030(para) C/evolution.xml:2188(title)
+#: C/evolution.xml:2219(para) C/evolution.xml:2377(title)
 msgid "S/MIME Encryption"
 msgstr "Cifrado S/MIME"
 
-#: C/evolution.xml:2033(para)
+#: C/evolution.xml:2222(para)
 msgid ""
 "Evolution helps you protect your privacy by using GNU Privacy Guard (GPG), "
 "an implementation of strong <link linkend=\"public-key-encryption\">Public "
@@ -5048,7 +5583,7 @@ msgstr ""
 "Guard (GPG), una implementación del potente algoritmo de <link linkend="
 "\"public-key-encryption\">cifrado de clave pública</link>."
 
-#: C/evolution.xml:2034(para)
+#: C/evolution.xml:2223(para)
 msgid ""
 "In order to send and receive encrypted emails using GPG, it is necessary to "
 "use two kinds of encryption keys: public and private. Public keys are used "
@@ -5064,7 +5599,7 @@ msgstr ""
 "compartir con aquellos a los que quiera enviar mensajes cifrados. También "
 "puede subirlas a un servidor de claves públicas."
 
-#: C/evolution.xml:2035(para)
+#: C/evolution.xml:2224(para)
 msgid ""
 "Those who wish to send you encrypted email must first have a copy of your "
 "public key on your keyring. To this end, public keys can be shared with "
@@ -5078,7 +5613,7 @@ msgstr ""
 "mensajes cifrados. Para ello, debe subir sus claves públicas a un servidor "
 "de claves públicas. Las claves privadas no se deben compartir con otros."
 
-#: C/evolution.xml:2036(para)
+#: C/evolution.xml:2225(para)
 msgid ""
 "Evolution does not support older versions of PGP, such as OpenPGP and Inline "
 "PGP."
@@ -5086,11 +5621,11 @@ msgstr ""
 "Evolution no soporta versiones antiguas de PGP, tales como OpenPGP y PGP "
 "inluido."
 
-#: C/evolution.xml:2037(para)
+#: C/evolution.xml:2226(para)
 msgid "You can use encryption in two different ways:"
 msgstr "El cifrado se puede usar de dos maneras diferentes:"
 
-#: C/evolution.xml:2040(para)
+#: C/evolution.xml:2229(para)
 msgid ""
 "You can encrypt the entire message, so that nobody but the recipient can "
 "read it."
@@ -5098,7 +5633,7 @@ msgstr ""
 "Puede cifrar el mensaje entero para que nadie, excepto el destinatario, "
 "pueda leerlo."
 
-#: C/evolution.xml:2043(para)
+#: C/evolution.xml:2232(para)
 msgid ""
 "You can attach an encrypted signature to a plain text message, so that the "
 "recipient can read the message without decrypting it, and needs decrypting "
@@ -5109,7 +5644,7 @@ msgstr ""
 "necesitaría descifrar la firma cuando quiera verificar la identidad del "
 "remitente."
 
-#: C/evolution.xml:2046(para)
+#: C/evolution.xml:2235(para)
 msgid ""
 "For example, suppose that Kevin wants to send an encrypted message to his "
 "friend Rachel. He looks up her public key on a general key server, and then "
@@ -5125,11 +5660,11 @@ msgstr ""
 "usa su clave privada para descifrarlo y el mensaje quedará listo para su "
 "lectura."
 
-#: C/evolution.xml:2049(title)
+#: C/evolution.xml:2238(title)
 msgid "Making a GPG Encryption Key"
 msgstr "Crear claves de cifrado GPG"
 
-#: C/evolution.xml:2050(para)
+#: C/evolution.xml:2239(para)
 msgid ""
 "Before you can get or send encrypted mail, you need to generate your public "
 "and private keys with GPG. This procedure covers version 1.2.4 of GPG. If "
@@ -5142,15 +5677,16 @@ msgstr ""
 "exacto. Puede averiguar la versión exacta usando la orden <command>gpg --"
 "version</command>."
 
-#: C/evolution.xml:2053(para)
+#: 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 instroduzca el comando <command>gpg --gen-key</command>."
 
-#: C/evolution.xml:2056(para)
+#: C/evolution.xml:2245(para)
 msgid "Select an algorithm, then press Enter."
 msgstr "Seleccione un algoritmo, después pulse Intro."
 
-#: C/evolution.xml:2058(para)
+#: C/evolution.xml:2247(para)
 msgid ""
 "To accept the default algorithm of DSA and ElGamal, press Enter "
 "(recommended)."
@@ -5158,7 +5694,7 @@ msgstr ""
 "Para aceptar el algoritmo predeterminado «DSA y ElGamal», pulse Intro "
 "(recomendado)."
 
-#: C/evolution.xml:2061(para)
+#: C/evolution.xml:2250(para)
 msgid ""
 "Select a key length, then press Enter. To accept the default, 1024 bits, "
 "press Enter."
@@ -5166,11 +5702,11 @@ msgstr ""
 "Seleccione una longitud de clave, después pulse Intro. Para aceptar la "
 "predeterminada, de 1024 bits, pulse Intro."
 
-#: C/evolution.xml:2064(para)
+#: 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."
 
-#: C/evolution.xml:2066(para)
+#: C/evolution.xml:2255(para)
 msgid ""
 "To accept the default of no expiration, press Enter, then press Y when you "
 "are prompted to verify the selection."
@@ -5178,31 +5714,32 @@ msgstr ""
 "Para aceptar la opción predeterminada sin caducidad, pulse Intro, después "
 "puse Y cuando se le pregunte la verificación de su elección."
 
-#: C/evolution.xml:2069(para)
+#: C/evolution.xml:2258(para)
 msgid "Type your real name, then press Enter."
 msgstr "Escriba su nombre real, después pulse Intro."
 
-#: C/evolution.xml:2072(para)
+#: C/evolution.xml:2261(para)
 msgid "Type your email address, then press Enter."
 msgstr "Escriba su dirección de correo-e, después pulse Intro."
 
-#: C/evolution.xml:2075(para)
+#: C/evolution.xml:2264(para)
 msgid "(Optional) Type a comment, then press Enter."
 msgstr "(Opcional) Escriba un comentario, después pulse Intro."
 
-#: C/evolution.xml:2078(para)
+#: 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:2081(para)
+#: C/evolution.xml:2270(para)
 msgid "Type a passphrase, then press Enter."
 msgstr "Escriba una frase de paso, después pulse Intro."
 
-#: C/evolution.xml:2084(para)
+#: C/evolution.xml:2273(para)
 msgid "Move your mouse randomly to generate the keys."
 msgstr "Mueva su ratón aleatoriamente para generar las claves."
 
-#: C/evolution.xml:2087(para)
+#: C/evolution.xml:2276(para)
 msgid ""
 "After the keys are generated, you can view your key information by entering "
 "<command>gpg --list-keys</command>. You should see something similar to "
@@ -5218,7 +5755,7 @@ msgstr ""
 "you@example.com&gt;  sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]  </"
 "computeroutput>"
 
-#: C/evolution.xml:2088(para)
+#: C/evolution.xml:2277(para)
 msgid ""
 "GPG creates one list, or keyring, for your public keys and one for your "
 "private keys. All the public keys you know are stored in the file ~/.gnupg/"
@@ -5229,11 +5766,11 @@ msgstr ""
 "están guardadas en el archivo ~/.gnupg/pubring.gpg. Si quiere darle a "
 "alguien su clave, envíele éste archivo."
 
-#: C/evolution.xml:2089(para)
+#: C/evolution.xml:2278(para)
 msgid "If you want, you can upload your keys to a key server."
 msgstr "Si lo desea puede subir sus claves a un servidor de claves."
 
-#: C/evolution.xml:2092(para)
+#: C/evolution.xml:2281(para)
 msgid ""
 "Check your public key ID with gpg--list-keys. It is the string after 1024D "
 "on the line beginning with pub. In the example above, it is 32j38dk2."
@@ -5242,7 +5779,7 @@ msgstr ""
 "identificador será la cadena que está detras de 1024D en la línea que "
 "empieza con «pub». En estte ejemplo es 32j38dk2."
 
-#: C/evolution.xml:2095(para)
+#: C/evolution.xml:2284(para)
 msgid ""
 "Enter the command <command>gpg --send-keys --keyserver wwwkeys.pgp.net "
 "<varname>32j38dk2</varname></command>. Substitute your key ID for "
@@ -5253,7 +5790,7 @@ msgstr ""
 "clave por <varname>32j38dk2</varname>. Necesitará su contraseña para poder "
 "hacerlo."
 
-#: C/evolution.xml:2098(para)
+#: C/evolution.xml:2287(para)
 msgid ""
 "Key servers store your public keys for you so that your friends can decrypt "
 "your messages. If you choose not to use a key server, you can manually send "
@@ -5268,7 +5805,7 @@ msgstr ""
 "publicarla de una vez y permitir a los demás descargarlas desde un servidor "
 "central cuando ellos quieran."
 
-#: C/evolution.xml:2099(para)
+#: C/evolution.xml:2288(para)
 msgid ""
 "If you don't have a key to unlock or encrypt a message, you can set your "
 "encryption tool to look it up automatically. If it can't find the key, an "
@@ -5278,11 +5815,11 @@ msgstr ""
 "herramienta de cifrado para buscarla automáticamente. Si no puede encontrar "
 "la clave se mostrará un mensaje de error."
 
-#: C/evolution.xml:2103(title)
+#: C/evolution.xml:2292(title)
 msgid "Getting and Using GPG Public Keys"
 msgstr "Obtener y usar claves GPG públicas"
 
-#: C/evolution.xml:2104(para)
+#: C/evolution.xml:2293(para)
 msgid ""
 "To send an encrypted message, you need to use the recipient's public key in "
 "combination with your private key. Evolution handles the encryption, but you "
@@ -5292,7 +5829,7 @@ msgstr ""
 "combinación con su clave privada. Evolution lo hace por usted, pero con todo "
 "necesitará obtener su clave y añadirla a su depósito de claves."
 
-#: C/evolution.xml:2105(para)
+#: C/evolution.xml:2294(para)
 msgid ""
 "To get public keys from a public key server, enter the command<command> gpg "
 "--recv-keys --keyserver wwwkeys.pgp.net <varname>keyid</varname></command>, "
@@ -5305,7 +5842,7 @@ msgstr ""
 "por el identificador del destinatario. Necesitará escribir su contraseña y "
 "su identificador se añadirá automáticamente a su llavero."
 
-#: C/evolution.xml:2107(para)
+#: C/evolution.xml:2296(para)
 msgid ""
 "The domain <quote><emphasis>wwwkeys.pgp.net</emphasis></quote> is assigned "
 "to multiple hosts in various networks. The gpg utility tries to connect to "
@@ -5317,7 +5854,7 @@ msgstr ""
 "a una en la red actual y si ese servidor en particular está caído, falla al "
 "superarse el tiempo de expiración."
 
-#: C/evolution.xml:2110(para)
+#: C/evolution.xml:2299(para)
 msgid ""
 "To avoid this, Type <command>$ host wwwkeys.pgp.net</command> in a terminal "
 "console and get the IP address of the hosts. You can ping each of them to "
@@ -5332,7 +5869,7 @@ msgstr ""
 "wwwkeys.pgp.net keyid con el número de dirección IP explícito que devolvió "
 "la utilidad del servidor."
 
-#: C/evolution.xml:2115(para)
+#: C/evolution.xml:2304(para)
 msgid ""
 "If someone sends you a public key directly, save it as a plain text file and "
 "enter the command <command>gpg <varname>--import</varname></command> to add "
@@ -5342,23 +5879,24 @@ msgstr ""
 "de texto plano e introduzca el comando <command>gpg <varname>--import</"
 "varname></command> para añadirá a su depósito de claves."
 
-#: C/evolution.xml:2119(title)
+#: C/evolution.xml:2308(title)
 msgid "Setting up GPG Encryption"
 msgstr "Configurar el cifrado GPG"
 
-#: C/evolution.xml:2125(para) C/evolution.xml:2164(para)
+#: 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:2128(para) C/evolution.xml:2167(para)
+#: C/evolution.xml:2317(para) C/evolution.xml:2356(para)
 msgid "Click the Security tab."
 msgstr "Pulse en la solapa de Seguridad."
 
-#: C/evolution.xml:2131(para)
+#: C/evolution.xml:2320(para)
 msgid "Specify your key ID in the PGP/GPG Key ID field."
 msgstr "Especifique el ID de su clave en el campo ID de la clave GPG/PGP."
 
-#: C/evolution.xml:2140(para)
+#: C/evolution.xml:2329(para)
 msgid ""
 "Evolution requires that you know your key ID. If you don't remember it, you "
 "can find it by typing <command>gpg --list-keys</command> in a terminal "
@@ -5370,42 +5908,43 @@ msgstr ""
 "en un terminal. El identificador de clave es una cadena de 8 caracteres con "
 "números y letras aleatorios."
 
-#: C/evolution.xml:2144(title)
+#: C/evolution.xml:2333(title)
 msgid "Encrypting Messages"
 msgstr "Cifrar mensajes"
 
-#: C/evolution.xml:2145(para)
+#: C/evolution.xml:2334(para)
 msgid "To encrypt a single message:"
 msgstr "Cifrar un sólo mensaje:"
 
-#: C/evolution.xml:2148(para)
+#: C/evolution.xml:2337(para)
 msgid "Open a Compose a Message window."
 msgstr "Abra una ventana del editor de mensajes."
 
-#: C/evolution.xml:2151(para)
+#: C/evolution.xml:2340(para)
 msgid "Click Security &gt; PGP Encrypt."
 msgstr "Pulse Seguridad &gt; Cifrado PGP."
 
-#: C/evolution.xml:2154(para)
+#: C/evolution.xml:2343(para)
 msgid "Compose your message."
 msgstr "Edite su mensaje."
 
-#: C/evolution.xml:2158(para)
+#: C/evolution.xml:2347(para)
 msgid "You can set Evolution to always sign your email messages:"
 msgstr ""
 "Puede configurar Evolution para que firme siempre sus mensajes de correo "
 "electrónico:"
 
 # index.docbook:172, index.docbook:216
-#: C/evolution.xml:2170(para)
+#: 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:2182(title)
+#: C/evolution.xml:2371(title)
 msgid "Unencrypting a Received Message"
 msgstr "Descifrar un mensaje recibido"
 
-#: C/evolution.xml:2183(para)
+#: C/evolution.xml:2372(para)
 msgid ""
 "If you receive an encrypted message, you need to decrypt it before you read "
 "it. Remember, the sender must have your public key before they can send you "
@@ -5415,7 +5954,7 @@ msgstr ""
 "Recuerde que el remitente tiene que tener su clave pública (la suya, de "
 "usted) antes de enviarle un mensaje cifrado."
 
-#: C/evolution.xml:2184(para)
+#: C/evolution.xml:2373(para)
 msgid ""
 "When you view the message, Evolution prompts you for your PGP password. "
 "Enter it, and the unencrypted message is displayed."
@@ -5423,7 +5962,7 @@ msgstr ""
 "Cuando vea el mensaje, Evolution le pedirá que escriba su contraseña PGP. "
 "Escríbala y el mensaje se mostrará apropiadamente."
 
-#: C/evolution.xml:2189(para)
+#: C/evolution.xml:2378(para)
 msgid ""
 "S/MIME encryption also uses a key-based approach, but it has some "
 "significant advantages in convenience and security. S/MIME uses "
@@ -5445,7 +5984,7 @@ msgstr ""
 "certificado S/MIME, su sistema recibirá automáticamente la parte pública del "
 "certificado y descifrará o verificará el mensaje."
 
-#: C/evolution.xml:2190(para)
+#: C/evolution.xml:2379(para)
 msgid ""
 "S/MIME is used most often in corporate settings. In these cases, "
 "administrators supply certificates that they have purchased from a "
@@ -5461,7 +6000,7 @@ msgstr ""
 "VeriSign* o Thawte*.  En cualquier caso, el administrador del sistema le "
 "proporciona un archivo de certificado."
 
-#: C/evolution.xml:2191(para)
+#: C/evolution.xml:2380(para)
 msgid ""
 "If you want to use S/MIME independently, you can extract an identification "
 "certificate from your Mozilla* or Netscape* Web browser. See the <ulink url="
@@ -5474,27 +6013,28 @@ msgstr ""
 "mozilla.org/projects/security/pki/psm/help_21/using_certs_help.html\">ayuda "
 "de mozilla</ulink>."
 
-#: C/evolution.xml:2192(para)
+#: 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:2195(title)
+#: C/evolution.xml:2384(title)
 msgid "Adding a Signing Certificate"
 msgstr "Añadir un certificado firmado"
 
-#: C/evolution.xml:2201(para)
+#: C/evolution.xml:2390(para)
 msgid "Click Certificates."
 msgstr "Pulse Certificados."
 
-#: C/evolution.xml:2204(para) C/evolution.xml:2327(para)
+#: C/evolution.xml:2393(para) C/evolution.xml:2516(para)
 msgid "Click Import."
 msgstr "Pulse Importar."
 
-#: C/evolution.xml:2207(para)
+#: C/evolution.xml:2396(para)
 msgid "Select the file to import, then click Open."
 msgstr "Seleccione el archivo a importar, después pulse Abrir."
 
-#: C/evolution.xml:2213(para)
+#: C/evolution.xml:2402(para)
 msgid ""
 "Similarly, you can add certificates that are sent to you independently of "
 "any authority by clicking the Contact Certificates tab and using the same "
@@ -5507,11 +6047,11 @@ msgstr ""
 "nuevas autoridades de certificados, que tienen sus propios archivos de "
 "certificados, de la misma forma."
 
-#: C/evolution.xml:2217(title)
+#: C/evolution.xml:2406(title)
 msgid "Signing or Encrypting Every Message"
 msgstr "Firmar o cifrar cada mensaje"
 
-#: C/evolution.xml:2218(para)
+#: C/evolution.xml:2407(para)
 msgid ""
 "After you have added your certificate, you can sign or encrypt a message by "
 "clicking Security &gt; S/MIME Sign or S/MIME Encrypt in the message composer."
@@ -5520,19 +6060,19 @@ msgstr ""
 "mensaje pulsando Seguridad &gt; Firma S/MIME o Cifrado S/MIME en el editor "
 "de mensajes."
 
-#: C/evolution.xml:2219(para)
+#: C/evolution.xml:2408(para)
 msgid "To have every message signed or encrypted:"
 msgstr "Para enviar cada mensaje cifrado o firmado:"
 
-#: C/evolution.xml:2225(para)
+#: C/evolution.xml:2414(para)
 msgid "Select the account to encrypt the messages in."
 msgstr "Seleccione la cuenta en la que cifrar mensajes."
 
-#: C/evolution.xml:2228(para)
+#: C/evolution.xml:2417(para)
 msgid "Click Edit, then click Security."
 msgstr "Pulse Editar, después pulse en Seguridad."
 
-#: C/evolution.xml:2231(para)
+#: C/evolution.xml:2420(para)
 msgid ""
 "Click Select next to Signing Certificate and specify the path to your "
 "signing certificate."
@@ -5540,7 +6080,7 @@ msgstr ""
 "Pulse Seleccionar junto a Certificado de firma y especificar la ruta a su "
 "certificado de firma."
 
-#: C/evolution.xml:2233(para)
+#: C/evolution.xml:2422(para)
 msgid ""
 "Click Select next to Encryption Certificate and specify the path to your "
 "encryption certificate."
@@ -5548,11 +6088,11 @@ msgstr ""
 "Pulse seleccionar junto a Certificado de cifrado y especifique la ruta a su "
 "certificado de cifrado."
 
-#: C/evolution.xml:2236(para)
+#: C/evolution.xml:2425(para)
 msgid "Select the appropriate options."
 msgstr "Seleccione las opciones apropiadas."
 
-#: C/evolution.xml:2252(para)
+#: C/evolution.xml:2441(para)
 msgid ""
 "Whether you only get a few email messages a day, or you receive hundreds, "
 "you probably want to sort and organize them. <trademark>Evolution</"
@@ -5562,35 +6102,35 @@ msgstr ""
 "probablemente querrá organizarlos. <trademark>Evolution</trademark> tiene "
 "las herramientas para ayudarle a hacerlo."
 
-#: C/evolution.xml:2255(link) C/evolution.xml:2278(title)
+#: C/evolution.xml:2444(link) C/evolution.xml:2467(title)
 msgid "Importing Your Old Email"
 msgstr "Importar su correo-e antiguo"
 
-#: C/evolution.xml:2258(link) C/evolution.xml:2368(title)
+#: C/evolution.xml:2447(link) C/evolution.xml:2557(title)
 msgid "Sorting the Message List"
 msgstr "Ordenación de la lista de mensajes"
 
-#: C/evolution.xml:2261(link) C/evolution.xml:2539(title)
+#: C/evolution.xml:2450(link) C/evolution.xml:2728(title)
 msgid "Getting Organized with Folders"
 msgstr "Organización básica de carpetas"
 
-#: C/evolution.xml:2264(link) C/evolution.xml:2554(title)
+#: C/evolution.xml:2453(link) C/evolution.xml:2743(title)
 msgid "Searching for Messages"
 msgstr "Búsqueda de mensajes"
 
-#: C/evolution.xml:2267(link) C/evolution.xml:2758(title)
+#: C/evolution.xml:2456(link) C/evolution.xml:2947(title)
 msgid "Create Rules to Automatically Organize Mail"
 msgstr "Creación de reglas para organizar automáticamente el correo"
 
-#: C/evolution.xml:2270(link) C/evolution.xml:2997(title)
+#: C/evolution.xml:2459(link) C/evolution.xml:3186(title)
 msgid "Using Search Folders"
 msgstr "Usar las carpetas de búsqueda"
 
-#: C/evolution.xml:2273(link) C/evolution.xml:3130(title)
+#: C/evolution.xml:2462(link) C/evolution.xml:3319(title)
 msgid "Stopping Junk Mail (Spam)"
 msgstr "Parar el correo basura (SPAM)"
 
-#: C/evolution.xml:2279(para)
+#: C/evolution.xml:2468(para)
 msgid ""
 "Evolution allows you to import old email and contacts so that you don't need "
 "to worry about losing your old information."
@@ -5598,19 +6138,19 @@ msgstr ""
 "Evolution le permite importar correo-e antiguo y sus contactos para que no "
 "tenga que preocuparse por la pérdida de información anterior."
 
-#: C/evolution.xml:2282(title)
+#: C/evolution.xml:2471(title)
 msgid "Importing Single Files"
 msgstr "Importar un sólo archivo"
 
-#: C/evolution.xml:2283(para)
+#: C/evolution.xml:2472(para)
 msgid "Evolution can import the following types of files:"
 msgstr "Evolution puede importar los siguientes tipos de archivos:"
 
-#: C/evolution.xml:2285(title)
+#: C/evolution.xml:2474(title)
 msgid "vCard (.vcf, .gcrd):"
 msgstr "vCard (.vcf, .gcrd):"
 
-#: C/evolution.xml:2286(para)
+#: C/evolution.xml:2475(para)
 msgid ""
 "The address book format used by the GNOME, KDE, and many other contact "
 "management applications. You should be able to export to vCard format from "
@@ -5620,11 +6160,11 @@ msgstr ""
 "numerosas aplicaciones de administración de contactos. Será necesario poder "
 "exportar la libreta de direcciones de su otra aplicación al formato vCard."
 
-#: C/evolution.xml:2289(title)
+#: C/evolution.xml:2478(title)
 msgid "vCalendar:"
 msgstr "vCalendar:"
 
-#: C/evolution.xml:2290(para)
+#: C/evolution.xml:2479(para)
 msgid ""
 "A format for storing calender files, which is generally used by Evolution, "
 "Microsoft Outlook, Sunbird, and Korganizer."
@@ -5632,11 +6172,11 @@ msgstr ""
 "Un formato para almacenar archivos de calendario. generalmente usado por "
 "Evolution, Microsoft Outlook, Sunbird y Korganizer."
 
-#: C/evolution.xml:2293(title)
+#: C/evolution.xml:2482(title)
 msgid "iCalendar or iCal (.ics):"
 msgstr "iCalendar or iCal (.ics):"
 
-#: C/evolution.xml:2294(para)
+#: C/evolution.xml:2483(para)
 msgid ""
 "A format for storing calendar files. iCalendar is used by Palm OS handhelds, "
 "Evolution, and Microsoft Outlook."
@@ -5645,21 +6185,22 @@ msgstr ""
 "programa utilizado por equipos de mano PalmOS, así como Evolution y "
 "Microsoft Outlook."
 
-#: C/evolution.xml:2297(title)
+#: C/evolution.xml:2486(title)
 msgid "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):"
 msgstr "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):"
 
-#: C/evolution.xml:2298(para)
-msgid "CSV or Tab files saved by using Evolution, Microsoft Outlook and Mozilla."
+#: C/evolution.xml:2487(para)
+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."
 
-#: C/evolution.xml:2301(title)
+#: C/evolution.xml:2490(title)
 msgid "Microsoft Outlook Express 4 (.mbx):"
 msgstr "Microsoft Outlook Express 4 (.mbx):"
 
-#: C/evolution.xml:2302(para)
+#: C/evolution.xml:2491(para)
 msgid ""
 "The email file format used by Microsoft Outlook Express 4. For other "
 "versions of Microsoft Outlook and Outlook Express, see the workaround "
@@ -5669,19 +6210,19 @@ msgstr ""
 "otras versiones de Microsoft Outlook y Outlook Express, vea la solución "
 "descrita en el <link linkend=\"bsawgkk\">Paso 1</link>."
 
-#: C/evolution.xml:2305(title)
+#: C/evolution.xml:2494(title)
 msgid "LDAP Data Interchange Format (.LDIF):"
 msgstr "Formato de intercambio de datos de LDAP (.LDIF):"
 
-#: C/evolution.xml:2306(para)
+#: C/evolution.xml:2495(para)
 msgid "A standard data format for contact cards."
 msgstr "Un formato de datos estándar para tarjetas de visita."
 
-#: C/evolution.xml:2309(title)
+#: C/evolution.xml:2498(title)
 msgid "Berkley Mailbox (.mbox or null extension):"
 msgstr "Berkley Mailbox (.mbox o extensión nula):"
 
-#: C/evolution.xml:2310(para)
+#: C/evolution.xml:2499(para)
 msgid ""
 "The email format used by Mozilla, Netscape, Evolution, Eudora*, and many "
 "other email clients."
@@ -5689,28 +6230,28 @@ msgstr ""
 "El formato de buzón de correo utilizado por los programas Mozilla, Netscape, "
 "Evolution, Eudora* y muchos otros clientes de correo electrónico."
 
-#: C/evolution.xml:2312(para)
+#: C/evolution.xml:2501(para)
 msgid "To import your old email:"
 msgstr "Importar sus correos electrónicos antiguos:"
 
-#: C/evolution.xml:2315(para) C/evolution.xml:2337(para)
-#: C/evolution.xml:3440(para)
+#: C/evolution.xml:2504(para) C/evolution.xml:2526(para)
+#: C/evolution.xml:3686(para)
 msgid "Click File &gt; Import."
 msgstr "Pulse Archivo &gt; Importar."
 
-#: C/evolution.xml:2321(para)
+#: C/evolution.xml:2510(para)
 msgid "Select Import a Single File, then click Forward."
 msgstr "Seleccione Importar un único archivo, después pulse Siguiente."
 
-#: C/evolution.xml:2324(para)
+#: C/evolution.xml:2513(para)
 msgid "Select the file to import, then click Forward."
 msgstr "Seleccione el archivo para importar, después pulse Adelante."
 
-#: C/evolution.xml:2333(title)
+#: C/evolution.xml:2522(title)
 msgid "Importing Multiple Files"
 msgstr "Importar múltiples archivos"
 
-#: C/evolution.xml:2334(para)
+#: C/evolution.xml:2523(para)
 msgid ""
 "Evolution automates the import process for several applications it can "
 "recognize."
@@ -5718,13 +6259,14 @@ msgstr ""
 "Evolution automatiza el proceso de importación para distintas aplicaciones "
 "que puede reconocer."
 
-#: C/evolution.xml:2343(para)
-msgid "Select Import Data and Settings From Older Programs, then click Forward."
+#: C/evolution.xml:2532(para)
+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."
 
-#: C/evolution.xml:2344(para)
+#: C/evolution.xml:2533(para)
 msgid ""
 "Follow the steps <link linkend=\"bsawely\">Step 3</link> through <link "
 "linkend=\"bsawf2t\">Step 5</link> to import."
@@ -5732,7 +6274,7 @@ msgstr ""
 "Siga los pasos <link linkend=\"bsawely\">Paso 3</link> hasta <link linkend="
 "\"bsawf2t\">Paso 5</link> para importar."
 
-#: C/evolution.xml:2345(para)
+#: C/evolution.xml:2534(para)
 msgid ""
 "Evolution searches for old mail programs and, if possible, imports the data "
 "from them."
@@ -5740,7 +6282,7 @@ msgstr ""
 "Evolution busca programas de correo antiguos y, si es posible, importa los "
 "datos de ellos."
 
-#: C/evolution.xml:2350(para)
+#: C/evolution.xml:2539(para)
 msgid ""
 "One migration method that works well is to use the Outport application. See "
 "<ulink url=\"http://outport.sourceforge.net\">outport.sourceforge.net</"
@@ -5752,7 +6294,7 @@ msgstr ""
 "net</ulink> para obtener información adicional. También puede importar datos "
 "en otro cliente de correo para Windows como Mozilla."
 
-#: C/evolution.xml:2353(para)
+#: C/evolution.xml:2542(para)
 msgid ""
 "While in Windows, import your .pst files into Mozilla Mail (or another mail "
 "program such as Netscape or Eudora that uses the standard mbox format)."
@@ -5761,17 +6303,19 @@ msgstr ""
 "otro cliente de correo que utilice el formato mbox estándar, como Netscape o "
 "Eudora)."
 
-#: C/evolution.xml:2357(para)
-msgid "Copy the files to the system or partition that Evolution is installed on."
+#: C/evolution.xml:2546(para)
+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:2360(para)
+#: 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:2363(para)
+#: C/evolution.xml:2552(para)
 msgid ""
 "For POP mail, filters are applied as messages are downloaded. For IMAP mail, "
 "filters are applied to new messages when you open the Inbox folder. On "
@@ -5788,7 +6332,7 @@ msgstr ""
 "todos los mensajes en la carpeta, seleccione la carpeta entera pulsaando Ctrl"
 "+A y después aplique los filtros pulsando Ctrl+Y."
 
-#: C/evolution.xml:2369(para)
+#: C/evolution.xml:2558(para)
 msgid ""
 "Evolution helps you work by letting you sort your email. To sort by sender, "
 "subject, or date, click the bars with those labels at the top of the message "
@@ -5810,7 +6354,7 @@ msgstr ""
 "disponer de un conjunto de opciones de ordenación y añadir o quitar columnas "
 "de la lista de mensajes."
 
-#: C/evolution.xml:2370(para)
+#: C/evolution.xml:2559(para)
 msgid ""
 "To look at the complete headers for a message, click View &gt; All Message "
 "Headers. To see all message data, click View &gt; Message Source."
@@ -5819,11 +6363,11 @@ msgstr ""
 "cabeceras del mensaje. Para ver todos los datos del mensaje, pulse Ver &gt; "
 "Mensaje en bruto."
 
-#: C/evolution.xml:2373(title)
+#: C/evolution.xml:2562(title)
 msgid "Sorting Mail In Email Threads"
 msgstr "Ordenar los correos por conversaciones"
 
-#: C/evolution.xml:2374(para)
+#: C/evolution.xml:2563(para)
 msgid ""
 "You can also choose a threaded message view. Click View &gt; Group By "
 "Threads to turn the threaded view on or off. When you select this option, "
@@ -5835,7 +6379,7 @@ msgstr ""
 "opción, Evolution agrupa las respuestas de un mensaje con el original, por "
 "lo que puede seguir el hilo de la conversación de un mensaje al siguiente."
 
-#: C/evolution.xml:2376(para)
+#: C/evolution.xml:2565(para)
 msgid ""
 "In a thread of conversation view, each new message is stacked below of the "
 "ones that arrived before it, so that the newest message is always the one "
@@ -5852,7 +6396,7 @@ msgstr ""
 "conversaciones se ordenan por la fecha del mensaje más reciente en las "
 "conversaciones."
 
-#: C/evolution.xml:2378(para)
+#: C/evolution.xml:2567(para)
 msgid ""
 "There is a gconf key to toggle between the collapsed or expanded state of "
 "mail thread. By default, it is collapsed and you can change this at /apps/"
@@ -5868,11 +6412,11 @@ msgstr ""
 "todas las conversaciones toman este estado. Es una opción muy avanzada sólo "
 "para usuarios avanzados."
 
-#: C/evolution.xml:2383(title)
+#: C/evolution.xml:2572(title)
 msgid "Sorting Mail with Column Headers"
 msgstr "Uso de cabeceras para ordenar los mensajes"
 
-#: C/evolution.xml:2384(para)
+#: C/evolution.xml:2573(para)
 msgid ""
 "The message list normally has columns to indicate whether a message has been "
 "read, whether it has attachments, how important it is, and the sender, date, "
@@ -5884,11 +6428,11 @@ msgstr ""
 "asunto. Puede cambiar el orden de las columnas o añadir y quitar columnas "
 "arrastrando y soltándolas."
 
-#: C/evolution.xml:2388(title)
+#: C/evolution.xml:2577(title)
 msgid "Sorting Mail With Column Headers"
 msgstr "Uso de cabeceras para ordenar los mensajes"
 
-#: C/evolution.xml:2389(para)
+#: C/evolution.xml:2578(para)
 msgid ""
 "In addition to it, Evolution enables you to sort your messages by using Sort-"
 "by list. You can use any of the criteria given in the Sort-by list such as "
@@ -5902,97 +6446,98 @@ msgstr ""
 "emphasis> para realizar la ordenación. Devuelve la lista de correo ordenada "
 "que coincide con los criterios que ha seleccionado."
 
-#: C/evolution.xml:2390(para)
+#: C/evolution.xml:2579(para)
 msgid "To sort messages, perform the following procedure:"
 msgstr "Para ordenar los mensajes, realice el siguiente procedimiento:"
 
-#: C/evolution.xml:2393(para)
-msgid "Right click message header bar."
-msgstr "Pulse con el botón derecho sobre las barra de cabeceras."
+#: C/evolution.xml:2582(para)
+msgid "Right-click message header bar."
+msgstr "Pulse con el botón derecho sobre la barra de cabeceras."
 
-#: C/evolution.xml:2396(para)
+#: C/evolution.xml:2585(para)
 msgid "Click Sort by to get a list of options."
 msgstr "Pulse Ordenar por para obtener una lista de opciones."
 
-#: C/evolution.xml:2398(title)
+#: C/evolution.xml:2587(title)
 msgid "Sort by:"
 msgstr "Ordenar por:"
 
-#: C/evolution.xml:2399(para)
+#: 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:2403(para)
+#: C/evolution.xml:2592(para)
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: C/evolution.xml:2406(para) C/evolution.xml:2412(para)
+#: C/evolution.xml:2595(para) C/evolution.xml:2601(para)
 msgid "Sender"
 msgstr "Remitente"
 
-#: C/evolution.xml:2409(para)
+#: C/evolution.xml:2598(para)
 msgid "Location"
 msgstr "Lugar"
 
-#: C/evolution.xml:2415(para)
+#: C/evolution.xml:2604(para)
 msgid "Due By"
 msgstr "Vence en"
 
-#: C/evolution.xml:2418(para)
+#: C/evolution.xml:2607(para)
 msgid "Follow Up Flag"
 msgstr "Marca de seguimiento"
 
-#: C/evolution.xml:2421(para)
+#: C/evolution.xml:2610(para)
 msgid "Flag Status"
 msgstr "Marca de estado"
 
-#: C/evolution.xml:2424(para)
+#: C/evolution.xml:2613(para)
 msgid "Size"
 msgstr "Tamaño"
 
-#: C/evolution.xml:2427(para)
+#: C/evolution.xml:2616(para)
 msgid "To"
 msgstr "Para"
 
-#: C/evolution.xml:2430(para)
+#: C/evolution.xml:2619(para)
 msgid "Received"
 msgstr "Recibido"
 
-#: C/evolution.xml:2433(para)
+#: C/evolution.xml:2622(para)
 msgid "Date"
 msgstr "Fecha"
 
-#: C/evolution.xml:2436(para)
+#: C/evolution.xml:2625(para)
 msgid "Subject"
 msgstr "Asunto"
 
-#: C/evolution.xml:2439(para)
+#: C/evolution.xml:2628(para)
 msgid "From"
 msgstr "De"
 
-#: C/evolution.xml:2442(para)
+#: C/evolution.xml:2631(para)
 msgid "Attachment"
 msgstr "Adjunto"
 
-#: C/evolution.xml:2445(para)
+#: C/evolution.xml:2634(para)
 msgid "Score"
 msgstr "Puntuación"
 
-#: C/evolution.xml:2448(para)
+#: C/evolution.xml:2637(para)
 msgid "Flagged"
 msgstr "Marcado"
 
-#: C/evolution.xml:2451(para) C/evolution.xml:3362(para)
-#: C/evolution.xml:4252(para) C/evolution.xml:4603(para)
-#: C/evolution.xml:4798(para)
+#: C/evolution.xml:2640(para) C/evolution.xml:3608(para)
+#: C/evolution.xml:4498(para) C/evolution.xml:4849(para)
+#: C/evolution.xml:5044(para)
 msgid "Status"
 msgstr "Estado"
 
-#: C/evolution.xml:2454(para)
+#: C/evolution.xml:2643(para)
 msgid "Custom"
 msgstr "Personalizado"
 
-#: C/evolution.xml:2458(para)
+#: C/evolution.xml:2647(para)
 msgid ""
 "Clicking each sort criteria cycles take you through three possibilities. "
 "Sort by criteria in ascending or descending order or unsort the message. "
@@ -6011,11 +6556,11 @@ msgstr ""
 "los ordenará descendentemente. La siguiente pulsación hará que se muestren "
 "sin orden."
 
-#: C/evolution.xml:2461(title)
+#: C/evolution.xml:2650(title)
 msgid "Sort Ascending:"
 msgstr "Orden ascendente:"
 
-#: C/evolution.xml:2462(para)
+#: C/evolution.xml:2651(para)
 msgid ""
 "Sorts the messages top to bottom and returns you the sorted message list in "
 "the order of oldest to the latest."
@@ -6023,11 +6568,11 @@ msgstr ""
 "Ordena los mensajes de arriba a abajo y le devuelve la lista ordenada de "
 "correos electrónicos en el orden de más viejo a más nuevo."
 
-#: C/evolution.xml:2465(title)
+#: C/evolution.xml:2654(title)
 msgid "Sort Descending:"
 msgstr "Orden descendente:"
 
-#: C/evolution.xml:2466(para)
+#: C/evolution.xml:2655(para)
 msgid ""
 "Sort descending revers the order and returns you the sorted message list in "
 "the order of newest to oldest."
@@ -6035,11 +6580,11 @@ msgstr ""
 "Ordena los mensajes de forma descendente y le devuelve la lista ordenada de "
 "correos electrónicos en el orden de más nuevo a más viejo."
 
-#: C/evolution.xml:2469(title)
+#: C/evolution.xml:2658(title)
 msgid "Unsort:"
 msgstr "Desordenar:"
 
-#: C/evolution.xml:2470(para)
+#: C/evolution.xml:2659(para)
 msgid ""
 "Unsort removes sorting from this column, reverting to the order of messages "
 "as they were added to the folder."
@@ -6047,11 +6592,11 @@ msgstr ""
 "Desordenar elimina la ordenación para esta columna, revirtiendo el orden de "
 "los mensajes según fueron añadidos a la carpeta."
 
-#: C/evolution.xml:2473(title)
+#: C/evolution.xml:2662(title)
 msgid "Removing a Column:"
 msgstr "Eliminar una columna:"
 
-#: C/evolution.xml:2474(para)
+#: C/evolution.xml:2663(para)
 msgid ""
 "Remove this column from the display. You can also remove columns by dragging "
 "the header off the list and letting it drop."
@@ -6059,11 +6604,11 @@ msgstr ""
 "Retira la columna de la pantalla. Para retirar columnas, también puede "
 "arrastrar y soltar la cabecera fuera de la lista."
 
-#: C/evolution.xml:2477(title)
+#: C/evolution.xml:2666(title)
 msgid "Adding a Column:"
 msgstr "Añadir una columna:"
 
-#: C/evolution.xml:2478(para)
+#: C/evolution.xml:2667(para)
 msgid ""
 "When you select this item, a dialog box appears, listing the possible "
 "columns. Drag the column you want into a space between existing column "
@@ -6074,11 +6619,11 @@ msgstr ""
 "cabeceras existentes. Una flecha roja le indica el lugar donde quedará la "
 "columna."
 
-#: C/evolution.xml:2481(title)
+#: C/evolution.xml:2670(title)
 msgid "Best Fit:"
 msgstr "Ajuste automático:"
 
-#: C/evolution.xml:2482(para)
+#: C/evolution.xml:2671(para)
 msgid ""
 "Automatically adjusts the widths of the columns for the most efficient use "
 "of space."
@@ -6086,11 +6631,11 @@ msgstr ""
 "Ajusta automáticamente las anchuras de las columnas para un uso más "
 "eficiente del espacio."
 
-#: C/evolution.xml:2485(title)
+#: C/evolution.xml:2674(title)
 msgid "Customizing the Current View:"
 msgstr "Personalizar la vista actual:"
 
-#: C/evolution.xml:2486(para)
+#: C/evolution.xml:2675(para)
 msgid ""
 "Choose this item to pick a more complex sort order for messages, or to "
 "choose which columns of information about your messages you want to display."
@@ -6098,19 +6643,19 @@ msgstr ""
 "Elija este elemento para escoger un orden de los mensajes más complejo o "
 "para elegir qué columnas quiere ver con la información de sus mensajes."
 
-#: C/evolution.xml:2490(para)
+#: C/evolution.xml:2679(para)
 msgid "Select the search criteria from the list."
 msgstr "Seleccione el criterio de búsqueda de la lista."
 
-#: C/evolution.xml:2491(para)
+#: C/evolution.xml:2680(para)
 msgid "You can view the messages in the desired order in the message list."
 msgstr "Puede ver los mensajes en el orden deseado en la lista de mensajes."
 
-#: C/evolution.xml:2497(title)
+#: C/evolution.xml:2686(title)
 msgid "Using the Follow up Feature"
 msgstr "Usar la característica de Marca de seguimiento"
 
-#: C/evolution.xml:2498(para)
+#: C/evolution.xml:2687(para)
 msgid ""
 "To make sure you don't forget about a message, you can use the Follow up "
 "feature."
@@ -6118,45 +6663,46 @@ msgstr ""
 "Para asegurarse de que no se olvida de un mensaje, puede usar la "
 "característica Marca de seguimiento."
 
-#: C/evolution.xml:2501(para)
+#: C/evolution.xml:2690(para)
 msgid "Select one or more messages."
 msgstr "Seleccione uno o más mensajes."
 
-#: C/evolution.xml:2504(para)
+#: C/evolution.xml:2693(para)
 msgid "Right-click one of the messages."
 msgstr "Pulse con el botón derecho sobre uno de los mensajes."
 
-#: C/evolution.xml:2507(para)
+#: C/evolution.xml:2696(para)
 msgid "Click Mark for Follow Up."
 msgstr "Pulse Marca para seguimiento."
 
-#: C/evolution.xml:2510(para)
+#: C/evolution.xml:2699(para)
 msgid "You can also open the Flag to Follow Up window by"
 msgstr "También puede abrir la ventana de Marcar para seguimiento así"
 
-#: C/evolution.xml:2513(para)
+#: C/evolution.xml:2702(para)
 msgid "Select the messages."
 msgstr "Seleccione los mensajes."
 
-#: C/evolution.xml:2516(para)
+#: C/evolution.xml:2705(para)
 msgid "Select Message menu."
 msgstr "Seleccione Menú de mensaje."
 
-#: C/evolution.xml:2519(para)
+#: C/evolution.xml:2708(para)
 msgid "Click Mark as."
 msgstr "Pulse en Marcar como."
 
-#: C/evolution.xml:2522(para)
+#: C/evolution.xml:2711(para)
 msgid "Select Follow Up or press Shift+Ctrl+G."
 msgstr "Seleccione Marcar para seguimiento o pulse Mayús+Ctrl+G."
 
-#: C/evolution.xml:2523(para)
-msgid "A dialog box opens to allow you to set the type of flag and the due date."
+#: C/evolution.xml:2712(para)
+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."
 
-#: C/evolution.xml:2527(para)
+#: C/evolution.xml:2716(para)
 msgid ""
 "The flag itself is the action you want to remind yourself about. Several are "
 "provided for you, such as Call, Forward, and Reply, but you can enter your "
@@ -6166,7 +6712,7 @@ msgstr ""
 "Tiene varias disponibles, como Llamar, Reenviar y Responder, pero puede "
 "escribir la nota o acción que prefiera."
 
-#: C/evolution.xml:2528(para)
+#: C/evolution.xml:2717(para)
 msgid ""
 "After you have added a flag, you can mark it as complete or remove it "
 "entirely by right-clicking the message, then click either Flag Completed or "
@@ -6176,7 +6722,7 @@ msgstr ""
 "eliminar la marca pinchando con el botón derecho sobre el mensaje y "
 "eligiendo Marcar como terminado o Quitar marca."
 
-#: C/evolution.xml:2529(para)
+#: C/evolution.xml:2718(para)
 msgid ""
 "When you read a flagged message, its flag status is displayed at the top, "
 "before the message headers. An overdue message might tell you "
@@ -6187,7 +6733,7 @@ msgstr ""
 "un mensaje atrasado podrá decirle algo como <quote>Llamar antes del 7 de "
 "abril de 2003 a las 17:00</quote>."
 
-#: C/evolution.xml:2530(para)
+#: C/evolution.xml:2719(para)
 msgid ""
 "Flags can help you organize your work in a number of ways. For example, you "
 "might add a Flag Status column to your message list and sort that way. "
@@ -6202,11 +6748,11 @@ msgstr ""
 "quitarles las marcas cuando haya acabado, de manera que la carpeta sólo "
 "contenga mensajes pendientes."
 
-#: C/evolution.xml:2532(title)
+#: C/evolution.xml:2721(title)
 msgid "Mark as Important Feature:"
 msgstr "Característica Marcar como importante:"
 
-#: C/evolution.xml:2533(para)
+#: C/evolution.xml:2722(para)
 msgid ""
 "If you prefer a simpler way to remind yourself about messages, you can mark "
 "them as important by right-clicking the message, then click Mark as "
@@ -6217,7 +6763,7 @@ msgstr ""
 "sobre el mensaje y después pulsando Marcar como importante o Seleccionar "
 "mensaje &gt; Marcar como &gt; Importante desde la barra de menú,"
 
-#: C/evolution.xml:2540(para)
+#: C/evolution.xml:2729(para)
 msgid ""
 "Evolution, like most other mail systems, stores mail in folders. You start "
 "out with a few mail folders, such as Inbox, Outbox, and Drafts, but you can "
@@ -6230,7 +6776,7 @@ msgstr ""
 "desee. Cree nuevas carpetas pulsaando Carpeta &gt; Nueva, o pulsando con el "
 "botón derecho sobre la lista y seleccionando Carpeta nueva."
 
-#: C/evolution.xml:2541(para)
+#: C/evolution.xml:2730(para)
 msgid ""
 "When you click OK, your new folder appears in the folder view. You can then "
 "move the messages to it by dragging and dropping them, or right click on the "
@@ -6241,7 +6787,7 @@ msgstr ""
 "o pulsando con el botón derecho del ratón y eligiendo Mover a la carpeta o "
 "pulsando Mayús+Ctrl+V."
 
-#: C/evolution.xml:2542(para)
+#: C/evolution.xml:2731(para)
 msgid ""
 "You can also drop the messages to a particular folder by selecting Message "
 "&gt; Move to folder. This will open the Select folder window, where you can "
@@ -6252,7 +6798,7 @@ msgstr ""
 "abrirá la ventana Seleccionar carpeta, donde podrá soltar su mensaje en "
 "cualquiera de las carpetas listadas."
 
-#: C/evolution.xml:2544(para)
+#: C/evolution.xml:2733(para)
 msgid ""
 "If you want to create a new folder click New at the bottom left of the "
 "window. Specify the location and enter the label of the folder at the entry "
@@ -6265,17 +6811,17 @@ msgstr ""
 "puede mover los mensajes desde una carpeta a otra seleccionando el mensaje y "
 "pulsando la solapa Mover en la parte inferior derecha."
 
-#: C/evolution.xml:2545(para)
+#: C/evolution.xml:2734(para)
 msgid ""
 "If you create a filter with the filter assistant, you can have mail filed "
 "automatically. Select Edit &gt; Message Filters to bring up the Message "
 "Filters window."
 msgstr ""
 "Si crea un filtro con el asistente de filtros puede tener el correo ordenado "
-"automáticamente. Para ello seleccione Editar &gt; Filtros de mensajes para que "
-"aparezca la ventana Filtros de mensajes."
+"automáticamente. Para ello seleccione Editar &gt; Filtros de mensajes para "
+"que aparezca la ventana Filtros de mensajes."
 
-#: C/evolution.xml:2547(para)
+#: C/evolution.xml:2736(para)
 msgid ""
 "Click on the Add button to bring up the Add Rule window from where you can "
 "set different criteria for filtering messages. For additional information on "
@@ -6287,7 +6833,7 @@ msgstr ""
 "obtener más información consulte <link linkend=\"usage-mail-org-filters-new"
 "\">Crear de reglas de filtrado nuevas</link>."
 
-#: C/evolution.xml:2549(para)
+#: C/evolution.xml:2738(para)
 msgid ""
 "The Inbox folder on most IMAP servers cannot contain both subfolders and "
 "messages. When you create additional folders on your IMAP mail server, "
@@ -6303,7 +6849,7 @@ msgstr ""
 "subcarpetas en el buzón de entrada, dejará de poder leer mensajes que "
 "existen en esta carpeta, hasta que las mueva hacia otro lugar."
 
-#: C/evolution.xml:2555(para)
+#: C/evolution.xml:2744(para)
 msgid ""
 "Most email clients can search the message for you, but Evolution does it "
 "differently and efficiently giving you faster search result with Quick "
@@ -6314,13 +6860,13 @@ msgstr ""
 "una búsqueda más rápida con Búsqueda rápida, Búsqueda personalizada y "
 "Búsqueda avanzada."
 
-#: C/evolution.xml:2557(title) C/evolution.xml:3302(title)
-#: C/evolution.xml:4184(title) C/evolution.xml:4492(title)
-#: C/evolution.xml:4736(title)
+#: C/evolution.xml:2746(title) C/evolution.xml:3548(title)
+#: C/evolution.xml:4430(title) C/evolution.xml:4738(title)
+#: C/evolution.xml:4982(title)
 msgid "Quick Search:"
 msgstr "Búsqueda rápida:"
 
-#: C/evolution.xml:2558(para)
+#: C/evolution.xml:2747(para)
 msgid ""
 "Quick Search displays all the messages that match the in-built criteria you "
 "selected from the drop-down list at the top left side, just above the "
@@ -6330,14 +6876,14 @@ msgstr ""
 "criterios integrados que ha seleccionado de la lista desplegable en la parte "
 "superior izquierda, justo encima de la lista de mensajes."
 
-#: C/evolution.xml:2560(para)
+#: C/evolution.xml:2749(para)
 msgid "To perform a quick search, perform the following procedure:"
 msgstr "Para realizar una búsqueda rápida, realice el siguiente procedimiento:"
 
-#: C/evolution.xml:2563(para) C/evolution.xml:2642(para)
-#: C/evolution.xml:3265(para) C/evolution.xml:3308(para)
-#: C/evolution.xml:4136(para) C/evolution.xml:4452(para)
-#: C/evolution.xml:4688(para)
+#: C/evolution.xml:2752(para) C/evolution.xml:2831(para)
+#: C/evolution.xml:3511(para) C/evolution.xml:3554(para)
+#: C/evolution.xml:4382(para) C/evolution.xml:4698(para)
+#: C/evolution.xml:4934(para)
 msgid ""
 "Click the search icon <inlinegraphic format=\"PNG\" fileref=\"figures/"
 "stock_search.png\"/> to expand the drop-down list."
@@ -6345,72 +6891,72 @@ msgstr ""
 "Pulse el botón de búsqueda <inlinegraphic format=\"PNG\" fileref=\"figures/"
 "stock_search.png\"/> para expandir la dista desplegable."
 
-#: C/evolution.xml:2566(para) C/evolution.xml:3311(para)
-#: C/evolution.xml:4192(para) C/evolution.xml:4534(para)
-#: C/evolution.xml:4744(para)
+#: C/evolution.xml:2755(para) C/evolution.xml:3557(para)
+#: C/evolution.xml:4438(para) C/evolution.xml:4780(para)
+#: C/evolution.xml:4990(para)
 msgid "Select the search criteria from the list:"
 msgstr "Seleccione el criterio de búsqueda de la lista:"
 
-#: C/evolution.xml:2569(para)
+#: C/evolution.xml:2758(para)
 msgid "All Messages"
 msgstr "Todos los mensajes"
 
-#: C/evolution.xml:2572(para)
+#: C/evolution.xml:2761(para)
 msgid "Unread Messages"
 msgstr "Mensajes sin leer"
 
-#: C/evolution.xml:2575(para)
+#: C/evolution.xml:2764(para)
 msgid "No Label"
 msgstr "Sin etiqueta"
 
-#: C/evolution.xml:2578(para) C/evolution.xml:2620(para)
+#: C/evolution.xml:2767(para) C/evolution.xml:2809(para)
 msgid "Important"
 msgstr "Importante"
 
-#: C/evolution.xml:2581(para) C/evolution.xml:2623(para)
+#: C/evolution.xml:2770(para) C/evolution.xml:2812(para)
 msgid "Work"
 msgstr "Trabajo"
 
-#: C/evolution.xml:2584(para) C/evolution.xml:2626(para)
-#: C/evolution.xml:3356(para) C/evolution.xml:4246(para)
-#: C/evolution.xml:4597(para) C/evolution.xml:4792(para)
-#: C/evolution.xml:5362(para)
+#: C/evolution.xml:2773(para) C/evolution.xml:2815(para)
+#: C/evolution.xml:3602(para) C/evolution.xml:4492(para)
+#: C/evolution.xml:4843(para) C/evolution.xml:5038(para)
+#: C/evolution.xml:5608(para)
 msgid "Personal"
 msgstr "Personal"
 
-#: C/evolution.xml:2587(para) C/evolution.xml:2629(para)
+#: C/evolution.xml:2776(para) C/evolution.xml:2818(para)
 msgid "To do"
 msgstr "Por hacer"
 
-#: C/evolution.xml:2590(para) C/evolution.xml:2632(para)
+#: C/evolution.xml:2779(para) C/evolution.xml:2821(para)
 msgid "Later"
 msgstr "Después"
 
-#: C/evolution.xml:2593(para)
+#: C/evolution.xml:2782(para)
 msgid "Read Messages"
 msgstr "Mensajes leídos"
 
-#: C/evolution.xml:2596(para)
+#: C/evolution.xml:2785(para)
 msgid "Recent Messages"
 msgstr "Mensajes recientes"
 
-#: C/evolution.xml:2599(para)
+#: C/evolution.xml:2788(para)
 msgid "Last 5 Days' Messages"
 msgstr "Mensajes de los últimos 5 días"
 
-#: C/evolution.xml:2602(para)
+#: C/evolution.xml:2791(para)
 msgid "Messages with Attachments"
 msgstr "Mensajes con adjuntos"
 
-#: C/evolution.xml:2605(para)
+#: C/evolution.xml:2794(para)
 msgid "Important Messages"
 msgstr "Mensajes importantes"
 
-#: C/evolution.xml:2608(para)
+#: C/evolution.xml:2797(para)
 msgid "Messages Not Junk"
 msgstr "Mensajes que no son spam"
 
-#: C/evolution.xml:2613(para)
+#: C/evolution.xml:2802(para)
 msgid ""
 "Evolution displays the messages matching the criteria present in the shown "
 "message list"
@@ -6418,7 +6964,7 @@ msgstr ""
 "Evolution muestra los mensajes que coincidan con los criterios presentes en "
 "la lista de mensajes mostrada."
 
-#: C/evolution.xml:2617(para)
+#: C/evolution.xml:2806(para)
 msgid ""
 "The following labels need not necessarily be the same as the default names "
 "listed here. You can change the name of these labels by selecting Edit &gt; "
@@ -6429,13 +6975,13 @@ msgstr ""
 "etiquetas seleccionando Editar &gt; Preferencias &gt; Preferencias del "
 "correo &gt; Colores."
 
-#: C/evolution.xml:2637(title) C/evolution.xml:3260(title)
-#: C/evolution.xml:4131(title) C/evolution.xml:4447(title)
-#: C/evolution.xml:4683(title)
+#: C/evolution.xml:2826(title) C/evolution.xml:3506(title)
+#: C/evolution.xml:4377(title) C/evolution.xml:4693(title)
+#: C/evolution.xml:4929(title)
 msgid "Customized Search:"
 msgstr "Búsqueda personalizada:"
 
-#: C/evolution.xml:2638(para)
+#: C/evolution.xml:2827(para)
 msgid ""
 "Evolution allows you to perform customized search. To search for a message "
 "use the following procedure:"
@@ -6443,11 +6989,11 @@ msgstr ""
 "Evolution le permite realizar búsquedas personalizadas. Para buscar un "
 "mensaje use el siguiente procedimiento:"
 
-#: C/evolution.xml:2644(title)
+#: C/evolution.xml:2833(title)
 msgid "Subject or Sender Contain:"
 msgstr "El asunto o remitente contiene:"
 
-#: C/evolution.xml:2645(para)
+#: C/evolution.xml:2834(para)
 msgid ""
 "Finds messages that contain the search text in the subject or sender. It "
 "does not search in the message body."
@@ -6455,76 +7001,78 @@ msgstr ""
 "Busca mensajes que contiene el texto buscado en el asunto o remitente. No "
 "busca en el cuerpo del mensaje."
 
-#: C/evolution.xml:2648(title)
+#: C/evolution.xml:2837(title)
 msgid "Recipients Contain:"
 msgstr "El destinatario contiene:"
 
-#: C/evolution.xml:2649(para)
+#: C/evolution.xml:2838(para)
 msgid "Finds messages with the search text in the To: and Cc: headers."
 msgstr "Busca mensajes con el texto buscado en las cabeceras Para: y Cc:."
 
-#: C/evolution.xml:2652(title)
+#: C/evolution.xml:2841(title)
 msgid "Message Contains:"
 msgstr "El mensaje contiene:"
 
-#: C/evolution.xml:2653(para)
+#: C/evolution.xml:2842(para)
 msgid "Searches the message body and all headers for the specified text."
 msgstr ""
 "Busca el texto especificado en el cuerpo del mensaje y en todas las "
 "cabeceras."
 
-#: C/evolution.xml:2656(title)
+#: C/evolution.xml:2845(title)
 msgid "Subject Contain:"
 msgstr "El asunto contiene:"
 
-#: C/evolution.xml:2657(para)
+#: 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:2660(title)
+#: C/evolution.xml:2849(title)
 msgid "Sender Contain:"
 msgstr "El remitente contiene:"
 
-#: C/evolution.xml:2661(para)
-msgid "Finds messages whose From: header contains a match for your search text."
+#: C/evolution.xml:2850(para)
+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."
 
-#: C/evolution.xml:2664(title)
+#: C/evolution.xml:2853(title)
 msgid "Body Contains:"
 msgstr "El cuerpo contiene:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2665(para)
+#: C/evolution.xml:2854(para)
 msgid "Searches only in message text, not any other header."
 msgstr "Busca sólo en el cuerpo del mensaje, no en ninguna otra cabecera."
 
-#: C/evolution.xml:2669(para)
+#: C/evolution.xml:2858(para)
 msgid "Click the drop-down list to select the scope"
 msgstr "Pulse sobre la lista desplegable para seleccionar el rango"
 
-#: C/evolution.xml:2672(para)
+#: C/evolution.xml:2861(para)
 msgid "Current Folder"
 msgstr "Carpeta actual"
 
-#: C/evolution.xml:2675(para)
+#: C/evolution.xml:2864(para)
 msgid "Current Account"
 msgstr "Cuenta actual"
 
-#: C/evolution.xml:2678(para)
+#: C/evolution.xml:2867(para)
 msgid "All Accounts"
 msgstr "Todas las cuentas"
 
-#: C/evolution.xml:2681(para)
+#: C/evolution.xml:2870(para)
 msgid "Current Message"
 msgstr "Mensaje actual"
 
-#: C/evolution.xml:2686(para)
+#: C/evolution.xml:2875(para)
 msgid "Type the search string in the search entry and press Enter."
 msgstr "Escriba la cadena de búsqueda en el campo de búsqueda y pulse Intro."
 
-#: C/evolution.xml:2688(para)
+#: C/evolution.xml:2877(para)
 msgid ""
 "The folder list will be disabled while you perform search on All Accounts or "
 "Current Account."
@@ -6532,7 +7080,7 @@ msgstr ""
 "Se deshabilitará la lista de carpetas mientras realiza una búsqueda en Todas "
 "las cuentas o en la Cuenta actual."
 
-#: C/evolution.xml:2692(para)
+#: C/evolution.xml:2881(para)
 msgid ""
 "Evolution shows your search results in the message list. You might want to "
 "create a search folder instead; see <link linkend=\"usage-mail-organize-"
@@ -6543,7 +7091,7 @@ msgstr ""
 "la <link linkend=\"usage-mail-organize-vfolders\">Uso de las carpetas de "
 "búsqueda</link>."
 
-#: C/evolution.xml:2694(para) C/evolution.xml:3300(para)
+#: C/evolution.xml:2883(para) C/evolution.xml:3546(para)
 msgid ""
 "To clear your search you can click the Clear icon in the search string "
 "field, or choose Search &gt; Clear from the menubar, or enter a blank "
@@ -6554,7 +7102,7 @@ msgstr ""
 "introducir una búsqueda vacía. También puede pulsar Mayús+Ctrl+Q para "
 "limpiar la búsqueda."
 
-#: C/evolution.xml:2697(para)
+#: C/evolution.xml:2886(para)
 msgid ""
 "You can even perform a quick search on a customized search results as it "
 "just filters and displays the messages in the message list."
@@ -6563,32 +7111,33 @@ msgstr ""
 "personalizada ya que sólo filtra y muestra los mensajes en la lista de "
 "mensajes."
 
-#: C/evolution.xml:2700(title) C/evolution.xml:4157(title)
-#: C/evolution.xml:4473(title) C/evolution.xml:4709(title)
+#: C/evolution.xml:2889(title) C/evolution.xml:4403(title)
+#: C/evolution.xml:4719(title) C/evolution.xml:4955(title)
 msgid "Advanced Search:"
 msgstr "Búsqueda avanzada:"
 
-#: C/evolution.xml:2701(para) C/evolution.xml:4158(para)
-#: C/evolution.xml:4474(para) C/evolution.xml:4710(para)
+#: C/evolution.xml:2890(para) C/evolution.xml:4404(para)
+#: C/evolution.xml:4720(para) C/evolution.xml:4956(para)
 msgid "You can perform an advanced search based on any of the search types."
 msgstr ""
 "Puede realizar una búsqueda avanzada basada en cualquiera de los tipos de "
 "búsqueda."
 
-#: C/evolution.xml:2705(para) C/evolution.xml:4162(para)
-#: C/evolution.xml:4478(para)
+#: C/evolution.xml:2894(para) C/evolution.xml:4408(para)
+#: C/evolution.xml:4724(para)
 msgid "Select the Search menu."
 msgstr "Seleccione el menú Buscar."
 
-#: C/evolution.xml:2708(para)
+#: 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:2713(para)
+#: C/evolution.xml:2902(para)
 msgid "Enter the Search name."
 msgstr "Introduzca el nombre de la búsqueda."
 
-#: C/evolution.xml:2716(para)
+#: C/evolution.xml:2905(para)
 msgid ""
 "Click Add to add rules. For more information on rules, refer <link linkend="
 "\"bsazsjd\">Step 4</link> under <link linkend=\"vfolder-create\">Creating A "
@@ -6598,15 +7147,15 @@ msgstr ""
 "acerca de las reglas, vea el <link linkend=\"bsazsjd\">Paso 4</link> bajo "
 "<link linkend=\"vfolder-create\">Crear una carpeta de búsqueda</link>."
 
-#: C/evolution.xml:2722(para)
+#: C/evolution.xml:2911(para)
 msgid "Press Save to save your search results."
 msgstr "Pulse Guardar par aguardar los resultados."
 
-#: C/evolution.xml:2726(title)
+#: C/evolution.xml:2915(title)
 msgid "Save Search:"
 msgstr "Guardar búsqueda:"
 
-#: C/evolution.xml:2727(para)
+#: C/evolution.xml:2916(para)
 msgid ""
 "To save your search results other than from advanced search, select Search "
 "&gt; Save Search. You can view the label of your search results listed under "
@@ -6616,27 +7165,28 @@ msgstr ""
 "seleccione Buscar &gt; Guardar búsqueda. Puede ver la etiqueta de los "
 "resultados de su búsqueda listada bajo el menú Buscar."
 
-#: C/evolution.xml:2730(title)
+#: C/evolution.xml:2919(title)
 msgid "Edit Saved Searches:"
 msgstr "Editar búsquedas guardadas:"
 
-#: C/evolution.xml:2731(para)
+#: C/evolution.xml:2920(para)
 msgid "To edit your saved searches,"
 msgstr "Editar sus búsquedas guardadas,"
 
-#: C/evolution.xml:2735(para)
+#: C/evolution.xml:2924(para)
 msgid "Select Search from the menu bar."
 msgstr "Seleccione Buscar en la barra de menú."
 
-#: C/evolution.xml:2738(para)
+#: 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:2743(para)
+#: C/evolution.xml:2932(para)
 msgid "Click the Edit button to open the Edit Rule dialog box."
 msgstr "Pulse el botón Editar para abrir el cuadro de diálogo Editar regla."
 
-#: C/evolution.xml:2744(para)
+#: C/evolution.xml:2933(para)
 msgid ""
 "You can also add or remove Searches from the list by using the respective "
 "buttons available at the right."
@@ -6644,11 +7194,11 @@ msgstr ""
 "También puede añadir o quitar Búsquedas de la lista usando los respectivos "
 "botones disponibles a la derecha."
 
-#: C/evolution.xml:2749(para)
+#: C/evolution.xml:2938(para)
 msgid "Edit the title or search criteria from the dialog box."
 msgstr "Edite el título o el criterio de búsqueda desde el cuadro de diálogo."
 
-#: C/evolution.xml:2759(para)
+#: C/evolution.xml:2948(para)
 msgid ""
 "Filters work very much like the mail room in a large company. Their purpose "
 "is to bundle, sort, and distribute mail to the various folders. In addition, "
@@ -6665,29 +7215,29 @@ msgstr ""
 "copias de un mismo mensaje en múltiples carpetas; pueden también conservar o "
 "incluso mandar una copia a otra persona."
 
-#: C/evolution.xml:2762(title)
+#: C/evolution.xml:2951(title)
 msgid "Creating New Filter Rules"
 msgstr "Crear reglas de filtros nuevas"
 
-#: C/evolution.xml:2765(para) C/evolution.xml:2969(para)
-#: C/evolution.xml:2984(para)
+#: C/evolution.xml:2954(para) C/evolution.xml:3158(para)
+#: C/evolution.xml:3173(para)
 msgid "Click Edit &gt; Message Filters."
 msgstr "Pulse Editar &gt; Filtros de mensajes."
 
-#: C/evolution.xml:2768(para) C/evolution.xml:3019(para)
-#: C/evolution.xml:5025(para) C/evolution.xml:5606(para)
+#: C/evolution.xml:2957(para) C/evolution.xml:3208(para)
+#: C/evolution.xml:5271(para) C/evolution.xml:5852(para)
 msgid "Click Add."
 msgstr "Pulse Añadir."
 
-#: C/evolution.xml:2771(para)
+#: C/evolution.xml:2960(para)
 msgid "Type a name for the filter in the Rule name field."
 msgstr "Escriba un nombre para el filtro en el campo de nombre de la regla."
 
-#: C/evolution.xml:2776(para)
+#: C/evolution.xml:2965(para)
 msgid "Define the criteria for the filter in the first section."
 msgstr "Defina el criterio para el filtro en la primera sección."
 
-#: C/evolution.xml:2777(para)
+#: C/evolution.xml:2966(para)
 msgid ""
 "For each of the filter criteria, you must first select which parts of the "
 "message you want to filter:"
@@ -6695,41 +7245,42 @@ msgstr ""
 "Para cada criterio de filtrado, debe seleccionar en primer lugar qué partes "
 "de los mensajes quiere filtrar:"
 
-#: C/evolution.xml:2779(title) C/evolution.xml:3029(title)
+#: C/evolution.xml:2968(title) C/evolution.xml:3218(title)
 msgid "Sender:"
 msgstr "Remitente:"
 
-#: C/evolution.xml:2780(para)
+#: 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:2783(title)
+#: C/evolution.xml:2972(title)
 msgid "Recipient:"
 msgstr "Destinatario:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2784(para) C/evolution.xml:3034(para)
+#: C/evolution.xml:2973(para) C/evolution.xml:3223(para)
 msgid "The recipients of the message."
 msgstr "Los destinatarios del mensaje."
 
-#: C/evolution.xml:2787(title) C/evolution.xml:3037(title)
+#: C/evolution.xml:2976(title) C/evolution.xml:3226(title)
 msgid "Subject:"
 msgstr "Asunto:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2788(para) C/evolution.xml:3038(para)
+#: C/evolution.xml:2977(para) C/evolution.xml:3227(para)
 msgid "The subject line of the message."
 msgstr "La línea asunto del mensaje."
 
-#: C/evolution.xml:2791(title)
+#: C/evolution.xml:2980(title)
 msgid "Specific Header:"
 msgstr "Cabecera específica:"
 
-#: C/evolution.xml:2792(para)
+#: C/evolution.xml:2981(para)
 msgid "Any header including custom ones."
 msgstr "Cualquier cabecera, incluyendo las personalizadas."
 
-#: C/evolution.xml:2794(para)
+#: C/evolution.xml:2983(para)
 msgid ""
 "If a message uses a header more than once, Evolution pays attention only to "
 "the first instance, even if the message defines the header differently the "
@@ -6747,20 +7298,20 @@ msgstr ""
 "si la segunda declaración no apareciera. Para filtrar mensajes que utilizan "
 "varias cabeceras varias veces, utilice una expresión regular."
 
-#: C/evolution.xml:2796(title) C/evolution.xml:3041(title)
+#: C/evolution.xml:2985(title) C/evolution.xml:3230(title)
 msgid "Message Body:"
 msgstr "Cuerpo del mensaje:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2797(para) C/evolution.xml:3042(para)
+#: C/evolution.xml:2986(para) C/evolution.xml:3231(para)
 msgid "Searches in the actual text of the message."
 msgstr "Busca en el texto efectivo del mensaje."
 
-#: C/evolution.xml:2800(title)
+#: C/evolution.xml:2989(title)
 msgid "Expression:"
 msgstr "Expresión:"
 
-#: C/evolution.xml:2801(para)
+#: C/evolution.xml:2990(para)
 msgid ""
 "(For programmers only) Match a message according to an expression you write "
 "in the Scheme language used to define filters in Evolution."
@@ -6768,11 +7319,11 @@ msgstr ""
 "(Sólo para programadores) busca un mensaje que corresponda a una expresión "
 "escrita en lenguaje Scheme, usado para definir filtros en Evolution."
 
-#: C/evolution.xml:2804(title) C/evolution.xml:3049(title)
+#: C/evolution.xml:2993(title) C/evolution.xml:3238(title)
 msgid "Date Sent:"
 msgstr "Fecha de envío:"
 
-#: C/evolution.xml:2805(para) C/evolution.xml:3050(para)
+#: C/evolution.xml:2994(para) C/evolution.xml:3239(para)
 msgid ""
 "Filters messages according to the date on which they were sent. First, "
 "choose the conditions you want a message to meet, such as before a given "
@@ -6790,12 +7341,12 @@ msgstr ""
 "en el calendario. Es posible incluso buscar mensajes dentro de un intervalo "
 "de tiempo relativo, por ejemplo, buscar mensajes en los últimos cuatro días."
 
-#: C/evolution.xml:2808(title) C/evolution.xml:3053(title)
+#: C/evolution.xml:2997(title) C/evolution.xml:3242(title)
 msgid "Date Received:"
 msgstr "Fecha de recepción:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2809(para) C/evolution.xml:3054(para)
+#: C/evolution.xml:2998(para) C/evolution.xml:3243(para)
 msgid ""
 "This works the same way as the Date Sent option, except that it compares the "
 "time you received the message with the dates you specify."
@@ -6803,11 +7354,11 @@ msgstr ""
 "Funciona del mismo modo que la opción Fecha de envío, excepto que compara la "
 "fecha y hora de recepción del mensaje con las fechas especificadas."
 
-#: C/evolution.xml:2812(title) C/evolution.xml:3057(title)
+#: C/evolution.xml:3001(title) C/evolution.xml:3246(title)
 msgid "Label:"
 msgstr "Etiqueta:"
 
-#: C/evolution.xml:2813(para) C/evolution.xml:3058(para)
+#: C/evolution.xml:3002(para) C/evolution.xml:3247(para)
 msgid ""
 "Messages can have labels of Important, Work, Personal, To Do, or Later. You "
 "can set labels with other filters or manually."
@@ -6816,11 +7367,11 @@ msgstr ""
 "Tareas pendientes o Más tarde. Puede establecer etiquetas con otros filtros "
 "o manualmente."
 
-#: C/evolution.xml:2816(title) C/evolution.xml:3061(title)
+#: C/evolution.xml:3005(title) C/evolution.xml:3250(title)
 msgid "Score:"
 msgstr "Puntuación:"
 
-#: C/evolution.xml:2817(para) C/evolution.xml:3062(para)
+#: C/evolution.xml:3006(para) C/evolution.xml:3251(para)
 msgid ""
 "Sets the message score to any whole number greater than 0. You can have one "
 "filter set or change a message score, and then set up another filter to move "
@@ -6835,20 +7386,20 @@ msgstr ""
 "simplemente un número que puede asignar a mensajes para que otros filtros "
 "puedan procesarlos."
 
-#: C/evolution.xml:2820(title) C/evolution.xml:3065(title)
+#: C/evolution.xml:3009(title) C/evolution.xml:3254(title)
 msgid "Size:"
 msgstr "Tamaño:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2821(para) C/evolution.xml:3066(para)
+#: C/evolution.xml:3010(para) C/evolution.xml:3255(para)
 msgid "Sorts based on the size of the message in kilobytes."
 msgstr "Ordenación basada en el tamaño del mensaje, en kilobytes."
 
-#: C/evolution.xml:2824(title) C/evolution.xml:3069(title)
+#: C/evolution.xml:3013(title) C/evolution.xml:3258(title)
 msgid "Status:"
 msgstr "Estado:"
 
-#: C/evolution.xml:2825(para) C/evolution.xml:3070(para)
+#: C/evolution.xml:3014(para) C/evolution.xml:3259(para)
 msgid ""
 "Filters according to the status of a message. The status can be Replied To, "
 "Draft, Important, Read, or Junk."
@@ -6856,27 +7407,27 @@ msgstr ""
 "Filtros de acuerdo al estado de un mensaje. El estado puede ser Respoder a, "
 "Borrador, Importante, Leído o SPAM."
 
-#: C/evolution.xml:2828(title)
+#: C/evolution.xml:3017(title)
 msgid "Flagged:"
 msgstr "Marcado:"
 
-#: C/evolution.xml:2829(para) C/evolution.xml:3074(para)
+#: C/evolution.xml:3018(para) C/evolution.xml:3263(para)
 msgid "Checks whether the message is flagged for follow-up."
 msgstr "Comprueba si el mensaje está marcado para seguimiento."
 
-#: C/evolution.xml:2832(title) C/evolution.xml:3077(title)
+#: C/evolution.xml:3021(title) C/evolution.xml:3266(title)
 msgid "Attachments:"
 msgstr "Adjuntos:"
 
-#: C/evolution.xml:2833(para) C/evolution.xml:3078(para)
+#: C/evolution.xml:3022(para) C/evolution.xml:3267(para)
 msgid "Creates a filter based on whether there is an attachment for the email."
 msgstr "Crea un filtro en función de si el correo-e contiene un adjunto."
 
-#: C/evolution.xml:2836(title)
+#: C/evolution.xml:3025(title)
 msgid "Mailing List"
 msgstr "Lista de correo"
 
-#: C/evolution.xml:2837(para) C/evolution.xml:3082(para)
+#: C/evolution.xml:3026(para) C/evolution.xml:3271(para)
 msgid ""
 "Filters based on the mailing list the message came from. This filter might "
 "miss messages from some list servers, because it checks for the X-BeenThere "
@@ -6890,11 +7441,11 @@ msgstr ""
 "redistribuciones de correo. El correo proveniente de  servidores de listas "
 "que no establezca adecuadamente la cabecera X-BeenThere no será filtrado."
 
-#: C/evolution.xml:2840(title)
+#: C/evolution.xml:3029(title)
 msgid "Regex Match:"
 msgstr "Coincide con la expresión regular:"
 
-#: C/evolution.xml:2841(para)
+#: C/evolution.xml:3030(para)
 msgid ""
 "If you know your way around a <link linkend=\"regular-expression\">regex</"
 "link>, or regular expression, this option allows you to search for complex "
@@ -6912,11 +7463,11 @@ msgstr ""
 "cómo usar las expresiones regulares examine la página del manual del comando "
 "grep."
 
-#: C/evolution.xml:2844(title)
+#: C/evolution.xml:3033(title)
 msgid "Source Account:"
 msgstr "Cuenta de orígen:"
 
-#: C/evolution.xml:2845(para)
+#: C/evolution.xml:3034(para)
 msgid ""
 "Filters messages according the server you got them from. This is most useful "
 "if you use multiple POP mail accounts."
@@ -6924,11 +7475,11 @@ msgstr ""
 "Filtros de mensajes de acuerdo con el servidor de las que las recibió. Esto "
 "es útil cuando tiene múltiples cuentas de correo POP."
 
-#: C/evolution.xml:2848(title) C/evolution.xml:2932(title)
+#: C/evolution.xml:3037(title) C/evolution.xml:3121(title)
 msgid "Pipe to Program:"
 msgstr "Encauzar al programa:"
 
-#: C/evolution.xml:2849(para)
+#: C/evolution.xml:3038(para)
 msgid ""
 "Evolution can use an external command to process a message, then process it "
 "based on the return value. Commands used in this way must return an integer. "
@@ -6939,50 +7490,51 @@ msgstr ""
 "deben devolver un entero. Generalmente esto se suele usar para añadir un "
 "filtro de correo spam."
 
-#: C/evolution.xml:2852(title)
+#: C/evolution.xml:3041(title)
 msgid "Junk Test:"
 msgstr "Detección de spam:"
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:2853(para)
+#: C/evolution.xml:3042(para)
 msgid "Filters based on the results of the junk mail test."
 msgstr "Filtros basados en los resultados de las pruebas de spam."
 
-#: C/evolution.xml:2856(title)
+#: C/evolution.xml:3045(title)
 msgid "Select the Criteria for the Condition:"
 msgstr "Seleccione el Criterio para la Condición:"
 
-#: C/evolution.xml:2857(para)
-msgid "If you want multiple criteria for this filter, click Add and repeat step 4."
+#: C/evolution.xml:3046(para)
+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."
 
-#: C/evolution.xml:2860(title)
+#: C/evolution.xml:3049(title)
 msgid "Select the Actions for the Filter in the Then Section:"
 msgstr "Seleccione las Acciones para el filtro en la sección Entonces:"
 
-#: C/evolution.xml:2861(para)
+#: C/evolution.xml:3050(para)
 msgid "Select any of the following options."
 msgstr "Seleccione cualqueira de la siguientes opciones."
 
-#: C/evolution.xml:2866(title)
+#: C/evolution.xml:3055(title)
 msgid "Move to Folder:"
 msgstr "Mover a la carpeta:"
 
-#: C/evolution.xml:2867(para)
+#: C/evolution.xml:3056(para)
 msgid "Moves the message into a folder you specify."
 msgstr "Mueve el mensaje dentro de la carpeta que especifique."
 
-#: C/evolution.xml:2872(title)
+#: C/evolution.xml:3061(title)
 msgid "Copy to Folder:"
 msgstr "Copar a la carpeta:"
 
-#: C/evolution.xml:2873(para)
+#: C/evolution.xml:3062(para)
 msgid "Puts a copy of the message into a folder you specify."
 msgstr "Pone una copia del mensaje en la carpeta que especifique."
 
-#: C/evolution.xml:2879(para)
+#: C/evolution.xml:3068(para)
 msgid ""
 "Marks the message for deletion. The message can be undeleted until you "
 "expunge or empty the trash."
@@ -6990,11 +7542,11 @@ msgstr ""
 "Marca el mensaje para borrarlo. Sigue siendo posible recuperar el mensaje de "
 "nuevo, al menos hasta que seleccione Purgar el correo."
 
-#: C/evolution.xml:2884(title)
+#: C/evolution.xml:3073(title)
 msgid "Stop Processing:"
 msgstr "Parar de procesar:"
 
-#: C/evolution.xml:2885(para)
+#: C/evolution.xml:3074(para)
 msgid ""
 "Select this if you want to all other filters ignore this message. Note that "
 "only filters listed after this particular rule will be ignored."
@@ -7003,35 +7555,35 @@ msgstr ""
 "mensaje. Note que sólo los filtros listados después de esta regla en "
 "particular, se ignorarán."
 
-#: C/evolution.xml:2890(title)
+#: C/evolution.xml:3079(title)
 msgid "Assign Color:"
 msgstr "Asignar color:"
 
-#: C/evolution.xml:2891(para)
+#: C/evolution.xml:3080(para)
 msgid "Marks the message with a color of your choice."
 msgstr "Marca el mensaje con un color de su elección."
 
-#: C/evolution.xml:2896(title)
+#: C/evolution.xml:3085(title)
 msgid "Assign Score:"
 msgstr "Asignar puntuación:"
 
-#: C/evolution.xml:2897(para)
+#: C/evolution.xml:3086(para)
 msgid "Assigns the message a numeric score."
 msgstr "Asigna al mensaje una puntuación numérica."
 
-#: C/evolution.xml:2902(title)
+#: C/evolution.xml:3091(title)
 msgid "Adjust Score:"
 msgstr "Ajustar puntuación:"
 
-#: C/evolution.xml:2903(para)
+#: C/evolution.xml:3092(para)
 msgid "Changes the numeric score by the amount you set."
 msgstr "Cambia la puntuación numérica por la cantidad que establezca."
 
-#: C/evolution.xml:2908(title)
+#: C/evolution.xml:3097(title)
 msgid "Set Status:"
 msgstr "Poner estado:"
 
-#: C/evolution.xml:2909(para)
+#: C/evolution.xml:3098(para)
 msgid ""
 "Sets the status of the message. The status can be Replied To, Draft, "
 "Important, Read, or Junk."
@@ -7039,11 +7591,11 @@ msgstr ""
 "Establece el estado del mensaje. El estado puede ser Respondió a, Borrador, "
 "Importante, Leído, o SPAM."
 
-#: C/evolution.xml:2914(title)
+#: C/evolution.xml:3103(title)
 msgid "Unset Status:"
 msgstr "Quitar estado:"
 
-#: C/evolution.xml:2915(para)
+#: C/evolution.xml:3104(para)
 msgid ""
 "If the message has a status value, unsets it. If a status value is not set, "
 "it does nothing."
@@ -7051,23 +7603,19 @@ msgstr ""
 "Si el mensaje tiene un estado, lo elimina. Si no tiene establecido un "
 "estado, no hace nada."
 
-#: C/evolution.xml:2920(title)
-msgid "Beep:"
-msgstr "Pitar:"
-
-#: C/evolution.xml:2921(para)
+#: C/evolution.xml:3110(para)
 msgid "Makes the system beep."
 msgstr "Hace que el sistema pite."
 
-#: C/evolution.xml:2926(title)
+#: C/evolution.xml:3115(title)
 msgid "Play Sound:"
 msgstr "Reproducir un sonido:"
 
-#: C/evolution.xml:2927(para)
+#: C/evolution.xml:3116(para)
 msgid "Select a sound file for Evolution to play."
 msgstr "Seleccione un archivo de sonido para que Evolution lo reproduzca."
 
-#: C/evolution.xml:2933(para)
+#: C/evolution.xml:3122(para)
 msgid ""
 "Sends the message to a program of your choice. No return value is expected. "
 "This feature can be used to create automatic Web postings from email "
@@ -7079,35 +7627,36 @@ msgstr ""
 "desde mensajes de correo o para realizar procesados posteriores adicionales "
 "que no estén soportados por Evolution."
 
-#: C/evolution.xml:2938(title)
+#: C/evolution.xml:3127(title)
 msgid "Run Program:"
 msgstr "Ejecutar programa:"
 
-#: C/evolution.xml:2939(para)
+#: C/evolution.xml:3128(para)
 msgid "Evolution runs an application."
 msgstr "Evolution ejecutar una aplicación."
 
-#: C/evolution.xml:2945(para)
+#: 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:2951(para)
+#: C/evolution.xml:3140(para)
 msgid "There is an easy shortcut for fast filter or search folder creation:"
 msgstr ""
 "Existe un atajo sencillo para los filtros rápidos o creación de carpetas de "
 "búsqueda:"
 
-#: C/evolution.xml:2954(para)
+#: C/evolution.xml:3143(para)
 msgid "Right-click the message in the message list."
 msgstr ""
 "Pulse con el botón derecho del ratón sobre el mensaje en la lista de "
 "mensajes."
 
-#: C/evolution.xml:2957(para)
+#: C/evolution.xml:3146(para)
 msgid "Select one of the items under the Create Rule From Message submenu."
 msgstr "Seleccione uno de los elementos bajo Crear regla del submenú Mensaje."
 
-#: C/evolution.xml:2958(para)
+#: C/evolution.xml:3147(para)
 msgid ""
 "Creating a rule based on a message opens the filter creation tool with some "
 "of the information about the message already filled in for your convenience."
@@ -7115,7 +7664,7 @@ msgstr ""
 "Crear una regla basada en un mensaje abre la herramienta de creación de "
 "filtros con alguna de la información acerca del mensaje ya introducida."
 
-#: C/evolution.xml:2961(para)
+#: C/evolution.xml:3150(para)
 msgid ""
 "If you have several filters that match a single message, they are all "
 "applied to the message in order, unless one of the filters has the Stop "
@@ -7127,7 +7676,7 @@ msgstr ""
 "usa esta acción en un filtro, el mensaje afectado no volverá a ser procesado "
 "por ningún otro filtro."
 
-#: C/evolution.xml:2962(para)
+#: C/evolution.xml:3151(para)
 msgid ""
 "When you first open the Filters dialog box, you are shown the list of "
 "filters sorted in the order in which they will be applied. You can move them "
@@ -7137,27 +7686,27 @@ msgstr ""
 "por el orden de aplicación de los mismos. Puede moverlos arriba y abajo, "
 "modificando así su prioridad pulsando los botones Arriba y Abajo."
 
-#: C/evolution.xml:2966(title)
+#: C/evolution.xml:3155(title)
 msgid "Editing Filters"
 msgstr "Editar de filtros"
 
-#: C/evolution.xml:2972(para)
+#: C/evolution.xml:3161(para)
 msgid "Select the filter to edit, then click Edit."
 msgstr "Seleccione el filtro a editar, después puse Editar."
 
-#: C/evolution.xml:2975(para)
+#: C/evolution.xml:3164(para)
 msgid "Make the desired corrections, then click OK twice."
 msgstr "Haga las correcciones que desee, después pulse Aceptar dos veces."
 
-#: C/evolution.xml:2981(title)
+#: C/evolution.xml:3170(title)
 msgid "Deleting Filters"
 msgstr "Borrar filtros"
 
-#: C/evolution.xml:2987(para)
+#: C/evolution.xml:3176(para)
 msgid "Select the filter to remove, then click Remove."
 msgstr "Seleccione el filtro a eliminar, después pulse Quitar."
 
-#: C/evolution.xml:2998(para)
+#: C/evolution.xml:3187(para)
 msgid ""
 "If filters aren't flexible enough, or you find yourself performing the same "
 "search again and again, consider a search folder. Search folders are an "
@@ -7172,7 +7721,7 @@ msgstr ""
 "cantidad de correo u olvida con frecuencia dónde pone sus mensajes, entonces "
 "las carpetas de búsqueda le ayudarán a mantener las cosas organizadas."
 
-#: C/evolution.xml:2999(para)
+#: C/evolution.xml:3188(para)
 msgid ""
 "A search folder is really a hybrid of all the other organizational tools: it "
 "looks like a folder, it acts like a search, and you set it up like a filter. "
@@ -7189,7 +7738,7 @@ msgstr ""
 "diferentes. Los mensajes incluidos son identificados al vuelo mediante un "
 "conjunto de criterios elegidos de antemano."
 
-#: C/evolution.xml:3000(para)
+#: C/evolution.xml:3189(para)
 msgid ""
 "As messages that meet the search folder criteria arrive or are deleted, "
 "Evolution automatically adjusts the search folder contents. When you delete "
@@ -7202,7 +7751,7 @@ msgstr ""
 "donde existe realmente, así como de cualquier carpeta de búsqueda con la que "
 "es posible consultarlo."
 
-#: C/evolution.xml:3001(para)
+#: C/evolution.xml:3190(para)
 msgid ""
 "The Unmatched Search Folder is the opposite of other search folders: it "
 "displays all messages that do not appear in other search folders."
@@ -7211,7 +7760,7 @@ msgstr ""
 "carpetas de búsqueda: contiene todos los mensajes que no cumplen los "
 "criterios satisfechos por las demás carpetas de búsqueda."
 
-#: C/evolution.xml:3002(para)
+#: C/evolution.xml:3191(para)
 msgid ""
 "If you use remote email storage like IMAP or Microsoft Exchange, and have "
 "created search folders to search through them, the Unmatched Search Folder "
@@ -7219,13 +7768,13 @@ msgid ""
 "that search remote mail stores, the Unmatched Search Folder does not search "
 "in them either."
 msgstr ""
-"Si usa un sistema de almacenamiento remoto como IMAP o Microsoft Exchange, y ha "
-"creado carpetas de búsqueda en ellos, la carpeta de búsqueda no coincidente "
-"también explora las carpetas en ellos. Si no crea ninguna carpeta de búsqueda "
-"que busque en almacenes de correo remotos, la carpeta de búsqueda No coincidente "
-"tampoco los buscará."
+"Si usa un sistema de almacenamiento remoto como IMAP o Microsoft Exchange, y "
+"ha creado carpetas de búsqueda en ellos, la carpeta de búsqueda no "
+"coincidente también explora las carpetas en ellos. Si no crea ninguna "
+"carpeta de búsqueda que busque en almacenes de correo remotos, la carpeta de "
+"búsqueda No coincidente tampoco los buscará."
 
-#: C/evolution.xml:3003(para)
+#: C/evolution.xml:3192(para)
 msgid ""
 "As an example of using folders, searches, and search folders, consider the "
 "following: To organize his mailbox, Jim sets up a search folder for email "
@@ -7238,22 +7787,24 @@ msgid ""
 "in the <quote>Anna</quote> search folder and in the <quote>Internal "
 "Evolution Discussion</quote> search folder."
 msgstr ""
-"Como ejemplo de uso de las carpetas, búsquedas y carpetas de búsqueda considere lo "
-"siguiente: Para organizar su buzón de correo, Juan define una carpeta de búsqueda para los correos "
-"enviados por su amiga y compañera de trabajo Ana. También tiene otra carpeta de búsqueda para "
-"los mensajes que incluyen novell.com en la dirección, y Evolution en la línea de asunto, "
-"con el fin de conservar el seguimiento de lo que sus compañeros de trabajo le envían acerca de "
-"Evolution. Si Ana le envía un mensaje acerca de cualquier otro tema distinto de Evolution, "
-"éste sólo aparece en la carpeta de búsqueda llamada <quote>Ana</quote>. Cuando Ana le envía "
-"un correo acerca de la interfaz de usuario de Evolution, el mensaje aparece tanto "
-"en la carpeta de búsqueda <quote>Ana</quote> como también en la carpeta de búsqueda "
+"Como ejemplo de uso de las carpetas, búsquedas y carpetas de búsqueda "
+"considere lo siguiente: Para organizar su buzón de correo, Juan define una "
+"carpeta de búsqueda para los correos enviados por su amiga y compañera de "
+"trabajo Ana. También tiene otra carpeta de búsqueda para los mensajes que "
+"incluyen novell.com en la dirección, y Evolution en la línea de asunto, con "
+"el fin de conservar el seguimiento de lo que sus compañeros de trabajo le "
+"envían acerca de Evolution. Si Ana le envía un mensaje acerca de cualquier "
+"otro tema distinto de Evolution, éste sólo aparece en la carpeta de búsqueda "
+"llamada <quote>Ana</quote>. Cuando Ana le envía un correo acerca de la "
+"interfaz de usuario de Evolution, el mensaje aparece tanto en la carpeta de "
+"búsqueda <quote>Ana</quote> como también en la carpeta de búsqueda "
 "<quote>Debate interno acerca de Evolution</quote>."
 
-#: C/evolution.xml:3006(title)
+#: C/evolution.xml:3195(title)
 msgid "Creating A Search Folder"
 msgstr "Crear una carpeta de búsqueda"
 
-#: C/evolution.xml:3009(para)
+#: C/evolution.xml:3198(para)
 msgid ""
 "Click Message &gt; Create Rule, then select a search folder based on "
 "Subject, Sender, Recipient, or Mailing List."
@@ -7261,13 +7812,13 @@ msgstr ""
 "Pulse Mensaje &gt; Crear regla, después seleccione una carpeta de búsqueda "
 "basada en el Asunto, Remitente, Destinatario o Lista de correo."
 
-#: C/evolution.xml:3011(para)
+#: C/evolution.xml:3200(para)
 msgid "Select Search menu &gt; Create Search Folder From Search."
 msgstr ""
 "Seleccione el menú Buscar &gt; Crear una carpeta de búsqueda desde la "
 "búsqueda."
 
-#: C/evolution.xml:3013(para)
+#: C/evolution.xml:3202(para)
 msgid ""
 "Perform this operation from the search results. Create a search folder from "
 "search is enabled only when you already have performed a search."
@@ -7276,17 +7827,17 @@ msgstr ""
 "búsqueda desde la búsqueda está activado sólo si ya ha realizado una "
 "búsqueda."
 
-#: C/evolution.xml:3016(para)
+#: C/evolution.xml:3205(para)
 msgid "Select Edit &gt; Search Folder"
 msgstr "Seleccione Editar &gt; Carpeta de búsqueda"
 
-#: C/evolution.xml:3024(para)
+#: C/evolution.xml:3213(para)
 msgid "Type the name of the search folder in the Search name field."
 msgstr ""
 "Escriba el nombre de la carpeta de búsqueda en el campo Nombre de la "
 "búsqueda."
 
-#: C/evolution.xml:3027(para)
+#: C/evolution.xml:3216(para)
 msgid ""
 "Select your search criteria. For each criterion, you must first select which "
 "of the following parts of the message you want the search to examine. The "
@@ -7297,19 +7848,19 @@ msgstr ""
 "similares a los de los filtros."
 
 # index.docbook:458, index.docbook:949
-#: C/evolution.xml:3030(para)
+#: C/evolution.xml:3219(para)
 msgid "Sender's address."
 msgstr "La dirección del remitente."
 
-#: C/evolution.xml:3033(title)
+#: C/evolution.xml:3222(title)
 msgid "Recipients:"
 msgstr "Destinatarios:"
 
-#: C/evolution.xml:3045(title)
+#: C/evolution.xml:3234(title)
 msgid "Expression (For programmers only):"
 msgstr "Expresión (sólo para programadores):"
 
-#: C/evolution.xml:3046(para)
+#: C/evolution.xml:3235(para)
 msgid ""
 "Match a message according to an expression you write in the Scheme language "
 "used to define filters in Evolution."
@@ -7317,31 +7868,33 @@ msgstr ""
 "Busca un mensaje que coincida con una expresión escrita en lenguaje Scheme, "
 "utilizado para definir filtros en Evolution."
 
-#: C/evolution.xml:3073(title)
+#: C/evolution.xml:3262(title)
 msgid "Follow Up:"
 msgstr "Seguimiento:"
 
-#: C/evolution.xml:3081(title)
+#: C/evolution.xml:3270(title)
 msgid "Mailing List:"
 msgstr "Lista de correo:"
 
-#: C/evolution.xml:3085(title)
+#: C/evolution.xml:3274(title)
 msgid "Match all:"
 msgstr "Coincidir con todo:"
 
-#: C/evolution.xml:3086(para)
+#: C/evolution.xml:3275(para)
 msgid "Checks whether the message matchs all the criteria listed."
 msgstr "Comprueba si el mensaje coincide con todos los criterios listados."
 
-#: C/evolution.xml:3090(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:"
+#: 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:"
 
-#: C/evolution.xml:3092(title)
+#: C/evolution.xml:3281(title)
 msgid "All local folders:"
 msgstr "Todas las carpetas locales:"
 
-#: C/evolution.xml:3093(para)
+#: C/evolution.xml:3282(para)
 msgid ""
 "Uses all local folders for the search folder source in addition to "
 "individual folders that are selected."
@@ -7349,11 +7902,11 @@ msgstr ""
 "Usa todas las carpetas locales para la fuente de la carpeta de búsqueda, "
 "además de las carpetas individuales seleccionadas."
 
-#: C/evolution.xml:3096(title)
+#: C/evolution.xml:3285(title)
 msgid "All active remote folders:"
 msgstr "Todas las carpetas remotas activas:"
 
-#: C/evolution.xml:3097(para)
+#: C/evolution.xml:3286(para)
 msgid ""
 "Remote folders are considered active if you are connected to the server; you "
 "must be connected to your mail server for the search folder to include any "
@@ -7365,11 +7918,11 @@ msgstr ""
 "para poder incluir cualquier mensaje de dicho origen además de las carpetas "
 "individuales seleccionadas."
 
-#: C/evolution.xml:3100(title)
+#: C/evolution.xml:3289(title)
 msgid "All local and active remote folders:"
 msgstr "Todas las carpetas locales y remotas activas:"
 
-#: C/evolution.xml:3101(para)
+#: C/evolution.xml:3290(para)
 msgid ""
 "Uses all local and active remote folders for the search folder source in "
 "addition to individual folders that are selected."
@@ -7377,27 +7930,27 @@ msgstr ""
 "Usa todas las carpetas activas remotas y locales para la fuente de la "
 "carpeta de búsqueda, además de las carpetas individuales seleccionadas."
 
-#: C/evolution.xml:3104(title)
+#: C/evolution.xml:3293(title)
 msgid "Specific folders only:"
 msgstr "Únicamente carpetas especificadas:"
 
-#: C/evolution.xml:3105(para)
+#: C/evolution.xml:3294(para)
 msgid "Uses individual folders for the search folder source."
 msgstr "Usa carpetas individuales para la fuente de carpeta de búsqueda."
 
-#: C/evolution.xml:3107(para)
+#: C/evolution.xml:3296(para)
 msgid "If you select Specific folders only,"
 msgstr "Si selecciona Únicamente carpetas especificadas,"
 
-#: C/evolution.xml:3110(para)
+#: C/evolution.xml:3299(para)
 msgid "click Add button to open the Select folder window."
 msgstr "pulse el botón Añadir para abrir la ventana Seleccionar carpeta."
 
-#: C/evolution.xml:3117(para)
+#: C/evolution.xml:3306(para)
 msgid "Select the folder and press Add button."
 msgstr "Seleccione la carpeta y pulse el botón Añadir."
 
-#: C/evolution.xml:3120(para)
+#: C/evolution.xml:3309(para)
 msgid ""
 "You can view the folder added to the list in the entry box at the bottom of "
 "the New Search Folder window."
@@ -7405,7 +7958,7 @@ msgstr ""
 "Puede ver la carpeta añadida a la lista de carpetas en la caja de texto de "
 "la parte inferior de la ventana Carpeta de búsqueda nueva."
 
-#: C/evolution.xml:3131(para)
+#: C/evolution.xml:3320(para)
 msgid ""
 "Evolution can check for junk mail for you. Evolution uses SpamAssassin and/"
 "or Bogofilter with trainable Bayesian filters to perform the spam check. "
@@ -7416,10 +7969,10 @@ msgstr ""
 "Evolution comprueba el correo basura. Evolution usa SpamAssasin y/o "
 "Bogofilter con filtros Bayesianos entrenables para realizar la comprobación "
 "de SPAM. Cuando el software detecta correo que parece ser correo basura, lo "
-"marcará y ocultará de su vista. Los mensajes marcados como correo basura sólo "
-"se muestran en la carpeta SPAM."
+"marcará y ocultará de su vista. Los mensajes marcados como correo basura "
+"sólo se muestran en la carpeta SPAM."
 
-#: C/evolution.xml:3132(para)
+#: C/evolution.xml:3321(para)
 msgid ""
 "The junk mail filter can learn which kinds of mail are legitimate and which "
 "are not if you train it. When you first start using junk mail blocking, "
@@ -7432,16 +7985,15 @@ msgid ""
 msgstr ""
 "El filtro de correo basura puede aprender qué tipos de correo son legítimos "
 "y cuales no, si lo entrena. Cuando comience a usar el bloqueador de correo "
-"basura, compruebe la carpeta SPAM para asegurarse de que el correo "
-"legítimo no se marca como correo basura. Si el correo bueno se marca "
-"incorrectamente, quítelo de la carpeta SPAM pulsando con el botón derecho "
-"y seleccionando Marcar como no SPAM o pulsando Mayús+Ctrl+J. Si Evolution "
-"falla algún correo basura, pulse con el botón derecho sobre el mensaje, "
-"después pulse Marcar como SPAM o Ctrl+J. Cuando lo corrija, el filtro puede "
-"reconocer mensajes similares para el futuro y se hace más preciso a medida "
-"que pasa el tiempo."
+"basura, compruebe la carpeta SPAM para asegurarse de que el correo legítimo "
+"no se marca como correo basura. Si el correo bueno se marca incorrectamente, "
+"quítelo de la carpeta SPAM pulsando con el botón derecho y seleccionando "
+"Marcar como no SPAM o pulsando Mayús+Ctrl+J. Si Evolution falla algún correo "
+"basura, pulse con el botón derecho sobre el mensaje, después pulse Marcar "
+"como SPAM o Ctrl+J. Cuando lo corrija, el filtro puede reconocer mensajes "
+"similares para el futuro y se hace más preciso a medida que pasa el tiempo."
 
-#: C/evolution.xml:3133(para)
+#: C/evolution.xml:3322(para)
 msgid ""
 "Every filter needs to learn at the least 100 spam and 100 ham to start "
 "working. For that, you must mark each message manually by clicking the "
@@ -7454,7 +8006,7 @@ msgstr ""
 "aprenda que es correo válido. El botón <emphasis>SPAM</emphasis> aprende qué "
 "mensajes son SPAM."
 
-#: C/evolution.xml:3134(para)
+#: C/evolution.xml:3323(para)
 msgid ""
 "To change your junk mail filtering preferences, click Edit &gt; Preferences, "
 "then click Mail Preferences."
@@ -7462,7 +8014,7 @@ msgstr ""
 "Para cambiar sus preferencias de filtrado de correo basura, pulse Editar "
 "&gt; Preferencias, después pulse Opciones de correo."
 
-#: C/evolution.xml:3135(para) C/evolution.xml:5659(para)
+#: C/evolution.xml:3324(para) C/evolution.xml:5905(para)
 msgid ""
 "For additional information on junk content, see <link linkend=\"mail-prefs-"
 "junk\">Junk Mail Preferences</link>."
@@ -7470,7 +8022,7 @@ msgstr ""
 "Para información adicional acerca del correo basura, vea <link linkend="
 "\"mail-prefs-junk\">Preferencias de spam</link>."
 
-#: C/evolution.xml:3136(para)
+#: C/evolution.xml:3325(para)
 msgid ""
 "For additional junk mail settings, see <link linkend=\"more-mail-options"
 "\">Receiving Mail Options</link>."
@@ -7478,7 +8030,7 @@ msgstr ""
 "Para ver ajustes de correo basura adicionales, consulte <link linkend=\"more-"
 "mail-options\">Opciones de recepción de correo</link>."
 
-#: C/evolution.xml:3138(para)
+#: C/evolution.xml:3327(para)
 msgid ""
 "SpamAssassin is an application that scan through the mail box to find junk "
 "mail. Evolution uses SpamAssassin as the default spam-filtering application. "
@@ -7491,7 +8043,7 @@ msgstr ""
 "\"http://spamassassin.apache.org/\">El proyecto SpamAssasin de Apache</"
 "ulink>."
 
-#: C/evolution.xml:3139(para)
+#: C/evolution.xml:3328(para)
 msgid ""
 "Bogofilter is a mail filter that classifies mail as spam or ham (non-spam) "
 "by a statistical analysis of the message's header and content (body). It is "
@@ -7506,7 +8058,7 @@ msgstr ""
 "consulte <ulink url=\"http://bogofilter.sourceforge.net/\">el sitio de "
 "Bogofilter</ulink>."
 
-#: C/evolution.xml:3146(para)
+#: C/evolution.xml:3335(para)
 msgid ""
 "This section shows you how to use the <trademark>Evolution</trademark> "
 "contacts tool to organize any amount of contact information, share addresses "
@@ -7517,27 +8069,27 @@ msgstr ""
 "información sobre contactos, compartir direcciones a través de una red y "
 "ahorrar tiempo con las tareas cotidianas."
 
-#: C/evolution.xml:3149(link) C/evolution.xml:3166(title)
+#: C/evolution.xml:3338(link) C/evolution.xml:3355(title)
 msgid "Contacts and Cards"
 msgstr "Contactos y tarjetas"
 
-#: C/evolution.xml:3152(link) C/evolution.xml:3258(title)
+#: C/evolution.xml:3341(link) C/evolution.xml:3504(title)
 msgid "Searching for Contacts"
 msgstr "Búsqueda de contactos"
 
-#: C/evolution.xml:3155(link) C/evolution.xml:3409(title)
+#: C/evolution.xml:3344(link) C/evolution.xml:3655(title)
 msgid "Organizing your Contacts"
 msgstr "Organizar sus contactos"
 
-#: C/evolution.xml:3158(link) C/evolution.xml:3525(title)
+#: C/evolution.xml:3347(link) C/evolution.xml:3771(title)
 msgid "LDAP: Shared Address Books on a Network"
 msgstr "LDAP: libretas de direcciones compartidas en una red"
 
-#: C/evolution.xml:3161(link) C/evolution.xml:3548(title)
+#: C/evolution.xml:3350(link) C/evolution.xml:3794(title)
 msgid "Send Me a Card: Adding New Cards Quickly"
 msgstr "Envíeme una tarjeta: Cómo añadir tarjetas rápidamente"
 
-#: C/evolution.xml:3167(para)
+#: C/evolution.xml:3356(para)
 msgid ""
 "Contacts are the individuals you have chosen to add to your address book so "
 "you can keep track of information about them and send email to them. In "
@@ -7550,15 +8102,16 @@ msgstr ""
 "direcciones para mantener un seguimiento de la información sobre ellos y "
 "enviarles correos electrónicos. En Evolution, un contacto individual se "
 "llama tarjeta. Para obtener más información acerca de cómo organizar su "
-"lista de contactos consulte <link linkend=\"usage-contact-organize\">Organizar "
-"sus contactos</link>. Para aprender a configurar la herramienta de contactos "
-"consulte <link linkend=\"config-prefs-contact\">Gestión de contactos</link>."
+"lista de contactos consulte <link linkend=\"usage-contact-organize"
+"\">Organizar sus contactos</link>. Para aprender a configurar la herramienta "
+"de contactos consulte <link linkend=\"config-prefs-contact\">Gestión de "
+"contactos</link>."
 
-#: C/evolution.xml:3170(title)
+#: C/evolution.xml:3359(title)
 msgid "The Contact Editor"
 msgstr "El editor de contactos"
 
-#: C/evolution.xml:3171(para)
+#: C/evolution.xml:3360(para)
 msgid ""
 "If you want to add or change cards, use the contact editor. You can edit "
 "email address, telephone numbers, mailer addresses and all other contact "
@@ -7569,23 +8122,23 @@ msgstr ""
 "mensajería instantánea y el resto de la información que ha introducido para "
 "un contacto en particular."
 
-#: C/evolution.xml:3172(para)
+#: C/evolution.xml:3361(para)
 msgid "The contact editor window has three tabs:"
 msgstr "La ventana del editor de contactos tiene tres solapas:"
 
-#: C/evolution.xml:3174(title)
+#: C/evolution.xml:3363(title)
 msgid "Contact:"
 msgstr "Contacto:"
 
-#: C/evolution.xml:3175(para)
+#: C/evolution.xml:3364(para)
 msgid "Contains basic contact information."
 msgstr "Contiene la información básica del contacto."
 
-#: C/evolution.xml:3178(title)
+#: C/evolution.xml:3367(title)
 msgid "Personal Information:"
 msgstr "Información personal:"
 
-#: C/evolution.xml:3179(para)
+#: C/evolution.xml:3368(para)
 msgid ""
 "Contains a more specific description of the person, including URLs for "
 "calendar and free/busy information."
@@ -7593,15 +8146,15 @@ msgstr ""
 "Contiene una descripción más específica de la persona, incluyendo URL para "
 "el calendario e información de disponibilidad."
 
-#: C/evolution.xml:3182(title)
+#: C/evolution.xml:3371(title)
 msgid "Mailing Address:"
 msgstr "Dirección de correo:"
 
-#: C/evolution.xml:3183(para)
+#: C/evolution.xml:3372(para)
 msgid "Contains the individual's mailing address."
 msgstr "Contiene las direcciones de correo individuales."
 
-#: C/evolution.xml:3185(para)
+#: C/evolution.xml:3374(para)
 msgid ""
 "You can also the Forward Contact menu item in the Action menu, which opens a "
 "new message with the card already attached, and Send Message to Contact, "
@@ -7611,7 +8164,7 @@ msgstr ""
 "un nuevo mensaje con la tarjeta adjuntada, y Enviar mensaje al contacto, que "
 "abrirá un nuevo mensaje con la dirección de correo-e del contacto."
 
-#: C/evolution.xml:3186(para)
+#: C/evolution.xml:3375(para)
 msgid ""
 "You can add a card from within an email message or calendar appointment. In "
 "an open email, right-click any email address or message, and click Add to "
@@ -7622,7 +8175,7 @@ msgstr ""
 "dirección o mensaje de correo electrónico, y elija en el menú Añadir a la "
 "libreta de direcciones o seleccione Añadir remitente a la libreta."
 
-#: C/evolution.xml:3187(para)
+#: C/evolution.xml:3376(para)
 msgid ""
 "Most of the items in the contact editor simply display the information you "
 "enter, but some of them have additional features:"
@@ -7631,11 +8184,11 @@ msgstr ""
 "la información que haya introducido, pero algunos de ellos tienen "
 "características adicionales:"
 
-#: C/evolution.xml:3189(title)
+#: C/evolution.xml:3378(title)
 msgid "Full Name:"
 msgstr "Nombre completo:"
 
-#: C/evolution.xml:3190(para)
+#: C/evolution.xml:3379(para)
 msgid ""
 "Specify the name of your contact here. You can type a name into the Full "
 "Name field, but you can also click the Full Name button to bring up a small "
@@ -7651,25 +8204,26 @@ msgid ""
 "quote> has two words, and to sort it correctly you must enter de Icaza, "
 "Miguel in the File As entry."
 msgstr ""
-"Especifique aquí el nombre de su contacto. Puede escribir un nombre dentro del campo Nombre completo, "
-"pero también puede pulsar el botón Nombre completo para mostrar una pequeña "
-"caja de diálogo con cajas de texto para nombre y apellido, títulos como <quote>Sr.</quote> "
-"o <quote>Su excelencia</quote>, y sufijos como <quote>Hijo</quote>. "
-"El nombre completo también interactúa con la caja Archivar como para ayudarle a "
-"organizar sus contactos y manejar apellidos multipalabra. Para ver cómo "
-"funciona escriba un nombre en el campo Nombre completo. Como ejemplo usaremos Miguel "
-"de Icaza. Notará que en campo Archivar como también se rellena, pero en "
-"orden inverso: Icaza, Miguel de. Si ha introducido Ignacio Sopelana Matamoros, el editor de "
+"Especifique aquí el nombre de su contacto. Puede escribir un nombre dentro "
+"del campo Nombre completo, pero también puede pulsar el botón Nombre "
+"completo para mostrar una pequeña caja de diálogo con cajas de texto para "
+"nombre y apellido, títulos como <quote>Sr.</quote> o <quote>Su excelencia</"
+"quote>, y sufijos como <quote>Hijo</quote>. El nombre completo también "
+"interactúa con la caja Archivar como para ayudarle a organizar sus contactos "
+"y manejar apellidos multipalabra. Para ver cómo funciona escriba un nombre "
+"en el campo Nombre completo. Como ejemplo usaremos Miguel de Icaza. Notará "
+"que en campo Archivar como también se rellena, pero en orden inverso: Icaza, "
+"Miguel de. Si ha introducido Ignacio Sopelana Matamoros, el editor de "
 "contactos debería haber adivinado que la entrada debería archivarse como "
 "<quote>Matamoros, Ignacio S.</quote>. No obstante el apellido de Miguel, "
 "<quote>de Icaza</quote>, tiene dos palabras y para ordenarlo correctamente "
 "debe introducir de Icaza, Miguel en el campo Archivar como."
 
-#: C/evolution.xml:3193(title)
+#: C/evolution.xml:3382(title)
 msgid "Where:"
 msgstr "Dónde:"
 
-#: C/evolution.xml:3194(para)
+#: C/evolution.xml:3383(para)
 msgid ""
 "Select one of your address books as the location for this contact. You might "
 "not be able to write to all available address books, especially those on a "
@@ -7679,11 +8233,11 @@ msgstr ""
 "contacto. Quizá no pueda escribir en todas las libretas de direcciones, "
 "especialmente en aquellas de una red."
 
-#: C/evolution.xml:3197(title)
+#: C/evolution.xml:3386(title)
 msgid "Categories:"
 msgstr "Categorías:"
 
-#: C/evolution.xml:3198(para)
+#: C/evolution.xml:3387(para)
 msgid ""
 "Click the Categories button to select categories for this card. If you "
 "assign contact categories, you can then search for contacts using those "
@@ -7696,11 +8250,11 @@ msgstr ""
 "contactos, vea <link linkend=\"usage-contact-organize\">Organizar sus "
 "contactos</link>."
 
-#: C/evolution.xml:3201(title)
+#: C/evolution.xml:3390(title)
 msgid "Free/Busy and Calendar URLs:"
 msgstr "URL de Disponibilidad y Calendario:"
 
-#: C/evolution.xml:3202(para)
+#: C/evolution.xml:3391(para)
 msgid ""
 "Click the Personal Information tab to enter Web addresses for the contact. "
 "If the contact publishes Free/Busy or calendar data online, using a server "
@@ -7714,27 +8268,28 @@ msgstr ""
 "direcciones para esos servidores aquí. Después de hacerlo, puede comprobar "
 "sus horarios cuando cree citas con el Calendario."
 
-#: C/evolution.xml:3207(title)
+#: C/evolution.xml:3396(title)
 msgid "Creating and Editing Contacts"
 msgstr "Crear y editar contactos"
 
-#: C/evolution.xml:3208(para)
+#: C/evolution.xml:3397(para)
 msgid "Follow the steps given below to create a new card."
 msgstr "Siga los pasos dados debajo para crear una nueva tarjeta."
 
-#: C/evolution.xml:3211(para)
+#: C/evolution.xml:3400(para)
 msgid "Click File &gt; New &gt; Contact."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Contacto."
 
-#: C/evolution.xml:3214(para)
+#: 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:3220(para)
+#: C/evolution.xml:3409(para)
 msgid "If you want to change a card that already exists,"
 msgstr "Si quiere modificar una tarjeta que ya existe,"
 
-#: C/evolution.xml:3223(para)
+#: C/evolution.xml:3412(para)
 msgid ""
 "Go to the Contacts window by selecting View &gt; Window &gt; Contacts from "
 "the menubar."
@@ -7742,31 +8297,32 @@ msgstr ""
 "Vaya a la ventana de Contactos seleccionando Ver &gt; Ventana &gt; Contactos "
 "desde la barra de menú."
 
-#: C/evolution.xml:3226(para)
+#: C/evolution.xml:3415(para)
 msgid "Double click on the card you want to edit."
 msgstr "Pulse dos veces en la tarjeta que quiera editar."
 
-#: C/evolution.xml:3229(para) C/evolution.xml:3249(para)
+#: C/evolution.xml:3418(para) C/evolution.xml:3438(para)
 msgid "Edit the information in the Contact Editor window."
 msgstr "Edite la información en la ventana del editor de contactos."
 
-#: C/evolution.xml:3235(para)
+#: C/evolution.xml:3424(para)
 msgid "You can also edit the contact information from the preview pane."
 msgstr ""
 "También puede editar la información del contacto desde el panel de vista "
 "previa."
 
-#: C/evolution.xml:3238(para)
+#: 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:3241(para)
+#: C/evolution.xml:3430(para)
 msgid "Select Add to Address Book to bring up the Contact Quick-Add window."
 msgstr ""
 "Seleccione Añadir a la libreta de direcciones para mostrar la ventana Añadir "
 "contacto rápido."
 
-#: C/evolution.xml:3246(para)
+#: C/evolution.xml:3435(para)
 msgid ""
 "Press the Edit Full button at the bottom left to bring up the Contact Editor "
 "window."
@@ -7774,7 +8330,102 @@ msgstr ""
 "Pulse la solapa Editar todo en la parte inferior izquierda para mostrar la "
 "ventana del Editor de contactos."
 
-#: C/evolution.xml:3261(para)
+#: C/evolution.xml:3446(title)
+msgid "Google Contacts"
+msgstr "Contactos de Google"
+
+#: C/evolution.xml:3447(para)
+msgid ""
+"Evolution allows you to access your Google Address Book. You can view the "
+"Google contacts offline and create, modify and delete the contacts online."
+msgstr ""
+"Evolution le permite acceder a su Libreta de direcciones de Google. Puede "
+"ver los contactos de Google cuando esté desconectado y crear, modificar y "
+"borrar elementos del calendario cuando esté conectado."
+
+#: C/evolution.xml:3448(para)
+msgid "To configure your Google Address Book in Evolution contacts:"
+msgstr ""
+"Para configurar su Libreta de direcciones de Google en sus contactos de "
+"Evolution:"
+
+#: C/evolution.xml:3451(para)
+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 "
+"ventana Libreta de direcciones nueva."
+
+#: C/evolution.xml:3456(para) C/evolution.xml:3953(para)
+msgid "Select Google from the Type drop-down list."
+msgstr "Seleccione Google de la lista desplegable de tipos."
+
+#: C/evolution.xml:3459(para)
+msgid "Specify a name for the address book."
+msgstr "Especifique un nombre para la libreta de direcciones."
+
+#: C/evolution.xml:3462(para)
+msgid ""
+"Select or deselect the following options and provide the username for the "
+"Google account:"
+msgstr ""
+"Seleccione o deseleccione las siguientes opciones y proporcione el nombre de "
+"usuario para la cuenta de Google:"
+
+#: C/evolution.xml:3466(title)
+msgid "Mark as default address book:"
+msgstr "Marcar como libreta de direcciones predeterminada:"
+
+#: C/evolution.xml:3467(para)
+msgid ""
+"Select this option to make the Google address book as your default address "
+"book."
+msgstr ""
+"Seleccione esta opción para que la libreta de direcciones de Google sea su "
+"libreta de direcciones predeterminada."
+
+#: C/evolution.xml:3472(title)
+msgid "Copy book content locally for offline operations:"
+msgstr "Copiar el contenido de la carpeta localmente para operar desconectado:"
+
+#: C/evolution.xml:3473(para)
+msgid ""
+"Select this option to copy the address book to your machine so you can "
+"access the contacts even when you are not connected to the network."
+msgstr ""
+"Seleccione esta opción para copiar la libreta de direcciones de su equipo, "
+"así podrá acceder a los contactos incluso cuando no está conectado a la red."
+
+#: C/evolution.xml:3478(title) C/evolution.xml:3968(title)
+msgid "Username:"
+msgstr "Usuario:"
+
+#: C/evolution.xml:3479(para)
+msgid "Specify the username of your Google account."
+msgstr "Especifique su nombre de usuario para su cuenta en Google."
+
+#: C/evolution.xml:3484(title)
+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"
+msgstr ""
+"Seleccione Usar SSL para activar una conexión segura entre Evolution y el "
+"servidor."
+
+#: C/evolution.xml:3490(title)
+msgid "Refresh:"
+msgstr "Actualizar:"
+
+#: C/evolution.xml:3491(para)
+msgid "Set the time to automatically refresh the Google address book."
+msgstr ""
+"Establezca el tiempo para refrescar la libreta de direcciones de Google "
+"automáticamente."
+
+#: C/evolution.xml:3507(para)
 msgid ""
 "Evolution enables you to find the contact address quickly by using "
 "Customized Search. To find the contact address you are looking for, use the "
@@ -7784,28 +8435,29 @@ msgstr ""
 "Búsqueda personalizada. Para buscar la dirección del contacto que está "
 "buscando, use el siguiente procedimiento:"
 
-#: C/evolution.xml:3268(para) C/evolution.xml:4139(para)
-#: C/evolution.xml:4455(para) C/evolution.xml:4691(para)
+#: 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:3271(para)
+#: C/evolution.xml:3517(para)
 msgid "Name begins with"
 msgstr "El nombre empieza por"
 
-#: C/evolution.xml:3274(para)
+#: C/evolution.xml:3520(para)
 msgid "Email begins with"
 msgstr "El correo-e empieza por"
 
-#: C/evolution.xml:3277(para)
+#: C/evolution.xml:3523(para)
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
-#: C/evolution.xml:3282(para)
+#: C/evolution.xml:3528(para)
 msgid "Press Enter to begin the search"
 msgstr "Pulse Intro para iniciar la búsqueda"
 
-#: C/evolution.xml:3285(para)
+#: C/evolution.xml:3531(para)
 msgid ""
 "For a more complex search, select Search Advanced and select criteria that "
 "describe your desired contact:"
@@ -7813,19 +8465,19 @@ msgstr ""
 "Para una búsqueda más compleja, seleccione Búsqueda avanzada y seleccione el "
 "criterio que describe el contacto que desea:"
 
-#: C/evolution.xml:3288(para)
+#: C/evolution.xml:3534(para)
 msgid "Name the rule in the Rule Name field."
 msgstr "Escriba un nombre para la regla en el campo Nombre de la regla."
 
-#: C/evolution.xml:3291(para)
+#: C/evolution.xml:3537(para)
 msgid "Set up your criteria in the Find items field."
 msgstr "Configure el criterio en el campo Buscar elementos."
 
-#: C/evolution.xml:3294(para)
+#: C/evolution.xml:3540(para)
 msgid "Select Add to add additional criteria."
 msgstr "Seleccione Añadir para añadir el criterio adicional."
 
-#: C/evolution.xml:3303(para)
+#: C/evolution.xml:3549(para)
 msgid ""
 "Displays all the contacts that match the built-in criteria you have selected "
 "from the drop-down list at the top left side, just above the Display pane."
@@ -7834,139 +8486,139 @@ msgstr ""
 "seleccionado de la lista desplegable en la parte izquierda, justo encima del "
 "panel de visualización."
 
-#: C/evolution.xml:3305(para)
+#: C/evolution.xml:3551(para)
 msgid "To perform quick search, use the following procedure:"
 msgstr "Para realizar una búsqueda rápida, use el siguiente procedimiento:"
 
-#: C/evolution.xml:3314(para) C/evolution.xml:4207(para)
-#: C/evolution.xml:4558(para) C/evolution.xml:4753(para)
+#: C/evolution.xml:3560(para) C/evolution.xml:4453(para)
+#: C/evolution.xml:4804(para) C/evolution.xml:4999(para)
 msgid "Anniversary"
 msgstr "Aniversario"
 
-#: C/evolution.xml:3317(para) C/evolution.xml:4210(para)
-#: C/evolution.xml:4561(para) C/evolution.xml:4756(para)
+#: C/evolution.xml:3563(para) C/evolution.xml:4456(para)
+#: C/evolution.xml:4807(para) C/evolution.xml:5002(para)
 msgid "Birthday"
 msgstr "Cumpleaños"
 
-#: C/evolution.xml:3320(para) C/evolution.xml:4213(para)
-#: C/evolution.xml:4564(para) C/evolution.xml:4759(para)
+#: C/evolution.xml:3566(para) C/evolution.xml:4459(para)
+#: C/evolution.xml:4810(para) C/evolution.xml:5005(para)
 msgid "Business"
 msgstr "Trabajo"
 
-#: C/evolution.xml:3323(para) C/evolution.xml:4216(para)
-#: C/evolution.xml:4567(para) C/evolution.xml:4762(para)
+#: C/evolution.xml:3569(para) C/evolution.xml:4462(para)
+#: C/evolution.xml:4813(para) C/evolution.xml:5008(para)
 msgid "Competition"
 msgstr "Autocompletado"
 
-#: C/evolution.xml:3326(para) C/evolution.xml:4765(para)
+#: C/evolution.xml:3572(para) C/evolution.xml:5011(para)
 msgid "Favorites"
 msgstr "Favoritos"
 
-#: C/evolution.xml:3329(para) C/evolution.xml:4222(para)
-#: C/evolution.xml:4573(para) C/evolution.xml:4768(para)
+#: C/evolution.xml:3575(para) C/evolution.xml:4468(para)
+#: C/evolution.xml:4819(para) C/evolution.xml:5014(para)
 msgid "Gifts"
 msgstr "Regalos"
 
-#: C/evolution.xml:3332(para) C/evolution.xml:4225(para)
-#: C/evolution.xml:4576(para) C/evolution.xml:4771(para)
+#: C/evolution.xml:3578(para) C/evolution.xml:4471(para)
+#: C/evolution.xml:4822(para) C/evolution.xml:5017(para)
 msgid "Goals/Objectives"
 msgstr "Metas/Objetivos"
 
-#: C/evolution.xml:3335(para) C/evolution.xml:4228(para)
+#: C/evolution.xml:3581(para) C/evolution.xml:4474(para)
 msgid "Holiday"
 msgstr "Fiesta"
 
-#: C/evolution.xml:3338(para) C/evolution.xml:4231(para)
-#: C/evolution.xml:4582(para) C/evolution.xml:4777(para)
+#: C/evolution.xml:3584(para) C/evolution.xml:4477(para)
+#: C/evolution.xml:4828(para) C/evolution.xml:5023(para)
 msgid "Holiday Cards"
 msgstr "Tarjetas de vacaciones"
 
-#: C/evolution.xml:3341(para)
+#: C/evolution.xml:3587(para)
 msgid "Hot Contacts"
 msgstr "Contactos"
 
-#: C/evolution.xml:3344(para) C/evolution.xml:4234(para)
-#: C/evolution.xml:4585(para) C/evolution.xml:4780(para)
+#: C/evolution.xml:3590(para) C/evolution.xml:4480(para)
+#: C/evolution.xml:4831(para) C/evolution.xml:5026(para)
 msgid "Ideas"
 msgstr "Ideas"
 
-#: C/evolution.xml:3347(para) C/evolution.xml:4237(para)
-#: C/evolution.xml:4588(para) C/evolution.xml:4783(para)
+#: C/evolution.xml:3593(para) C/evolution.xml:4483(para)
+#: C/evolution.xml:4834(para) C/evolution.xml:5029(para)
 msgid "International"
 msgstr "Internacional"
 
-#: C/evolution.xml:3350(para) C/evolution.xml:4240(para)
+#: C/evolution.xml:3596(para) C/evolution.xml:4486(para)
 msgid "Key Customer"
 msgstr "Cliente clave"
 
-#: C/evolution.xml:3353(para) C/evolution.xml:4243(para)
-#: C/evolution.xml:4594(para) C/evolution.xml:4789(para)
+#: C/evolution.xml:3599(para) C/evolution.xml:4489(para)
+#: C/evolution.xml:4840(para) C/evolution.xml:5035(para)
 msgid "Miscellaneous"
 msgstr "Miscelánea"
 
-#: C/evolution.xml:3359(para) C/evolution.xml:4249(para)
-#: C/evolution.xml:4600(para) C/evolution.xml:4795(para)
+#: C/evolution.xml:3605(para) C/evolution.xml:4495(para)
+#: C/evolution.xml:4846(para) C/evolution.xml:5041(para)
 msgid "Phone Calls"
 msgstr "Llamadas de teléfono"
 
-#: C/evolution.xml:3365(para) C/evolution.xml:4255(para)
-#: C/evolution.xml:4606(para) C/evolution.xml:4801(para)
+#: C/evolution.xml:3611(para) C/evolution.xml:4501(para)
+#: C/evolution.xml:4852(para) C/evolution.xml:5047(para)
 msgid "Strategies"
 msgstr "Estrategias"
 
-#: C/evolution.xml:3368(para) C/evolution.xml:4258(para)
-#: C/evolution.xml:4609(para) C/evolution.xml:4804(para)
+#: C/evolution.xml:3614(para) C/evolution.xml:4504(para)
+#: C/evolution.xml:4855(para) C/evolution.xml:5050(para)
 msgid "Suppliers"
 msgstr "Proveedores"
 
-#: C/evolution.xml:3371(para) C/evolution.xml:4261(para)
-#: C/evolution.xml:4612(para) C/evolution.xml:4807(para)
+#: C/evolution.xml:3617(para) C/evolution.xml:4507(para)
+#: C/evolution.xml:4858(para) C/evolution.xml:5053(para)
 msgid "Time &amp; Expenses"
 msgstr "Tiempo y gastos"
 
-#: C/evolution.xml:3374(para) C/evolution.xml:4264(para)
-#: C/evolution.xml:4615(para) C/evolution.xml:4810(para)
+#: C/evolution.xml:3620(para) C/evolution.xml:4510(para)
+#: C/evolution.xml:4861(para) C/evolution.xml:5056(para)
 msgid "VIP"
 msgstr "VIP"
 
-#: C/evolution.xml:3377(para) C/evolution.xml:4267(para)
-#: C/evolution.xml:4618(para) C/evolution.xml:4813(para)
+#: C/evolution.xml:3623(para) C/evolution.xml:4513(para)
+#: C/evolution.xml:4864(para) C/evolution.xml:5059(para)
 msgid "Waiting"
 msgstr "Esperando"
 
-#: C/evolution.xml:3380(para)
+#: C/evolution.xml:3626(para)
 msgid "Weather: Cloudy"
 msgstr "Meteorología: Nuboso"
 
-#: C/evolution.xml:3383(para)
+#: C/evolution.xml:3629(para)
 msgid "Weather: Fog"
 msgstr "Meteorología: Niebla"
 
-#: C/evolution.xml:3386(para)
+#: C/evolution.xml:3632(para)
 msgid "Weather: Partly Cloudy"
 msgstr "Meteorología: Parcialmente nuboso"
 
-#: C/evolution.xml:3389(para)
+#: C/evolution.xml:3635(para)
 msgid "Weather: Rain"
 msgstr "Meteorología: Lluvia"
 
-#: C/evolution.xml:3392(para)
+#: C/evolution.xml:3638(para)
 msgid "Weather: Snow"
 msgstr "Meteorología: Nieve"
 
-#: C/evolution.xml:3395(para)
+#: C/evolution.xml:3641(para)
 msgid "Weather: Sunny"
 msgstr "Meteorología: Soleado"
 
-#: C/evolution.xml:3398(para)
+#: C/evolution.xml:3644(para)
 msgid "Weather: Thunderstorms"
 msgstr "Meteorología: Tormenta"
 
-#: C/evolution.xml:3403(para)
+#: C/evolution.xml:3649(para)
 msgid "Evolution displays the desired contacts."
 msgstr "Evolution muestra los contactos deseados."
 
-#: C/evolution.xml:3410(para)
+#: C/evolution.xml:3656(para)
 msgid ""
 "Evolution allows you to organize your contacts. You can create several "
 "individual address books, or contact lists. Within a given address book, you "
@@ -7976,23 +8628,23 @@ msgstr ""
 "libretas de direcciones individuales o grupos de contactos. Dentro de una "
 "libreta de direcciones dada puede tener varias categorías para los contactos."
 
-#: C/evolution.xml:3413(link) C/evolution.xml:3427(title)
+#: C/evolution.xml:3659(link) C/evolution.xml:3673(title)
 msgid "Contacts Groups"
 msgstr "Grupos de contactos"
 
-#: C/evolution.xml:3416(link) C/evolution.xml:3449(title)
+#: C/evolution.xml:3662(link) C/evolution.xml:3695(title)
 msgid "Creating a List of Contacts"
 msgstr "Crear una lista de contactos"
 
-#: C/evolution.xml:3419(link) C/evolution.xml:3481(title)
+#: C/evolution.xml:3665(link) C/evolution.xml:3727(title)
 msgid "Grouping with Categories"
 msgstr "Agrupación por categorías"
 
-#: C/evolution.xml:3422(link) C/evolution.xml:3542(title)
+#: C/evolution.xml:3668(link) C/evolution.xml:3788(title)
 msgid "Configuring Evolution to use LDAP"
 msgstr "Configuración de Evolution para utilizar LDAP"
 
-#: C/evolution.xml:3428(para)
+#: C/evolution.xml:3674(para)
 msgid ""
 "Contacts Groups are nothing but Address Books. The simplest way to organize "
 "contacts is to create additional address books. You can create a new one by "
@@ -8008,7 +8660,7 @@ msgstr ""
 "proporcionar un nombre. Para los contactos en la red debe proporcionar más "
 "información acerca del servidor de contactos al que está intentando acceder."
 
-#: C/evolution.xml:3429(para)
+#: C/evolution.xml:3675(para)
 msgid ""
 "To move a card from one group to another, just drag it from the main display "
 "of contacts and drop it to a different group. You cannot change the contents "
@@ -8018,7 +8670,7 @@ msgstr ""
 "vista general de contactos. No puede modificar el contenido de la mayoría de "
 "los contactos de red."
 
-#: C/evolution.xml:3431(para)
+#: C/evolution.xml:3677(para)
 msgid ""
 "Contacts groups are not the same as contact lists. A contact group is like a "
 "folder or address book full of contacts. A contact list is a single contact "
@@ -8031,11 +8683,11 @@ msgstr ""
 "contactos y generalmente se usa para enviar correos electrónicos a varias "
 "personas a la vez."
 
-#: C/evolution.xml:3436(title)
+#: C/evolution.xml:3682(title)
 msgid "Importing Contacts"
 msgstr "Importar contactos"
 
-#: C/evolution.xml:3437(para)
+#: C/evolution.xml:3683(para)
 msgid ""
 "You can import contacts from other contact management tools with the Import "
 "tool."
@@ -8043,11 +8695,11 @@ msgstr ""
 "Puede importar contactos desde otra herramienta de gestión de contactos con "
 "la herramienta Importar."
 
-#: C/evolution.xml:3442(para)
+#: C/evolution.xml:3688(para)
 msgid "Mail yourself a contact as vCard attachment."
 msgstr "Envíese a si mismo un contacto como un adjunto vCard."
 
-#: C/evolution.xml:3443(para)
+#: C/evolution.xml:3689(para)
 msgid ""
 "Currently VCF and LDIF are supported. CSV and TAB format files are supported "
 "from Microsoft Outlook, Thunderbird, Mozilla, and Evolution."
@@ -8055,7 +8707,7 @@ msgstr ""
 "Actualmente se soportan VCF y LDIF. Los formatos CSV y TAB están soportados "
 "desde Miscrosoft Outlook, Thunderbird, Mozilla  y Evolution."
 
-#: C/evolution.xml:3450(para)
+#: C/evolution.xml:3696(para)
 msgid ""
 "A contact list is a set of contacts with a single nickname that you create. "
 "When you send email to the nickname, it is sent to every member of the list. "
@@ -8069,7 +8721,7 @@ msgstr ""
 "para su conveniencia, en lugar de ser una dirección de correo real "
 "gestionada por una aplicación para listas de correo en un servidor."
 
-#: C/evolution.xml:3451(para)
+#: C/evolution.xml:3697(para)
 msgid ""
 "For example, you could create one card for each family member, then add "
 "those cards to a contact list called <quote>Family.</quote> Then, instead of "
@@ -8082,33 +8734,33 @@ msgstr ""
 "correo electrónico de cada persona individualmente, puede enviar un correo "
 "electrónico a <quote>Familia</quote> y el mensaje se enviará a todos ellos."
 
-#: C/evolution.xml:3452(para)
+#: C/evolution.xml:3698(para)
 msgid "To create a list of contacts:"
 msgstr "Para crear una lista de contactos:"
 
-#: C/evolution.xml:3455(para)
+#: C/evolution.xml:3701(para)
 msgid "Open the list creation dialog box by clicking the New List button."
 msgstr ""
 "Abra el cuadro de diálogo de creación de listas pulsando el botón Nueva "
 "lista."
 
-#: C/evolution.xml:3457(para)
+#: C/evolution.xml:3703(para)
 msgid "Click File &gt; New &gt; Contact List."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Lista de contactos."
 
-#: C/evolution.xml:3460(para)
+#: C/evolution.xml:3706(para)
 msgid "Specify a name for the list."
 msgstr "Especifique un nombre para la lista."
 
-#: C/evolution.xml:3463(para)
+#: C/evolution.xml:3709(para)
 msgid "Specify the names or email addresses of contacts."
 msgstr "Especifique los nombres o direcciones de correo-e de los contactos."
 
-#: C/evolution.xml:3465(para)
+#: C/evolution.xml:3711(para)
 msgid "Drag contacts from the main window into the list."
 msgstr "Arrastre los contactos desde la ventana principal hasta la lista."
 
-#: C/evolution.xml:3468(para)
+#: C/evolution.xml:3714(para)
 msgid ""
 "Choose whether you want to hide the email addresses when you send a message "
 "to the list."
@@ -8116,7 +8768,7 @@ msgstr ""
 "Elija si quiere ocultar las direcciones de los correos-e cuando envíe un "
 "mensaje a la lista."
 
-#: C/evolution.xml:3469(para)
+#: C/evolution.xml:3715(para)
 msgid ""
 "Unless it is a very small list, it is recommended that you leave the "
 "addresses hidden. This is the same thing as using the <quote>Bcc:</quote> "
@@ -8129,11 +8781,11 @@ msgstr ""
 "to-types\">Especificar destinatarios adicioneles para correo electrónico</"
 "link>."
 
-#: C/evolution.xml:3472(para)
+#: C/evolution.xml:3718(para)
 msgid "When you are finished, click OK."
 msgstr "Cuando termine, pulse Aceptar."
 
-#: C/evolution.xml:3475(para)
+#: C/evolution.xml:3721(para)
 msgid ""
 "The list appears as a contact card, which you can use as you would any other "
 "card, including mailing the list to another person and sending email to the "
@@ -8143,7 +8795,7 @@ msgstr ""
 "demás, incluyendo la posibilidad de enviar la lista a otra persona y la de "
 "enviar un mensaje a la lista."
 
-#: C/evolution.xml:3476(para)
+#: C/evolution.xml:3722(para)
 msgid ""
 "To mail the list, open a new email and type the name you chose for the list. "
 "Evolution addresses the message to the entire list when you send the "
@@ -8156,11 +8808,12 @@ msgstr ""
 "tarjeta correspondiente en la libreta de direcciones, y seleccionar Enviar "
 "un mensaje a la lista."
 
-#: C/evolution.xml:3477(para)
+#: 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:3482(para)
+#: C/evolution.xml:3728(para)
 msgid ""
 "Another way to group cards is to mark them as belonging to different "
 "categories. You can mark a card as being in several categories or no "
@@ -8174,25 +8827,25 @@ msgstr ""
 "la categoría <guilabel>Trabajo</guilabel> porque trabaja con él y en la "
 "categoría <guilabel>Amigos</guilabel> porque es un amigo."
 
-#: C/evolution.xml:3483(para)
+#: C/evolution.xml:3729(para)
 msgid "To mark a card as belonging to a category,"
 msgstr "Para marcar una tarjeta como perteneciente a una categoría,"
 
-#: C/evolution.xml:3486(para)
+#: C/evolution.xml:3732(para)
 msgid "Double click the card to appear the Contact Editor window"
 msgstr ""
 "Pulse dos veces sobre la tarjeta para que aparezca la ventana del Editor de "
 "contactos"
 
-#: C/evolution.xml:3489(para)
+#: C/evolution.xml:3735(para)
 msgid "Click the Categories button at the left."
 msgstr "Pulse el botón Categorías de la izquierda."
 
-#: C/evolution.xml:3490(para)
+#: C/evolution.xml:3736(para)
 msgid "You can view the Categories dialog box as given below."
 msgstr "Puede ver el cuadro de diálogo de Categorías tal y como se ve debajo."
 
-#: C/evolution.xml:3502(para)
+#: C/evolution.xml:3748(para)
 msgid ""
 "Select the category from the list. You can select as many or as few "
 "categories as you like."
@@ -8200,7 +8853,7 @@ msgstr ""
 "Seleccione la categoría de la lista. Puede seleccionar tantas categorías "
 "como desee."
 
-#: C/evolution.xml:3505(para)
+#: C/evolution.xml:3751(para)
 msgid ""
 "If the master list of categories doesn't suit you, you can add your own "
 "categories. To add a new category,"
@@ -8208,11 +8861,12 @@ msgstr ""
 "Si la lista maestra de categorías no se ajusta a sus necesidades puede "
 "añadir sus propias categorías. Para añadir una nueva categoría,"
 
-#: C/evolution.xml:3508(para)
+#: 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:3512(para)
+#: C/evolution.xml:3758(para)
 msgid ""
 "You can view the category name appeared in the field next to Categories "
 "button in the Contact Editor."
@@ -8220,7 +8874,7 @@ msgstr ""
 "Puede ver que el nombre de la categoría aparece en el campo junto al botón "
 "Categorías en el Editor de contactos."
 
-#: C/evolution.xml:3519(para)
+#: C/evolution.xml:3765(para)
 msgid ""
 "You can edit or set the color and icon for each categories available under "
 "categories list. To achieve that click Edit button at the bottom of the "
@@ -8231,7 +8885,7 @@ msgstr ""
 "inferior de la ventana de Categorías. Pulse el botón Borrar para borrar "
 "elementos de la lista."
 
-#: C/evolution.xml:3526(para)
+#: C/evolution.xml:3772(para)
 msgid ""
 "The <link linkend=\"ldap\">LDAP</link> protocol was created to let users "
 "share contact information over a network by sharing access to a central "
@@ -8247,7 +8901,7 @@ msgstr ""
 "libreta LDAP las direcciones de todos sus empleados o los contactos de "
 "clientes."
 
-#: C/evolution.xml:3527(para)
+#: C/evolution.xml:3773(para)
 msgid ""
 "To learn how to add a remote LDAP directory to your available address books, "
 "see <link linkend=\"config-prefs-contact\">Contact Management</link>. Remote "
@@ -8255,12 +8909,13 @@ msgid ""
 "They work like a local folder of contact cards, with the following "
 "exceptions:"
 msgstr ""
-"Para aprender a añadir un directorio LDAP remoto a sus libretas de direcciones disponibles"
-"consulte <link linkend=\"config-prefs-contact\">Gestión de contactos</link>. Los grupos de contactos remotos "
-"aparecen bajo el elemento En servidores LDAP en el selector. "
-"Funciona como una carpeta de tarjetas locales, con las siguientes excepciones:"
+"Para aprender a añadir un directorio LDAP remoto a sus libretas de "
+"direcciones disponiblesconsulte <link linkend=\"config-prefs-contact"
+"\">Gestión de contactos</link>. Los grupos de contactos remotos aparecen "
+"bajo el elemento En servidores LDAP en el selector. Funciona como una "
+"carpeta de tarjetas locales, con las siguientes excepciones:"
 
-#: C/evolution.xml:3530(para)
+#: C/evolution.xml:3776(para)
 msgid ""
 "Network folders are only available when you are connected to the network. If "
 "you use a laptop or have a modem connection, you might want to copy or cache "
@@ -8268,11 +8923,11 @@ msgid ""
 "desired contacts into the local address books."
 msgstr ""
 "Las carpetas de red sólo están disponibles cuando se conecta a la red. Si "
-"usa un equipo portátil o una conexión telefónica, conviene hacer una "
-"copia del directorio de red o colocar en caché algún directorio de red. Para ello, arrastre "
-"los contactos deseados dentro de la lista de contactos local."
+"usa un equipo portátil o una conexión telefónica, conviene hacer una copia "
+"del directorio de red o colocar en caché algún directorio de red. Para ello, "
+"arrastre los contactos deseados dentro de la lista de contactos local."
 
-#: C/evolution.xml:3531(para)
+#: C/evolution.xml:3777(para)
 msgid ""
 "You can also mark the network folder for offline usage. To mark the folder, "
 "right-click the folder, then click Properties. Select Copy Folder Content "
@@ -8283,7 +8938,7 @@ msgstr ""
 "Propiedades. Seleccione Copiar el contenido de la carpeta localmente para "
 "operación desconectada."
 
-#: C/evolution.xml:3534(para)
+#: C/evolution.xml:3780(para)
 msgid ""
 "To prevent excess network traffic, Evolution does not normally load data "
 "from the LDAP server upon opening."
@@ -8291,7 +8946,7 @@ msgstr ""
 "Para prevenir exceso de tráfico en la red, Evolution no descarga los datos "
 "del servidor LDAP de una forma normal al iniciarse."
 
-#: C/evolution.xml:3537(para)
+#: C/evolution.xml:3783(para)
 msgid ""
 "Depending on your server settings, you might not be able to edit all the "
 "fields in a contact stored on an LDAP server. Some servers prohibit some or "
@@ -8304,7 +8959,7 @@ msgstr ""
 "la que Evolution proporciona. Compruebe con su administrador de su sistema "
 "si necesita una configuración diferente."
 
-#: C/evolution.xml:3543(para)
+#: C/evolution.xml:3789(para)
 msgid ""
 "For information about setting up Evolution to use LDAP, refer to <link "
 "linkend=\"config-prefs-contact\">Contact Management</link>."
@@ -8312,7 +8967,7 @@ msgstr ""
 "Para obtener más información acerca de cómo configurar Evolution para usar "
 "LDAP, vea <link linkend=\"config-prefs-contact\">Gestión de contactos</link>."
 
-#: C/evolution.xml:3549(para)
+#: C/evolution.xml:3795(para)
 msgid ""
 "When you get information about a person in the mail or in a calendar entry, "
 "you can add it to an address card. To do so, right-click any email address "
@@ -8322,15 +8977,17 @@ msgid ""
 "operation. For more information, see <link linkend=\"config-sync"
 "\">Synchronizing Your Handheld Device</link>."
 msgstr ""
-"Cuando reciba información acerca de una persona en el correo o en una entrada del calendario, "
-"puede añadirla a una tarjeta de visita. Para ello, pulse con el botón derecho sobre cualquier dirección de correo o sobre "
-"cualquier correo-e y elija la opción Añadir remitente a la libreta de direcciones en el menú que aparece. Si "
-"el remitente ya existe, la solapa del Editor se abrirá y podrá editar los detalles. "
-"Evolution también puede añadir tarjetas desde dispositivos de mano durante la "
-"operación de sincronización HotSync*. Para obtener más información consulte "
-"<link linkend=\"config-sync\">Sincronización de Evolution con dispositivos portátiles</link>."
+"Cuando reciba información acerca de una persona en el correo o en una "
+"entrada del calendario, puede añadirla a una tarjeta de visita. Para ello, "
+"pulse con el botón derecho sobre cualquier dirección de correo o sobre "
+"cualquier correo-e y elija la opción Añadir remitente a la libreta de "
+"direcciones en el menú que aparece. Si el remitente ya existe, la solapa del "
+"Editor se abrirá y podrá editar los detalles. Evolution también puede añadir "
+"tarjetas desde dispositivos de mano durante la operación de sincronización "
+"HotSync*. Para obtener más información consulte <link linkend=\"config-sync"
+"\">Sincronización de Evolution con dispositivos portátiles</link>."
 
-#: C/evolution.xml:3555(para)
+#: C/evolution.xml:3801(para)
 msgid ""
 "This section shows you how to use the <trademark>Evolution</trademark> "
 "Calendar to manage your schedule alone or in conjunction with peers. To "
@@ -8343,47 +9000,47 @@ msgstr ""
 "linkend=\"importing-mail\">Importar un solo archivo</link>, que describe la "
 "herramienta de importación."
 
-#: C/evolution.xml:3558(link) C/evolution.xml:3590(title)
+#: C/evolution.xml:3804(link) C/evolution.xml:3836(title)
 msgid "Ways of Looking at your Calendar"
 msgstr "Opciones de la vista de calendario"
 
-#: C/evolution.xml:3561(link) C/evolution.xml:3748(title)
+#: C/evolution.xml:3807(link) C/evolution.xml:3994(title)
 msgid "Scheduling With the Evolution Calendar"
 msgstr "Planificación con el calendario de Evolution"
 
-#: C/evolution.xml:3564(link) C/evolution.xml:4128(title)
+#: C/evolution.xml:3810(link) C/evolution.xml:4374(title)
 msgid "Searching for Calendar Items"
 msgstr "Buscar elementos del calendario"
 
-#: C/evolution.xml:3567(link) C/evolution.xml:4276(title)
+#: C/evolution.xml:3813(link) C/evolution.xml:4522(title)
 msgid "Printing Displayed Items"
 msgstr "Imprimir los elementos mostrados"
 
-#: C/evolution.xml:3570(link) C/evolution.xml:4281(title)
+#: C/evolution.xml:3816(link) C/evolution.xml:4527(title)
 msgid "Deleting Old Appointments and Meetings"
 msgstr "Borrar citas y reuniones antiguas"
 
-#: C/evolution.xml:3573(link) C/evolution.xml:4286(title)
+#: C/evolution.xml:3819(link) C/evolution.xml:4532(title)
 msgid "Delegating Meetings"
 msgstr "Eliminar reuniones"
 
-#: C/evolution.xml:3576(link) C/evolution.xml:4306(title)
+#: C/evolution.xml:3822(link) C/evolution.xml:4552(title)
 msgid "Multiple Calendars, Web Calendars, and CalDAV"
 msgstr "Múltiples calendarios, calendarios web y CalDAV"
 
-#: C/evolution.xml:3579(link) C/evolution.xml:4313(title)
+#: C/evolution.xml:3825(link) C/evolution.xml:4559(title)
 msgid "The Task List"
 msgstr "La Lista de tareas"
 
-#: C/evolution.xml:3582(link) C/evolution.xml:4628(title)
+#: C/evolution.xml:3828(link) C/evolution.xml:4874(title)
 msgid "Memos"
 msgstr "Notas"
 
-#: C/evolution.xml:3585(link) C/evolution.xml:4823(title)
+#: C/evolution.xml:3831(link) C/evolution.xml:5069(title)
 msgid "Configuring Time Zones"
 msgstr "Configurar la zona horaria"
 
-#: C/evolution.xml:3591(para)
+#: C/evolution.xml:3837(para)
 msgid ""
 "In Evolution, you can keep multiple calendars and overlay them one over the "
 "next. For example, you might have a schedule of events for work, one for "
@@ -8401,11 +9058,11 @@ msgstr ""
 "diferentes juegos de citas, puede asegurarse de evitar conflictos, "
 "reduciendo la carga en la vista."
 
-#: C/evolution.xml:3592(para)
+#: C/evolution.xml:3838(para)
 msgid "Appointments for each calendar appear as a different color."
 msgstr "Las citas para cada calendario aparecen con un color diferente."
 
-#: C/evolution.xml:3593(para)
+#: C/evolution.xml:3839(para)
 msgid ""
 "The toolbar offers you five different buttons that can show you different "
 "views of your calendar."
@@ -8413,75 +9070,74 @@ msgstr ""
 "La barra de herramientas le ofrece cinco botones diferentes que le pueden "
 "mostrar distintas vistas de su calendario."
 
-#: C/evolution.xml:3601(para)
+#: C/evolution.xml:3847(para)
 msgid "Calendar View"
 msgstr "Vista del calendario"
 
-#: C/evolution.xml:3604(para)
+#: C/evolution.xml:3850(para)
 msgid "Shortcut Keys"
 msgstr "Atajos de teclado"
 
-#: C/evolution.xml:3611(para)
+#: C/evolution.xml:3857(para)
 msgid "Day"
 msgstr "Día"
 
-#: C/evolution.xml:3614(para)
+#: C/evolution.xml:3860(para)
 msgid "control+y"
 msgstr "control+y"
 
-#: C/evolution.xml:3619(para)
+#: C/evolution.xml:3865(para)
 msgid "Work Week"
 msgstr "Semana laboral"
 
-#: C/evolution.xml:3622(para)
+#: C/evolution.xml:3868(para)
 msgid "control+j"
 msgstr "control+j"
 
-#: C/evolution.xml:3627(para)
+#: C/evolution.xml:3873(para)
 msgid "Week"
 msgstr "Semana"
 
-#: C/evolution.xml:3630(para)
+#: C/evolution.xml:3876(para)
 msgid "control+k"
 msgstr "control+k"
 
-#: C/evolution.xml:3635(para)
+#: C/evolution.xml:3881(para)
 msgid "Month"
 msgstr "Mes"
 
-#: C/evolution.xml:3638(para)
+#: C/evolution.xml:3884(para)
 msgid "control+m"
 msgstr "control+m"
 
-#: C/evolution.xml:3643(para)
+#: C/evolution.xml:3889(para)
 msgid "List"
 msgstr "Lista"
 
-#: C/evolution.xml:3646(para)
+#: C/evolution.xml:3892(para)
 msgid "control+l"
 msgstr "control+l"
 
-#: C/evolution.xml:3652(para)
+#: C/evolution.xml:3898(para)
 msgid ""
 "You can also select an arbitrary range of days in the small calendar in the "
 "side bar. To do this, select the days that you want to view in your calendar."
 msgstr ""
-"Puede elegir cualquier rango de días en el calendario pequeño en la "
-"barra lateral. Para ello seleccione los días que quiere ver en el "
-"calendario."
+"Puede elegir cualquier rango de días en el calendario pequeño en la barra "
+"lateral. Para ello seleccione los días que quiere ver en el calendario."
 
-#: C/evolution.xml:3654(para)
+#: C/evolution.xml:3900(para)
 msgid ""
 "The Previous and Next buttons move you forward and back in your calendar "
 "pages. If you are using a week or month view, you can move by week or month. "
 "To return to today's listing, click the Today button in the toolbar."
 msgstr ""
-"Los botones Anterior y Siguiente sirven para desplazarse adelante y atrás por "
-"las páginas del calendario. Si está usando la vista de semana o mes, puede "
-"desplazarse una semana o un mes. Para volver al día de hoy pulse Hoy "
+"Los botones Anterior y Siguiente sirven para desplazarse adelante y atrás "
+"por las páginas del calendario. Si está usando la vista de semana o mes, "
+"puede desplazarse una semana o un mes. Para volver al día de hoy pulse Hoy "
 "en la barra de tareas."
 
-#: C/evolution.xml:3655(para)
+#: C/evolution.xml:3901(para)
 msgid ""
 "To visit calendar entries for a specific date, click Go To and select the "
 "date in the dialog box that appears."
@@ -8489,11 +9145,11 @@ msgstr ""
 "Para visitar las entradas del calendario para una fecha específica, pulse en "
 "Ir a para abrir un cuadro de diálogo donde elegir la fecha."
 
-#: C/evolution.xml:3658(title)
+#: C/evolution.xml:3904(title)
 msgid "Calendar Properties"
 msgstr "Propiedades del calendario"
 
-#: C/evolution.xml:3659(para)
+#: C/evolution.xml:3905(para)
 msgid ""
 "Evolution allows you to edit the label of your calendar, assign color, and "
 "copy content for offline use. To set your calendar properties"
@@ -8502,33 +9158,33 @@ msgstr ""
 "copiar los contenidos para su uso desconectado. Para establecer las "
 "propiedades de su calendario"
 
-#: C/evolution.xml:3662(para)
+#: C/evolution.xml:3908(para)
 msgid "Select the calendar from the side bar at the left."
 msgstr "Seleccione el calendario desde la barra lateral en la izquierda."
 
-#: C/evolution.xml:3665(para)
-msgid "Right click on the calendar."
+#: C/evolution.xml:3911(para)
+msgid "Right-click on the calendar."
 msgstr "Pulse con el botón derecho en el calendario."
 
-#: C/evolution.xml:3668(para)
+#: C/evolution.xml:3914(para)
 msgid "Select Properties to open Calendar Properties dialog box."
 msgstr ""
 "Seleccione Propiedades para abrir el cuadro de diálogo Propiedades del "
 "calendario."
 
-#: C/evolution.xml:3680(para)
+#: C/evolution.xml:3926(para)
 msgid "Edit the label from Name field."
 msgstr "Edite la etiqueta desde el campo Nombre."
 
-#: C/evolution.xml:3683(para)
+#: C/evolution.xml:3929(para)
 msgid "To assign a color for the calendar, click the Color button."
 msgstr "Para asignar un color para el calendario,pulse el botón Color."
 
-#: C/evolution.xml:3686(para)
+#: C/evolution.xml:3932(para)
 msgid "Select the color and click OK."
 msgstr "Seleccione el color y pulse Aceptar."
 
-#: C/evolution.xml:3689(para)
+#: C/evolution.xml:3935(para)
 msgid ""
 "To mark your calendar content for offline use, click Copy calendar contents "
 "locally for offline operations."
@@ -8536,18 +9192,18 @@ msgstr ""
 "Para marcar el contenido de su calendario para un uso desconectado, pulse "
 "Copiar el contenido del calendario localmente para trabajar desconectado."
 
-#: C/evolution.xml:3691(para)
+#: C/evolution.xml:3937(para)
 msgid ""
-"Right click on the calendar at the left and select Mark Calendar for offline "
+"Right-click on the calendar at the left and select Mark Calendar for offline "
 "use. For more information on working offline refer <link linkend=\"usage-"
 "mail-getnsend-offline\">Working Offline</link>."
 msgstr ""
 "Pulse con el botón derecho sobre el calendario a la izquierda y seleccione "
 "Marcar el calendario para uso desconectado. Para obtener más información "
-"acerca de trabajar desconectado, vea <link linkend=\"usage-mail-getnsend-"
+"acerca de trabajar desconectado consulte <link linkend=\"usage-mail-getnsend-"
 "offline\">Trabar desconectado</link>."
 
-#: C/evolution.xml:3693(para)
+#: C/evolution.xml:3939(para)
 msgid ""
 "To export or share or to store a calendar locally in iCal format, right "
 "click on the calendar in the calendar view at the left and select Save to "
@@ -8557,7 +9213,7 @@ msgstr ""
 "iCal, pulse con el botón derecho sobre el calendario en la vista de "
 "calendario a la izquierda y seleccione Guardar al disco."
 
-#: C/evolution.xml:3695(para)
+#: C/evolution.xml:3941(para)
 msgid ""
 "Click Mark as default folder if you want to mark this folder as your default "
 "calendar folder."
@@ -8565,11 +9221,11 @@ msgstr ""
 "Pulse Marcar como carpeta predeterminada si quiere marcar esta carpeta como "
 "su carpeta predeterminada para los calendarios."
 
-#: C/evolution.xml:3699(title)
+#: C/evolution.xml:3945(title)
 msgid "Google Calendar"
 msgstr "Google Calendar"
 
-#: C/evolution.xml:3700(para)
+#: C/evolution.xml:3946(para)
 msgid ""
 "Evolution allows you to access your Google calendar. You can view the Google "
 "calendar offline or create, modify, and delete the calendar items online."
@@ -8578,53 +9234,45 @@ msgstr ""
 "calendario de Google cuando esté desconectado o crear, modificar y borrar "
 "elementos del calendario cuando esté conectado."
 
-#: C/evolution.xml:3701(para)
+#: C/evolution.xml:3947(para)
 msgid "To integrate the Google calendar to Evolution:"
 msgstr "Para integrar el calendario de Google en Evolution:"
 
-#: C/evolution.xml:3704(para)
+#: C/evolution.xml:3950(para)
 msgid "Click New, then select Calendar to open the New Calendar dialog."
 msgstr ""
 "Pulse Nuevo, después seleccione Calendario para abrir el diálogo Calendario "
 "nuevo."
 
-#: C/evolution.xml:3707(para)
-msgid "Select Google from the Type drop-down list."
-msgstr "Seleccione Google de la lista desplegable de tipos."
-
-#: C/evolution.xml:3712(para)
+#: C/evolution.xml:3958(para)
 msgid "Specify the following:"
 msgstr "Especifique lo siguiente:"
 
-#: C/evolution.xml:3716(title)
+#: C/evolution.xml:3962(title)
 msgid "Name:"
 msgstr "Nombre:"
 
-#: C/evolution.xml:3717(para)
+#: C/evolution.xml:3963(para)
 msgid "Specify a name for the Google calendar"
 msgstr "Especifique un nombre para el calendario en Google"
 
-#: C/evolution.xml:3722(title)
-msgid "Username:"
-msgstr "Usuario:"
-
-#: C/evolution.xml:3723(para)
+#: C/evolution.xml:3969(para)
 msgid "Specify your username for your Google account"
 msgstr "Especifique su nombre de usuario para su cuenta en Google"
 
-#: C/evolution.xml:3729(para)
+#: C/evolution.xml:3975(para)
 msgid "Set the time to automatically refresh the calendar."
 msgstr "Establezca el tiempo para refrescar el calendario automáticamente."
 
-#: C/evolution.xml:3732(para)
+#: C/evolution.xml:3978(para)
 msgid ""
-"Select Use SSL to enable SSL for communication between Evolution and the "
+"Select Use SSL to enable a secure connection between Evolution and the "
 "Google server."
 msgstr ""
-"Seleccione Usar SSL para activar SSL para la comunicación entre Evolution y "
-"el servidor de Google."
+"Seleccione Usar SSL para activar una conexión segura entre Evolution y el "
+"servidor de Google."
 
-#: C/evolution.xml:3735(para)
+#: C/evolution.xml:3981(para)
 msgid ""
 "If you want to set a color label for the calendar, click the Color tab, "
 "select the desired color, then click OK."
@@ -8632,7 +9280,7 @@ msgstr ""
 "Si quiere establecer un color para una etiqueta del calendario, pulse la "
 "solapa Color y seleccione el color que desee y pulse Aceptar."
 
-#: C/evolution.xml:3738(para)
+#: C/evolution.xml:3984(para)
 msgid ""
 "If you want to view the calendar items offline, select Copy calendar content "
 "locally for offline operation check box."
@@ -8641,13 +9289,14 @@ msgstr ""
 "seleccione la casilla de verificación Copiar el contenido del calendario "
 "localmente para trabajar desconectado."
 
-#: C/evolution.xml:3739(para)
-msgid "If you select this option, you cannot modify or create the calendar items."
+#: C/evolution.xml:3985(para)
+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."
 
-#: C/evolution.xml:3749(para)
+#: C/evolution.xml:3995(para)
 msgid ""
 "There are two types of events you can schedule with Evolution: appointments "
 "and meetings. An appointment is an event you schedule for yourself only, and "
@@ -8661,68 +9310,71 @@ msgstr ""
 "También puede usar la búsqueda de Disponibilidad para las reuniones y "
 "determinar la disponibilidad de los participantes."
 
-#: C/evolution.xml:3752(link) C/evolution.xml:3775(title)
+#: C/evolution.xml:3998(link) C/evolution.xml:4021(title)
 msgid "Appointments"
 msgstr "Citas"
 
-#: C/evolution.xml:3755(link) C/evolution.xml:3947(title)
+#: C/evolution.xml:4001(link) C/evolution.xml:4193(title)
 msgid "Sending a Meeting Invitation"
 msgstr "Enviar una invitación para reunión"
 
-#: C/evolution.xml:3758(link) C/evolution.xml:4036(title)
+#: C/evolution.xml:4004(link) C/evolution.xml:4282(title)
 msgid "Accepting and Replying to a Meeting Request"
 msgstr "Aceptar y responder a solicitudes de reuniones"
 
-#: C/evolution.xml:3761(link) C/evolution.xml:4054(title)
+#: C/evolution.xml:4007(link) C/evolution.xml:4300(title)
 msgid "Reading Responses to Meeting Requests"
 msgstr "Leer respuestas a solicitudes de reunión"
 
-#: C/evolution.xml:3764(link) C/evolution.xml:4059(title)
+#: C/evolution.xml:4010(link) C/evolution.xml:4305(title)
 msgid "Using the Free/Busy View"
 msgstr "Uso de la característica de disponibilidad"
 
-#: C/evolution.xml:3767(link) C/evolution.xml:4088(title)
-msgid "Publishing Calendar and Free/Busy Information Without a Groupware Server"
+#: C/evolution.xml:4013(link) C/evolution.xml:4334(title)
+msgid ""
+"Publishing Calendar and Free/Busy Information Without a Groupware Server"
 msgstr ""
 "Publicar la información de Disponibilidad de calendario sin un servidor "
 "Groupware"
 
-#: C/evolution.xml:3770(link) C/evolution.xml:4121(title)
+#: C/evolution.xml:4016(link) C/evolution.xml:4367(title)
 msgid "Accessing Free/Busy Data Without a Groupware Server"
 msgstr "Acceder a datos de Disponibilidad sin un servidor Groupware"
 
-#: C/evolution.xml:3776(para)
+#: 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:3779(link) C/evolution.xml:3793(title)
+#: C/evolution.xml:4025(link) C/evolution.xml:4039(title)
 msgid "Creating Appointments"
 msgstr "Crear de citas"
 
-#: C/evolution.xml:3782(link) C/evolution.xml:3881(title)
-#: C/evolution.xml:5311(title)
+#: C/evolution.xml:4028(link) C/evolution.xml:4127(title)
+#: C/evolution.xml:5557(title)
 msgid "Reminders"
 msgstr "Recordatorios"
 
-#: C/evolution.xml:3785(link) C/evolution.xml:3917(title)
+#: C/evolution.xml:4031(link) C/evolution.xml:4163(title)
 msgid "Classifications"
 msgstr "Clasificaciones"
 
-#: C/evolution.xml:3788(link) C/evolution.xml:3940(title)
+#: C/evolution.xml:4034(link) C/evolution.xml:4186(title)
 msgid "Recurrence"
 msgstr "Repetición"
 
-#: C/evolution.xml:3796(para)
+#: C/evolution.xml:4042(para)
 msgid "Click File &gt; New &gt; Appointment."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Cita."
 
-#: C/evolution.xml:3798(para)
-msgid "Click Calendars on the Switcher, then click File &gt; New &gt; Appointment."
+#: C/evolution.xml:4044(para)
+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."
 
-#: C/evolution.xml:3800(para)
+#: C/evolution.xml:4046(para)
 msgid ""
 "Double-click in a blank space on the calendar view to open an Appointment "
 "dialog box. The particular time on the calendar view against which you have "
@@ -8732,32 +9384,33 @@ msgstr ""
 "cuadro de diálogo Cita. Se creará la cita para esa hora en particular en la "
 "vista del calendario sobre la que haya pulsado dos veces."
 
-#: C/evolution.xml:3802(para)
-msgid "Select the required duration on the calender view and enter the summary."
+#: C/evolution.xml:4048(para)
+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."
 
-#: C/evolution.xml:3805(para) C/evolution.xml:3960(para)
+#: C/evolution.xml:4051(para) C/evolution.xml:4206(para)
 msgid "Select a calendar in the Calendar drop-down list."
 msgstr "Seleccione un calendario en la lista desplegable de Calendario."
 
-#: C/evolution.xml:3806(para) C/evolution.xml:3817(para)
-#: C/evolution.xml:3975(para) C/evolution.xml:4358(para)
-#: C/evolution.xml:4412(para) C/evolution.xml:4644(para)
-#: C/evolution.xml:5710(para)
+#: C/evolution.xml:4052(para) C/evolution.xml:4063(para)
+#: C/evolution.xml:4221(para) C/evolution.xml:4604(para)
+#: C/evolution.xml:4658(para) C/evolution.xml:4890(para)
+#: C/evolution.xml:5956(para)
 msgid "Enter a brief summary in the Summary field."
 msgstr "Escriba un breve resumen para la tarea en el campo Resumen."
 
-#: C/evolution.xml:3811(para) C/evolution.xml:3978(para)
+#: C/evolution.xml:4057(para) C/evolution.xml:4224(para)
 msgid "(Optional) Type a location in the Location field."
 msgstr "(Opcional) escriba una ubicación en el campo Lugar."
 
-#: C/evolution.xml:3814(para)
+#: C/evolution.xml:4060(para)
 msgid "Select the date and time."
 msgstr "Seleccione la fecha y la hora."
 
-#: C/evolution.xml:3820(para) C/evolution.xml:3981(para)
+#: C/evolution.xml:4066(para) C/evolution.xml:4227(para)
 msgid ""
 "To select this appointment as an all day event, click Options &gt; All Day "
 "Event."
@@ -8765,17 +9418,19 @@ msgstr ""
 "Para seleccionar esta cita como un Acontecimiento para todo el día, pulse "
 "Opciones &gt; Acontecimiento para todo el día."
 
-#: C/evolution.xml:3822(para) C/evolution.xml:3983(para)
+#: 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:3825(para) C/evolution.xml:3986(para)
-msgid "If the event is an all day event, specify a starting date and an ending date."
+#: 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."
 msgstr ""
 "Si el acontecimiento es un acontecimiento para todo el día, especifique la "
 "fecha de comienzo y la fecha de finalización."
 
-#: C/evolution.xml:3828(para) C/evolution.xml:3989(para)
+#: C/evolution.xml:4074(para) C/evolution.xml:4235(para)
 msgid ""
 "If the event is not an all day event, specify a starting time and an ending "
 "time."
@@ -8783,54 +9438,56 @@ msgstr ""
 "Si el acontecimiento no es un acontecimiento para todo el día, especifique "
 "una hora de comienzo y una hora de finalización."
 
-#: C/evolution.xml:3831(para) C/evolution.xml:3992(para)
+#: C/evolution.xml:4077(para) C/evolution.xml:4238(para)
 msgid "Select For to specify the duration."
 msgstr "Seleccione Durante para especificar la duración."
 
-#: C/evolution.xml:3833(para) C/evolution.xml:3994(para)
+#: 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:3836(para) C/evolution.xml:3997(para)
-#: C/evolution.xml:4367(para) C/evolution.xml:4418(para)
+#: C/evolution.xml:4082(para) C/evolution.xml:4243(para)
+#: C/evolution.xml:4613(para) C/evolution.xml:4664(para)
 msgid "Type the time zone information in the Time Zone field."
 msgstr "Escriba la información de zona horaria en el campo Zona horaria."
 
-#: C/evolution.xml:3838(para) C/evolution.xml:3999(para)
-#: C/evolution.xml:4369(para) C/evolution.xml:4420(para)
+#: C/evolution.xml:4084(para) C/evolution.xml:4245(para)
+#: C/evolution.xml:4615(para) C/evolution.xml:4666(para)
 msgid "Click the globe to customize the time zone."
 msgstr "Pulse el globo terráqueo para personalizar la zona horaria."
 
-#: C/evolution.xml:3839(para) C/evolution.xml:4000(para)
-#: C/evolution.xml:4370(para) C/evolution.xml:4421(para)
+#: 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:3842(para)
+#: C/evolution.xml:4088(para)
 msgid "To show the time as busy, click Options &gt; Show Time as Busy."
 msgstr ""
 "Para mostrar la hora como ocupada, pulse Opciones &gt; Mostrar hora como "
 "ocupada."
 
-#: C/evolution.xml:3845(para) C/evolution.xml:3923(para)
-#: C/evolution.xml:4373(para) C/evolution.xml:4424(para)
-#: C/evolution.xml:4640(para)
+#: C/evolution.xml:4091(para) C/evolution.xml:4169(para)
+#: C/evolution.xml:4619(para) C/evolution.xml:4670(para)
+#: C/evolution.xml:4886(para)
 msgid "(Optional) Type a category in the Categories field."
 msgstr "(Opcional) escriba una categoría en el campo Categoría."
 
-#: C/evolution.xml:3846(para) C/evolution.xml:3929(para)
-#: C/evolution.xml:4374(para) C/evolution.xml:4425(para)
+#: C/evolution.xml:4092(para) C/evolution.xml:4175(para)
+#: C/evolution.xml:4620(para) C/evolution.xml:4671(para)
 msgid "To show or hide the Categories field, click View &gt; Categories."
 msgstr "Para mostrar u ocultar el campo Categorías, pulse Ver &gt; Categorías."
 
-#: C/evolution.xml:3849(para) C/evolution.xml:4377(para)
-#: C/evolution.xml:4428(para) C/evolution.xml:4650(para)
-#: C/evolution.xml:5719(para)
+#: C/evolution.xml:4095(para) C/evolution.xml:4623(para)
+#: C/evolution.xml:4674(para) C/evolution.xml:4896(para)
+#: C/evolution.xml:5965(para)
 msgid "(Optional) Enter a description in the Description field."
 msgstr "(Opcional) escriba una descripción en el campo Descripción."
 
-#: C/evolution.xml:3852(para) C/evolution.xml:3907(para)
-#: C/evolution.xml:4003(para)
+#: C/evolution.xml:4098(para) C/evolution.xml:4153(para)
+#: C/evolution.xml:4249(para)
 msgid ""
 "To create an alarm for this appointment, click Alarms on the toolbar, or "
 "click Options &gt; Alarms."
@@ -8838,14 +9495,14 @@ msgstr ""
 "Para crear una alerta para esta cita, pulse Alertas en la barra de "
 "herramientas o pulse Opciones &gt; Alertas."
 
-#: C/evolution.xml:3853(para) C/evolution.xml:3910(para)
-#: C/evolution.xml:4004(para)
+#: C/evolution.xml:4099(para) C/evolution.xml:4156(para)
+#: C/evolution.xml:4250(para)
 msgid "Select Customize to add or remove customized alarms for the event."
 msgstr ""
 "Seleccione Personalizar para añadir o eliminar alertas personalizadas para "
 "el acontecimiento."
 
-#: C/evolution.xml:3854(para) C/evolution.xml:4005(para)
+#: C/evolution.xml:4100(para) C/evolution.xml:4251(para)
 msgid ""
 "For more information on reminders, see <link linkend=\"bshly4v\">Reminders</"
 "link>."
@@ -8853,9 +9510,9 @@ msgstr ""
 "Para obtener más información acerca de los recordatorios, vea <link linkend="
 "\"bshly4v\">Recordatorios</link>."
 
-#: C/evolution.xml:3857(para) C/evolution.xml:4008(para)
-#: C/evolution.xml:4386(para) C/evolution.xml:4431(para)
-#: C/evolution.xml:4653(para)
+#: C/evolution.xml:4103(para) C/evolution.xml:4254(para)
+#: C/evolution.xml:4632(para) C/evolution.xml:4677(para)
+#: C/evolution.xml:4899(para)
 msgid ""
 "(Optional) To add an attachment, drag and drop the attachment into the "
 "attachment bar."
@@ -8863,9 +9520,9 @@ msgstr ""
 "(Opcional) para añadir un adjunto a la tarea, arrastre y suelte el adjunto "
 "en la barra de adjuntos."
 
-#: C/evolution.xml:3859(para) C/evolution.xml:4010(para)
-#: C/evolution.xml:4388(para) C/evolution.xml:4433(para)
-#: C/evolution.xml:4655(para)
+#: C/evolution.xml:4105(para) C/evolution.xml:4256(para)
+#: C/evolution.xml:4634(para) C/evolution.xml:4679(para)
+#: C/evolution.xml:4901(para)
 msgid ""
 "Click the Attach button on the toolbar, or click Insert &gt; Attachment and "
 "then browse to the attachment."
@@ -8873,7 +9530,7 @@ msgstr ""
 "Pulse el botón Adjuntar en la barra de herramientas, o pulse Insertar &gt; "
 "Adjunto y después examine para seleccionar el adjunto."
 
-#: C/evolution.xml:3862(para) C/evolution.xml:4013(para)
+#: C/evolution.xml:4108(para) C/evolution.xml:4259(para)
 msgid ""
 "(Optional) Select a classification (Public, Private, or Confidential) by "
 "clicking &gt; Options &gt; Classifications."
@@ -8881,11 +9538,11 @@ msgstr ""
 "(Opcional) seleccione una clasificación (Pública, Privada o Confidencial) "
 "pulsando Opciones &gt; Clasificaciones."
 
-#: C/evolution.xml:3865(para) C/evolution.xml:4016(para)
+#: C/evolution.xml:4111(para) C/evolution.xml:4262(para)
 msgid "(Optional) Click the Recurrence button on the toolbar."
 msgstr "(Opcional) pulse el botón Repetición en la barra de herramientas."
 
-#: C/evolution.xml:3867(para) C/evolution.xml:4018(para)
+#: C/evolution.xml:4113(para) C/evolution.xml:4264(para)
 msgid ""
 "Click Options &gt; Recurrence, and specify whether you want the appointment "
 "to recur and how often."
@@ -8893,11 +9550,11 @@ msgstr ""
 "Pulse Opciones &gt; Repetición, y especifique cuando y con qué frecuencia "
 "quiere que se repita la cita."
 
-#: C/evolution.xml:3872(title)
+#: C/evolution.xml:4118(title)
 msgid "All Day Event"
 msgstr "Acontecimiento para todo el día"
 
-#: C/evolution.xml:3873(para)
+#: C/evolution.xml:4119(para)
 msgid ""
 "An All Day event appears at the top of a day's appointment list, in the "
 "header under the date, rather than inside. That makes it easy to have "
@@ -8916,7 +9573,7 @@ msgstr ""
 "solaparse. Cuando eso ocurre se muestran con múltiples columnas en la vista "
 "del día del calendario."
 
-#: C/evolution.xml:3874(para)
+#: C/evolution.xml:4120(para)
 msgid ""
 "If you create calendar appointments that overlap, Evolution displays them "
 "side by side in your calendar."
@@ -8924,7 +9581,7 @@ msgstr ""
 "Si crea citas que se solapan, Evolution las mostrará lado a lado en el "
 "calendario."
 
-#: C/evolution.xml:3882(para)
+#: C/evolution.xml:4128(para)
 msgid ""
 "You can have several Reminders for individual appointments, any time prior "
 "to the appointment you schedule. You can have one reminder of each of the "
@@ -8934,27 +9591,29 @@ msgstr ""
 "antelación a la cita que ha planificado. Puede tener un recordatorio de cada "
 "uno de los siguientes tipos:"
 
-#: C/evolution.xml:3886(title)
+#: C/evolution.xml:4132(title)
 msgid "Display:"
 msgstr "Mostrar:"
 
-#: C/evolution.xml:3887(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."
+#: 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."
 
-#: C/evolution.xml:3892(title)
+#: C/evolution.xml:4138(title)
 msgid "Audio:"
 msgstr "Sonido:"
 
-#: C/evolution.xml:3893(para)
+#: C/evolution.xml:4139(para)
 msgid "Your computer delivers a sound alarm."
 msgstr "Su sistema emitirça un sonido como alerta."
 
-#: C/evolution.xml:3898(title)
+#: C/evolution.xml:4144(title)
 msgid "Program:"
 msgstr "Ejecutar un programa:"
 
-#: C/evolution.xml:3899(para)
+#: C/evolution.xml:4145(para)
 msgid ""
 "You can run a program as a reminder. You can enter its name in the text "
 "field, or find it with the Browse button."
@@ -8962,7 +9621,7 @@ msgstr ""
 "Puede ejecutar un programa como recordatorio. Debe introducir el nombre en "
 "el campo de texto o buscarlo con el botón Explorar."
 
-#: C/evolution.xml:3903(para)
+#: C/evolution.xml:4149(para)
 msgid ""
 "Apart from the above notifications, the Evolution alarm icon blinks in the "
 "notification area. To pause the alarm or view the event, click the "
@@ -8972,11 +9631,11 @@ msgstr ""
 "parpadea en el área de notificación. Para pausar la alerta o ver el "
 "acontecimiento, pulse en el icono de notificación."
 
-#: C/evolution.xml:3904(para)
+#: C/evolution.xml:4150(para)
 msgid "To create a reminder:"
 msgstr "Crear un recordatorio:"
 
-#: C/evolution.xml:3913(para)
+#: C/evolution.xml:4159(para)
 msgid ""
 "If you have stored reminders in a local calendar, they work from the moment "
 "you log in. However, for reminders stored on any remote server like "
@@ -8984,13 +9643,15 @@ msgid ""
 "at least once after logging in. No matter where the reminders are stored, "
 "you can quit Evolution and still be reminded of an upcoming appointment."
 msgstr ""
-"Si ha almacenado recordatorios en el calendario local, tendrán efecto desde el momento "
-"en el que inicie su sesión en el sistema. Sin embargo, para recordatorios almacenados en un servidor remoto como "
-"GroupWise o Exchange que requieren autenticación, deberá ejecutar Evolution "
-"al menos una vez tras el inicio de sesión. Con independencia del lugar de almacenamiento, "
-"puede salir de Evolution y aún podrá recibir los recordatorios de las citas próximas."
+"Si ha almacenado recordatorios en el calendario local, tendrán efecto desde "
+"el momento en el que inicie su sesión en el sistema. Sin embargo, para "
+"recordatorios almacenados en un servidor remoto como GroupWise o Exchange "
+"que requieren autenticación, deberá ejecutar Evolution al menos una vez tras "
+"el inicio de sesión. Con independencia del lugar de almacenamiento, puede "
+"salir de Evolution y aún podrá recibir los recordatorios de las citas "
+"próximas."
 
-#: C/evolution.xml:3918(para)
+#: C/evolution.xml:4164(para)
 msgid ""
 "If you are using a calendar on a Novell <trademark class=\"registered"
 "\">GroupWise</trademark> or Microsoft Exchange server, select a "
@@ -9010,7 +9671,7 @@ msgstr ""
 "del servidor; compruebe con el administrador de su sistema o ajuste su "
 "configuración de delegación."
 
-#: C/evolution.xml:3919(para)
+#: C/evolution.xml:4165(para)
 msgid ""
 "If you are using a Novell GroupWise or Microsoft Exchange server, other "
 "people on the server can check your schedule to see if you are available at "
@@ -9025,11 +9686,13 @@ msgstr ""
 "la caja Libre en la selección Mostrar hora como. Generalmente las citas se "
 "muestran como Ocupado."
 
-#: C/evolution.xml:3920(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."
+#: 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."
 
-#: C/evolution.xml:3926(para)
+#: C/evolution.xml:4172(para)
 msgid ""
 "Select the check box next to each category that matches the appointment you "
 "are creating."
@@ -9037,7 +9700,7 @@ msgstr ""
 "Seleccione la casilla de verificación junto a cada categoría que coincida "
 "con la cita que está creando."
 
-#: C/evolution.xml:3933(para)
+#: C/evolution.xml:4179(para)
 msgid ""
 "You can add a new category to your category list by clicking Edit Master "
 "Category List, then click Click Here To Add A Category."
@@ -9046,7 +9709,7 @@ msgstr ""
 "lista maestra de categorías y a continuación en Pulse aquí para añadir una "
 "categoría."
 
-#: C/evolution.xml:3935(para)
+#: C/evolution.xml:4181(para)
 msgid ""
 "After you have selected your categories, click OK to assign these categories "
 "to the appointment. The categories you selected are now listed in the text "
@@ -9056,7 +9719,7 @@ msgstr ""
 "cita. Las categorías seleccionadas se muestran en un cuadro de texto a la "
 "derecha del botón Categorías."
 
-#: C/evolution.xml:3936(para)
+#: C/evolution.xml:4182(para)
 msgid ""
 "Appointments with categories appear with icons in the calendar display, and "
 "you can also search for appointments by category. To display only the "
@@ -9068,7 +9731,7 @@ msgstr ""
 "de una categoría en particular, seleccione la categoría correspondiente en "
 "la barra de búsqueda en la parte superior del calendario."
 
-#: C/evolution.xml:3941(para)
+#: C/evolution.xml:4187(para)
 msgid ""
 "The Recurrence tool button lets you describe repetition in appointments "
 "ranging from once every day up to once every 100 years. You can then choose "
@@ -9087,7 +9750,7 @@ msgstr ""
 "de junio de 2008</quote> o <quote>de cada mes el primer viernes en 12 "
 "ocasiones</quote>."
 
-#: C/evolution.xml:3942(para)
+#: C/evolution.xml:4188(para)
 msgid ""
 "After you have finished settings, click the Save button in the toolbar to "
 "save and close the appointment editor window. If you want, you can alter an "
@@ -9095,13 +9758,14 @@ msgid ""
 "change other settings by right-clicking the appointment then choosing Open, "
 "or double-clicking the appointment."
 msgstr ""
-"Cuando haya terminado con todos los detalles pulse el botón Guardar en la barra de herramientas para "
-"guardar la cita y cerrar la ventana del editor. Si lo desea, puede modificar "
-"el resumen de una cita en la vista del calendario pulsando sobre ella y escribiendo directamente. "
-"Puede cambiar otros ajustes pulsando con el botón derecho sobre la cita y después eligiendo Abrir o "
-"pulsando dos veces sobre la cita."
+"Cuando haya terminado con todos los detalles pulse el botón Guardar en la "
+"barra de herramientas para guardar la cita y cerrar la ventana del editor. "
+"Si lo desea, puede modificar el resumen de una cita en la vista del "
+"calendario pulsando sobre ella y escribiendo directamente. Puede cambiar "
+"otros ajustes pulsando con el botón derecho sobre la cita y después "
+"eligiendo Abrir o pulsando dos veces sobre la cita."
 
-#: C/evolution.xml:3948(para)
+#: C/evolution.xml:4194(para)
 msgid ""
 "A meeting is an event you schedule for multiple people. Evolution can be "
 "used to schedule group meetings and help you manage responses to meeting "
@@ -9111,7 +9775,7 @@ msgstr ""
 "Evolution sirve para organizar reuniones de grupos y ayudarle a gestionar "
 "las respuestas a las solicitudes de reunión."
 
-#: C/evolution.xml:3949(para)
+#: C/evolution.xml:4195(para)
 msgid ""
 "When you create a meeting or group appointment, you can specify the "
 "attendees in several categories, such as <quote>chair</quote> or "
@@ -9124,7 +9788,7 @@ msgstr ""
 "requerido</quote>. Cuando guarde su lista, cada invitado recibirá un mensaje "
 "con los datos de la cita y tendrán la opción de responder."
 
-#: C/evolution.xml:3950(para)
+#: C/evolution.xml:4196(para)
 msgid ""
 "If you don't need to collect attendance information when you're scheduling "
 "an event, and would rather just announce the event, right-click the meeting "
@@ -9140,15 +9804,15 @@ msgstr ""
 "destinatarios podrán incluir el acontecimiento en sus calendarios con una "
 "pulsación, pero no le enviarán respuesta acerca de si asistirán o no."
 
-#: C/evolution.xml:3951(para)
+#: C/evolution.xml:4197(para)
 msgid "To schedule a meeting:"
 msgstr "Para planificar una reunión:"
 
-#: C/evolution.xml:3954(para) C/evolution.xml:4064(para)
+#: C/evolution.xml:4200(para) C/evolution.xml:4310(para)
 msgid "Click File &gt; New &gt; Meeting."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Reunión."
 
-#: C/evolution.xml:3957(para) C/evolution.xml:4403(para)
+#: C/evolution.xml:4203(para) C/evolution.xml:4649(para)
 msgid ""
 "If you have multiple email accounts, select the one to use by selecting an "
 "item in the Organizer field."
@@ -9156,23 +9820,24 @@ msgstr ""
 "Si tiene múltiples cuentas de correo seleccione la que quiere usar "
 "seleccionando un elemento en el campo Organizador."
 
-#: C/evolution.xml:3963(para) C/evolution.xml:4067(para)
+#: C/evolution.xml:4209(para) C/evolution.xml:4313(para)
 msgid "Click Add to add the email addresses of people you want to invite."
 msgstr ""
 "Pulse añadir para añadir las direcciones de correo-e de las personas a las "
 "que quiere invitar."
 
-#: C/evolution.xml:3966(para)
-msgid "To remove an attendee from the list, select an attendee and press Remove."
+#: C/evolution.xml:4212(para)
+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."
 
-#: C/evolution.xml:3969(para)
+#: C/evolution.xml:4215(para)
 msgid "To edit a field, select the field and click Edit."
 msgstr "Para editar un campo, seleccione el campo y pulse Editar."
 
-#: C/evolution.xml:3972(para)
+#: C/evolution.xml:4218(para)
 msgid ""
 "Click View on the menu bar to show or hide the Type, Role, Status, and RSVP "
 "fields."
@@ -9180,7 +9845,7 @@ msgstr ""
 "Pulse Ver en la barra de menú para ver u ocultar los campos Tipo, Rol, "
 "Estado y RSVP."
 
-#: C/evolution.xml:4021(para)
+#: C/evolution.xml:4267(para)
 msgid ""
 "To query free/busy information for the attendees, click the Free/Busy button "
 "on the toolbar."
@@ -9188,21 +9853,22 @@ msgstr ""
 "Para preguntar la información de Disponibilidad de los asistentes, pulse el "
 "botón Disponibilidad en la barra de herramientas."
 
-#: C/evolution.xml:4023(para)
+#: C/evolution.xml:4269(para)
 msgid "Click Options &gt; Free/Busy."
 msgstr "Pulse Opciones &gt; Disponibilidad."
 
-#: C/evolution.xml:4026(para)
+#: C/evolution.xml:4272(para)
 msgid "Click Save to save the meeting."
 msgstr "Pulse Guardar para guardar la reunión."
 
-#: C/evolution.xml:4029(para)
-msgid "An email is sent out to all the recipients, inviting them to your event."
+#: C/evolution.xml:4275(para)
+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."
 
-#: C/evolution.xml:4031(para)
+#: C/evolution.xml:4277(para)
 msgid ""
 "In Evolution, a meeting can have only one organizer, and only the organizer "
 "can add participants to that meeting. Though it is possible to change the "
@@ -9219,7 +9885,7 @@ msgstr ""
 "ha invitado el organizador, es recomendable que reenvíe el mensaje de "
 "invitación que recibió del organizador original a los asistentes."
 
-#: C/evolution.xml:4037(para)
+#: C/evolution.xml:4283(para)
 msgid ""
 "Meeting requests are sent as iCal attachments. To view or respond to one, "
 "click the attachment icon and view it inline in the mail window. All the "
@@ -9232,19 +9898,19 @@ msgstr ""
 "fechas. Después puede elegir cómo responder a la invitación. Sus opciones "
 "son:"
 
-#: C/evolution.xml:4040(para)
+#: C/evolution.xml:4286(para)
 msgid "Accept"
 msgstr "Aceptar"
 
-#: C/evolution.xml:4043(para)
+#: C/evolution.xml:4289(para)
 msgid "Tentatively Accept"
 msgstr "Aceptado provisionalmente"
 
-#: C/evolution.xml:4046(para)
+#: C/evolution.xml:4292(para)
 msgid "Decline"
 msgstr "Rehusar"
 
-#: C/evolution.xml:4049(para)
+#: C/evolution.xml:4295(para)
 msgid ""
 "Click OK to send an email to the organizer with your answer. The event is "
 "also added to your calendar if you accept."
@@ -9252,7 +9918,7 @@ msgstr ""
 "Pulse Aceptar para enviar un correo-e con su respuesta al organizador. Si "
 "acepta el acontecimiento también se añadirá a su calendario."
 
-#: C/evolution.xml:4050(para)
+#: C/evolution.xml:4296(para)
 msgid ""
 "After you add the meeting to your calendar, you can make changes to the "
 "information, but if the original organizer sends out another update, your "
@@ -9262,7 +9928,7 @@ msgstr ""
 "a la información, pero si el organizador original envía otra actualización, "
 "sus cambios se sobreescribirán."
 
-#: C/evolution.xml:4055(para)
+#: C/evolution.xml:4301(para)
 msgid ""
 "When you get a reply to a meeting invitation you sent, you can view it "
 "inline by clicking the attachment and selecting View Inline."
@@ -9270,7 +9936,7 @@ msgstr ""
 "Cuando reciba una respuesta a su invitación de reunión, podrá verla incluida "
 "dentro del mensaje pulsando el adjunto y seleccionando Ver incluido."
 
-#: C/evolution.xml:4060(para)
+#: C/evolution.xml:4306(para)
 msgid ""
 "In addition to the standard meeting scheduling tools, you can use the Free/"
 "Busy view to check whether people are available in advance. The Free/Busy "
@@ -9291,17 +9957,18 @@ msgstr ""
 "todavía puede usar los acontecimientos iCal en forma de invitaciones para "
 "coordinar las agendas con otras personas."
 
-#: C/evolution.xml:4061(para)
+#: C/evolution.xml:4307(para)
 msgid "To access the free/busy view:"
 msgstr "Para acceder a la vista de disponibilidad:"
 
-#: C/evolution.xml:4070(para)
-msgid "Click the Free/Busy button on the toolbar, or click Options &gt; Free/Busy."
+#: C/evolution.xml:4316(para)
+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."
 
-#: C/evolution.xml:4075(para)
+#: C/evolution.xml:4321(para)
 msgid ""
 "Adjust the meeting time, either by dragging the meeting borders or by using "
 "the Autopick buttons to choose a time automatically, then click Save and "
@@ -9314,21 +9981,22 @@ msgstr ""
 "actualizados automáticamente, el resto recibirá una notificación por correo "
 "electrónico de cualquier cambio en los planes."
 
-#: C/evolution.xml:4079(title)
+#: C/evolution.xml:4325(title)
 msgid "Attendee List:"
 msgstr "Lista de asistentes:"
 
-#: C/evolution.xml:4080(para)
-msgid "The Attendee List shows the people who have been invited to the appointment."
+#: C/evolution.xml:4326(para)
+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."
 
-#: C/evolution.xml:4083(title)
+#: C/evolution.xml:4329(title)
 msgid "Schedule Grid:"
 msgstr "Cuadrícula de planificación:"
 
-#: C/evolution.xml:4084(para)
+#: C/evolution.xml:4330(para)
 msgid ""
 "The Schedule Grid shows the published Free/Busy information for the people "
 "you have invited. This is where you compare schedules to find free time to "
@@ -9347,7 +10015,7 @@ msgstr ""
 "un URL y ha indtroducido ese URL en la tarjeta del contacto usando el editor "
 "de contactos."
 
-#: C/evolution.xml:4089(para)
+#: C/evolution.xml:4335(para)
 msgid ""
 "You can publish Calendar and Free/Busy information to a WebDAV, FTP server, "
 "or remote machine through secure shell or other Web server with HTTP PUT "
@@ -9359,15 +10027,15 @@ msgstr ""
 "web con soporte HTTP PUT. Compruebe con el administrador de su sistema si no "
 "está seguro de disponer de esta funcionalidad."
 
-#: C/evolution.xml:4090(para)
+#: C/evolution.xml:4336(para)
 msgid "To set up Calendar or Free/Busy publishing:"
 msgstr "Para establecer la disponibilidad de publicación de un Calendario:"
 
-#: C/evolution.xml:4093(para) C/evolution.xml:4827(para)
+#: C/evolution.xml:4339(para) C/evolution.xml:5073(para)
 msgid "Click Edit &gt; Preferences, then click Calendar and Tasks."
 msgstr "Pulse Editar &gt; Preferencias, después pulse Calendario y tareas."
 
-#: C/evolution.xml:4096(para)
+#: C/evolution.xml:4342(para)
 msgid ""
 "Click the Calendar Publishing tab, click Add, then select the information "
 "you want to publish."
@@ -9375,23 +10043,23 @@ msgstr ""
 "Pulse en la solapa Publicación de calendarios, pulse Añadir, después "
 "seleccione la información que quiere publicar."
 
-#: C/evolution.xml:4099(para)
+#: C/evolution.xml:4345(para)
 msgid "Select the frequency with which you want to upload data."
 msgstr "Seleccione la frecuencia con la que quiere subir datos."
 
-#: C/evolution.xml:4102(para)
+#: C/evolution.xml:4348(para)
 msgid "Select the calendars you want to display data for."
 msgstr "Seleccione los calendarios para los que quiere mostrar los datos."
 
-#: C/evolution.xml:4105(para)
+#: C/evolution.xml:4351(para)
 msgid "Specify the publishing location for the upload server."
 msgstr "Especifique la ubicación para publicar en el servidor de subidas."
 
-#: C/evolution.xml:4108(para)
+#: C/evolution.xml:4354(para)
 msgid "Type your username and password."
 msgstr "Escriba su nombre de usuario y contraseña."
 
-#: C/evolution.xml:4114(para)
+#: C/evolution.xml:4360(para)
 msgid ""
 "To immediately publish calendar information, go to the Calendar tool and "
 "click Actions &gt; Publish Calendar Information."
@@ -9400,13 +10068,13 @@ msgstr ""
 "herramienta del Calendario y pulse Acciones &gt; Publicar información del "
 "calendario."
 
-#: C/evolution.xml:4116(para) C/evolution.xml:6676(para)
+#: C/evolution.xml:4362(para) C/evolution.xml:6915(para)
 msgid "You can specify a template to use when posting to the Free/Busy server."
 msgstr ""
 "Puede especificar una plantilla para usar cuando publique contra el servidor "
 "de disponibilidad."
 
-#: C/evolution.xml:4122(para)
+#: C/evolution.xml:4368(para)
 msgid ""
 "If individuals give you a URL for Free/Busy data or for their Web calendar, "
 "you can enter it as part of the contact information in the Contacts tool. "
@@ -9419,7 +10087,7 @@ msgstr ""
 "reunión con ellos, Evolution comprueba los horarios y los muestra en los "
 "datos de Disponibilidad."
 
-#: C/evolution.xml:4129(para)
+#: C/evolution.xml:4375(para)
 msgid ""
 "You can use a customized search, an advanced search, or a quick search to "
 "search for Calendar items."
@@ -9427,7 +10095,7 @@ msgstr ""
 "Puede usar una búsqueda personalizada, una búsqueda avanzada o una búsqueda "
 "rápida para buscar elementos del Calendario."
 
-#: C/evolution.xml:4132(para)
+#: C/evolution.xml:4378(para)
 msgid ""
 "Evolution enables you to find the Calendar items by using a Customized "
 "Search."
@@ -9435,56 +10103,56 @@ msgstr ""
 "Evolution le permite buscar los elementos del Calendario usando la Búsqueda "
 "personalizada."
 
-#: C/evolution.xml:4142(para) C/evolution.xml:4458(para)
-#: C/evolution.xml:4694(para)
+#: C/evolution.xml:4388(para) C/evolution.xml:4704(para)
+#: C/evolution.xml:4940(para)
 msgid "Summary contains"
 msgstr "El resumen contiene"
 
-#: C/evolution.xml:4145(para) C/evolution.xml:4461(para)
-#: C/evolution.xml:4697(para)
+#: C/evolution.xml:4391(para) C/evolution.xml:4707(para)
+#: C/evolution.xml:4943(para)
 msgid "Description contains"
 msgstr "La descripción contiene"
 
-#: C/evolution.xml:4148(para) C/evolution.xml:4464(para)
-#: C/evolution.xml:4700(para)
+#: C/evolution.xml:4394(para) C/evolution.xml:4710(para)
+#: C/evolution.xml:4946(para)
 msgid "Any field Contains"
 msgstr "Cualquier campo contiene"
 
-#: C/evolution.xml:4153(para) C/evolution.xml:4705(para)
+#: C/evolution.xml:4399(para) C/evolution.xml:4951(para)
 msgid "Evolution displays the desired Calendar items."
 msgstr "Evolution muestra los elementos del Calendario deseados."
 
-#: C/evolution.xml:4165(para) C/evolution.xml:4479(para)
-#: C/evolution.xml:4717(para)
+#: C/evolution.xml:4411(para) C/evolution.xml:4725(para)
+#: C/evolution.xml:4963(para)
 msgid "Select Advanced Search to open Advanced Search dialog box."
 msgstr ""
 "Seleccione Búsqueda avanzada para abrir el cuadro de diálogo Búsqueda "
 "avanzada."
 
-#: C/evolution.xml:4166(para) C/evolution.xml:4480(para)
-#: C/evolution.xml:4718(para)
+#: C/evolution.xml:4412(para) C/evolution.xml:4726(para)
+#: C/evolution.xml:4964(para)
 msgid "Search name field displays the search type you have selected."
 msgstr ""
 "El campo de búsqueda de nombre muestra el tipo de búsqueda que ha "
 "seleccionado."
 
-#: C/evolution.xml:4171(para) C/evolution.xml:4485(para)
-#: C/evolution.xml:4723(para)
+#: C/evolution.xml:4417(para) C/evolution.xml:4731(para)
+#: C/evolution.xml:4969(para)
 msgid "Click Add to add rules."
 msgstr "Pulse Añadir para añadir reglas."
 
-#: C/evolution.xml:4174(para) C/evolution.xml:4488(para)
-#: C/evolution.xml:4726(para)
+#: C/evolution.xml:4420(para) C/evolution.xml:4734(para)
+#: C/evolution.xml:4972(para)
 msgid "Select the criteria, and then type a search entry in the given field."
 msgstr ""
 "Seleccione el criterio y después escriba una entrada de búsqueda en el campo "
 "proporcionado."
 
-#: C/evolution.xml:4180(para) C/evolution.xml:4732(para)
+#: C/evolution.xml:4426(para) C/evolution.xml:4978(para)
 msgid "Click Save to save your search results."
 msgstr "Pulse Guardar para guardar los resultados."
 
-#: C/evolution.xml:4185(para)
+#: C/evolution.xml:4431(para)
 msgid ""
 "Displays all the Calendar items that match the criteria that you have "
 "selected from the drop-down list in the Search bar."
@@ -9492,43 +10160,43 @@ msgstr ""
 "Muestra todos los elementos del Calendario que coincidan con los criterios "
 "que haya seleccionado de la lista desplegable en la barra de búsqueda."
 
-#: C/evolution.xml:4189(para) C/evolution.xml:4741(para)
+#: C/evolution.xml:4435(para) C/evolution.xml:4987(para)
 msgid "Click the Show drop-down list."
 msgstr "Pulse Mostrar la lista desplegable."
 
-#: C/evolution.xml:4195(para) C/evolution.xml:4537(para)
-#: C/evolution.xml:4747(para)
+#: C/evolution.xml:4441(para) C/evolution.xml:4783(para)
+#: C/evolution.xml:4993(para)
 msgid "Any Category"
 msgstr "Cualquier categoría"
 
-#: C/evolution.xml:4198(para) C/evolution.xml:4540(para)
-#: C/evolution.xml:4750(para)
+#: C/evolution.xml:4444(para) C/evolution.xml:4786(para)
+#: C/evolution.xml:4996(para)
 msgid "Unmatched"
 msgstr "No coincidente"
 
-#: C/evolution.xml:4201(para)
+#: C/evolution.xml:4447(para)
 msgid "Active Appointments"
 msgstr "Citas activas"
 
-#: C/evolution.xml:4204(para)
+#: C/evolution.xml:4450(para)
 msgid "Next 7 Days' Appointments"
 msgstr "Citas de los próximos 7 días"
 
-#: C/evolution.xml:4219(para) C/evolution.xml:4570(para)
+#: C/evolution.xml:4465(para) C/evolution.xml:4816(para)
 msgid "Favourites"
 msgstr "Favoritos"
 
-#: C/evolution.xml:4272(para)
+#: C/evolution.xml:4518(para)
 msgid "You can view the desired items listed in the Calendar view."
 msgstr "Puede ver los elementos deseados listados en la vista del Calendario."
 
-#: C/evolution.xml:4277(para)
+#: C/evolution.xml:4523(para)
 msgid "To print the displayed calendar items, click File &gt; Print."
 msgstr ""
 "Para imprimir los elementos mostrados del calendario pulse Archivo &gt; "
 "Imprimir."
 
-#: C/evolution.xml:4282(para)
+#: C/evolution.xml:4528(para)
 msgid ""
 "Keeping a list of everything you did in the past eventually slows down your "
 "calendar. To delete old events, click Actions &gt; Purge, then enter the "
@@ -9539,29 +10207,29 @@ msgstr ""
 "introduzca el número de días de acontecimientos pasados que quiere mantener. "
 "Pulse Aceptar para purgar los elementos."
 
-#: C/evolution.xml:4287(para)
+#: C/evolution.xml:4533(para)
 msgid "Only attendees of a meeting can delegate a meeting."
 msgstr "Sólo los asistentes a una reunión pueden delegar una reunión."
 
-#: C/evolution.xml:4290(para)
+#: C/evolution.xml:4536(para)
 msgid "In the Calendar, right-click the meeting you want to delegate."
 msgstr ""
 "En el Calendario, pulse con el botón derecho en la reunión que quiere "
 "delegar."
 
-#: C/evolution.xml:4293(para)
+#: C/evolution.xml:4539(para)
 msgid "Click Delegate Meeting."
 msgstr "Pulse Delegar reunión."
 
-#: C/evolution.xml:4296(para)
+#: C/evolution.xml:4542(para)
 msgid "Select the contacts you want to delegate the meeting to."
 msgstr "Seleccione los contactos a los que quiere delegar la reunión."
 
-#: C/evolution.xml:4302(para)
+#: C/evolution.xml:4548(para)
 msgid "Each contact receives a copy of the meeting invitation."
 msgstr "Cada contacto recibe una copia de la invitación a la reunión."
 
-#: C/evolution.xml:4307(para)
+#: C/evolution.xml:4553(para)
 msgid ""
 "To create a new calendar, click File &gt; New &gt; Calendar. If the calendar "
 "is one you plan to store locally, you need only provide a name and color. If "
@@ -9583,7 +10251,7 @@ msgstr ""
 "añadido el calendario de un equipo de deporte a su calendario, puede que no "
 "necesite actualizarlo más de una vez por semana."
 
-#: C/evolution.xml:4308(para)
+#: C/evolution.xml:4554(para)
 msgid ""
 "The <ulink url=\"http://icalshare.com\">icalshare.com Web site</ulink> has "
 "an extensive list of shared online calendars, including national and "
@@ -9595,7 +10263,7 @@ msgstr ""
 "fiestas nacionales y religiosas, fases de la luna, deportes y "
 "acontecimientos locales y regionales."
 
-#: C/evolution.xml:4309(para)
+#: C/evolution.xml:4555(para)
 msgid ""
 "Evolution lets you view and manage calendars on remote CalDAV servers. The "
 "procedure to create a CalDAV calendar source is similar to that of a remote "
@@ -9607,7 +10275,7 @@ msgstr ""
 "calendario Web remoto. Puede ver y crear acontecimientos en las cuentas "
 "CalDAV igual que en los otros calendarios de Evolution."
 
-#: C/evolution.xml:4314(para)
+#: C/evolution.xml:4560(para)
 msgid ""
 "The Task List, located in the upper-right corner of the calendar, lets you "
 "keep a list of tasks separate from your calendar appointments."
@@ -9616,7 +10284,7 @@ msgstr ""
 "calendario, permite mantener la lista de tareas separada de las citas del "
 "calendario."
 
-#: C/evolution.xml:4315(para)
+#: C/evolution.xml:4561(para)
 msgid ""
 "You can use the list in a larger window by clicking the Tasks button in the "
 "side bar."
@@ -9624,7 +10292,7 @@ msgstr ""
 "Puede usar la lista en la ventana más grande pulsando el botón Tareas en la "
 "barra lateral."
 
-#: C/evolution.xml:4316(para)
+#: C/evolution.xml:4562(para)
 msgid ""
 "Task Lists are more easily organized in the dedicated Tasks tool. Each task "
 "list is assigned a color, and you can use the Tasks tool switcher to hide "
@@ -9638,34 +10306,35 @@ msgstr ""
 "calendario aparecen las tareas de todas las listas de tareas, coloreadas por "
 "su código de lista."
 
-#: C/evolution.xml:4319(link) C/evolution.xml:4330(title)
+#: C/evolution.xml:4565(link) C/evolution.xml:4576(title)
 msgid "Creating a New Task List"
 msgstr "Crear una nueva lista de tareas"
 
 # index.docbook:41, index.docbook:293
-#: C/evolution.xml:4322(link) C/evolution.xml:4349(title)
+#: C/evolution.xml:4568(link) C/evolution.xml:4595(title)
 msgid "Creating a New Task"
 msgstr "Crear una tarea nueva"
 
-#: C/evolution.xml:4325(link) C/evolution.xml:4394(title)
+#: C/evolution.xml:4571(link) C/evolution.xml:4640(title)
 msgid "Assigned Tasks"
 msgstr "Tareas asignadas"
 
-#: C/evolution.xml:4333(para)
+#: C/evolution.xml:4579(para)
 msgid "Click File &gt; New &gt; Task List."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Lista de tareas."
 
-#: C/evolution.xml:4336(para)
+#: C/evolution.xml:4582(para)
 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:4339(para)
-msgid "(Optional) If the task is an online list, specify the URL of the task list."
+#: C/evolution.xml:4585(para)
+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."
 
-#: C/evolution.xml:4345(para)
+#: C/evolution.xml:4591(para)
 msgid ""
 "After you have added a task to your to-do list, its summary appears in the "
 "Summary section of the task list. To view or edit a detailed description of "
@@ -9685,28 +10354,28 @@ msgstr ""
 "dirección y tipo de ordenación, o pulse con el botón derecho para añadir o "
 "eliminar columnas desde la pantalla."
 
-#: C/evolution.xml:4352(para)
+#: C/evolution.xml:4598(para)
 msgid "Click File &gt; New &gt; Task."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Tarea."
 
-#: C/evolution.xml:4355(para) C/evolution.xml:4406(para)
+#: C/evolution.xml:4601(para) C/evolution.xml:4652(para)
 msgid "Select a group for the task."
 msgstr "Seleccione un grupo para la tarea."
 
-#: C/evolution.xml:4361(para)
+#: C/evolution.xml:4607(para)
 msgid "(Optional) Specify a starting date and ending date for the task."
 msgstr ""
 "(Opcional) especifique una fecha de comienzo y una fecha de finalización "
 "para la tarea."
 
-#: C/evolution.xml:4364(para)
+#: C/evolution.xml:4610(para)
 msgid "(Optional) Specify a starting time and ending time for the task."
 msgstr ""
 "(Opcional) especifique una hora de comienzo y una hora de finalización para "
 "la tarea."
 
-#: C/evolution.xml:4380(para) C/evolution.xml:4436(para)
-#: C/evolution.xml:4658(para)
+#: C/evolution.xml:4626(para) C/evolution.xml:4682(para)
+#: C/evolution.xml:4904(para)
 msgid ""
 "(Optional) Click Options &gt; Classifications, then select a classification "
 "(as Public, Private or Confidential)."
@@ -9714,7 +10383,7 @@ msgstr ""
 "(Opcional) pulse Opciones &gt; Clasificaciones, después seleccione una "
 "clasificación (como Público, Privado o Confidencial)."
 
-#: C/evolution.xml:4383(para) C/evolution.xml:4439(para)
+#: C/evolution.xml:4629(para) C/evolution.xml:4685(para)
 msgid ""
 "(Optional) To specify a status for the task, click Options &gt; Status "
 "Details."
@@ -9722,11 +10391,11 @@ msgstr ""
 "(Opcional) para especificar un estado para la tarea, pulse Opciones &gt; "
 "Detalles del estado."
 
-#: C/evolution.xml:4395(para)
+#: C/evolution.xml:4641(para)
 msgid "Evolution can be used to assign a task to multiple people."
 msgstr "Evolution se puede usar para asignar una tarea a varias personas."
 
-#: C/evolution.xml:4396(para)
+#: C/evolution.xml:4642(para)
 msgid ""
 "When you assign a task, you can specify the attendees in several categories, "
 "such as <quote>chair</quote> or <quote>required.</quote> When you save the "
@@ -9739,15 +10408,15 @@ msgstr ""
 "datos de la cita y tendrán la opción de responder."
 
 # index.docbook:41, index.docbook:293
-#: C/evolution.xml:4397(para)
+#: C/evolution.xml:4643(para)
 msgid "To assign a new task:"
 msgstr "Asignar una tarea nueva:"
 
-#: C/evolution.xml:4400(para)
+#: C/evolution.xml:4646(para)
 msgid "Click File &gt; New &gt; Assigned Task."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Tarea asignada."
 
-#: C/evolution.xml:4409(para)
+#: C/evolution.xml:4655(para)
 msgid ""
 "Click Add, or press Insert key, or right click and then press Add to add the "
 "email addresses of people you want to assign the task. To remove an attendee "
@@ -9762,7 +10431,7 @@ msgstr ""
 "el campo y después pulse Editar. Pulse Ver en la barra de menú para mostrar "
 "u ocultar los campos Tipo, Rol, Estado y RSVP."
 
-#: C/evolution.xml:4415(para)
+#: C/evolution.xml:4661(para)
 msgid ""
 "(Optional) Specify a starting date and time, and a due date and time for the "
 "task."
@@ -9770,21 +10439,22 @@ msgstr ""
 "(Opcional) especifique una fecha y hora de comienzo y una fecha y hora de "
 "caducidad para la tarea."
 
-#: C/evolution.xml:4445(title)
+#: C/evolution.xml:4691(title)
 msgid "Searching for Task Items"
 msgstr "Buscar elementos de las tareas"
 
-#: C/evolution.xml:4448(para)
-msgid "Evolution enables you to find the task items by using Customized Search."
+#: C/evolution.xml:4694(para)
+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."
 
-#: C/evolution.xml:4469(para)
+#: C/evolution.xml:4715(para)
 msgid "Evolution displays the desired Task items."
 msgstr "Evolution muestra los elementos de las tareas deseados."
 
-#: C/evolution.xml:4493(para)
+#: C/evolution.xml:4739(para)
 msgid ""
 "Displays all the task items that match the criteria that you have selected "
 "from the drop-down list at the top left side, just above the display pane."
@@ -9793,7 +10463,7 @@ msgstr ""
 "que haya seleccionado de la lista desplegable en la parte superior "
 "izquierda, justo encima del panel de visualización."
 
-#: C/evolution.xml:4495(para)
+#: C/evolution.xml:4741(para)
 msgid ""
 "This feature provides the following best quick search options. This allows "
 "you to quickly see when tasks are due, as it can become unwieldy for "
@@ -9803,19 +10473,19 @@ msgstr ""
 "permite ver rápidamente cuándo vencen las tareas, ya que puede ser "
 "interesante para planificarse si tiene muchas tareas entre manos."
 
-#: C/evolution.xml:4497(title)
+#: C/evolution.xml:4743(title)
 msgid "Any Category:"
 msgstr "Cualquier categoría:"
 
-#: C/evolution.xml:4498(para)
+#: C/evolution.xml:4744(para)
 msgid "Displays all the tasks that fall under any category."
 msgstr "Muestra todas las tareas que están bajo cualquier categoría."
 
-#: C/evolution.xml:4501(title)
+#: C/evolution.xml:4747(title)
 msgid "Unmatched:"
 msgstr "No coincidente:"
 
-#: C/evolution.xml:4502(para)
+#: C/evolution.xml:4748(para)
 msgid ""
 "Displays all the tasks that do not fall under any of the categories listed "
 "here."
@@ -9823,19 +10493,20 @@ msgstr ""
 "Muestra todas las tareas que no están bajo ninguna de las categorías aquí "
 "listadas."
 
-#: C/evolution.xml:4505(title)
+#: C/evolution.xml:4751(title)
 msgid "Next 7 Days' Tasks:"
 msgstr "Tareas de los próximos 7 días:"
 
-#: C/evolution.xml:4506(para)
+#: 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:4509(title)
+#: C/evolution.xml:4755(title)
 msgid "Active Tasks:"
 msgstr "Tareas activas:"
 
-#: C/evolution.xml:4510(para)
+#: C/evolution.xml:4756(para)
 msgid ""
 "Displays all the tasks whose due date is yet to come. This allows you to see "
 "the date due for tasks due in the future."
@@ -9843,35 +10514,35 @@ msgstr ""
 "Muestra todas las tareas cuya fecha de vencimiento está por llegar. Esto le "
 "permite ver la fecha de vencimiento de las tareas que caducan en el futuro."
 
-#: C/evolution.xml:4513(title)
+#: C/evolution.xml:4759(title)
 msgid "Over Due Tasks:"
 msgstr "Tareas vencidas:"
 
-#: C/evolution.xml:4514(para)
+#: C/evolution.xml:4760(para)
 msgid "Displays all the tasks whose end date has already passed."
 msgstr "Muestra todas las tareas cuya fecha de vencimiento ya ha pasado."
 
-#: C/evolution.xml:4517(title)
+#: C/evolution.xml:4763(title)
 msgid "Completed Tasks:"
 msgstr "Tareas completadas:"
 
-#: C/evolution.xml:4518(para)
+#: C/evolution.xml:4764(para)
 msgid "Displays the tasks whose status is 100% completed."
 msgstr "Muestra las tareas cuyo estado es 100% completado."
 
-#: C/evolution.xml:4521(title)
+#: C/evolution.xml:4767(title)
 msgid "Tasks With Attachment:"
 msgstr "Tareas con adjuntos:"
 
-#: C/evolution.xml:4522(para)
+#: C/evolution.xml:4768(para)
 msgid "Displays all the tasks with attachments."
 msgstr "Muestra todas las tareas con adjuntos."
 
-#: C/evolution.xml:4525(title)
+#: C/evolution.xml:4771(title)
 msgid "&lt;List of Categories&gt;:"
 msgstr "&lt;Lista de categorías&gt;:"
 
-#: C/evolution.xml:4526(para)
+#: C/evolution.xml:4772(para)
 msgid ""
 "Lists all the tasks that belong to a particular category such as "
 "Anniversary, Holidays, Gifts, etc."
@@ -9879,47 +10550,47 @@ msgstr ""
 "Lista todas las tareas que pertenezcan a una categoría particular tal como "
 "Aniversarios, Vacaciones, Reglados, etc."
 
-#: C/evolution.xml:4528(para)
+#: C/evolution.xml:4774(para)
 msgid "To perform quick search,"
 msgstr "Para realizar una búsqueda rápida,"
 
-#: C/evolution.xml:4531(para)
+#: C/evolution.xml:4777(para)
 msgid "Click the Show drop-down list from the Search bar."
 msgstr "Pulse sobre la lista desplegable en la barra de búsqueda."
 
-#: C/evolution.xml:4543(para)
+#: C/evolution.xml:4789(para)
 msgid "Next 7 Days Tasks"
 msgstr "Tareas de los próximos 7 días"
 
-#: C/evolution.xml:4546(para)
+#: C/evolution.xml:4792(para)
 msgid "Active Tasks"
 msgstr "Tareas activas"
 
-#: C/evolution.xml:4549(para)
+#: C/evolution.xml:4795(para)
 msgid "Over Due Tasks"
 msgstr "Tareas vencidas"
 
-#: C/evolution.xml:4552(para)
+#: C/evolution.xml:4798(para)
 msgid "Completed Tasks"
 msgstr "Tareas completadas"
 
-#: C/evolution.xml:4555(para)
+#: C/evolution.xml:4801(para)
 msgid "Tasks With Attachments"
 msgstr "Tareas con adjuntos"
 
-#: C/evolution.xml:4579(para) C/evolution.xml:4774(para)
+#: C/evolution.xml:4825(para) C/evolution.xml:5020(para)
 msgid "Holidays"
 msgstr "Vacaciones"
 
-#: C/evolution.xml:4591(para) C/evolution.xml:4786(para)
+#: C/evolution.xml:4837(para) C/evolution.xml:5032(para)
 msgid "Key Customers"
 msgstr "Clientes clave"
 
-#: C/evolution.xml:4623(para)
+#: C/evolution.xml:4869(para)
 msgid "You can view the desired items listed in the Task view."
 msgstr "Puede ver los elementos deseados listados en la vista de tareas."
 
-#: C/evolution.xml:4629(para)
+#: C/evolution.xml:4875(para)
 msgid ""
 "In Evolution, the Memos component lets you create, edit, and store journal "
 "entries without dates, using the filesystem as a backend."
@@ -9927,23 +10598,23 @@ msgstr ""
 "En Evolution, el componente de Notas le permite crear, editar y almacenar "
 "entradas sin fecha de su diario, usando el sistema de archivos como «backend»."
 
-#: C/evolution.xml:4631(para)
+#: C/evolution.xml:4877(para)
 msgid "To create a new memo entry:"
 msgstr "Crear una nueva nota:"
 
-#: C/evolution.xml:4634(para)
+#: C/evolution.xml:4880(para)
 msgid "Click File &gt; New &gt; Memo."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Nota."
 
-#: C/evolution.xml:4637(para) C/evolution.xml:5707(para)
+#: C/evolution.xml:4883(para) C/evolution.xml:5953(para)
 msgid "Select the Group in which you would like to create the entry."
 msgstr "Seleccione el grupo en el que quiere crear la entrada."
 
-#: C/evolution.xml:4641(para)
+#: C/evolution.xml:4887(para)
 msgid "To show or hide Categories field, click View &gt; Categories."
 msgstr "Para mostrar u ocultar el campo Categorías, pulse Ver &gt; Categorías."
 
-#: C/evolution.xml:4647(para) C/evolution.xml:5713(para)
+#: C/evolution.xml:4893(para) C/evolution.xml:5959(para)
 msgid ""
 "In the Start Date field, type the date this reminder note should appear in "
 "the recipients' Calendars."
@@ -9951,11 +10622,11 @@ msgstr ""
 "En el campo Fecha de inicio escriba la fecha en la que esta nota "
 "recordatoria debería aparecer en los calendarios de los Destinatarios."
 
-#: C/evolution.xml:4663(title)
+#: C/evolution.xml:4909(title)
 msgid "The Memo List"
 msgstr "La lista de notas"
 
-#: C/evolution.xml:4664(para)
+#: C/evolution.xml:4910(para)
 msgid ""
 "As with calendars and tasks, you can create multiple memo lists. Each memo "
 "list is assigned a color, and you can use the side bar to hide and show memo "
@@ -9965,23 +10636,23 @@ msgstr ""
 "notas. Cada lista de notas tendrá su color y podrá usar el selector de Notas "
 "para mostrar y ocultar las notas."
 
-#: C/evolution.xml:4665(para)
+#: C/evolution.xml:4911(para)
 msgid "To create a new memo list:"
 msgstr "Crear una nueva lista de notas:"
 
-#: C/evolution.xml:4668(para)
+#: C/evolution.xml:4914(para)
 msgid "Click File &gt; New &gt; Memo List."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Lista de notas."
 
-#: C/evolution.xml:4671(para)
+#: C/evolution.xml:4917(para)
 msgid "Enter the type, name and color for the memo list."
 msgstr "Escriba el tipo, nombre y color para la lista de notas."
 
-#: C/evolution.xml:4680(title)
+#: C/evolution.xml:4926(title)
 msgid "Searching for Memo Items"
 msgstr "Buscar elementos de las notas"
 
-#: C/evolution.xml:4681(para)
+#: C/evolution.xml:4927(para)
 msgid ""
 "You can use a customized search, an advanced search, or a quick search to "
 "search for Memo Items."
@@ -9989,17 +10660,18 @@ msgstr ""
 "Puede usar una búsqueda personalizada, una búsqueda avanzada o una búsqueda "
 "rápida para buscar elementos de las notas."
 
-#: C/evolution.xml:4684(para)
-msgid "Evolution enables you to find the Memo items by using a Customized Search."
+#: C/evolution.xml:4930(para)
+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."
 
-#: C/evolution.xml:4714(para)
+#: C/evolution.xml:4960(para)
 msgid "Select the desired search type from the drop-down list."
 msgstr "Seleccione la opción de búsqueda que desea de la lista desplegable."
 
-#: C/evolution.xml:4737(para)
+#: C/evolution.xml:4983(para)
 msgid ""
 "Displays all the Memo items that match the criteria that you have selected "
 "from the Show drop-down list in the Search bar."
@@ -10007,11 +10679,11 @@ msgstr ""
 "Muestra todos los elementos de las notas que coincidan con los criterios que "
 "haya seleccionado ç de la lista desplegable en la barra de búsqueda."
 
-#: C/evolution.xml:4816(para)
+#: C/evolution.xml:5062(para)
 msgid "You can view the desired items listed in the Memo view."
 msgstr "Puede ver los elementos deseados listados en la vista del notas."
 
-#: C/evolution.xml:4824(para)
+#: C/evolution.xml:5070(para)
 msgid ""
 "Evolution supports the use of time zones. If you share calendar files with "
 "friends or co-workers, you might need to configure your time zone."
@@ -10020,19 +10692,20 @@ msgstr ""
 "archivos de calendario con amigos o compañeros de trabajo es bastante "
 "posible que tenga que configurar su zona horaria."
 
-#: C/evolution.xml:4830(para)
+#: 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:4831(para)
+#: C/evolution.xml:5077(para)
 msgid "Each red dot represents a major city."
 msgstr "Cada punto rojo representa una gran ciudad."
 
-#: C/evolution.xml:4834(para)
+#: C/evolution.xml:5080(para)
 msgid "Select a city, then click OK."
 msgstr "Seleccione una ciudad, después pulse Aceptar."
 
-#: C/evolution.xml:4837(para)
+#: C/evolution.xml:5083(para)
 msgid ""
 "You can also configure time zone information specific to each appointment. "
 "To do that, simply create a new appointment and click the globe to customize "
@@ -10049,11 +10722,11 @@ msgstr ""
 "las llamadas con varias horas de diferencia. Usar las zonas horarias "
 "adecuadas en cada cita ayuda a evitar esa confusión potencial."
 
-#: C/evolution.xml:4841(title)
+#: C/evolution.xml:5087(title)
 msgid "Marcus Bains Line"
 msgstr "Línea Marcus Bains"
 
-#: C/evolution.xml:4842(para)
+#: C/evolution.xml:5088(para)
 msgid ""
 "The Marcus Bains Line is a marker to show the current date and time. This "
 "feature is available in the Evolution calendar."
@@ -10061,7 +10734,7 @@ msgstr ""
 "La línea Marcus Bains es un marcador para mostrar la fecha y hora actuales. "
 "Ahora esta característica está disponible en el calendario de Evolution."
 
-#: C/evolution.xml:4848(para)
+#: C/evolution.xml:5094(para)
 msgid ""
 "<trademark>Evolution</trademark> Exchange for Microsoft Exchange allows "
 "Evolution clients to access accounts on Microsoft Exchange 2000 and 2003 "
@@ -10072,28 +10745,28 @@ msgstr ""
 "2000 y 2003. Al igual que Evolution, es software libre y está licenciado "
 "bajo la GPL."
 
-#: C/evolution.xml:4851(link) C/evolution.xml:4871(title)
+#: C/evolution.xml:5097(link) C/evolution.xml:5117(title)
 msgid "Evolution Exchange Features"
 msgstr "Características de Evolution Exchange"
 
-#: C/evolution.xml:4854(link) C/evolution.xml:4973(title)
+#: C/evolution.xml:5100(link) C/evolution.xml:5219(title)
 msgid "Adding Your Exchange Account to Evolution"
 msgstr "Añadir su cuenta Exchange a Evolution"
 
-#: C/evolution.xml:4857(link) C/evolution.xml:5091(title)
+#: C/evolution.xml:5103(link) C/evolution.xml:5337(title)
 msgid "Accessing the Exchange Server"
 msgstr "Acceder al servidor Exchange"
 
-#: C/evolution.xml:4860(link) C/evolution.xml:5099(title)
+#: C/evolution.xml:5106(link) C/evolution.xml:5345(title)
 msgid "Settings Exclusive to Evolution Exchange"
 msgstr "Ajustes exclusivos de Evolution Exchange"
 
-#: C/evolution.xml:4863(link) C/evolution.xml:5122(link)
-#: C/evolution.xml:5344(title)
+#: C/evolution.xml:5109(link) C/evolution.xml:5368(link)
+#: C/evolution.xml:5590(title)
 msgid "Scheduling Meetings with Free/Busy"
 msgstr "Planificar citas según disponibilidad"
 
-#: C/evolution.xml:4867(para)
+#: C/evolution.xml:5113(para)
 msgid ""
 "Evolution Exchange works only with Exchange 2000 and later, and requires "
 "that Outlook Web Access be enabled. Each user needs a valid Microsoft "
@@ -10103,23 +10776,24 @@ msgstr ""
 "habilitar el componente Outlook Web Access. Cada usuario debe disponer de "
 "una cuenta válida en el servidor Microsoft Exchange, incluida la licencia."
 
-#: C/evolution.xml:4872(para)
-msgid "Evolution Exchange supports the following basic Microsoft Exchange features:"
+#: C/evolution.xml:5118(para)
+msgid ""
+"Evolution Exchange supports the following basic Microsoft Exchange features:"
 msgstr ""
 "Evolution Exchange soporta las siguientes características básicas de "
 "Microsoft Exchange:"
 
-#: C/evolution.xml:4875(para) C/evolution.xml:6532(link)
-#: C/evolution.xml:6543(title) C/evolution.xml:6591(link)
-#: C/evolution.xml:6605(title)
+#: C/evolution.xml:5121(para) C/evolution.xml:6771(link)
+#: C/evolution.xml:6782(title) C/evolution.xml:6830(link)
+#: C/evolution.xml:6844(title)
 msgid "General"
 msgstr "General"
 
-#: C/evolution.xml:4879(title)
+#: C/evolution.xml:5125(title)
 msgid "Remote Exchange Information Store:"
 msgstr "Almacén remoto de información de Exchange:"
 
-#: C/evolution.xml:4880(para)
+#: C/evolution.xml:5126(para)
 msgid ""
 "Allows you to access mail, address book (including the Global Address List "
 "folder), calendars, and task folders on an Exchange server from Evolution."
@@ -10128,19 +10802,19 @@ msgstr ""
 "carpeta Lista de direcciones globales), calendarios y carpetas de tareas en "
 "un servidor Exchange desde Evolution."
 
-#: C/evolution.xml:4885(title)
+#: C/evolution.xml:5131(title)
 msgid "Palm Synchronization:"
 msgstr "Sincronización con Palm:"
 
-#: C/evolution.xml:4886(para)
+#: C/evolution.xml:5132(para)
 msgid "Supported for Contacts and Calendars on Exchange."
 msgstr "Compatibilidad con los contactos y calendarios de Exchange."
 
-#: C/evolution.xml:4891(title)
+#: C/evolution.xml:5137(title)
 msgid "Password Management:"
 msgstr "Gestión de contraseñas:"
 
-#: C/evolution.xml:4892(para)
+#: C/evolution.xml:5138(para)
 msgid ""
 "Allows you to reset your password. If your password has expired, Evolution "
 "asks you to change your password at startup."
@@ -10148,15 +10822,15 @@ msgstr ""
 "Le permite borrar su contraseña. Si su contraseña ha caducado, Evolution le "
 "pregunta si quiere cambiarla durante el inicio."
 
-#: C/evolution.xml:4898(para) C/evolution.xml:5433(para)
+#: C/evolution.xml:5144(para) C/evolution.xml:5679(para)
 msgid "Mail"
 msgstr "Correo"
 
-#: C/evolution.xml:4902(title)
+#: C/evolution.xml:5148(title)
 msgid "Viewing Mail in Exchange Folders:"
 msgstr "Ver correo en carpetas Exchange:"
 
-#: C/evolution.xml:4903(para)
+#: C/evolution.xml:5149(para)
 msgid ""
 "Mail stored on the Exchange server is visible in the Mail component in "
 "Evolution."
@@ -10164,11 +10838,11 @@ msgstr ""
 "El correo almacenado en el servidor Exchange se verá en el componente de "
 "correo de Evolution."
 
-#: C/evolution.xml:4908(title)
+#: C/evolution.xml:5154(title)
 msgid "Sending Email via Exchange Protocols:"
 msgstr "Envío de correo mediante protocolos Exchange:"
 
-#: C/evolution.xml:4909(para)
+#: C/evolution.xml:5155(para)
 msgid ""
 "If you use the Microsoft Exchange mail transport protocol to send email, "
 "make sure that the address you have entered as your email address is exactly "
@@ -10183,11 +10857,11 @@ msgstr ""
 "<quote>sunombre@exchange-server.ejemplo.com</quote> en lugar de "
 "<quote>sunombre@ejemplo.com.</quote>."
 
-#: C/evolution.xml:4914(title)
+#: C/evolution.xml:5160(title)
 msgid "Out of Office Message:"
 msgstr "Mensaje de Estoy fuera de la oficina:"
 
-#: C/evolution.xml:4915(para)
+#: C/evolution.xml:5161(para)
 msgid ""
 "You can set <quote>out of Office</quote> message that will automatically be "
 "sent to people who send mail to you while you are away from office."
@@ -10196,11 +10870,11 @@ msgstr ""
 "enviará automáticamente a las personas que le envíen correos mientras está "
 "fuera de la oficina."
 
-#: C/evolution.xml:4920(title)
+#: C/evolution.xml:5166(title)
 msgid "Send Options:"
 msgstr "Opciones de envío:"
 
-#: C/evolution.xml:4921(para)
+#: C/evolution.xml:5167(para)
 msgid ""
 "You can set the priority and sensitivity of the sent message so that the "
 "recipients will know how important the message is.The priority can have one "
@@ -10216,16 +10890,16 @@ msgstr ""
 "Confidencial respectivamente. También puede activar la confirmación de envío "
 "de mensaje y de lectura de mensaje para los mensajes enviados."
 
-#: C/evolution.xml:4927(para) C/evolution.xml:5456(para)
-#: C/evolution.xml:6987(link) C/evolution.xml:7057(title)
+#: C/evolution.xml:5173(para) C/evolution.xml:5702(para)
+#: C/evolution.xml:7350(link) C/evolution.xml:7420(title)
 msgid "Calendar"
 msgstr "Calendario"
 
-#: C/evolution.xml:4931(title)
+#: C/evolution.xml:5177(title)
 msgid "Meeting Requests/Proposal:"
 msgstr "Solicitud y convocatoria de reuniones:"
 
-#: C/evolution.xml:4932(para)
+#: C/evolution.xml:5178(para)
 msgid ""
 "Allows Evolution users to schedule meetings. You can check when other users "
 "are busy according to their calendars and send the meeting requests "
@@ -10235,11 +10909,11 @@ msgstr ""
 "cuando están ocupados los otros usuarios de acuerdo con sus calendarios y "
 "enviar peticiones de reunión de forma consecuente."
 
-#: C/evolution.xml:4937(title)
+#: C/evolution.xml:5183(title)
 msgid "Adding iCalendar Meeting Requests to the Calendar:"
 msgstr "Añadir solicitudes de reuniones iCalendar al calendario:"
 
-#: C/evolution.xml:4938(para)
+#: C/evolution.xml:5184(para)
 msgid ""
 "Allows you to add the iCalendar meeting requests you receive to your "
 "Exchange calendar. Note that you need to specify the calendar from the list, "
@@ -10249,24 +10923,24 @@ msgstr ""
 "calendario Exchange. Nótese que necesita especificar el calendario de la "
 "lista, en la que quiere añadir sus horarios de reuniones."
 
-#: C/evolution.xml:4944(para) C/evolution.xml:5368(para)
-#: C/evolution.xml:5467(para)
+#: C/evolution.xml:5190(para) C/evolution.xml:5614(para)
+#: C/evolution.xml:5713(para)
 msgid "Contacts"
 msgstr "Contactos"
 
-#: C/evolution.xml:4948(title)
+#: C/evolution.xml:5194(title)
 msgid "Address Completion:"
 msgstr "Autocompletado de direcciones:"
 
-#: C/evolution.xml:4949(para)
+#: C/evolution.xml:5195(para)
 msgid "Supported for your Exchange Contacts folder."
 msgstr "Soporte para sus carpeta de contactos Exchange."
 
-#: C/evolution.xml:4954(title)
+#: C/evolution.xml:5200(title)
 msgid "Adding vCards to the Address Book:"
 msgstr "Añadir vCards a la libreta de direcciones:"
 
-#: C/evolution.xml:4955(para)
+#: C/evolution.xml:5201(para)
 msgid ""
 "Allows you to save the vCards you receive in attachment to your Exchange "
 "address book.New Address Book entries can also be created on Exchange from "
@@ -10277,11 +10951,11 @@ msgstr ""
 "también se pueden crear desde mensajes de correo-e recibidos con una sola "
 "pulsación."
 
-#: C/evolution.xml:4961(para)
+#: C/evolution.xml:5207(para)
 msgid "Work Offline (disconnected mode)"
 msgstr "«Trabajar desconectado» (modo desconectado)"
 
-#: C/evolution.xml:4962(para)
+#: C/evolution.xml:5208(para)
 msgid ""
 "To mark a folder for offline usage, right-click the folder, then click "
 "Properties. Click Copy Folder Content Locally for Offline Operation. For "
@@ -10293,11 +10967,11 @@ msgstr ""
 "carpeta localmente para operación desconectada. Para obtener más información "
 "vea <link linkend=\"usage-mail-getnsend-offline\">Trabar desconectado</link>."
 
-#: C/evolution.xml:4967(para)
+#: C/evolution.xml:5213(para)
 msgid "Recall Message function is not available."
 msgstr "La función Recordar mensaje no está disponible."
 
-#: C/evolution.xml:4974(para)
+#: C/evolution.xml:5220(para)
 msgid ""
 "After you have installed Evolution Exchange, you need to set up access for "
 "your Exchange account on both the Exchange server and within Evolution."
@@ -10305,35 +10979,35 @@ msgstr ""
 "Después de instalar Evolution Exchange, necesita configurar el acceso a su "
 "cuenta Exchange tanto en el servidor Exchange como en Evolution."
 
-#: C/evolution.xml:4977(link) C/evolution.xml:4994(title)
+#: C/evolution.xml:5223(link) C/evolution.xml:5240(title)
 msgid "Exchange Server Settings"
 msgstr "Configuración del servidor Exchange"
 
-#: C/evolution.xml:4980(link) C/evolution.xml:5008(title)
+#: C/evolution.xml:5226(link) C/evolution.xml:5254(title)
 msgid "Standard Configuration Tool for Evolution Exchange"
 msgstr "Herramienta de configuración estándar para Evolution Exchange"
 
-#: C/evolution.xml:4983(link) C/evolution.xml:5012(title)
+#: C/evolution.xml:5229(link) C/evolution.xml:5258(title)
 msgid "Simple Configuration Tool for Evolution Exchange"
 msgstr "Herramienta sencilla de configuración para Evolution Exchange"
 
-#: C/evolution.xml:4986(link) C/evolution.xml:5019(title)
+#: C/evolution.xml:5232(link) C/evolution.xml:5265(title)
 msgid "Creating a New Exchange Account"
 msgstr "Creación de una nueva cuenta Exchange"
 
-#: C/evolution.xml:4989(link) C/evolution.xml:5043(title)
+#: C/evolution.xml:5235(link) C/evolution.xml:5289(title)
 msgid "Configuring an Existing Account for Evolution Exchange Account"
 msgstr "Configurar una cuenta existente para utilizarla con Evolution Exchange"
 
-#: C/evolution.xml:4995(para)
+#: C/evolution.xml:5241(para)
 msgid "Check with your system administrator to ensure that:"
 msgstr "Compruebe con el administrador del sistema los puntos siguientes:"
 
-#: C/evolution.xml:4998(para)
+#: C/evolution.xml:5244(para)
 msgid "You have a valid account on the Exchange server."
 msgstr "Posee una cuenta válida en el servidor Exchange."
 
-#: C/evolution.xml:5001(para)
+#: C/evolution.xml:5247(para)
 msgid ""
 "You are permitted to access the account with WebDAV. This is the default "
 "setting for the Exchange server, so unless your system administrator has "
@@ -10343,7 +11017,7 @@ msgstr ""
 "predeterminado del servidor Exchange, y no debería sernecesario modificarlo, "
 "a menos que su administrador de sistema lo haya deshabilitado."
 
-#: C/evolution.xml:5004(para)
+#: C/evolution.xml:5250(para)
 msgid ""
 "The <ulink url=\"http://support.novell.com\"><trademark class=\"registered"
 "\">Novell</trademark> Web site Knowledgebase</ulink> has additional "
@@ -10355,7 +11029,7 @@ msgstr ""
 "información adicional para asegurar que su servidor Exchange acepte las "
 "conexiones de Evolution."
 
-#: C/evolution.xml:5009(para)
+#: C/evolution.xml:5255(para)
 msgid ""
 "When you know that your server is ready for you to connect, you are ready to "
 "add your Exchange account to Evolution Exchange."
@@ -10363,7 +11037,7 @@ msgstr ""
 "Una vez sepa que su servidor está disponible para conectarse, está preparado "
 "para añadir su cuenta Exchange a Evolution Exchange."
 
-#: C/evolution.xml:5013(para)
+#: C/evolution.xml:5259(para)
 msgid ""
 "Evolution Exchange comes with a simple account creation tool for Exchange "
 "accounts."
@@ -10371,7 +11045,7 @@ msgstr ""
 "Evolution Exchange proporciona una herramienta de creación de cuentas simple "
 "para cuentas Exchange."
 
-#: C/evolution.xml:5014(para)
+#: C/evolution.xml:5260(para)
 msgid ""
 "If you have no accounts configured, the simple account configuration "
 "assistant starts when you start Evolution. It asks only for the Outlook Web "
@@ -10384,7 +11058,7 @@ msgstr ""
 "Evolution Exchange determinará por sí mismo el resto de la información "
 "necesaria."
 
-#: C/evolution.xml:5015(para)
+#: C/evolution.xml:5261(para)
 msgid ""
 "If the simple account configuration tool does not run automatically, you "
 "need to create an account manually. For more information on how to do this, "
@@ -10396,7 +11070,7 @@ msgstr ""
 "información acerca de ello, vea <link linkend=\"config-exchange-new-account"
 "\">Creación de una nueva cuenta Exchange</link>."
 
-#: C/evolution.xml:5030(para)
+#: C/evolution.xml:5276(para)
 msgid ""
 "Create the account following the procedure in <link linkend=\"usage-"
 "mainwindow-starting\">Starting Evolution for the First Time</link>. Remember "
@@ -10407,11 +11081,12 @@ msgstr ""
 "seleccionar el servidor Miscrosoft Exchange como el tipo de servidor en la "
 "sección Recepción de correo."
 
-#: C/evolution.xml:5036(para)
+#: 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:5044(para)
+#: C/evolution.xml:5290(para)
 msgid ""
 "Use the following procedure to configure your existing account for Evolution "
 "Exchange:"
@@ -10419,7 +11094,7 @@ msgstr ""
 "Use el siguiente procedimiento para configurar su cuenta ya existente para "
 "Evolution Exchange:"
 
-#: C/evolution.xml:5050(para)
+#: C/evolution.xml:5296(para)
 msgid ""
 "Select the account you want to convert, then click Edit to appear the "
 "Account Editor."
@@ -10427,15 +11102,15 @@ msgstr ""
 "Seleccione la cuenta que quiera convertir, después pulse Editar para que "
 "aparezca el Editor de cuentas."
 
-#: C/evolution.xml:5051(para)
+#: C/evolution.xml:5297(para)
 msgid "You can view Identity tab enabled."
 msgstr "Podrá ver la solapa Identidad activada."
 
-#: C/evolution.xml:5056(para) C/evolution.xml:5630(para)
+#: C/evolution.xml:5302(para) C/evolution.xml:5876(para)
 msgid "Change your email address as needed."
 msgstr "Cambie su cuenta de correo electrónico si es necesario."
 
-#: C/evolution.xml:5059(para)
+#: C/evolution.xml:5305(para)
 msgid ""
 "Click the Receiving Mail tab, then select Microsoft Exchange as your server "
 "type."
@@ -10443,7 +11118,7 @@ msgstr ""
 "Pulse sobre la solapa Recepción de correo, después seleccione Microsoft "
 "Exchange como tipo de servidor."
 
-#: C/evolution.xml:5064(para)
+#: C/evolution.xml:5310(para)
 msgid ""
 "Type your user name, and the Outlook Web Access (OWA) URL. Click "
 "Authenticate, then enter the password at the prompt. The Exchange server "
@@ -10453,11 +11128,11 @@ msgstr ""
 "Autenticar, después introduzca la contraseña al ser preguntar. El servidor "
 "autenticará su cuenta."
 
-#: C/evolution.xml:5072(para) C/evolution.xml:5644(para)
+#: C/evolution.xml:5318(para) C/evolution.xml:5890(para)
 msgid "Click the Receiving Options tab."
 msgstr "Pulse en la solapa Opciones de recepción."
 
-#: C/evolution.xml:5073(para)
+#: C/evolution.xml:5319(para)
 msgid ""
 "Specify how often to check for new mail, your Global Catalog server name and "
 "whether to apply filters to messages in your Inbox, check for junk, set a "
@@ -10468,7 +11143,7 @@ msgstr ""
 "su Bandeja de entrada, comprobar el correo basura, establecer una caducidad "
 "para la contraseña y cualquier otro ajuste que quiera incluir."
 
-#: C/evolution.xml:5076(para)
+#: C/evolution.xml:5322(para)
 msgid ""
 "Use the Defaults tab to define folders, send cc: or bcc: messages to certain "
 "IDs, and set options for message receipts."
@@ -10477,16 +11152,16 @@ msgstr ""
 "determinadas identidades y establecer opciones para los destinatarios de los "
 "mensajes."
 
-#: C/evolution.xml:5079(para)
+#: C/evolution.xml:5325(para)
 msgid "Use the Security tab to set PGP and s/MIME options."
 msgstr "Use la solapa Seguridad para establecer las opciones PGP y S/MIME."
 
 # index.docbook:88, index.docbook:89
-#: C/evolution.xml:5082(para)
+#: C/evolution.xml:5328(para)
 msgid "Quit Evolution and restart it."
 msgstr "Salir de Evolution y reiniciarlo."
 
-#: C/evolution.xml:5083(para)
+#: C/evolution.xml:5329(para)
 msgid ""
 "Changes to Evolution Exchange accounts configuration are not active until "
 "you have restarted the application."
@@ -10494,7 +11169,7 @@ msgstr ""
 "Los cambios en la configuración de cuentas de Evolution Exchange no se "
 "activarán hasta después de reiniciar la aplicación."
 
-#: C/evolution.xml:5092(para)
+#: C/evolution.xml:5338(para)
 msgid ""
 "When you have installed Evolution Exchange, you can access public folders "
 "and perform certain Exchange actions like delegation and password "
@@ -10514,7 +11189,7 @@ msgstr ""
 "la de Contactos para los contactos y la herramienta de Calendario para "
 "planificar sus horarios."
 
-#: C/evolution.xml:5093(para)
+#: C/evolution.xml:5339(para)
 msgid ""
 "If you are using both an Exchange account and a local mail account, you "
 "should be aware that whenever you save an email address or appointment from "
@@ -10531,7 +11206,7 @@ msgstr ""
 "direcciones de su dispositivo Palm OS se sincronizarán con las carpetas "
 "correspondientes en Exchange, y no en su equipo local."
 
-#: C/evolution.xml:5094(para)
+#: C/evolution.xml:5340(para)
 msgid ""
 "To avoid unnecessary strain on the server, the Global Address List (GAL) "
 "appears empty until you search for something in it."
@@ -10539,7 +11214,7 @@ msgstr ""
 "Para evitar carga innecesaria en el servidor, la Lista de direcciones "
 "globales (GAL) aparece vacía hasta que busque algo en ella."
 
-#: C/evolution.xml:5100(para)
+#: C/evolution.xml:5346(para)
 msgid ""
 "There are some settings in Evolution that are available only with Evolution "
 "Exchange, like delegation and permission handling, creating <quote>Out of "
@@ -10550,31 +11225,31 @@ msgstr ""
 "mensajes <quote>Estoy fuera de la oficina</quote>, cambiar la contraseña y "
 "ver el tamaño de la carpeta."
 
-#: C/evolution.xml:5104(link) C/evolution.xml:5127(title)
+#: C/evolution.xml:5350(link) C/evolution.xml:5373(title)
 msgid "Send Options"
 msgstr "Opciones de envío"
 
-#: C/evolution.xml:5107(link) C/evolution.xml:5208(title)
+#: C/evolution.xml:5353(link) C/evolution.xml:5454(title)
 msgid "Access Delegation"
 msgstr "Delegación de acceso"
 
-#: C/evolution.xml:5110(link) C/evolution.xml:5212(title)
+#: C/evolution.xml:5356(link) C/evolution.xml:5458(title)
 msgid "Delegating Access to Others"
 msgstr "Delegando acceso a terceros"
 
-#: C/evolution.xml:5113(link) C/evolution.xml:5262(title)
+#: C/evolution.xml:5359(link) C/evolution.xml:5508(title)
 msgid "Subscribe to Other Users' Folders"
 msgstr "Subscribirse a la carpeta de otro usuario"
 
-#: C/evolution.xml:5116(link) C/evolution.xml:5286(title)
+#: C/evolution.xml:5362(link) C/evolution.xml:5532(title)
 msgid "Subscribe to Public Folders"
 msgstr "Suscribirse a carpetas públicas"
 
-#: C/evolution.xml:5119(link) C/evolution.xml:5316(title)
+#: C/evolution.xml:5365(link) C/evolution.xml:5562(title)
 msgid "Setting an Out of Office Message"
 msgstr "Configuración un mensaje de Estoy fuera"
 
-#: C/evolution.xml:5128(para)
+#: C/evolution.xml:5374(para)
 msgid ""
 "You can set the priority and sensitivity of the sent message from an "
 "exchange account so that the recipients will know how important the message "
@@ -10591,11 +11266,11 @@ msgstr ""
 "confirmación de envío de mensaje y de lectura de mensaje para los mensajes "
 "enviados."
 
-#: C/evolution.xml:5131(title)
+#: C/evolution.xml:5377(title)
 msgid "Tracking Options"
 msgstr "Opciones de seguimiento"
 
-#: C/evolution.xml:5132(para)
+#: C/evolution.xml:5378(para)
 msgid ""
 "Evolution lets you track the status of an item you have sent. You can enable "
 "the Delivery Receipt request as well as Read Receipt request so that you "
@@ -10606,26 +11281,26 @@ msgstr ""
 "lectura de mensaje y así podrá saber cuándo llegó el elemento al "
 "destinatario o cuándo lo leyó."
 
-#: C/evolution.xml:5133(para)
+#: C/evolution.xml:5379(para)
 msgid "To set the importance and sensitivity of the message:"
 msgstr "Para establecer la importancia y sensibilidad del mensaje:"
 
-#: C/evolution.xml:5136(para)
+#: C/evolution.xml:5382(para)
 msgid "Open a Compose Message window."
 msgstr "Abra una ventana del editor de mensajes."
 
 # index.docbook:473, index.docbook:474
-#: C/evolution.xml:5139(para)
+#: C/evolution.xml:5385(para)
 msgid "Select the exchange account from the From field."
 msgstr "Seleccione la cuenta de Exchange del campo De."
 
-#: C/evolution.xml:5142(para)
+#: C/evolution.xml:5388(para)
 msgid "Click Insert &gt; Send Options to open the Send Option dialog box"
 msgstr ""
 "Pulse Insertar &gt; Opciones de envío para abrir el cuadro de diálogo de "
 "Opciones de envío"
 
-#: C/evolution.xml:5147(para)
+#: C/evolution.xml:5393(para)
 msgid ""
 "Select the priority for your sent message from the given three options "
 "(Normal, High, Low)"
@@ -10633,7 +11308,7 @@ msgstr ""
 "Seleccione la prioridad para su mensaje enviado de las tres opciones "
 "proporcionadas (Normal, Alta, Baja)"
 
-#: C/evolution.xml:5150(para)
+#: C/evolution.xml:5396(para)
 msgid ""
 "Select the sensitivity for your sent message from the given four options "
 "(Normal, Personal, Private, Confidential)."
@@ -10641,11 +11316,11 @@ msgstr ""
 "Seleccione la sensibilidad para su mensaje enviado de las cuatro opciones "
 "proporcionadas (Normal, Personal, Privado, Confidencial)."
 
-#: C/evolution.xml:5154(title)
+#: C/evolution.xml:5400(title)
 msgid "Message Access Delegation:"
 msgstr "Delegación de acceso a mensajes:"
 
-#: C/evolution.xml:5155(para)
+#: C/evolution.xml:5401(para)
 msgid ""
 "Click Send as Delegate to send the message to the recipient on behalf of "
 "someone else."
@@ -10653,7 +11328,7 @@ msgstr ""
 "Pulse Enviar como delegado para enviar el mensaje al destinatario en nombre "
 "de otra persona."
 
-#: C/evolution.xml:5158(para)
+#: C/evolution.xml:5404(para)
 msgid ""
 "To send a calendar item as delegate, you should subscribe to the delegator's "
 "message and also you should have necessary rights assigned to you by the "
@@ -10663,11 +11338,11 @@ msgstr ""
 "mensaje del delgado y también debe tener asignados los permisos necesarios "
 "por el delegador."
 
-#: C/evolution.xml:5162(para)
+#: C/evolution.xml:5408(para)
 msgid "Click User to open Show Contacts dialog box."
 msgstr "Pulse Usuario para abrir el cuadro de diálogo Mostrar contactos."
 
-#: C/evolution.xml:5165(para)
+#: C/evolution.xml:5411(para)
 msgid ""
 "Select the contact from the desired Address book and click Add, then close "
 "the dialog box."
@@ -10675,7 +11350,7 @@ msgstr ""
 "Seleccione el contacto de la Libreta de direcciones deseada y pulse Añadir, "
 "después cierre el cuadro de diálogo."
 
-#: C/evolution.xml:5167(para)
+#: C/evolution.xml:5413(para)
 msgid ""
 "You are not permitted to send a message on behalf of more than one person at "
 "a time."
@@ -10683,7 +11358,7 @@ msgstr ""
 "No se le permite enviar un mensaje en nombre de a más de una persona a la "
 "vez."
 
-#: C/evolution.xml:5169(para)
+#: C/evolution.xml:5415(para)
 msgid ""
 "When the recipient opens the mail, he or she can also read a message that "
 "<guilabel>The message was sent by &lt;Delegator's name&gt; on behalf of &lt;"
@@ -10694,7 +11369,7 @@ msgstr ""
 "delegador&gt;</guilabel> en la barra de cabeceras del panel de vista "
 "preliminar."
 
-#: C/evolution.xml:5174(para)
+#: C/evolution.xml:5420(para)
 msgid ""
 "Select the Request a delivery receipt for this message check box to get a "
 "delivery receipt from your recipient."
@@ -10702,7 +11377,7 @@ msgstr ""
 "Seleccione la casilla de verificación Pedir una confirmación de entrega para "
 "este mensaje para obtener una confirmación de entrega de su destinatario."
 
-#: C/evolution.xml:5177(para)
+#: C/evolution.xml:5423(para)
 msgid ""
 "Select the Request a read receipt for this message to get a read receipt for "
 "the message you have sent."
@@ -10710,11 +11385,11 @@ msgstr ""
 "Seleccione Pedir una confirmación de lectura para este mensaje para obtener "
 "una confirmación de lectura para este mensaje que ha enviado."
 
-#: C/evolution.xml:5186(title)
+#: C/evolution.xml:5432(title)
 msgid "Delegating Calendar Items"
 msgstr "Delegar elementos del calendario"
 
-#: C/evolution.xml:5187(para)
+#: C/evolution.xml:5433(para)
 msgid ""
 "You can send Meetings or Appointments on behalf of someone else if you have "
 "subscribed to his or her Calendar."
@@ -10722,23 +11397,23 @@ msgstr ""
 "Puede enviar Reuniones o Citas en nombre de otra persona si se ha suscrito a "
 "su calendario."
 
-#: C/evolution.xml:5190(para)
+#: C/evolution.xml:5436(para)
 msgid "Select the delegator's Calendar."
 msgstr "Seleccione el calendario del delegado."
 
-#: C/evolution.xml:5193(para)
+#: C/evolution.xml:5439(para)
 msgid "Open a new Meeting composer window."
 msgstr "Abra una ventana del editor de Reuniones."
 
-#: C/evolution.xml:5196(para)
+#: C/evolution.xml:5442(para)
 msgid "Add the recipients."
 msgstr "Añada los destinatarios."
 
-#: C/evolution.xml:5199(para)
+#: C/evolution.xml:5445(para)
 msgid "Fill in the information."
 msgstr "Rellene la información."
 
-#: C/evolution.xml:5201(para)
+#: C/evolution.xml:5447(para)
 msgid ""
 "When the recipient receives the calendar item, a message indicates that the "
 "item was created by someone on behalf of the Delegator."
@@ -10746,7 +11421,7 @@ msgstr ""
 "Cuando el destinatario recibe el elemento del calendario, un mensaje "
 "indicará que el elemento se creó por alguien en nombre del Delegador."
 
-#: C/evolution.xml:5209(para)
+#: C/evolution.xml:5455(para)
 msgid ""
 "You can allow other people in your organization's Global Address List to "
 "access your calendar, address book, and messages, and they can let you "
@@ -10759,25 +11434,26 @@ msgstr ""
 "usuarios hacer cualquier cosa, desde consultarse mutuamente sus planes hasta "
 "gestionar completamente toda su información personal."
 
-#: C/evolution.xml:5213(para)
+#: C/evolution.xml:5459(para)
 msgid "To add someone to your list of delegates:"
 msgstr "Para añadir alguien a su lista de delegados:"
 
-#: C/evolution.xml:5219(para)
+#: C/evolution.xml:5465(para)
 msgid "Click the Exchange Settings tab."
 msgstr "Pulse en la solapa Configuración de Exchange."
 
-#: C/evolution.xml:5222(para)
+#: C/evolution.xml:5468(para)
 msgid "Click Delegation Assistant to open the Delegates dialog box."
 msgstr ""
 "Pulse Asistente de delegaciones para abrir el cuadro de diálogo de los "
 "Delegados."
 
-#: C/evolution.xml:5227(para)
+#: 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:5228(para)
+#: C/evolution.xml:5474(para)
 msgid ""
 "Remember that the Global Address List (GAL) appears empty until you have "
 "searched for something in it."
@@ -10785,7 +11461,7 @@ msgstr ""
 "Recuerde que la Lista de direcciones globales (GAL) aparecerá vacía hasta "
 "que haya introducido algo para buscar."
 
-#: C/evolution.xml:5231(para)
+#: C/evolution.xml:5477(para)
 msgid ""
 "Select the delegate and click Edit to open the delegate permission dialog "
 "box."
@@ -10793,7 +11469,7 @@ msgstr ""
 "Seleccione el delegado y pulse Editar para abrir el cuadro de diálogo de "
 "permisos del delegado."
 
-#: C/evolution.xml:5236(para)
+#: C/evolution.xml:5482(para)
 msgid ""
 "Select from the following access levels for each of the four types of "
 "folders:"
@@ -10801,15 +11477,15 @@ msgstr ""
 "Seleccione uno de los siguientes niveles de acceso para cada uno de los "
 "cuatro tipos de carpetas:"
 
-#: C/evolution.xml:5239(para)
+#: C/evolution.xml:5485(para)
 msgid "Do not allow this person to access any folders of this type."
 msgstr "No permitir a esta persona acceder a ninguna carpeta de este tipo."
 
-#: C/evolution.xml:5242(title)
+#: C/evolution.xml:5488(title)
 msgid "Reviewer (read-only):"
 msgstr "Revisor (sólo lectura):"
 
-#: C/evolution.xml:5243(para)
+#: C/evolution.xml:5489(para)
 msgid ""
 "Allows the delegate to see items in this type of folder, but not create new "
 "items or edit existing items."
@@ -10817,11 +11493,11 @@ msgstr ""
 "Permite al delegado ver elementos en este tipo de carpeta pero no crear "
 "nuevos o modificar los existentes."
 
-#: C/evolution.xml:5246(title)
+#: C/evolution.xml:5492(title)
 msgid "Author (read, create):"
 msgstr "Autor (leer, crear):"
 
-#: C/evolution.xml:5247(para)
+#: C/evolution.xml:5493(para)
 msgid ""
 "The delegate can view items in your folders, and can create new items, but "
 "cannot change any existing items."
@@ -10829,15 +11505,15 @@ msgstr ""
 "El delegado puede ver elementos en sus carpetas y puede crear otros nuevos "
 "pero no puede modificar ninguno de los existentes."
 
-#: C/evolution.xml:5250(title)
+#: C/evolution.xml:5496(title)
 msgid "Editor (read, create, edit):"
 msgstr "Editor (leer, crear, editar):"
 
-#: C/evolution.xml:5251(para)
+#: C/evolution.xml:5497(para)
 msgid "The delegate can view, create, and change items in your folders."
 msgstr "El delegado puede ver, crear y cambiar elementos en sus carpetas."
 
-#: C/evolution.xml:5258(para)
+#: C/evolution.xml:5504(para)
 msgid ""
 "The delegate is notified through a separate mail that he or she is being "
 "added to your list of delegates. The mail summarizes all the rights that "
@@ -10847,15 +11523,15 @@ msgstr ""
 "añadido a su lista de delegados. El correo resume todos los permisos que se "
 "le han asignado."
 
-#: C/evolution.xml:5263(para)
+#: C/evolution.xml:5509(para)
 msgid "To access the folders delegated to you:"
 msgstr "Para acceder a las carpetas que le han sido delegadas:"
 
-#: C/evolution.xml:5266(para)
+#: C/evolution.xml:5512(para)
 msgid "Click File &gt; Subscribe to Other User's Exchange Folder."
 msgstr "Pulse Archivo &gt; Suscribirse a la carpeta Exchange de otro usuario."
 
-#: C/evolution.xml:5271(para)
+#: C/evolution.xml:5517(para)
 msgid ""
 "Specify the email address of the user who has delegated to you, or click "
 "User to select the user from your address book."
@@ -10863,11 +11539,11 @@ msgstr ""
 "Especifique la dirección de correo-e del usuario que le haya delegado o "
 "pulse el botón Usuario para elegirlo de su libreta de direcciones."
 
-#: C/evolution.xml:5274(para)
+#: C/evolution.xml:5520(para)
 msgid "Select the folder you want to open."
 msgstr "Seleccione la carpeta que quiere abrir."
 
-#: C/evolution.xml:5280(para)
+#: C/evolution.xml:5526(para)
 msgid ""
 "Folders delegated to you appear in your folder list inside a folder labeled "
 "with the name of its owner. For example, if Martha Thompson delegates "
@@ -10880,7 +11556,7 @@ msgstr ""
 "carpeta llamada Ignacio Matamoros en el árbol de carpetas, al mismo nivel "
 "que sus carpetas locales y carpetas públicas."
 
-#: C/evolution.xml:5281(para)
+#: C/evolution.xml:5527(para)
 msgid ""
 "If the folder fails to open properly, check with the folder owner to make "
 "sure that you have been granted the correct access permissions."
@@ -10888,29 +11564,31 @@ msgstr ""
 "Si la carpeta no se abre adecuadamente, compruebe con el dueño de la carpeta "
 "que le ha concedido los permisos de acceso correctos."
 
-#: C/evolution.xml:5287(para)
+#: 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:5293(para)
+#: C/evolution.xml:5539(para)
 msgid "Select the Exchange account."
 msgstr "Seleccione la cuenta de Exchange."
 
-#: C/evolution.xml:5296(para)
+#: C/evolution.xml:5542(para)
 msgid "Check the folders you want to subscribe to."
 msgstr "Seleccione las carpetas a las que se quiere suscribir."
 
-#: C/evolution.xml:5302(para)
-msgid "The folders you have subscribed to appear in the folder list at the left."
+#: C/evolution.xml:5548(para)
+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."
 
-#: C/evolution.xml:5305(para)
+#: C/evolution.xml:5551(para)
 msgid "To view contents of a folder, click it."
 msgstr "Para ver el contenido de una carpeta, pulse sobre ella."
 
-#: C/evolution.xml:5312(para)
+#: C/evolution.xml:5558(para)
 msgid ""
 "Reminders for meetings in your Exchange calendar do not work until you have "
 "run Evolution at least once after logging in. This is different from locally "
@@ -10932,7 +11610,7 @@ msgstr ""
 "guilabel>. Para obtener más información acerca de los Recordatorios consulte "
 "<link linkend=\"bshly4v\">Recordatorios</link>."
 
-#: C/evolution.xml:5317(para)
+#: C/evolution.xml:5563(para)
 msgid ""
 "An Out of Office message is an automatic reply that you can send as a reply "
 "to messages, explaining why you are not immediately responding to their "
@@ -10947,11 +11625,11 @@ msgstr ""
 "para que la gente sepa que realmente no los está ignorando."
 
 # index.docbook:473, index.docbook:474
-#: C/evolution.xml:5323(para)
+#: C/evolution.xml:5569(para)
 msgid "Select the Exchange account, then click Edit."
 msgstr "Seleccione la cuenta de Exchange, después pulse Editar."
 
-#: C/evolution.xml:5326(para)
+#: C/evolution.xml:5572(para)
 msgid ""
 "Select the Exchange Settings tab. The top option allows you to set an Out of "
 "Office message."
@@ -10959,15 +11637,15 @@ msgstr ""
 "Seleccione la solapa Configuración de Exchange. La opción superior le "
 "permitirá establecer un Mensaje para cuando esté fuera de la oficina."
 
-#: C/evolution.xml:5329(para)
+#: C/evolution.xml:5575(para)
 msgid "Click I Am Currently Out of the Office."
 msgstr "Pulse Ahora no estoy en la oficina."
 
-#: C/evolution.xml:5332(para)
+#: C/evolution.xml:5578(para)
 msgid "Type a short message in the text field."
 msgstr "Escriba un mensaje corto en el campo de texto."
 
-#: C/evolution.xml:5339(para)
+#: C/evolution.xml:5585(para)
 msgid ""
 "Your message is automatically sent to anyone who sends you mail until you "
 "return and select I Am in the office."
@@ -10975,7 +11653,7 @@ msgstr ""
 "Su mensaje se envía automáticamente a cualquiera que le envíe correo hasta "
 "que vuelva y seleccione Ahora estoy en la oficina."
 
-#: C/evolution.xml:5345(para)
+#: C/evolution.xml:5591(para)
 msgid ""
 "Evolution helps you fix a convenient time for a meeting according to the "
 "availability of the attendees.It's Free/Busy feature allows you to perform a "
@@ -10989,11 +11667,11 @@ msgstr ""
 "usuarios para saber si están ocupados según sus calendarios Exchange, y de "
 "ser así cambiar la hora de la reunión de una forma conjunta."
 
-#: C/evolution.xml:5349(para)
+#: C/evolution.xml:5595(para)
 msgid "Create a new appointment in the calendar."
 msgstr "Crear una nueva cita en el calendario."
 
-#: C/evolution.xml:5352(para)
+#: C/evolution.xml:5598(para)
 msgid ""
 "Right-click the appointment, then select Schedule Meeting to appear "
 "Evolution Meeting editor."
@@ -11001,13 +11679,13 @@ msgstr ""
 "Pulse con el botón derecho del ratón sobre la cita, después seleccione "
 "Concertar una reunión para mostrar el editor de citas de Evolution."
 
-#: C/evolution.xml:5355(para)
+#: C/evolution.xml:5601(para)
 msgid "Click the Add tab to enter the email addresses into the list."
 msgstr ""
 "Pulse sobre la solapa Añadir para introducir las direcciones de correo-e en "
 "la lista."
 
-#: C/evolution.xml:5358(para)
+#: C/evolution.xml:5604(para)
 msgid ""
 "Click the Attendees tab to select the participants from Global Address List "
 "(GAL)."
@@ -11015,17 +11693,18 @@ msgstr ""
 "Pulse la solapa Participantes para seleccionar los participantes de Listas "
 "de direcciones globales (GAL)."
 
-#: C/evolution.xml:5359(para)
-msgid "You can directly select the participants from the following address lists."
+#: C/evolution.xml:5605(para)
+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."
 
-#: C/evolution.xml:5365(para)
+#: C/evolution.xml:5611(para)
 msgid "Global Address List"
 msgstr "Lista de direcciones global"
 
-#: C/evolution.xml:5371(para)
+#: C/evolution.xml:5617(para)
 msgid ""
 "You can also specify the category as Anniversary, Birthday, Business etc. "
 "from the drop-down list for each address list given."
@@ -11033,31 +11712,31 @@ msgstr ""
 "También puede especificar la categoría como Aniversario, Cumpleaños, "
 "Negocios etc, de la lista desplegable para cada lista de direcciones dada."
 
-#: C/evolution.xml:5374(para)
+#: C/evolution.xml:5620(para)
 msgid "Add the participants to the following categories of attendees."
 msgstr "Añada los participantes a las siguientes categorías de asistentes."
 
-#: C/evolution.xml:5377(para)
+#: C/evolution.xml:5623(para)
 msgid "Chair Persons"
 msgstr "Presidencia"
 
-#: C/evolution.xml:5380(para)
+#: C/evolution.xml:5626(para)
 msgid "Required Participants"
 msgstr "Participantes requeridos"
 
-#: C/evolution.xml:5383(para)
+#: C/evolution.xml:5629(para)
 msgid "Optional Participants"
 msgstr "Participantes opcionales"
 
-#: C/evolution.xml:5386(para)
+#: C/evolution.xml:5632(para)
 msgid "Resources"
 msgstr "Recursos"
 
-#: C/evolution.xml:5391(para)
+#: C/evolution.xml:5637(para)
 msgid "Click Free/Busy tool at the top right corner."
 msgstr "La herramienta de Disponibilidad en la esquina superior derecha."
 
-#: C/evolution.xml:5394(para)
+#: C/evolution.xml:5640(para)
 msgid ""
 "Click Options &gt; Update Free/Busy to check participant schedules and, if "
 "possible, update the meeting in all participants' calendars"
@@ -11066,7 +11745,7 @@ msgstr ""
 "los participantes y, si es posible, actualizar la reunión en los calendarios "
 "de cada uno de los asistentes"
 
-#: C/evolution.xml:5397(para)
+#: C/evolution.xml:5643(para)
 msgid ""
 "If meeting attendees are not available during the times you have scheduled a "
 "meeting, you can <quote>nudge</quote> the meeting forward or backward to the "
@@ -11084,7 +11763,7 @@ msgstr ""
 "asistentes estarán disponibles. Si el resultado no le satisface, arrastre "
 "los lados de la reunión hacia las horas que desea seleccionar."
 
-#: C/evolution.xml:5403(para)
+#: C/evolution.xml:5649(para)
 msgid ""
 "<trademark>Evolution</trademark> can access accounts on <trademark class="
 "\"registered\">Novell</trademark><trademark class=\"registered\">GroupWise</"
@@ -11094,35 +11773,35 @@ msgstr ""
 "<trademark class=\"registered\">Novell</trademark><trademark class="
 "\"registered\">GroupWise</trademark> 7."
 
-#: C/evolution.xml:5406(link) C/evolution.xml:5429(title)
+#: C/evolution.xml:5652(link) C/evolution.xml:5675(title)
 msgid "GroupWise Features"
 msgstr "Características de GroupWise"
 
-#: C/evolution.xml:5409(link) C/evolution.xml:5518(title)
+#: C/evolution.xml:5655(link) C/evolution.xml:5764(title)
 msgid "GroupWise Terminology vs. Evolution Terminology"
 msgstr "Terminologías GroupWise y Evolution"
 
-#: C/evolution.xml:5412(link) C/evolution.xml:5589(title)
+#: C/evolution.xml:5658(link) C/evolution.xml:5835(title)
 msgid "Adding your GroupWise Account to Evolution"
 msgstr "Añadir su cuenta GroupWise a Evolution"
 
-#: C/evolution.xml:5415(link) C/evolution.xml:5730(title)
+#: C/evolution.xml:5661(link) C/evolution.xml:5976(title)
 msgid "Scheduling Appointments with Free/Busy"
 msgstr "Planificando citas según disponibilidad"
 
-#: C/evolution.xml:5418(link) C/evolution.xml:5752(title)
+#: C/evolution.xml:5664(link) C/evolution.xml:5998(title)
 msgid "Managing Sent Items"
 msgstr "Gestionar los elementos enviados"
 
-#: C/evolution.xml:5421(link) C/evolution.xml:5933(title)
+#: C/evolution.xml:5667(link) C/evolution.xml:6179(title)
 msgid "Giving Other People Access to Your Mailbox or Calendar"
 msgstr "Dar acceso a su Buzón de correo o Calendario a otros"
 
-#: C/evolution.xml:5424(link) C/evolution.xml:6104(title)
+#: C/evolution.xml:5670(link) C/evolution.xml:6350(title)
 msgid "Junk Mail Handling"
 msgstr "Gestión de correo basura"
 
-#: C/evolution.xml:5430(para)
+#: C/evolution.xml:5676(para)
 msgid ""
 "GroupWise connectivity in Evolution supports the following basic Novell "
 "GroupWise features:"
@@ -11130,23 +11809,23 @@ msgstr ""
 "La conectividad de GroupWise en Evolution soporta las siguientes "
 "características básicas de Novell GroupWise:"
 
-#: C/evolution.xml:5436(para)
+#: C/evolution.xml:5682(para)
 msgid "Viewing mail and folders stored on the GroupWise system."
 msgstr "Ver el correo y las carpetas almacenadas en el sistema GroupWise."
 
-#: C/evolution.xml:5439(para)
+#: C/evolution.xml:5685(para)
 msgid "Sending mail from you GroupWise account."
 msgstr "Enviar correo desde su cuenta GroupWise."
 
-#: C/evolution.xml:5442(para)
+#: C/evolution.xml:5688(para)
 msgid "Converting mail to a task or meeting."
 msgstr "Convertir un correo en una tarea o reunión."
 
-#: C/evolution.xml:5445(para)
+#: C/evolution.xml:5691(para)
 msgid "Tracking the status of a message."
 msgstr "Seguir el estado de un mensaje."
 
-#: C/evolution.xml:5448(para)
+#: C/evolution.xml:5694(para)
 msgid ""
 "Marking a message as junk mail adds the sender to your GroupWise junk mail "
 "list."
@@ -11154,11 +11833,11 @@ msgstr ""
 "Marcar un mensaje como correo basura añade al remitente a su lista de correo "
 "basura de GroupWise."
 
-#: C/evolution.xml:5451(para)
+#: C/evolution.xml:5697(para)
 msgid "Improved Status Tracking."
 msgstr "Seguimiento de estado mejorado."
 
-#: C/evolution.xml:5459(para)
+#: C/evolution.xml:5705(para)
 msgid ""
 "You can send and receive appointment and meeting requests. Allows Evolution "
 "users to schedule meetings and view attendee availability for other users on "
@@ -11168,7 +11847,7 @@ msgstr ""
 "usuarios de Evolution programar sus reuniones y examinar la disponibilidad "
 "de asistencia de otros usuarios en GroupWise."
 
-#: C/evolution.xml:5462(para)
+#: C/evolution.xml:5708(para)
 msgid ""
 "You can receive an iCalendar meeting request and add it to your GroupWise "
 "calendar."
@@ -11176,7 +11855,7 @@ msgstr ""
 "Puede recibir una solicitud de reunión con iCalendar y añadirla a su "
 "calendario GroupWise."
 
-#: C/evolution.xml:5470(para)
+#: C/evolution.xml:5716(para)
 msgid ""
 "Address Completion is supported for your GroupWise address books, including "
 "the System address book, the Frequent Contacts address book, and your "
@@ -11186,7 +11865,7 @@ msgstr ""
 "GruopWise, incluyendo la libreta de direcciones del sistema, los Contactos "
 "frecuentes y su libreta de direcciones personal."
 
-#: C/evolution.xml:5473(para)
+#: C/evolution.xml:5719(para)
 msgid ""
 "If you receive a card attachment and click Save in Address Book, it is saved "
 "to your Personal address book. New Address Book entries can also be added to "
@@ -11197,7 +11876,7 @@ msgstr ""
 "de las libretas de direcciones nuevas también se pueden añadir a su libreta "
 "de direcciones personal desde mensajes de correo-e recibidos."
 
-#: C/evolution.xml:5476(para)
+#: C/evolution.xml:5722(para)
 msgid ""
 "To create your GroupWise Frequent contacts and Personal address books, you "
 "need to access your GroupWise account once through GroupWise Java client "
@@ -11211,11 +11890,11 @@ msgstr ""
 "crearlas. La libreta de direcciones del sistema de GroupWise se marca para "
 "uso desconectado de manera predeterminada. Esto acelera el rendimiento."
 
-#: C/evolution.xml:5481(para) C/evolution.xml:5553(para)
+#: C/evolution.xml:5727(para) C/evolution.xml:5799(para)
 msgid "Reminder Note"
 msgstr "Nota de recuerdo"
 
-#: C/evolution.xml:5484(para)
+#: C/evolution.xml:5730(para)
 msgid ""
 "GroupWise Reminder Note is integrated into Memo component. You can view the "
 "Reminder notes listed under Memos at the bottom right of the Calendar view "
@@ -11226,39 +11905,39 @@ msgstr ""
 "derecha de la vista del Calendario suponiendo que las ha seleccionando bajo "
 "el componente de Notas."
 
-#: C/evolution.xml:5489(para)
+#: C/evolution.xml:5735(para)
 msgid "Proxy"
 msgstr "Proxy"
 
-#: C/evolution.xml:5492(para)
+#: C/evolution.xml:5738(para)
 msgid "You can assign Proxy access to other users."
 msgstr "Puede asignar acceso proxy a otros usuarios."
 
-#: C/evolution.xml:5495(para)
+#: C/evolution.xml:5741(para)
 msgid "You can view other users' accounts through Proxy access."
 msgstr "Puede ver las cuentas de otros usuarios a través de un proxy."
 
-#: C/evolution.xml:5500(para)
+#: C/evolution.xml:5746(para)
 msgid "There are, however, some features that are not available:"
 msgstr "Sin embargo, algunas características no están disponibles:"
 
-#: C/evolution.xml:5503(para)
+#: C/evolution.xml:5749(para)
 msgid "Resending items"
 msgstr "Reenviar elementos"
 
-#: C/evolution.xml:5506(para)
+#: C/evolution.xml:5752(para)
 msgid "Retracting items"
 msgstr "Retractar elementos"
 
-#: C/evolution.xml:5509(para)
+#: C/evolution.xml:5755(para)
 msgid "Accepting appointments or meetings in offline mode"
 msgstr "Aceptar citas o reuniones en modo desconectado"
 
-#: C/evolution.xml:5512(para)
+#: C/evolution.xml:5758(para)
 msgid "Archive"
 msgstr "Archivar"
 
-#: C/evolution.xml:5519(para)
+#: C/evolution.xml:5765(para)
 msgid ""
 "GroupWise and Evolution sometimes uses different terminology for different "
 "types of items. The following table compares GroupWise terminology to "
@@ -11268,55 +11947,55 @@ msgstr ""
 "tipos de elementos. La siguiente tabla compara la terminología de GroupWise "
 "con la terminología de Evolution."
 
-#: C/evolution.xml:5527(para)
+#: C/evolution.xml:5773(para)
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: C/evolution.xml:5537(para) C/evolution.xml:5548(para)
+#: C/evolution.xml:5783(para) C/evolution.xml:5794(para)
 msgid "Appointment"
 msgstr "Cita"
 
-#: C/evolution.xml:5540(para)
+#: C/evolution.xml:5786(para)
 msgid "Meeting"
 msgstr "Reunión"
 
-#: C/evolution.xml:5545(para)
+#: C/evolution.xml:5791(para)
 msgid "Posted Appointment"
 msgstr "Cita postpuesta"
 
-#: C/evolution.xml:5556(para) C/evolution.xml:5580(para)
+#: C/evolution.xml:5802(para) C/evolution.xml:5826(para)
 msgid "None; use a task"
 msgstr "Ninguno, usar una tarea"
 
-#: C/evolution.xml:5561(para)
+#: C/evolution.xml:5807(para)
 msgid "Discussion Note"
 msgstr "Nota de discusión"
 
-#: C/evolution.xml:5564(para)
+#: C/evolution.xml:5810(para)
 msgid "None; use an assigned task"
 msgstr "Ninguno, usar una tarea asignada"
 
-#: C/evolution.xml:5569(para)
+#: C/evolution.xml:5815(para)
 msgid "Phone Message"
 msgstr "Mensajes telefónicos"
 
-#: C/evolution.xml:5572(para)
+#: C/evolution.xml:5818(para)
 msgid "None; use a message"
 msgstr "Ninguno, usar un mensaje"
 
-#: C/evolution.xml:5577(para)
+#: C/evolution.xml:5823(para)
 msgid "Checklist"
 msgstr "Lista de comprobación"
 
-#: C/evolution.xml:5592(link) C/evolution.xml:5600(title)
+#: C/evolution.xml:5838(link) C/evolution.xml:5846(title)
 msgid "Creating a New GroupWise Account"
 msgstr "Crear una nueva cuenta GroupWise"
 
-#: C/evolution.xml:5595(link) C/evolution.xml:5615(title)
+#: C/evolution.xml:5841(link) C/evolution.xml:5861(title)
 msgid "Changing an Existing Account to Work with GroupWise"
 msgstr "Modificar una cuenta existente para trabajar con GroupWise"
 
-#: C/evolution.xml:5609(para)
+#: C/evolution.xml:5855(para)
 msgid ""
 "Create the account following the procedure in <link linkend=\"usage-"
 "mainwindow-starting\">Starting Evolution for the First Time</link>."
@@ -11324,7 +12003,7 @@ msgstr ""
 "Cree la cuenta siguiendo el procedimiento en <link linkend=\"usage-"
 "mainwindow-starting\">Inicio de Evolution por primera vez</link>."
 
-#: C/evolution.xml:5616(para)
+#: C/evolution.xml:5862(para)
 msgid ""
 "If you have an existing email account, and want to convert it to use with "
 "GroupWise:"
@@ -11332,15 +12011,15 @@ msgstr ""
 "Si ya tiene una cuenta de correo-e existente y quiere convertirla para "
 "usarla con GroupWise:"
 
-#: C/evolution.xml:5622(para)
+#: C/evolution.xml:5868(para)
 msgid "Select the account you want to convert, then click Edit."
 msgstr "Seleccione la cuenta que quiere convertir, después pulse Editar."
 
-#: C/evolution.xml:5625(para)
+#: C/evolution.xml:5871(para)
 msgid "Click the Identity tab."
 msgstr "Pulse la solapa de Identidad."
 
-#: C/evolution.xml:5633(para)
+#: C/evolution.xml:5879(para)
 msgid ""
 "Click the Receiving Email tab, then select Novell GroupWise as your server "
 "type."
@@ -11348,7 +12027,7 @@ msgstr ""
 "Pulse sobre la solapa Recepción de correo, después seleccione Novell "
 "GroupWise como el tipo de servidor."
 
-#: C/evolution.xml:5638(para)
+#: C/evolution.xml:5884(para)
 msgid ""
 "Type the name of your mail server, your user name, and select whether to use "
 "SSL."
@@ -11356,15 +12035,15 @@ msgstr ""
 "Escriba el nombre del servidor de su correo, su nombre de usuario y "
 "seleccione si quiere usar SSL."
 
-#: C/evolution.xml:5640(para)
+#: C/evolution.xml:5886(para)
 msgid ""
-"Select SSL for a highly secured connection between your client and server. "
-"Contact your administrator for further details."
+"Select Use SSL to enable a secure connection between Evolution and the "
+"server."
 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."
+"Seleccione Usar SSL para activar una conexión segura entre Evolution y el "
+"servidor."
 
-#: C/evolution.xml:5665(para)
+#: C/evolution.xml:5911(para)
 msgid ""
 "Select if you want to automatically synchronize your remote calendar and "
 "contacts locally."
@@ -11372,7 +12051,7 @@ msgstr ""
 "Seleccione si quiere sincronizar automáticamente su calendario remoto y sus "
 "contactos localmente."
 
-#: C/evolution.xml:5666(para)
+#: C/evolution.xml:5912(para)
 msgid ""
 "It fetches the remote calendar and contact information and stores it on your "
 "local drive."
@@ -11380,7 +12059,7 @@ msgstr ""
 "Obtiene el calendario y la información del contacto remotos y los almacena "
 "en su unidad local."
 
-#: C/evolution.xml:5668(para)
+#: C/evolution.xml:5914(para)
 msgid ""
 "Remote calendar and contacts are typically stored remotely on servers rather "
 "than on local hard disk."
@@ -11388,7 +12067,7 @@ msgstr ""
 "Generalmente los calendarios y contactos remotos se almacenan en servidores "
 "en lugar de en discos duros locales."
 
-#: C/evolution.xml:5672(para)
+#: C/evolution.xml:5918(para)
 msgid ""
 "Specify your Post Office Agent SOAP port in the Post Office Agent SOAP Port "
 "field."
@@ -11396,7 +12075,7 @@ msgstr ""
 "Especifique su puerto del agente de la oficina de correos SOAP en el campo "
 "Puerto del agente de la oficina de correos SOAP."
 
-#: C/evolution.xml:5676(para)
+#: C/evolution.xml:5922(para)
 msgid ""
 "(Optional) Click the Proxy tab, then click Add to add any Proxy users to "
 "your account."
@@ -11404,11 +12083,11 @@ msgstr ""
 "(Opcional) pulse sobre la solapa Proxy, después pulse Añadir para añadir "
 "cualquier usuario proxy a su cuenta."
 
-#: C/evolution.xml:5687(title)
+#: C/evolution.xml:5933(title)
 msgid "Reminder Notes"
 msgstr "Notas de recordatorios"
 
-#: C/evolution.xml:5688(para)
+#: C/evolution.xml:5934(para)
 msgid ""
 "GroupWise Reminder notes are like mail messages except they are scheduled "
 "for a particular day and appear on the Calendar for that date. You can use "
@@ -11423,7 +12102,7 @@ msgstr ""
 "Calendario en la fecha que especifique. No se emplazan en su Buzón de correo "
 "o en el buzón de correo de ningún otro usuario."
 
-#: C/evolution.xml:5689(para)
+#: C/evolution.xml:5935(para)
 msgid ""
 "Evolution integrates this feature into its Memo component so that you can "
 "view the Reminder notes listed under Memo at the right bottom side of the "
@@ -11433,7 +12112,7 @@ msgstr ""
 "que puede ver las Notas de recordatorio listadas bajo las Notas en la parte "
 "inferior derecha de la vista del calendario."
 
-#: C/evolution.xml:5691(para)
+#: C/evolution.xml:5937(para)
 msgid ""
 "Select the memo or the Reminder notes under the Memo component to display it "
 "on the Calendar view."
@@ -11441,7 +12120,7 @@ msgstr ""
 "Seleccione la nota o la Nota de recordatorio bajo el componente Notas para "
 "mostrarla en la vista del Calendario."
 
-#: C/evolution.xml:5694(para)
+#: C/evolution.xml:5940(para)
 msgid ""
 "To create a new Reminder Note follow <link linkend=\"b1012vde\">Step 1</"
 "link> through <link linkend=\"b10fqh6r\">Step 8</link> under <link linkend="
@@ -11451,15 +12130,15 @@ msgstr ""
 "\">Paso 1</link> hasta el <link linkend=\"b10fqh6r\">Paso 8</link> bajo "
 "<link linkend=\"b1012vdd\">Notas</link>."
 
-#: C/evolution.xml:5695(para)
+#: C/evolution.xml:5941(para)
 msgid "To send a Reminder Note,"
 msgstr "Enviar una nota de recordatorio,"
 
-#: C/evolution.xml:5698(para)
+#: C/evolution.xml:5944(para)
 msgid "Click File &gt; New &gt; Shared Memo."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Nota compartida."
 
-#: C/evolution.xml:5701(para)
+#: C/evolution.xml:5947(para)
 msgid ""
 "Select the Organizer's account name from the drop-down list given next to "
 "the Organizer field."
@@ -11467,7 +12146,7 @@ msgstr ""
 "Seleccione el nombre de la cuenta del Organizador de la lista desplegable "
 "proporcionada junto al campo Organizador."
 
-#: C/evolution.xml:5704(para)
+#: C/evolution.xml:5950(para)
 msgid ""
 "In the To field, type a username, then press Enter. Repeat for additional "
 "users."
@@ -11475,15 +12154,15 @@ msgstr ""
 "En el campo Para escriba un nombre de usuario, después pulse Intro. Repita "
 "la operación para añadir usuarios adicionales."
 
-#: C/evolution.xml:5716(para)
+#: C/evolution.xml:5962(para)
 msgid "Specify the category that the Reminder note falls under."
 msgstr "Especifique la categoría bajo la que recae la nota de recordatorio."
 
-#: C/evolution.xml:5722(para)
+#: C/evolution.xml:5968(para)
 msgid "Click Save."
 msgstr "Pulse Guardar."
 
-#: C/evolution.xml:5731(para)
+#: C/evolution.xml:5977(para)
 msgid ""
 "When you schedule a meeting with your calendar on GroupWise, you can check "
 "when other local GroupWise users are busy according to their GroupWise "
@@ -11493,7 +12172,7 @@ msgstr ""
 "podrá comprobar la disponibilidad de otros usuarios en el mismo servidor en "
 "función de sus respectivos calendarios GruopWise."
 
-#: C/evolution.xml:5733(para)
+#: C/evolution.xml:5979(para)
 msgid ""
 "Reminders for appointments in your GroupWise calendar do not work until you "
 "have run Evolution at least once after logging in. This is different from "
@@ -11506,15 +12185,15 @@ msgstr ""
 "que funcionan desde el mismo momento de iniciar la sesión, sin tener en "
 "cuenta si ejecutó el Evolution durante dicha sesión."
 
-#: C/evolution.xml:5736(para)
+#: C/evolution.xml:5982(para)
 msgid "Open a new appointment in the calendar."
 msgstr "Abra una nueva cita en el calendario."
 
-#: C/evolution.xml:5739(para)
+#: C/evolution.xml:5985(para)
 msgid "Click Actions &gt; Schedule Meeting."
 msgstr "Pulse Acciones &gt; Planificar una reunión."
 
-#: C/evolution.xml:5742(para)
+#: C/evolution.xml:5988(para)
 msgid ""
 "Add attendees, either by entering their email addresses into the list, or by "
 "clicking the Invite Others button."
@@ -11522,7 +12201,7 @@ msgstr ""
 "Añada participantes, ya sea introduciendo sus direcciones de correo-e en la "
 "lista o pulsando el botón Invitar a otros."
 
-#: C/evolution.xml:5745(para)
+#: C/evolution.xml:5991(para)
 msgid ""
 "Click Options, then click Update Free/Busy to check participant schedules "
 "and, if possible, update the meeting in all participants' calendars."
@@ -11531,7 +12210,7 @@ msgstr ""
 "agendas de los participantes y, si es posible, actualizar la reunión en los "
 "calendarios de cada uno de los asistentes."
 
-#: C/evolution.xml:5748(para)
+#: C/evolution.xml:5994(para)
 msgid ""
 "If meeting attendees are not available during the times you have scheduled a "
 "meeting, you can <quote>nudge</quote> the meeting forward or backward to the "
@@ -11549,24 +12228,24 @@ msgstr ""
 "asistentes estarán disponibles. Si el resultado no le satisface, arrastre "
 "los lados de la reunión hacia las horas que desea seleccionar."
 
-#: C/evolution.xml:5755(link) C/evolution.xml:5775(title)
+#: C/evolution.xml:6001(link) C/evolution.xml:6021(title)
 msgid "Confirming Delivery of Items You have Sent"
 msgstr "Confirmar la entrega de los elementos que ha enviado"
 
-#: C/evolution.xml:5758(link) C/evolution.xml:5881(title)
+#: C/evolution.xml:6004(link) C/evolution.xml:6127(title)
 msgid "Displaying Sent Items"
 msgstr "Mostrar elementos enviados"
 
-#: C/evolution.xml:5761(link) C/evolution.xml:5820(title)
+#: C/evolution.xml:6007(link) C/evolution.xml:6066(title)
 msgid "Checking the Status of an Item You Have Sent"
 msgstr "Comprobar el estado de un elemento que ha enviado"
 
-#: C/evolution.xml:5764(link) C/evolution.xml:5767(link)
-#: C/evolution.xml:5847(title)
+#: C/evolution.xml:6010(link) C/evolution.xml:6013(link)
+#: C/evolution.xml:6093(title)
 msgid "Requesting a Reply for Items You Send"
 msgstr "Petición de respuesta para elementos que envíe"
 
-#: C/evolution.xml:5771(para)
+#: C/evolution.xml:6017(para)
 msgid ""
 "You can manage your sent items for GroupWise email only if the recipient is "
 "located on the same GroupWise system as you."
@@ -11574,7 +12253,7 @@ msgstr ""
 "Puede gestionar sus elementos enviados para correo electrónico GroupWise "
 "sólo si el destinatario está ubicado en el mismo sistema GruopWise."
 
-#: C/evolution.xml:5776(para)
+#: C/evolution.xml:6022(para)
 msgid ""
 "Evolution provides several ways for you to confirm that your item was "
 "delivered. You can easily track message status of any message you have sent. "
@@ -11586,11 +12265,11 @@ msgstr ""
 "enviado. Por ejemplo, puede ver cuándo se entregó un correo-e y cuándo lo "
 "abrió o borró el destinatario."
 
-#: C/evolution.xml:5778(title)
+#: C/evolution.xml:6024(title)
 msgid "Track an Item You Sent:"
 msgstr "Seguir un elemento que haya enviado:"
 
-#: C/evolution.xml:5779(para)
+#: C/evolution.xml:6025(para)
 msgid ""
 "You can check the status in the Message Status window of an email you have "
 "sent."
@@ -11598,11 +12277,11 @@ msgstr ""
 "Puede comprobar el estado de un correo electrónico que haya enviado en la "
 "ventana Estado del mensaje."
 
-#: C/evolution.xml:5782(title)
+#: C/evolution.xml:6028(title)
 msgid "Receive Notification When the Item is Opened or Deleted:"
 msgstr "Recibir una notificación cuando se abre o borra el elemento:"
 
-#: C/evolution.xml:5783(para)
+#: C/evolution.xml:6029(para)
 msgid ""
 "You can receive notification when the recipient opens or deletes a message. "
 "For information, see <link linkend=\"Ak05sv1\">Requesting a Reply for Items "
@@ -11612,11 +12291,11 @@ msgstr ""
 "mensaje. Para obtener más información consulte <link linkend=\"Ak05sv1"
 "\">Recibir notificaciones acerca de elementos que envíe</link>."
 
-#: C/evolution.xml:5786(title)
+#: C/evolution.xml:6032(title)
 msgid "Request a Reply:"
 msgstr "Pedir una respuesta:"
 
-#: C/evolution.xml:5787(para)
+#: C/evolution.xml:6033(para)
 msgid ""
 "You can inform the recipient that you need a reply to an email. Evolution "
 "adds a sentence to the item stating that a reply is requested and changes "
@@ -11629,26 +12308,27 @@ msgstr ""
 "doble flecha. Para obtener más información vea <link linkend=\"Ak05sv1"
 "\">Petición de respuesta para elementos que envíe</link>."
 
-#: C/evolution.xml:5791(title) C/evolution.xml:5905(title)
+#: C/evolution.xml:6037(title) C/evolution.xml:6151(title)
 msgid "Enabling Status Tracking"
 msgstr "Activar el seguimiento de estado"
 
-#: C/evolution.xml:5794(para) C/evolution.xml:5834(para)
-#: C/evolution.xml:5850(para)
+#: 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:5795(para)
+#: C/evolution.xml:6041(para)
 msgid "Select Status Tracking."
 msgstr "Seleccione Seguimiento de estado"
 
-#: C/evolution.xml:5800(para) C/evolution.xml:5912(para)
+#: C/evolution.xml:6046(para) C/evolution.xml:6158(para)
 msgid "Select the check box next to Create a sent item to track information."
 msgstr ""
 "Seleccione la casilla de verificación junto a Crear un elemento enviado para "
 "seguimiento de la información."
 
-#: C/evolution.xml:5803(para) C/evolution.xml:5915(para)
+#: C/evolution.xml:6049(para) C/evolution.xml:6161(para)
 msgid ""
 "Select any of the options given (Delivered, Delivered and opened, All "
 "information)"
@@ -11656,7 +12336,7 @@ msgstr ""
 "Seleccione cualqueira de las opciones dadas (Entregado, Entregado y abierto, "
 "Toda la información)"
 
-#: C/evolution.xml:5804(para) C/evolution.xml:5916(para)
+#: C/evolution.xml:6050(para) C/evolution.xml:6162(para)
 msgid ""
 "Based on this selection, you can view the status of the send message in the "
 "Sent Items folder."
@@ -11664,7 +12344,7 @@ msgstr ""
 "Basándose en esta selección, puede ver el estado del mensaje enviado en la "
 "carpeta de Correo enviado."
 
-#: C/evolution.xml:5805(para)
+#: C/evolution.xml:6051(para)
 msgid ""
 "For more information, see <link linkend=\"Aal54a9\">Checking the Status of "
 "an Item You Have Sent</link>."
@@ -11672,7 +12352,7 @@ msgstr ""
 "Para obtener más información, consulte <link linkend=\"Aal54a9\">Comprobar "
 "el estado de un elemento que ha enviado</link>."
 
-#: C/evolution.xml:5808(para) C/evolution.xml:5919(para)
+#: C/evolution.xml:6054(para) C/evolution.xml:6165(para)
 msgid ""
 "(Optional)Select the check box next to Auto-delete sent item to "
 "automatically delete the sent item from the Sent folder."
@@ -11680,19 +12360,20 @@ msgstr ""
 "(Opcional) Seleccione la casilla junto a Autoborrar el elemento enviado para "
 "borrar automáticamente el elemento enviado de la carpeta Correo enviado."
 
-#: C/evolution.xml:5811(para) C/evolution.xml:5922(para)
+#: C/evolution.xml:6057(para) C/evolution.xml:6168(para)
 msgid "Under Return Notification, specify the type of return receipt you want."
 msgstr ""
 "En Devolver notificación, especifique el tipo de notificación que desea "
 "recibir."
 
-#: C/evolution.xml:5823(para)
-msgid "Right-click an email in your Sent folder, then click Track Message Status."
+#: C/evolution.xml:6069(para)
+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."
 
-#: C/evolution.xml:5824(para)
+#: C/evolution.xml:6070(para)
 msgid ""
 "With Message Tracking, you know when the item reaches the recipients or is "
 "read by them. You also know exactly who received your message, who read your "
@@ -11702,15 +12383,15 @@ msgstr ""
 "destinatarios o cuándo se leyó. También podrá saber exactamente quién "
 "recibió su mensaje, quién lo leyó y quién lo borró y cuándo."
 
-#: C/evolution.xml:5831(title)
+#: C/evolution.xml:6077(title)
 msgid "Changing the Priority of an Email"
 msgstr "Cambiar la prioridad de un correo-e"
 
-#: C/evolution.xml:5837(para)
+#: C/evolution.xml:6083(para)
 msgid "Select High Priority, Standard Priority, Low Priority, or Undefined."
 msgstr "Seleccione Prioridad Alta, Estándar, Baja, o Indefinida."
 
-#: C/evolution.xml:5838(para)
+#: C/evolution.xml:6084(para)
 msgid ""
 "The small icon next to an item in the Mailbox is red when the priority is "
 "high."
@@ -11718,13 +12399,13 @@ msgstr ""
 "El pequeño icono junto al elemento en el Buzón de correo será rojo cuando la "
 "prioridad sea alta."
 
-#: C/evolution.xml:5854(para)
+#: C/evolution.xml:6100(para)
 msgid "Click Reply Requested, then specify when you want to receive the reply."
 msgstr ""
 "Pulse Respuesta solicitada, después especifique cuando quiere recibir la "
 "respuesta."
 
-#: C/evolution.xml:5855(para)
+#: C/evolution.xml:6101(para)
 msgid ""
 "If you select When Convenient, then Reply Requested: When Convenient appears "
 "at the top of the message. If you select Within x Days, then Reply "
@@ -11736,7 +12417,7 @@ msgstr ""
 "días, entonces aparecerá Respuesta solicitada: en <varname>día del mes día "
 "numérico hora año</varname> en la parte superior del mensaje."
 
-#: C/evolution.xml:5858(para)
+#: C/evolution.xml:6104(para)
 msgid ""
 "Click Set Expiration Date, then specify the number of days for this message "
 "to remain in the recipient's Inbox."
@@ -11744,11 +12425,11 @@ msgstr ""
 "Pulse Establecer fecha de caducidad y especifique el número de días durante "
 "el cual este mensaje permanecerá en el buzón de correo del destinatario."
 
-#: C/evolution.xml:5866(title)
+#: C/evolution.xml:6112(title)
 msgid "Setting Message Delivery Options"
 msgstr "Establecer opciones de entrega de los mensajes"
 
-#: C/evolution.xml:5867(para)
+#: C/evolution.xml:6113(para)
 msgid ""
 "You can delay the delivery of an individual message by having it held in the "
 "Outbox for a specified time."
@@ -11756,11 +12437,11 @@ msgstr ""
 "Puede posponer la entrega de un mensaje individual dejándolo en la Bandeja "
 "de salida por un periodo de tiempo especificado."
 
-#: C/evolution.xml:5870(para)
+#: C/evolution.xml:6116(para)
 msgid "Click Delay message delivery."
 msgstr "Pulse Retrasar la entrega del mensaje."
 
-#: C/evolution.xml:5873(para)
+#: C/evolution.xml:6119(para)
 msgid ""
 "Use the Date and Time options to specify how long the message should remain "
 "in the Outbox before it is sent to the recipient."
@@ -11769,11 +12450,11 @@ msgstr ""
 "permanecer el mensaje en la Bandeja de salida antes de que se envíe a su "
 "destinatario."
 
-#: C/evolution.xml:5884(para)
+#: C/evolution.xml:6130(para)
 msgid "Click the Sent Items folder in the Folder List."
 msgstr "Pulse en la carpeta Correo enviado en la lista de carpetas."
 
-#: C/evolution.xml:5887(para)
+#: C/evolution.xml:6133(para)
 msgid ""
 "All sent items reside in this folder unless you select a different folder "
 "for sent email in the account editor default settings. For more information, "
@@ -11787,17 +12468,18 @@ msgstr ""
 "el Correo enviado y los Borradores</link> bajo <link linkend=\"b13uhy6r"
 "\">Predeterminados</link>."
 
-#: C/evolution.xml:5890(title)
+#: C/evolution.xml:6136(title)
 msgid "Delegating an Item"
 msgstr "Borrar un elemento"
 
-#: C/evolution.xml:5893(para)
-msgid "In the Calendar, right-click the meeting or appointment you want to delegate."
+#: C/evolution.xml:6139(para)
+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."
 
-#: C/evolution.xml:5896(para)
+#: C/evolution.xml:6142(para)
 msgid ""
 "Select Delegate Meeting, then select the contacts you want to delegate the "
 "meeting/appointment for."
@@ -11805,11 +12487,11 @@ msgstr ""
 "Seleccione Delegar reunión, después seleccione los contactos a los que "
 "quiere delegar la reunión o cita."
 
-#: C/evolution.xml:5902(para)
+#: C/evolution.xml:6148(para)
 msgid "Each contact gets a copy of the appointment or meeting."
 msgstr "Cada contacto obtiene una copia de la cita o reunión."
 
-#: C/evolution.xml:5908(para)
+#: C/evolution.xml:6154(para)
 msgid ""
 "In the Compose Meeting window, click Insert &gt; Send Options &gt; Status "
 "Tracking"
@@ -11817,7 +12499,7 @@ msgstr ""
 "En la ventana del editor de mensaje pulse Insertar &gt; Opciones de envío "
 "&gt; Seguimiento de estado"
 
-#: C/evolution.xml:5934(para)
+#: C/evolution.xml:6180(para)
 msgid ""
 "Use Proxy to manage another user's Mailbox and Calendar. Proxy lets you "
 "perform various actions, such as reading, accepting, and declining items on "
@@ -11828,7 +12510,7 @@ msgstr ""
 "aceptar y rechazar elementos de parte del otro usuario, con las "
 "restricciones que el otro usuario ajuste."
 
-#: C/evolution.xml:5936(para)
+#: C/evolution.xml:6182(para)
 msgid ""
 "You can proxy for a user in a different post office or domain, as long as "
 "that person is in the same GroupWise system. You cannot proxy for a user in "
@@ -11838,27 +12520,27 @@ msgstr ""
 "diferente, siempre que la persona esté en el mismo sistema GroupWise. No "
 "puede establecer el proxy para un usuario en un sistema GroupWise diferente."
 
-#: C/evolution.xml:5941(link) C/evolution.xml:5958(title)
+#: C/evolution.xml:6187(link) C/evolution.xml:6204(title)
 msgid "Receiving Proxy Rights"
 msgstr "Obtener derechos del Proxy"
 
-#: C/evolution.xml:5944(link) C/evolution.xml:5963(title)
+#: C/evolution.xml:6190(link) C/evolution.xml:6209(title)
 msgid "Assigning Proxy Rights to Another User"
 msgstr "Asignar derechos proxy a otro usuario"
 
-#: C/evolution.xml:5947(link) C/evolution.xml:6034(title)
+#: C/evolution.xml:6193(link) C/evolution.xml:6280(title)
 msgid "Adding and Removing Proxy Names and Rights in Your Proxy List"
 msgstr "Añadir y eliminar nombres y derechos Proxy en su Lista proxy"
 
-#: C/evolution.xml:5950(link) C/evolution.xml:6065(title)
+#: C/evolution.xml:6196(link) C/evolution.xml:6311(title)
 msgid "Managing Someone Else's Mailbox or Calendar"
 msgstr "Gestionar el buzón de correo o el calendario de otra persona"
 
-#: C/evolution.xml:5953(link) C/evolution.xml:6089(title)
+#: C/evolution.xml:6199(link) C/evolution.xml:6335(title)
 msgid "Marking an Item Private"
 msgstr "Hacer un elemento privado"
 
-#: C/evolution.xml:5959(para)
+#: C/evolution.xml:6205(para)
 msgid ""
 "Two steps must be completed before you can act as someone's proxy. First, "
 "the person for whom you plan to act as proxy must grant you rights in the "
@@ -11871,7 +12553,7 @@ msgstr ""
 "seleccionar al usuario de tal forma que pueda acceder a su Buzón de correo o "
 "Calendario."
 
-#: C/evolution.xml:5964(para)
+#: C/evolution.xml:6210(para)
 msgid ""
 "Use the Proxy List in the Preferences Account Editor to give other users "
 "rights to proxy for you. You can assign each user different rights to your "
@@ -11888,19 +12570,19 @@ msgstr ""
 "calendario, deles acceso de lectura para las citas. La siguiente tabla "
 "describe los permisos que puede otorgar a los usuarios:"
 
-#: C/evolution.xml:5972(para)
+#: C/evolution.xml:6218(para)
 msgid "This Right"
 msgstr "Este derecho"
 
-#: C/evolution.xml:5975(para)
+#: C/evolution.xml:6221(para)
 msgid "Lets your proxy do this"
 msgstr "Permite que su proxy haga esto"
 
-#: C/evolution.xml:5982(para)
+#: C/evolution.xml:6228(para)
 msgid "Read"
 msgstr "Leer"
 
-#: C/evolution.xml:5985(para)
+#: C/evolution.xml:6231(para)
 msgid ""
 "Read items you receive. Proxies cannot see your Contacts folder with this or "
 "any other proxy right."
@@ -11908,11 +12590,11 @@ msgstr ""
 "Leer los elementos que reciba. Los proxies no pueden ver su Carpeta de "
 "contactos con éste o cualquier otro derecho."
 
-#: C/evolution.xml:5990(para)
+#: C/evolution.xml:6236(para)
 msgid "Write"
 msgstr "Escribir"
 
-#: C/evolution.xml:5993(para)
+#: C/evolution.xml:6239(para)
 msgid ""
 "Create and send items in your name, including applying your signature if you "
 "have one defined. Assign categories to items, and change the subject of "
@@ -11921,11 +12603,11 @@ msgstr ""
 "Crear y enviar elementos en su nombre, incluyendo su firma si ha definido "
 "una. Asignar categorías a los elementos y cambiar el asunto de los elementos."
 
-#: C/evolution.xml:5998(para)
+#: C/evolution.xml:6244(para)
 msgid "Subscribe to my alarms"
 msgstr "Suscribirse a sus alertas"
 
-#: C/evolution.xml:6001(para)
+#: C/evolution.xml:6247(para)
 msgid ""
 "Receive the same alarms you receive. Receiving alarms is supported only if "
 "the proxy is on the same post office you are."
@@ -11933,11 +12615,11 @@ msgstr ""
 "Recibir las mismas alertas que usted reciba. Recibir alertas está soportado "
 "sólo si el proxy está en la misma oficina postal."
 
-#: C/evolution.xml:6006(para)
+#: C/evolution.xml:6252(para)
 msgid "Subscribe to my notifications"
 msgstr "Suscribirse a sus notificaciones"
 
-#: C/evolution.xml:6009(para)
+#: C/evolution.xml:6255(para)
 msgid ""
 "Receive notification when you receive items. Receiving notifications is "
 "supported only if the proxy is on the same post office you are."
@@ -11946,11 +12628,11 @@ msgstr ""
 "notificaciones sólo está soportada si el proxy está en la misma oficina "
 "postal."
 
-#: C/evolution.xml:6014(para)
+#: C/evolution.xml:6260(para)
 msgid "Modify options/rules/folders"
 msgstr "Modificar opciones/reglas/carpetas"
 
-#: C/evolution.xml:6017(para)
+#: C/evolution.xml:6263(para)
 msgid ""
 "Change the options in your Mailbox. The proxy can edit any of your Options "
 "settings, including the access given to other users. If the proxy also has "
@@ -11963,11 +12645,11 @@ msgstr ""
 "modificar reglas y carpetas. Este permiso permite a un proxy añadir, borrar "
 "y modificar categorías."
 
-#: C/evolution.xml:6022(para)
+#: C/evolution.xml:6268(para)
 msgid "Read items marked Private"
 msgstr "Leer elementos marcados como Privado"
 
-#: C/evolution.xml:6025(para)
+#: C/evolution.xml:6271(para)
 msgid ""
 "Read the items you marked Private. If you don't give a proxy Private rights, "
 "all items marked Private in your Mailbox are hidden from that proxy."
@@ -11976,15 +12658,15 @@ msgstr ""
 "Privados a un proxy, todos los elementos marcados como Privado en su Buzón "
 "de correo permanecerán ocultos para ese proxy."
 
-#: C/evolution.xml:6040(para)
+#: C/evolution.xml:6286(para)
 msgid "Select the GroupWise account to edit, then click Edit."
 msgstr "Seleccione la cuenta GruopWise para editarla, después pulse Editar."
 
-#: C/evolution.xml:6043(para)
+#: C/evolution.xml:6289(para)
 msgid "Click the Proxy tab, then click Add."
 msgstr "Pulse en la solapa Proxy, después en Añadir."
 
-#: C/evolution.xml:6046(para)
+#: C/evolution.xml:6292(para)
 msgid ""
 "To add a user to the list, type the name in the Name box or import the "
 "contact from Contact list."
@@ -11992,11 +12674,11 @@ msgstr ""
 "Para añadir un usuario a la lista, escriba el nombre en la caja Nombre o "
 "importe el contacto de la Lista de contactos."
 
-#: C/evolution.xml:6049(para)
+#: C/evolution.xml:6295(para)
 msgid "Select the rights you want to give to the user."
 msgstr "Seleccione los derechos que quiere darle al usuario."
 
-#: C/evolution.xml:6054(para)
+#: C/evolution.xml:6300(para)
 msgid ""
 "Repeat <link linkend=\"Aai4sat\">Step 4</link> and <link linkend=\"Aai4sll"
 "\">Step 5</link> to assign rights to each user in the Proxy List."
@@ -12005,7 +12687,7 @@ msgstr ""
 "\"Aai4sll\">Paso 5</link> para asignar derechos a cada usuario en la lista "
 "proxy."
 
-#: C/evolution.xml:6061(para)
+#: C/evolution.xml:6307(para)
 msgid ""
 "To delete a user from the Proxy List, select the user, then click Remove "
 "User."
@@ -12013,7 +12695,7 @@ msgstr ""
 "Para borrar un usuario de la lista proxy, seleccione el usuario, después "
 "pulse Quitar usuario."
 
-#: C/evolution.xml:6066(para)
+#: C/evolution.xml:6312(para)
 msgid ""
 "Before you can act as a proxy for someone, that person must give you proxy "
 "rights in his or her Proxy List in Preferences. The amount of access you "
@@ -12023,15 +12705,16 @@ msgstr ""
 "de proxy en su Lista proxy en las Preferencias. La cantidad de acceso que "
 "tenga dependerá de los permisos que le hayan concedido."
 
-#: C/evolution.xml:6069(para)
+#: 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:6072(para)
+#: C/evolution.xml:6318(para)
 msgid "Click Proxy Login."
 msgstr "Pulse Sesión proxy."
 
-#: C/evolution.xml:6077(para)
+#: C/evolution.xml:6323(para)
 msgid ""
 "Type the user name of the person who has given you Proxy access, or select "
 "from the list."
@@ -12039,11 +12722,11 @@ msgstr ""
 "Escriba el nombre de usuario de la persona que le ha dado acceso proxy o "
 "selecciónelo de la lista."
 
-#: C/evolution.xml:6081(para)
+#: C/evolution.xml:6327(para)
 msgid "The user's data appears in the respective components."
 msgstr "Los datos del usuario aparecerán en los respectivos componentes."
 
-#: C/evolution.xml:6083(para)
+#: C/evolution.xml:6329(para)
 msgid ""
 "You can set different colors to each user to distinguish between each users' "
 "appointments. You can also select whether to display the appointments of a "
@@ -12053,7 +12736,7 @@ msgstr ""
 "citas de cada usuario. También puede seleccionar si quiere mostrar las citas "
 "de un usuario en particular o no hacerlo."
 
-#: C/evolution.xml:6090(para)
+#: C/evolution.xml:6336(para)
 msgid ""
 "You can limit a proxy's access to individual items in your Mailbox or "
 "Calendar by marking items Private."
@@ -12061,7 +12744,7 @@ msgstr ""
 "Puede limitar el acceso de un proxy a elementos individuales en su Buzón de "
 "correo o Calendario haciéndolos privados."
 
-#: C/evolution.xml:6091(para)
+#: C/evolution.xml:6337(para)
 msgid ""
 "When you mark an item Private, you prevent unauthorized proxies from opening "
 "it. Proxies cannot access items marked Private unless you give them those "
@@ -12071,7 +12754,7 @@ msgstr ""
 "puedan abrirlo. Los proxies no pueden acceder a los elementos marcados como "
 "Privado a no ser que les de esos permisos en su Lista de acceso."
 
-#: C/evolution.xml:6092(para)
+#: C/evolution.xml:6338(para)
 msgid ""
 "If you mark an item Private when you send it, neither your proxies nor the "
 "recipient's proxies can open the item without rights. If you mark an item "
@@ -12088,11 +12771,12 @@ msgstr ""
 "búsqueda de Disponibilidad en concordancia con el estado que seleccionó "
 "cuando aceptó la cita."
 
-#: C/evolution.xml:6095(para)
+#: 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:6097(para)
+#: C/evolution.xml:6343(para)
 msgid ""
 "In your Calendar, click an item in the Appointments, Reminder Notes, or "
 "Tasks List, click Actions, then click Mark Private."
@@ -12100,7 +12784,7 @@ msgstr ""
 "En su Calendario, pulse un elemento en las Citas, Notas de recordatorio o "
 "Lista de tareas, pulse Acciones y después pulse Marcar como privado."
 
-#: C/evolution.xml:6105(para)
+#: C/evolution.xml:6351(para)
 msgid ""
 "Junk mail handling for GroupWise accounts is a little different than other "
 "junk mail handling. When you mark an item as junk mail in GroupWise, the "
@@ -12114,33 +12798,35 @@ msgstr ""
 "Debido a que estos ajustes están en el sistema GroupWise, su lista de SPAM "
 "le sigue de equipo en equipo."
 
-#: C/evolution.xml:6108(link) C/evolution.xml:6125(title)
+#: C/evolution.xml:6354(link) C/evolution.xml:6371(title)
 msgid "Marking a Message As Junk Mail"
 msgstr "Marcar un mensaje como spam"
 
-#: C/evolution.xml:6111(link) C/evolution.xml:6135(title)
+#: C/evolution.xml:6357(link) C/evolution.xml:6381(title)
 msgid "Marking a Message As Not Junk Mail"
 msgstr "Marcar un mensaje como no spam"
 
-#: C/evolution.xml:6114(link) C/evolution.xml:6149(title)
+#: C/evolution.xml:6360(link) C/evolution.xml:6395(title)
 msgid "Enabling or Disabling Your Junk Mail List"
 msgstr "Activar o desactivar su lista de correo basura"
 
-#: C/evolution.xml:6117(link) C/evolution.xml:6164(title)
+#: C/evolution.xml:6363(link) C/evolution.xml:6410(title)
 msgid "Adding an Email Address to Your Junk List"
 msgstr "Añadir una dirección de correo electrónico a su lista de correo basura"
 
-#: C/evolution.xml:6120(link) C/evolution.xml:6179(title)
+#: 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:6128(para)
-msgid "Select the message to mark as junk, then click the Junk icon or press Ctrl+J."
+#: C/evolution.xml:6374(para)
+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."
 
-#: C/evolution.xml:6129(para)
+#: C/evolution.xml:6375(para)
 msgid ""
 "The message is moved to your Junk Mail folder and the user is added to your "
 "junk list."
@@ -12148,23 +12834,23 @@ msgstr ""
 "El mensaje se moverá a su carpeta de correo basura y el usuario se añadirá a "
 "su lista de spam."
 
-#: C/evolution.xml:6138(para)
+#: C/evolution.xml:6384(para)
 msgid "Select the message to mark as not junk in your Junk Mail folder."
 msgstr ""
 "Seleccione el mensaje para marcarlo como no spam en su Carpeta de correo "
 "basura."
 
-#: C/evolution.xml:6141(para)
+#: C/evolution.xml:6387(para)
 msgid "Right-click the message, then click Mark as Not Junk."
 msgstr ""
 "Pulse con el botón derecho sobre el mensaje, después pulse Marcar como no "
 "spam."
 
-#: C/evolution.xml:6142(para)
+#: C/evolution.xml:6388(para)
 msgid "Or select the message and press Shift+Ctrl+J"
 msgstr "O seleccione el mensaje y pulse Mayús+Ctrl+J"
 
-#: C/evolution.xml:6143(para)
+#: C/evolution.xml:6389(para)
 msgid ""
 "The message is moved to your Mailbox folder and the name is removed from "
 "your junk list."
@@ -12172,28 +12858,29 @@ msgstr ""
 "El mensaje se moverá a su Bandeja de entrada y el nombre se eliminará de su "
 "lista de correo basura."
 
-#: C/evolution.xml:6152(para) C/evolution.xml:6167(para)
-#: C/evolution.xml:6182(para)
+#: C/evolution.xml:6398(para) C/evolution.xml:6413(para)
+#: C/evolution.xml:6428(para)
 msgid "Right-click a message, then click Junk Mail Settings."
 msgstr "Pulse con el botón derecho, después pulse Opciones de spam."
 
-#: C/evolution.xml:6155(para)
+#: C/evolution.xml:6401(para)
 msgid "Select if you want to enable or disable junk mail handling."
 msgstr "Seleccione si quiere activar o desactivar el manejo del correo basura."
 
-#: C/evolution.xml:6170(para)
+#: 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:6173(para)
+#: C/evolution.xml:6419(para)
 msgid "Click Add, then click OK."
 msgstr "Pulse Añadir, después pulse Aceptar."
 
-#: C/evolution.xml:6185(para)
+#: C/evolution.xml:6431(para)
 msgid "Select the email address to remove, then click Remove."
 msgstr "Seleccione la dirección de correo-e a quitar, después pulse Quitar."
 
-#: C/evolution.xml:6197(para)
+#: C/evolution.xml:6443(para)
 msgid ""
 "Perhaps your mail server has changed names. Or you have grown tired of a "
 "certain layout for your appointments. Whatever the reason, you can change "
@@ -12204,39 +12891,39 @@ msgstr ""
 "puede que quiera cambiar su configuración de <trademark>Evolution</"
 "trademark>."
 
-#: C/evolution.xml:6200(link) C/evolution.xml:6254(title)
+#: C/evolution.xml:6446(link) C/evolution.xml:6500(title)
 msgid "Working with Mail Accounts"
 msgstr "Utilización de cuentas de correo"
 
-#: C/evolution.xml:6203(link) C/evolution.xml:6297(title)
+#: C/evolution.xml:6449(link) C/evolution.xml:6543(title)
 msgid "Autocompletion"
 msgstr "Autocompletado"
 
-#: C/evolution.xml:6206(link) C/evolution.xml:6359(title)
+#: C/evolution.xml:6452(link) C/evolution.xml:6598(title)
 msgid "Mail Preferences"
 msgstr "Opciones de correo"
 
-#: C/evolution.xml:6209(link) C/evolution.xml:6528(title)
+#: C/evolution.xml:6455(link) C/evolution.xml:6767(title)
 msgid "Composer Preferences"
 msgstr "Editor de correo"
 
-#: C/evolution.xml:6212(link) C/evolution.xml:6587(title)
+#: C/evolution.xml:6458(link) C/evolution.xml:6826(title)
 msgid "Calendar and Tasks Settings"
 msgstr "Preferencias del calendario y de las tareas"
 
-#: C/evolution.xml:6215(link) C/evolution.xml:6706(title)
+#: C/evolution.xml:6461(link) C/evolution.xml:7069(title)
 msgid "Contact Management"
 msgstr "Gestión de contactos"
 
-#: C/evolution.xml:6218(link) C/evolution.xml:6689(title)
+#: C/evolution.xml:6464(link) C/evolution.xml:7052(title)
 msgid "Certificates"
 msgstr "Certificados"
 
-#: C/evolution.xml:6221(link) C/evolution.xml:6839(title)
+#: C/evolution.xml:6467(link) C/evolution.xml:7202(title)
 msgid "Debug Logs"
 msgstr "Depuración de sucesos"
 
-#: C/evolution.xml:6224(para)
+#: C/evolution.xml:6470(para)
 msgid ""
 "You reach the Evolution settings window by clicking Edit &gt; Preferences. "
 "In the left part of the settings window is a column, similar to the "
@@ -12250,15 +12937,15 @@ msgstr ""
 "de Evolution personalizar. La parte derecha de la ventana es donde realmente "
 "realizará cambios."
 
-#: C/evolution.xml:6226(para)
+#: C/evolution.xml:6472(para)
 msgid "There are six items you can customize."
 msgstr "Existen seis elementos que puede personalizar."
 
-#: C/evolution.xml:6228(title)
+#: C/evolution.xml:6474(title)
 msgid "Mail Accounts:"
 msgstr "Cuentas de correo:"
 
-#: C/evolution.xml:6229(para)
+#: C/evolution.xml:6475(para)
 msgid ""
 "Add or change information about your email accounts, such as the servers you "
 "connect to, the way you download mail, and your password authentication "
@@ -12271,11 +12958,11 @@ msgstr ""
 "complejo de la lista y está descrito en <link linkend=\"config-prefs-mail-"
 "identity\">Utilización de cuentas de correo</link>."
 
-#: C/evolution.xml:6232(title)
+#: C/evolution.xml:6478(title)
 msgid "Autocompletion:"
 msgstr "Autocompletado:"
 
-#: C/evolution.xml:6233(para)
+#: C/evolution.xml:6479(para)
 msgid ""
 "Set the address books to be used when completing email addresses in the "
 "message composer. For more information, see <link linkend=\"bshoq5l"
@@ -12285,11 +12972,11 @@ msgstr ""
 "correo-e en el editor de mensajes. Para obtener más información vea <link "
 "linkend=\"bshoq5l\">Autocompletado</link>."
 
-#: C/evolution.xml:6236(title)
+#: C/evolution.xml:6482(title)
 msgid "Mail Preferences:"
 msgstr "Opciones de correo:"
 
-#: C/evolution.xml:6237(para)
+#: C/evolution.xml:6483(para)
 msgid ""
 "These are overall mail reading preferences, such as display settings, "
 "notification options, and security. Settings that vary per account are in "
@@ -12304,11 +12991,11 @@ msgstr ""
 "link>, pero la mayoría de los ajustes de correo están en <link linkend="
 "\"config-prefs-mail\">Opciones de correo</link>."
 
-#: C/evolution.xml:6240(title)
+#: C/evolution.xml:6486(title)
 msgid "Composer Preferences:"
 msgstr "Preferencias del editor:"
 
-#: C/evolution.xml:6241(para)
+#: C/evolution.xml:6487(para)
 msgid ""
 "These are settings for the way that you use the mail composer, such as "
 "signatures, and spelling. This includes the ability to substitute graphical "
@@ -12323,11 +13010,11 @@ msgstr ""
 "en las <link linkend=\"config-prefs-mail-composer\">Preferencias del editor</"
 "link>."
 
-#: C/evolution.xml:6244(title)
+#: C/evolution.xml:6490(title)
 msgid "Calendar and Tasks:"
 msgstr "Calendario y tareas:"
 
-#: C/evolution.xml:6245(para)
+#: C/evolution.xml:6491(para)
 msgid ""
 "Use these settings to control how the calendar behaves, including your time "
 "zone and the length of your work week. For more information, see <link "
@@ -12338,11 +13025,11 @@ msgstr ""
 "más información vea <link linkend=\"config-prefs-cal\">Preferencias del "
 "calendario y de las tareas</link>."
 
-#: C/evolution.xml:6248(title)
+#: C/evolution.xml:6494(title)
 msgid "Certificates:"
 msgstr "Certificados:"
 
-#: C/evolution.xml:6249(para)
+#: C/evolution.xml:6495(para)
 msgid ""
 "Use these settings for certificate handling for S/MIME security systems. For "
 "more information, see <link linkend=\"bshoty0\">Certificates</link>."
@@ -12351,7 +13038,7 @@ msgstr ""
 "MIME. Para obtener más información vea <link linkend=\"bshoty0"
 "\">Certificados</link>."
 
-#: C/evolution.xml:6251(para)
+#: C/evolution.xml:6497(para)
 msgid ""
 "Previous versions of Evolution included directory servers, folder settings, "
 "and Exchange delegation in the settings tool. Directory servers can now be "
@@ -12367,7 +13054,7 @@ msgstr ""
 "botón derecho sobre la carpeta, y la delegación para Exchange está "
 "disponible en el menú Mensaje de la herramienta Exchange."
 
-#: C/evolution.xml:6255(para)
+#: C/evolution.xml:6501(para)
 msgid ""
 "Evolution allows you to maintain multiple accounts, or identities. When you "
 "are writing an email message, you can choose which account to use by "
@@ -12379,7 +13066,7 @@ msgstr ""
 "cuanta quiere usar seleccionándola de una lista desplegable junto al campo "
 "De: en el editor de mensajes."
 
-#: C/evolution.xml:6256(para)
+#: C/evolution.xml:6502(para)
 msgid ""
 "Click Send/Receive to update all mail sources that are not disabled. If you "
 "don't want to check mail for a given account, select the account in Edit "
@@ -12390,7 +13077,7 @@ msgstr ""
 "seleccione la cuenta en la página Editar &gt; Preferencias &gt; Cuentas de "
 "correo y pulse el botón Desactivar."
 
-#: C/evolution.xml:6257(para)
+#: C/evolution.xml:6503(para)
 msgid ""
 "To add a new account, click Add to open the Evolution configuration "
 "assistant. To alter an existing account, select it in the Preferences "
@@ -12401,15 +13088,15 @@ msgstr ""
 "selecciónela y pulse en Editar para abrir el cuadro de diálogo del editor de "
 "cuentas."
 
-#: C/evolution.xml:6258(para)
+#: C/evolution.xml:6504(para)
 msgid "The account editor dialog box has seven sections:"
 msgstr "El cuadro de diálogo del editor de cuentas cuenta con siete secciones:"
 
-#: C/evolution.xml:6260(title)
+#: C/evolution.xml:6506(title)
 msgid "Identity:"
 msgstr "Identidad:"
 
-#: C/evolution.xml:6261(para)
+#: C/evolution.xml:6507(para)
 msgid ""
 "Specify the name and email address for this account. You can also choose a "
 "default signature to insert into messages sent from this account."
@@ -12418,11 +13105,11 @@ msgstr ""
 "puede elegir una firma predeterminada para añadirla al final de los mensajes "
 "enviados desde esta cuenta."
 
-#: C/evolution.xml:6264(title)
+#: C/evolution.xml:6510(title)
 msgid "Receiving Email:"
 msgstr "Recibir correo electrónico:"
 
-#: C/evolution.xml:6265(para)
+#: C/evolution.xml:6511(para)
 msgid ""
 "Select the way you receive email. You can download email from a <link "
 "linkend=\"pop\">POP server</link>, read and keep it on the server (Microsoft "
@@ -12441,7 +13128,7 @@ msgstr ""
 "seleccionar una de las tres opciones proporcionadas: Sin cifrado, Cifrado "
 "TLS o Cifrado SSL."
 
-#: C/evolution.xml:6267(para)
+#: C/evolution.xml:6513(para)
 msgid ""
 "Your system administrator might ask you to connect to a specific port on a "
 "mail server. To specify which port you use, just type a colon and the port "
@@ -12455,7 +13142,7 @@ msgstr ""
 "servidor smtp.ejemplo.net, especifique smtp.ejemplo.net:142 como nombre del "
 "servidor."
 
-#: C/evolution.xml:6268(para)
+#: C/evolution.xml:6514(para)
 msgid ""
 "For additional information, see <link linkend=\"second-step\">Receiving "
 "Mail</link>."
@@ -12463,11 +13150,11 @@ msgstr ""
 "Para obtener información adicional, vea <link linkend=\"second-step"
 "\">Recepción de correo</link>."
 
-#: C/evolution.xml:6270(title)
+#: C/evolution.xml:6516(title)
 msgid "Receiving Options:"
 msgstr "Opciones de recepción:"
 
-#: C/evolution.xml:6271(para)
+#: C/evolution.xml:6517(para)
 msgid ""
 "Decide if you want to check for mail automatically and how often, as well as "
 "setting other message retrieval options."
@@ -12475,7 +13162,7 @@ msgstr ""
 "Decida si quiere descargar su correo automáticamente y con qué frecuencia, "
 "así como otras opciones de recuperación de los mensajes."
 
-#: C/evolution.xml:6273(para)
+#: C/evolution.xml:6519(para)
 msgid ""
 "For additional information, see <link linkend=\"more-mail-options"
 "\">Receiving Mail Options</link>."
@@ -12485,11 +13172,11 @@ msgstr ""
 
 # #-#-#-#-#  usage-exchange.po  #-#-#-#-#
 # index.docbook:342, index.docbook:514
-#: C/evolution.xml:6275(title)
+#: C/evolution.xml:6521(title)
 msgid "Sending Mail:"
 msgstr "Envío de correo:"
 
-#: C/evolution.xml:6276(para)
+#: C/evolution.xml:6522(para)
 msgid ""
 "Use this section to choose and configure a method for sending mail. You can "
 "choose <link linkend=\"smtp\">SMTP</link>, Microsoft Exchange (if you have "
@@ -12501,7 +13188,7 @@ msgstr ""
 "instalado Evolution Connector para Microsoft Exchange), <link linkend="
 "\"sendmail\">Sendmail</link> o muchas otras opciones."
 
-#: C/evolution.xml:6278(para)
+#: C/evolution.xml:6524(para)
 msgid ""
 "For additional information, see <link linkend=\"third-step\">Sending Mail</"
 "link>."
@@ -12509,11 +13196,11 @@ msgstr ""
 "Para obtener información adicional vea <link linkend=\"third-step\">Envío de "
 "correo</link>."
 
-#: C/evolution.xml:6280(title)
+#: C/evolution.xml:6526(title)
 msgid "Defaults:"
 msgstr "Predeterminados:"
 
-#: C/evolution.xml:6281(para)
+#: C/evolution.xml:6527(para)
 msgid ""
 "Use this section to set where this account stores the messages that it has "
 "sent, and the messages that you save as drafts. If you want to revert to the "
@@ -12523,7 +13210,7 @@ msgstr ""
 "los guardados como borradores. Si quiere restaurar la configuración "
 "predeterminada pulse el botón Revertir."
 
-#: C/evolution.xml:6283(para)
+#: C/evolution.xml:6529(para)
 msgid ""
 "If you want to send someone a copy of every message from this account, "
 "select either Always Carbon-Copy (Cc) To: or Always Blind Carbon-Copy (Bcc) "
@@ -12533,7 +13220,7 @@ msgstr ""
 "active la casilla Siempre enviar copia de carbón (Cc) a: o Siempre enviar "
 "copia de carbón oculta (Cco) a: e introduzca una o más direcciones."
 
-#: C/evolution.xml:6284(para)
+#: C/evolution.xml:6530(para)
 msgid ""
 "You can specify the way you want to receive message receipts. You can set "
 "Send message receipts to Never, Always or Ask for each message. For more "
@@ -12544,7 +13231,7 @@ msgstr ""
 "por cada mensaje. Para obtener más información consulte <link linkend="
 "\"b13uhy6r\">Ajustes predeterminados</link>."
 
-#: C/evolution.xml:6285(para)
+#: C/evolution.xml:6531(para)
 msgid ""
 "You can change the default settings of your sent items. Click Advanced Send "
 "Options to prioritize, classify your send messages. You can also set the "
@@ -12559,11 +13246,11 @@ msgstr ""
 "concordancia. Active el seguimiento de estado así como Devolver notificación "
 "para el correo, el calendario y las tareas."
 
-#: C/evolution.xml:6287(title)
+#: C/evolution.xml:6533(title)
 msgid "Security:"
 msgstr "Seguridad:"
 
-#: C/evolution.xml:6288(para)
+#: C/evolution.xml:6534(para)
 msgid ""
 "Use this section to set the security options for this account. If you use "
 "encryption, enter your PGP key ID (see <link linkend=\"encryption"
@@ -12575,11 +13262,11 @@ msgstr ""
 "\"encryption\">Cifrado</link>) y elija, entre las cuatro opciones "
 "disponibles, la manera de manejar su clave y firma."
 
-#: C/evolution.xml:6291(title)
+#: C/evolution.xml:6537(title)
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: C/evolution.xml:6292(para)
+#: C/evolution.xml:6538(para)
 msgid ""
 "This only displays if you have a GroupWise account. Use this section to set "
 "proxy access for other users to access your mailbox or calendar."
@@ -12588,7 +13275,7 @@ msgstr ""
 "ajustar el acceso proxy para que otros usuarios accedan a su Bandeja de "
 "correo o Calendario."
 
-#: C/evolution.xml:6298(para)
+#: C/evolution.xml:6544(para)
 msgid ""
 "The Autocompletion tool lets you choose address books to auto-complete names "
 "for you in the mail composer. This functionality requires accessibility to "
@@ -12602,11 +13289,11 @@ msgstr ""
 "autocompletado, seleccione cada una de las libretas de direcciones que "
 "quiere usar en la página Autocompletado."
 
-#: C/evolution.xml:6302(title)
+#: C/evolution.xml:6548(title)
 msgid "IMAP Mail Headers"
 msgstr "Cabeceras de correo IMAP"
 
-#: C/evolution.xml:6303(para)
+#: C/evolution.xml:6549(para)
 msgid ""
 "Evolution allows you to choose the headers that you want to download so that "
 "you can reduce the download time and filter or move your mail around the way "
@@ -12619,11 +13306,11 @@ msgstr ""
 "las preferencias de las cabeceras de corroe IMAP y así ahorrar tiempo de "
 "descarga. Las cabeceras de correo IMAP son las siguientes:"
 
-#: C/evolution.xml:6305(title)
+#: C/evolution.xml:6551(title)
 msgid "All Headers:"
 msgstr "Todas las cabeceras:"
 
-#: C/evolution.xml:6306(para)
+#: C/evolution.xml:6552(para)
 msgid ""
 "This includes all the available IMAP Mail headers. By choosing this option, "
 "Evolution will download all the headers for all the messages."
@@ -12631,11 +13318,11 @@ msgstr ""
 "Esto incluye todas las cabeceras de correo IMAP disponibles. Eligiendo esta "
 "opción Evolution descargará todas las cabeceras de todos los mensajes."
 
-#: C/evolution.xml:6309(title)
+#: C/evolution.xml:6555(title)
 msgid "Basic Headers:"
 msgstr "Cabeceras básicas:"
 
-#: C/evolution.xml:6310(para)
+#: C/evolution.xml:6556(para)
 msgid ""
 "This will include Date, From, To, CC, Subject, Preferences, In-Reply-To, "
 "Message-ID, Mime-Version, and Content-Type. If you want to just fetch and "
@@ -12649,11 +13336,11 @@ msgstr ""
 "en sus listas de correo, elija esta opción. Esto hará que Evolution trabaje "
 "más rápido y generalmente se recomienda para usuarios normales."
 
-#: C/evolution.xml:6313(title)
+#: C/evolution.xml:6559(title)
 msgid "Mailing List Headers:"
 msgstr "Cabeceras de las listas de correo:"
 
-#: C/evolution.xml:6314(para)
+#: C/evolution.xml:6560(para)
 msgid ""
 "Enable this option to have filters based on mailing list headers (like list "
 "ID) so that in addition to the basic headers, the headers that correspond to "
@@ -12668,7 +13355,7 @@ msgstr ""
 "correo, el propietario de la lista de correo y demás, con lo que puede crear "
 "un filtro para listas de correo."
 
-#: C/evolution.xml:6316(para)
+#: C/evolution.xml:6562(para)
 msgid ""
 "This is the default Header preference that comes with Evolution. When this "
 "option is chosen, Evolution will download a basic set of headers (as "
@@ -12683,42 +13370,16 @@ msgstr ""
 "correo. Si no tiene ningún filtro en Evolution, se recomienda que cambie a "
 "la opción «Cabeceras básicas»."
 
-#: C/evolution.xml:6318(title)
-msgid "Custom Headers:"
-msgstr "Cabeceras personalizadas:"
-
-#: C/evolution.xml:6319(para)
-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."
-
-#: C/evolution.xml:6322(para)
-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."
-
-#: C/evolution.xml:6324(para)
+#: C/evolution.xml:6563(para)
 msgid "To set the IMAP Mail headers:"
 msgstr "Para establecer las cabeceras de correo IMAP:"
 
-#: C/evolution.xml:6330(para)
+#: 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:6333(para)
+#: C/evolution.xml:6572(para)
 msgid ""
 "On the Account Editor, click IMAP Headers tab to open IMAP Headers to the "
 "Account Editor."
@@ -12726,13 +13387,14 @@ msgstr ""
 "En el Editor de cuentas, pulse la solapa Cabeceras IMAP para abrir las "
 "Cabeceras IMAP en el Editor de cuentas."
 
-#: C/evolution.xml:6338(para)
-msgid "Click Fetch All Headers to download all the available header information."
+#: C/evolution.xml:6577(para)
+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."
 
-#: C/evolution.xml:6340(para)
+#: C/evolution.xml:6579(para)
 msgid ""
 "The more headers you have, the more time it will consume to download. This "
 "option is not recommended."
@@ -12740,25 +13402,25 @@ msgstr ""
 "Cuantas más cabeceras tenga más tiempo llevará descargarlas. No se "
 "recomienda esta opción."
 
-#: C/evolution.xml:6344(para)
+#: C/evolution.xml:6583(para)
 msgid "Click Basic Headers to download basic headers."
 msgstr "Pulse Cabeceras básicas para descargar las cabeceras básicas."
 
-#: C/evolution.xml:6347(para)
+#: C/evolution.xml:6586(para)
 msgid "Click Basic and Mailing Headers to download both."
 msgstr ""
 "Pulse Cabeceras básicas y de listas de correo predeterminadas para descargar "
 "ambas."
 
-#: C/evolution.xml:6350(para)
+#: C/evolution.xml:6589(para)
 msgid "Click Add to add any predefined custom headers."
 msgstr "Pulse Añadir para añadir cualquier cabecera predefinida."
 
-#: C/evolution.xml:6353(para)
+#: C/evolution.xml:6592(para)
 msgid "Click Remove to remove the custom headers."
 msgstr "Pulse Eliminar para eliminar las cabeceras personalizadas."
 
-#: C/evolution.xml:6360(para)
+#: C/evolution.xml:6599(para)
 msgid ""
 "The Mail Preferences tool lets you choose how to display citations, how long "
 "to wait before marking a message as read, and other mail display settings."
@@ -12768,35 +13430,35 @@ msgstr ""
 "así como otros ajustes de representación del correo."
 
 # index.docbook:29, index.docbook:30
-#: C/evolution.xml:6363(link) C/evolution.xml:6387(title)
+#: C/evolution.xml:6602(link) C/evolution.xml:6626(title)
 msgid "General Mail Settings"
 msgstr "Ajustes generales del correo"
 
-#: C/evolution.xml:6366(link) C/evolution.xml:6409(title)
+#: C/evolution.xml:6605(link) C/evolution.xml:6648(title)
 msgid "HTML Mail Preferences"
 msgstr "Preferencias del correo en HTML"
 
-#: C/evolution.xml:6369(link) C/evolution.xml:6427(title)
+#: C/evolution.xml:6608(link) C/evolution.xml:6666(title)
 msgid "Label Preferences"
 msgstr "Preferencias de las etiquetas"
 
-#: C/evolution.xml:6372(link) C/evolution.xml:6461(title)
+#: C/evolution.xml:6611(link) C/evolution.xml:6700(title)
 msgid "Mail Header Preferences"
 msgstr "Opciones de las cabeceras del correo"
 
-#: C/evolution.xml:6375(link) C/evolution.xml:6473(title)
+#: C/evolution.xml:6614(link) C/evolution.xml:6712(title)
 msgid "Junk Mail Preferences"
 msgstr "Opciones de correo spam"
 
-#: C/evolution.xml:6378(link) C/evolution.xml:6516(title)
+#: C/evolution.xml:6617(link) C/evolution.xml:6755(title)
 msgid "Automatic Contacts Preferences"
 msgstr "Preferencias de los contactos automáticos"
 
-#: C/evolution.xml:6381(link) C/evolution.xml:6522(title)
+#: C/evolution.xml:6620(link) C/evolution.xml:6761(title)
 msgid "Calendar and Tasks Preferences"
 msgstr "Preferencias del calendario y de las tareas"
 
-#: C/evolution.xml:6384(para)
+#: C/evolution.xml:6623(para)
 msgid ""
 "For information on individual email account settings, see <link linkend="
 "\"config-prefs-mail-identity\">Working with Mail Accounts</link>."
@@ -12805,15 +13467,15 @@ msgstr ""
 "<link linkend=\"config-prefs-mail-identity\">Utilización de cuentas de "
 "correo</link>."
 
-#: C/evolution.xml:6388(para) C/evolution.xml:6544(para)
+#: C/evolution.xml:6627(para) C/evolution.xml:6783(para)
 msgid "The General page has the following options:"
 msgstr "La página General tiene las siguientes opciones:"
 
-#: C/evolution.xml:6390(title)
+#: C/evolution.xml:6629(title)
 msgid "Message Fonts:"
 msgstr "Tipografías del mensaje:"
 
-#: C/evolution.xml:6391(para)
+#: C/evolution.xml:6630(para)
 msgid ""
 "Normally, Evolution uses the same fonts as other GNOME applications. To "
 "choose different fonts, deselect Use the same fonts as other applications "
@@ -12824,11 +13486,11 @@ msgstr ""
 "las mismas tipografías que en otras aplicaciones y elija una tipografía "
 "estándar y otra de tamaño fijo."
 
-#: C/evolution.xml:6394(title)
+#: C/evolution.xml:6633(title)
 msgid "Message Display:"
 msgstr "Vista de los mensajes:"
 
-#: C/evolution.xml:6395(para)
+#: C/evolution.xml:6634(para)
 msgid ""
 "Choose how long you want to wait before marking a message read, how to "
 "highlight quotations, and the default encoding. Enable <guilabel>Fall back "
@@ -12854,7 +13516,7 @@ msgstr ""
 "aplicación externa. También puede activar la barra espaciadora mágica y las "
 "carpetas de búsqueda."
 
-#: C/evolution.xml:6397(para)
+#: C/evolution.xml:6636(para)
 msgid ""
 "To group the messages as threads select View &gt; Group By threads or press "
 "Ctrl+T."
@@ -12862,11 +13524,11 @@ msgstr ""
 "Para agrupar mensajes por conversaciones, seleccione Ver &gt; Agrupar por "
 "conversaciones o pulse Ctrl +T."
 
-#: C/evolution.xml:6399(title)
+#: C/evolution.xml:6638(title)
 msgid "Deleting Mail:"
 msgstr "Borrar correo:"
 
-#: C/evolution.xml:6400(para)
+#: C/evolution.xml:6639(para)
 msgid ""
 "Choose whether to delete messages automatically when quitting Evolution and "
 "how frequently, and whether you want to explicitly confirm the final "
@@ -12881,11 +13543,11 @@ msgstr ""
 "frecuencia para la eliminación: Cada vez, Una vez por día, Una vez por "
 "semana y Una vez por mes."
 
-#: C/evolution.xml:6403(title)
+#: C/evolution.xml:6642(title)
 msgid "New Mail Notifications:"
 msgstr "Notificaciones de correo nuevo:"
 
-#: C/evolution.xml:6404(para)
+#: C/evolution.xml:6643(para)
 msgid ""
 "Evolution can alert you to the arrival of new mail with a beep or by playing "
 "a sound file. Choose your alert noise, or select none, as you prefer. You "
@@ -12896,23 +13558,23 @@ msgstr ""
 "ninguno, tal como prefiera. Puede elegir no notificar la llegada de correo "
 "nuevo."
 
-#: C/evolution.xml:6410(para)
+#: C/evolution.xml:6649(para)
 msgid "The HTML Mail page has the following options:"
 msgstr "La página Correo HTML tiene las siguientes opciones:"
 
-#: C/evolution.xml:6412(title)
+#: C/evolution.xml:6651(title)
 msgid "Show Image Animations:"
 msgstr "Mostrar imágenes animadas:"
 
-#: C/evolution.xml:6413(para)
+#: C/evolution.xml:6652(para)
 msgid "Turns image animation (e.g. GIF files) on or off."
 msgstr "Activar o desactivar las animaciones (ej. archivos GIF)."
 
-#: C/evolution.xml:6416(title)
+#: C/evolution.xml:6655(title)
 msgid "Prompt When Sending HTML Messages to Contacts That Don't Want Them:"
 msgstr "Preguntar al mandar mensajes HTML a contactos que no los quieren:"
 
-#: C/evolution.xml:6417(para)
+#: C/evolution.xml:6656(para)
 msgid ""
 "Some people do not like HTML mail, and you can set Evolution to warn you of "
 "this preference. This warning appears only when you send HTML mail to people "
@@ -12923,11 +13585,11 @@ msgstr ""
 "HTML a personas a las que previamente ha anotado en su libreta de "
 "direcciones que no quieren recibirlo."
 
-#: C/evolution.xml:6420(title)
+#: C/evolution.xml:6659(title)
 msgid "Loading Images:"
 msgstr "Cargar imágenes:"
 
-#: C/evolution.xml:6421(para)
+#: C/evolution.xml:6660(para)
 msgid ""
 "You can embed a image in an email and have it load only when the message "
 "arrives. However, spammers can use image loading patterns to confirm "
@@ -12942,7 +13604,7 @@ msgstr ""
 "carguen las imágenes automáticamente, hacerlo solamente si el remitente está "
 "en su libreta de direcciones o cargarlas siempre."
 
-#: C/evolution.xml:6423(para)
+#: C/evolution.xml:6662(para)
 msgid ""
 "If you have chosen not to load images automatically, you can choose to see "
 "the images in one message at a time by selecting View &gt; Load Images or "
@@ -12952,7 +13614,7 @@ msgstr ""
 "imágenes en cada mensaje seleccionando Ver &gt; Cargar imágenes o pulsando "
 "Ctrl+I."
 
-#: C/evolution.xml:6428(para)
+#: C/evolution.xml:6667(para)
 msgid ""
 "The Label preferences option lets you add color labels for different kinds "
 "of messages. You can add, edit, or remove the labels. You can also assign "
@@ -12962,46 +13624,47 @@ msgstr ""
 "color para diferentes tipos de mensajes. Puede añadir, editar o eliminar las "
 "etiquetas. También puede asignar colores a cada etiqueta que haya creado."
 
-#: C/evolution.xml:6430(para)
+#: C/evolution.xml:6669(para)
 msgid "To create a label:"
 msgstr "Para crear una etiqueta:"
 
-#: C/evolution.xml:6433(para)
+#: C/evolution.xml:6672(para)
 msgid "Click Add and specify the name in the Label Name dialog box."
 msgstr ""
 "Pulse Añadir y especifique el nombre en la caja de diálogo Nombre de la "
 "etiqueta."
 
-#: C/evolution.xml:6436(para)
+#: C/evolution.xml:6675(para)
 msgid "Click the color tab and select a color, then click OK."
 msgstr "Pulse la solapa de color y seleccione el color, después pulse Aceptar."
 
-#: C/evolution.xml:6439(para)
+#: C/evolution.xml:6678(para)
 msgid "To edit label properties:"
 msgstr "Para editar las propiedades de la etiqueta:"
 
-#: C/evolution.xml:6442(para)
+#: C/evolution.xml:6681(para)
 msgid "Select the label and click Edit."
 msgstr "Seleccione la etiqueta y pulse Editar."
 
-#: C/evolution.xml:6445(para)
+#: C/evolution.xml:6684(para)
 msgid "Edit name and color, then click OK."
 msgstr "Edite el nombre y color, después pulse Aceptar."
 
 # index.docbook:41, index.docbook:293
-#: C/evolution.xml:6448(para)
+#: C/evolution.xml:6687(para)
 msgid "To assign a label to a specific email message:"
 msgstr "Para asignar una etiqueta a un mensaje de correo-e específico:"
 
-#: C/evolution.xml:6451(para)
+#: 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:6454(para)
+#: C/evolution.xml:6693(para)
 msgid "Click Label and select the desired label for the message."
 msgstr "Pulse Etiqueta y seleccione la etiqueta deseada para el mensaje."
 
-#: C/evolution.xml:6462(para)
+#: C/evolution.xml:6701(para)
 msgid ""
 "The headers on an incoming message are the information about the message "
 "that isn't the content of the message itself, such as the sender and the "
@@ -13016,11 +13679,11 @@ msgstr ""
 "puede añadir o quitar cabeceras a la lista. Las cabeceras predeterminadas no "
 "se pueden eliminar."
 
-#: C/evolution.xml:6464(title)
+#: C/evolution.xml:6703(title)
 msgid "Sender Photograph:"
 msgstr "Foto del remitente:"
 
-#: C/evolution.xml:6465(para)
+#: C/evolution.xml:6704(para)
 msgid ""
 "This feature adds support for viewing the photograph of the sender at the "
 "right side of the preview pane."
@@ -13028,7 +13691,7 @@ msgstr ""
 "Esta característica añade soporte para ver la fotografía del remitente en la "
 "parte derecha del panel de vista preliminar."
 
-#: C/evolution.xml:6467(para)
+#: C/evolution.xml:6706(para)
 msgid ""
 "To enable this feature, select Edit &gt; Preferences &gt; Mail Preferences "
 "&gt; Headers &gt; Show the photograph of sender in the email preview. "
@@ -13039,7 +13702,7 @@ msgstr ""
 "vista preliminar del correo-e. Deseleccione esta opción para desactivar esta "
 "característica."
 
-#: C/evolution.xml:6468(para)
+#: C/evolution.xml:6707(para)
 msgid ""
 "By default it searches only in the local addressbooks enabled for "
 "autocompletion. If you deselect the option <guilabel>Search for sender "
@@ -13060,7 +13723,7 @@ msgstr ""
 "tomará el primer contacto independientemente de que tenga o no una "
 "fotografía."
 
-#: C/evolution.xml:6469(para)
+#: C/evolution.xml:6708(para)
 msgid ""
 "This feature is disabled by default as it causes delay in fetching the "
 "messages."
@@ -13068,7 +13731,7 @@ msgstr ""
 "Esta característica está desactivada de forma predeterminada ya que causa "
 "retraso al obtener los correos."
 
-#: C/evolution.xml:6474(para)
+#: C/evolution.xml:6713(para)
 msgid ""
 "You can check your incoming messages for junk content by using Bogofilter "
 "and SpamAssassin* tools, which have trainable Bayesian filters. You need to "
@@ -13079,15 +13742,11 @@ msgstr ""
 "Debeactivar los respectivos complementos de SPAM para activar el filtro de "
 "SPAM."
 
-#: C/evolution.xml:6475(para)
+#: C/evolution.xml:6714(para)
 msgid "To enable Junk plugins:"
 msgstr "Activar complementos anti SPAM:"
 
-#: C/evolution.xml:6478(para)
-msgid "Select Edit &gt; Plugins"
-msgstr "Seleccione Editar &gt; Complementos"
-
-#: C/evolution.xml:6481(para)
+#: C/evolution.xml:6720(para)
 msgid ""
 "Select the junk plugins you want. You can select either Bogofilter or "
 "SpamAssassin, or you can select both."
@@ -13095,11 +13754,11 @@ msgstr ""
 "Seleccione los complementos de filtro de SPAM que quiera. Puede seleccionar "
 "tanto Bogofilter como SpamAssasin, o puede seleccionar los dos."
 
-#: C/evolution.xml:6485(title)
+#: C/evolution.xml:6724(title)
 msgid "General:"
 msgstr "General:"
 
-#: C/evolution.xml:6486(para)
+#: C/evolution.xml:6725(para)
 msgid ""
 "You can check incoming email for junk contents and also decide how often you "
 "want to delete junk mail. You also have the option to choose either "
@@ -13109,19 +13768,20 @@ msgstr ""
 "frecuencia quiere borrar el correo basura. También tiene la opción de elegir "
 "entre SpamAssasin, Bogofilter o ambos."
 
-#: C/evolution.xml:6489(title)
+#: C/evolution.xml:6728(title)
 msgid "Checking Incoming Mail for Junk:"
 msgstr "Detectar si el correo entrante es spam:"
 
-#: C/evolution.xml:6490(para)
+#: 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:6493(title)
+#: C/evolution.xml:6732(title)
 msgid "Delete junk mail on exit:"
 msgstr "Borrar los correos SPAM al salir:"
 
-#: C/evolution.xml:6494(para)
+#: C/evolution.xml:6733(para)
 msgid ""
 "This option deletes junk messages when you exit. You can also specify when "
 "to delete the junk messages (every time, once per day, once per week, once "
@@ -13131,11 +13791,11 @@ msgstr ""
 "cuándo se deben borrar los correos basura de las opciones (Cada vez, Una vez "
 "por día, Una vez por semana, Una vez por mes)."
 
-#: C/evolution.xml:6497(title)
+#: C/evolution.xml:6736(title)
 msgid "Default junk plugin:"
 msgstr "Complemento spam predeterminado:"
 
-#: C/evolution.xml:6498(para)
+#: C/evolution.xml:6737(para)
 msgid ""
 "Select either SpamAssassin or Bogofilter, or both, as your junk filter. You "
 "can view them only if you have enabled the respective plugins. When you "
@@ -13147,11 +13807,11 @@ msgstr ""
 "Cuando seleccione cualquier opción, también le informa si el binario "
 "correspondiente está disponible o no."
 
-#: C/evolution.xml:6502(title)
+#: C/evolution.xml:6741(title)
 msgid "SpamAssassin Options:"
 msgstr "Opciones de SpamAssasin:"
 
-#: C/evolution.xml:6503(para)
+#: C/evolution.xml:6742(para)
 msgid ""
 "Remote Test performs junk mail filtering on remote servers. It also includes "
 "online tests, like checking for blacklisted message senders and ISPs."
@@ -13160,7 +13820,7 @@ msgstr ""
 "También incluyen pruebas en línea como comprobación de remitentes e ISP en "
 "listas negras."
 
-#: C/evolution.xml:6505(para)
+#: C/evolution.xml:6744(para)
 msgid ""
 "This option uses tests that require a network connection, such as checking "
 "to see if a message is in a list of known junk messages, or if the sender or "
@@ -13177,11 +13837,11 @@ msgstr ""
 "eficacia. Cuando seleccione esta opción, no necesitará ninguna configuración "
 "adicional para que funcione."
 
-#: C/evolution.xml:6507(title)
+#: C/evolution.xml:6746(title)
 msgid "Bogofilter Options:"
 msgstr "Opciones de Bogofilter:"
 
-#: C/evolution.xml:6508(para)
+#: C/evolution.xml:6747(para)
 msgid ""
 "Select Convert mail text to Unicode to enable Unicode* filtering. For more "
 "information on Bogofilter, see the <ulink url=\"http://bogofilter."
@@ -13192,7 +13852,7 @@ msgstr ""
 "consulte el <ulink url=\"http://bogofilter.sourceforge.net/\">sitio de "
 "Bogofilter</ulink>."
 
-#: C/evolution.xml:6511(para)
+#: C/evolution.xml:6750(para)
 msgid ""
 "Check new messages for junk contents option under Edit &gt; Preferences &gt; "
 "Mail Accounts &gt; Edit &gt; Receiving options is enabled only for IMAP. "
@@ -13205,7 +13865,7 @@ msgstr ""
 "bajo Editar &gt; Preferencias &gt; Opciones de correo &gt; SPAM &gt; General "
 "se refiere sólo al correo POP y Correo local."
 
-#: C/evolution.xml:6517(para)
+#: C/evolution.xml:6756(para)
 msgid ""
 "There are two items in this section: Automatic Contacts automatically adds "
 "people that you respond to into your address book. You can select the "
@@ -13216,7 +13876,7 @@ msgstr ""
 "direcciones. Puede seleccionar la libreta de direcciones predeterminada para "
 "los contactos automáticos de la lista."
 
-#: C/evolution.xml:6518(para)
+#: C/evolution.xml:6757(para)
 msgid ""
 "Instant Messaging Contacts periodically synchronizes contact information and "
 "images with your instant messaging program. Currently this only works with "
@@ -13228,7 +13888,7 @@ msgstr ""
 "Actualmente esto sólo funciona con Pidgin. Su libreta de direcciones no debe "
 "ser de sólo lectura para que ambas características funcionen correctamente."
 
-#: C/evolution.xml:6523(para)
+#: C/evolution.xml:6762(para)
 msgid ""
 "Allows you to delete messages after you have acted on an appointment. It "
 "also allows you to select calendars to search for meeting conflicts."
@@ -13237,7 +13897,7 @@ msgstr ""
 "También le permite seleccionar calendarios para buscar conflictos entre "
 "reuniones."
 
-#: C/evolution.xml:6529(para)
+#: C/evolution.xml:6768(para)
 msgid ""
 "There are three tabs for message composer settings where you can set the "
 "composer preferences. The General tab covers assorted behavior, the "
@@ -13249,19 +13909,19 @@ msgstr ""
 "configurar el comportamiento, la solapa Firma le permite establecer su firma "
 "y la solapa Ortografía controla la corrección ortográfica."
 
-#: C/evolution.xml:6535(link) C/evolution.xml:6575(title)
+#: C/evolution.xml:6774(link) C/evolution.xml:6814(title)
 msgid "Signature"
 msgstr "Firma"
 
-#: C/evolution.xml:6538(link) C/evolution.xml:6580(title)
+#: C/evolution.xml:6777(link) C/evolution.xml:6819(title)
 msgid "Spell Checking"
 msgstr "Ortografía"
 
-#: C/evolution.xml:6546(title)
+#: C/evolution.xml:6785(title)
 msgid "Default Behavior:"
 msgstr "Comportamiento predeterminado:"
 
-#: C/evolution.xml:6547(para)
+#: C/evolution.xml:6786(para)
 msgid ""
 "Choose how to normally forward and reply to messages, what character set "
 "they will use, whether they are in HTML, and whether that HTML can contain "
@@ -13271,7 +13931,7 @@ msgstr ""
 "caracteres usará, si desea utilizar el formato HTML y en ese caso, si desea "
 "utilizar emoticones."
 
-#: C/evolution.xml:6549(para)
+#: C/evolution.xml:6788(para)
 msgid ""
 "You can forward messages either as an attachment or inline, or else as "
 "quoted. Choose reply style from the drop-down list: Quote original message, "
@@ -13281,11 +13941,11 @@ msgstr ""
 "citado. Elija la forma de responder de la lista desplegable: Citar el "
 "mensaje original, No citar el mensaje original, Adjuntar mensaje original."
 
-#: C/evolution.xml:6551(title)
+#: C/evolution.xml:6790(title)
 msgid "Top Posting Options:"
 msgstr "Opciones de publicar por encima:"
 
-#: C/evolution.xml:6552(para)
+#: C/evolution.xml:6791(para)
 msgid ""
 "When replying, you can choose where to place your signature in the message. "
 "You can place the signature either above the original message or at the end "
@@ -13300,27 +13960,28 @@ msgstr ""
 "del correo electrónico."
 
 # index.docbook:462, index.docbook:594
-#: C/evolution.xml:6555(title) C/evolution.xml:6628(title)
+#: C/evolution.xml:6794(title) C/evolution.xml:6867(title)
 msgid "Alerts:"
 msgstr "Alertas:"
 
-#: C/evolution.xml:6556(para)
+#: C/evolution.xml:6795(para)
 msgid "There are two optional alerts you can select:"
 msgstr "Hay dos alertas opcionales que puede seleccionar:"
 
-#: C/evolution.xml:6561(title)
+#: C/evolution.xml:6800(title)
 msgid "Prompt When Sending Messages With an Empty Subject Line:"
 msgstr "Preguntar al mandar mensajes con el asunto vacío:"
 
-#: C/evolution.xml:6562(para)
+#: 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:6567(title)
+#: C/evolution.xml:6806(title)
 msgid "Prompt When Sending Messages with Only Bcc Recipients Defined:"
 msgstr "Preguntar al mandar mensajes que sólo tengan definido Cco:"
 
-#: C/evolution.xml:6568(para)
+#: C/evolution.xml:6807(para)
 msgid ""
 "The composer warns you if you try to send a message that has only Bcc "
 "recipients. This is important because some mail servers fail to transmit "
@@ -13332,7 +13993,7 @@ msgstr ""
 "correo sólo aceptarán copias ocultas cuando el mensaje contiene al menos un "
 "destinatario visible para todos los lectores."
 
-#: C/evolution.xml:6576(para)
+#: C/evolution.xml:6815(para)
 msgid ""
 "The signature editor allows you to create several different signatures in "
 "plain text or in HTML, and to specify which of them will be added to email "
@@ -13345,7 +14006,7 @@ msgstr ""
 "una firma alternativa, o no utilizar ninguna, desde el propio editor de "
 "correo."
 
-#: C/evolution.xml:6581(para)
+#: C/evolution.xml:6820(para)
 msgid ""
 "To choose a spell-checking language, select it here. You must install gnome-"
 "spell, aspell, and an aspell language package (like for example aspell-en "
@@ -13364,56 +14025,56 @@ msgstr ""
 "ortografía mientras se escribe. Puede ajustar el color de las palabras mal "
 "escritas."
 
-#: C/evolution.xml:6588(para)
+#: C/evolution.xml:6827(para)
 msgid "The calendar configuration tool has several pages:"
 msgstr "La herramienta de configuración del calendario tiene varias páginas:"
 
-#: C/evolution.xml:6594(link) C/evolution.xml:6634(title)
+#: C/evolution.xml:6833(link) C/evolution.xml:6873(title)
 msgid "Display"
 msgstr "Mostrar"
 
 # index.docbook:462, index.docbook:594
-#: C/evolution.xml:6597(link) C/evolution.xml:6667(title)
+#: C/evolution.xml:6836(link) C/evolution.xml:6906(title)
 msgid "Alarms"
 msgstr "Alertas"
 
-#: C/evolution.xml:6600(link) C/evolution.xml:6680(title)
+#: C/evolution.xml:6839(link) C/evolution.xml:6919(title)
 msgid "Calendar Publishing"
 msgstr "Publicar el calendario"
 
-#: C/evolution.xml:6606(para)
+#: C/evolution.xml:6845(para)
 msgid "The General page lets you set the following options:"
 msgstr "La página General le permite establecer los siguientes valores:"
 
-#: C/evolution.xml:6608(title)
+#: C/evolution.xml:6847(title)
 msgid "Time Zone:"
 msgstr "Zona horaria:"
 
-#: C/evolution.xml:6609(para)
+#: C/evolution.xml:6848(para)
 msgid "The city you're located in, to specify your time zone."
 msgstr "La ciudad en la que se encuentra, para calcular su zona horaria."
 
-#: C/evolution.xml:6612(title)
+#: C/evolution.xml:6851(title)
 msgid "Time Format:"
 msgstr "Formato de la hora:"
 
-#: C/evolution.xml:6613(para)
+#: C/evolution.xml:6852(para)
 msgid "Choose between twelve-hour (AM/PM) and twenty-four-hour time formats."
 msgstr "Elija entre el formato de doce horas (AM/PM) o de veinticuatro horas."
 
-#: C/evolution.xml:6616(title)
+#: C/evolution.xml:6855(title)
 msgid "Week Starts:"
 msgstr "La semana empieza en:"
 
-#: C/evolution.xml:6617(para)
+#: C/evolution.xml:6856(para)
 msgid "Select the day to display as the first in each week."
 msgstr "Seleccione el día a mostrar como el primer día de cada semana."
 
-#: C/evolution.xml:6620(title)
+#: C/evolution.xml:6859(title)
 msgid "Day Begins:"
 msgstr "El día comienza a las:"
 
-#: C/evolution.xml:6621(para)
+#: C/evolution.xml:6860(para)
 msgid ""
 "For Evolution, a normal work day begins at 9 a.m. and ends at 5 p.m. You can "
 "select your preferred hours."
@@ -13421,15 +14082,15 @@ msgstr ""
 "Para Evolution, un día normal de trabajo comienza a las 9 horas y termina a "
 "las 17 horas. Puede seleccionar su horario de trabajo preferido."
 
-#: C/evolution.xml:6624(title)
+#: C/evolution.xml:6863(title)
 msgid "Day Ends:"
 msgstr "El día acaba a las:"
 
-#: C/evolution.xml:6625(para)
+#: C/evolution.xml:6864(para)
 msgid "Sets the end of a normal workday."
 msgstr "Establece el final de un día de trabajo normal."
 
-#: C/evolution.xml:6629(para)
+#: C/evolution.xml:6868(para)
 msgid ""
 "If you want to be warned before you delete any appointment, or to have a "
 "reminder automatically appear for each event, select the options here."
@@ -13437,7 +14098,7 @@ msgstr ""
 "Active las casillas si desea mostrar una advertencia antes de eliminar "
 "cualquier cita, o recibir recordatorios automáticos para cada acontecimiento."
 
-#: C/evolution.xml:6635(para)
+#: C/evolution.xml:6874(para)
 msgid ""
 "The Display page lets you choose how your appointments and tasks appear in "
 "your calendar."
@@ -13445,11 +14106,11 @@ msgstr ""
 "La sección Vista sirve para elegir la presentación de sus citas y tareas "
 "dentro del calendario."
 
-#: C/evolution.xml:6637(title)
+#: C/evolution.xml:6876(title)
 msgid "Time Divisions:"
 msgstr "Divisiones de horas:"
 
-#: C/evolution.xml:6638(para)
+#: C/evolution.xml:6877(para)
 msgid ""
 "Sets the time increments shown as fine lines on the daily view in the "
 "calendar."
@@ -13457,11 +14118,12 @@ msgstr ""
 "Establece el incremento de tiempo mostrado como líneas finas en la vista "
 "diaria del calendario."
 
-#: C/evolution.xml:6641(title)
+#: 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:6642(para)
+#: C/evolution.xml:6881(para)
 msgid ""
 "If there is space, Evolution shows the end times in the week and month views "
 "for each appointment."
@@ -13469,11 +14131,11 @@ msgstr ""
 "Si hay espacio suficiente, el cliente Evolution mostrará las horas finales "
 "en las vistas semanales y mensajes para cada cita."
 
-#: C/evolution.xml:6645(title)
+#: C/evolution.xml:6884(title)
 msgid "Compress weekends in month view:"
 msgstr "Comprimir fines de semana en la vista mensual:"
 
-#: C/evolution.xml:6646(para)
+#: C/evolution.xml:6885(para)
 msgid ""
 "Select this option to display weekends in one box instead of two in the "
 "month view."
@@ -13481,37 +14143,37 @@ msgstr ""
 "Seleccione esta opción para mostrar los fines de semana en una caja en lugar "
 "de dos en la vista mensual."
 
-#: C/evolution.xml:6649(title)
+#: C/evolution.xml:6888(title)
 msgid "Show week numbers in date navigator:"
 msgstr "Muestra los números de las semanas en el navegador de fechas:"
 
-#: C/evolution.xml:6650(para)
+#: C/evolution.xml:6889(para)
 msgid "Shows the week numbers next to the respective weeks in the calendar."
 msgstr ""
 "Muestra los números de la semana junto a las respectivas semanas en el "
 "calendario."
 
-#: C/evolution.xml:6653(title)
+#: C/evolution.xml:6892(title)
 msgid "Tasks due today:"
 msgstr "Tareas que vencen hoy:"
 
-#: C/evolution.xml:6654(para)
+#: C/evolution.xml:6893(para)
 msgid "Select the color for tasks due today."
 msgstr "Establece el color para las tareas que vencen hoy."
 
-#: C/evolution.xml:6657(title)
+#: C/evolution.xml:6896(title)
 msgid "Overdue tasks:"
 msgstr "Tareas vencidas:"
 
-#: C/evolution.xml:6658(para)
+#: C/evolution.xml:6897(para)
 msgid "Select the color for overdue tasks."
 msgstr "Establece el color para las tareas vencidas."
 
-#: C/evolution.xml:6661(title)
+#: C/evolution.xml:6900(title)
 msgid "Hide completed tasks after:"
 msgstr "Ocultar las tareas completadas tras:"
 
-#: C/evolution.xml:6662(para)
+#: C/evolution.xml:6901(para)
 msgid ""
 "Select this option to have completed tasks hidden after a period of time "
 "measured in days, hours, or minutes. If you don't select this option, "
@@ -13522,11 +14184,11 @@ msgstr ""
 "opción, las tareas completadas se mantendrán en su lista de tareas, marcadas "
 "como completadas."
 
-#: C/evolution.xml:6669(title)
+#: C/evolution.xml:6908(title)
 msgid "Select the Calendars for Alarm Notification:"
 msgstr "Seleccionar los calendarios para las notificaciones de alerta:"
 
-#: C/evolution.xml:6670(para)
+#: C/evolution.xml:6909(para)
 msgid ""
 "Select the calendars for which you want an alarm notification. If you don't "
 "select the calendar, you will not have an alarm notification for any event "
@@ -13536,15 +14198,15 @@ msgstr ""
 "Si no selecciona el calendario no tendrça notificaciones de alerta para "
 "ningún acontecimiento en este calendario."
 
-#: C/evolution.xml:6675(title)
+#: C/evolution.xml:6914(title)
 msgid "Free/Busy"
 msgstr "Disponibilidad"
 
-#: C/evolution.xml:6682(title)
+#: C/evolution.xml:6921(title)
 msgid "Publishing:"
 msgstr "Publicación:"
 
-#: C/evolution.xml:6683(para)
+#: C/evolution.xml:6922(para)
 msgid ""
 "Allows you to select a URL to post your calendar information to. When you "
 "add a URL, you can specify the publishing location, the frequency of "
@@ -13555,7 +14217,185 @@ msgstr ""
 "publicación, la frecuencia de publicación, qué calendario publicará y cómo "
 "qué persona autenticarse."
 
-#: C/evolution.xml:6690(para)
+#: C/evolution.xml:6928(title)
+msgid "Network Preferences"
+msgstr "Preferencias de red"
+
+#: C/evolution.xml:6929(para)
+msgid "This interface lets you configure your network proxy settings."
+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:"
+
+#: C/evolution.xml:6933(title)
+msgid "Use system defaults:"
+msgstr "Usar los valores predeterminados del sistema:"
+
+#: C/evolution.xml:6934(para)
+msgid ""
+"Select this option to use the system wide proxy settings configured through "
+"Control Center &gt; Network Proxies in GNOME. When this option is selected, "
+"Evolution uses the proxy settings in the /system/http_proxy and /system/"
+"proxy/gconf keys."
+msgstr ""
+"Seleccione esta opción para usar los ajustes globales del proxy configurados "
+"a través Centro de control &gt; Proxy de la red en GNOME. Cuando esta opción "
+"está seleccionada Evolution usa los ajustes del proxy en las claves /system/"
+"http_proxy y /system/proxy/gconf."
+
+#: C/evolution.xml:6937(para)
+msgid ""
+"If these keys do not reflect the settings configured through Control Center "
+"&gt; Network Proxies, Evolution does not work with the proxy and you must "
+"either update these gconf keys or choose Manual proxy configuration."
+msgstr ""
+"Si estas claves no reflejan los ajustes configurados a través de Centro de "
+"control &gt; Proxy de la red, Evolution no trabajará con el proxy y deberá "
+"actualizar esas claves de gconf o elegir Configuración manual del proxy."
+
+#: C/evolution.xml:6940(title)
+msgid "Direct connection to the Internet:"
+msgstr "Conexión directa a Internet:"
+
+#: C/evolution.xml:6941(para)
+msgid "Select this option to connect directly to the internet."
+msgstr "Seleccione esta opción para conectarse directamente a Internet."
+
+#: C/evolution.xml:6944(title)
+msgid "Manual proxy configuration:"
+msgstr "Configuración manual del proxy:"
+
+#: C/evolution.xml:6945(para)
+msgid ""
+"This option helps you costomize proxy settings regardless of the desktop you "
+"use. Specify hosts and ports for HTTP and optionally for other protocols. In "
+"the No Proxy Domain field, specify that comma-separated domain names do not "
+"go through the configured proxy server. You can specify patterns like *."
+"example.com or .example.com in the No Proxy Domain list. Specify a username "
+"and password, and if the proxy server requires authentication, select Use "
+"Authentication to enable the username and password fields. The customized "
+"proxy settings are as follows:"
+msgstr ""
+"Esta opción le ayuda a personalizar los ajustes del proxy independientemente "
+"del escritorio que use. Especifique equipos y puertos para HTTP y, "
+"opcionalmente, para otros protocolos. En el campo «Sin dominio proxy» "
+"especifique los nombres de dominio, separados por comas, que no están "
+"configurados a través del proxy. Puede especificar patrones como *.ejemplo."
+"com o ejemplo.com en la lista Sin dominio proxy. Especifique un nombre de "
+"usuario y una contraseña y, si el proxy requiere autenticación, seleccione "
+"Usar autenticación para activar los campos usuario y contraseña. Los ajustes "
+"personalizados del proxy son los siguientes:"
+
+#: C/evolution.xml:6954(para)
+msgid "Proxy Configuration Settings"
+msgstr "Ajustes de configuración del proxy"
+
+#: C/evolution.xml:6964(para)
+msgid "HTTP Proxy"
+msgstr "Proxy HTTP"
+
+#: C/evolution.xml:6967(para)
+msgid "The machine name to proxy HTTP through."
+msgstr "El nombre de la máquina sobre la que pasar a través del proxy HTTP."
+
+#: C/evolution.xml:6972(para) C/evolution.xml:6988(para)
+#: C/evolution.xml:7004(para)
+msgid "Port"
+msgstr "Puerto"
+
+#: C/evolution.xml:6975(para)
+msgid ""
+"The port for the machine defined by the HTTP Proxy field that you proxy "
+"through."
+msgstr "El puerto para la máquina definida por el campo puerto del Proxy HTTP."
+
+#: C/evolution.xml:6980(para)
+msgid "Secure HTTP Proxy"
+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"
+
+#: 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."
+
+#: C/evolution.xml:6996(para)
+msgid "SOCKS Host"
+msgstr "Equipo SOCKS"
+
+#: C/evolution.xml:6999(para)
+msgid "The machine name to proxy SOCKS through."
+msgstr "El nombre de la máquina sobre la que pasar a través de proxy SOCKS."
+
+#: C/evolution.xml:7007(para)
+msgid "The port for the machine defined by the SOCKS host."
+msgstr "El puerto para la máquina definida por el equipo SOCKS."
+
+#: C/evolution.xml:7012(para)
+msgid "No proxy domain"
+msgstr "Sin dominio proxy"
+
+#: C/evolution.xml:7015(para)
+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 "
+"(using an initial wildcard like *.example.com), IP host addresses (both IPv4 "
+"and IPv6) and network addresses with a netmask similar to 192.168.0.0/24."
+msgstr ""
+"Esta clave contiene una lista de equipos conectados directamente, en lugar "
+"de a través del proxy (si está activo). Los valores pueden ser nombres de "
+"equipos, dominios (usando un comodín inicial como *.ejemplo.com), "
+"direcciones IP de equipos (tanto de IPv4 como de IPv6) y direcciones de red "
+"con una máscara de red similar a 192.168.0.0/24."
+
+#: C/evolution.xml:7020(para)
+msgid "Use authentication"
+msgstr "Usar autenticación"
+
+#: C/evolution.xml:7023(para)
+msgid ""
+"If this option is enabled, it uses authentication to connect via the proxy "
+"server."
+msgstr ""
+"Si esta opción está activada, usa autenticación para conectarse a través del "
+"servidor proxy."
+
+#: C/evolution.xml:7028(para)
+msgid "Username"
+msgstr "Usuario"
+
+#: C/evolution.xml:7031(para)
+msgid "Username used to authenticate when performing an HTTP proxying."
+msgstr "Usuario que usar para autenticarse al pasar por un proxy HTTP."
+
+#: C/evolution.xml:7036(para)
+msgid "Password"
+msgstr "Contraseña"
+
+#: C/evolution.xml:7039(para)
+msgid "Password used to authenticate when performing an HTTP proxying."
+msgstr "Contraseña que usar para autenticarse al pasar por un proxy HTTP."
+
+#: C/evolution.xml:7046(title)
+msgid "Automatic proxy configuration URL:"
+msgstr "URL para la configuración automática del proxy:"
+
+#: C/evolution.xml:7047(para)
+msgid ""
+"Specify the automatic proxy configuration URL for Evolution to use in the "
+"autoconfig script to configure the proxy."
+msgstr ""
+"Especifique el URL para la configuración automática del proxy que Evolution "
+"usará en el script de autoconfiguración para configurar el proxy."
+
+#: C/evolution.xml:7053(para)
 msgid ""
 "Evolution allows you to add certificates for yourself as well as for "
 "contacts. This allows you to communicate with others securely over an "
@@ -13567,11 +14407,11 @@ msgstr ""
 "una conexión cifrada o firmar un mensaje confirmando su identidad al "
 "contacto. Estos ajustes sólo se aplican al cifrado S/MIME."
 
-#: C/evolution.xml:6692(title)
+#: C/evolution.xml:7055(title)
 msgid "Your Certificates:"
 msgstr "Sus certificados:"
 
-#: C/evolution.xml:6693(para)
+#: C/evolution.xml:7056(para)
 msgid ""
 "Click the Your Certificates tab to display a list of certificates that you "
 "own. You can import, view and delete your certificates from this page."
@@ -13580,11 +14420,11 @@ msgstr ""
 "certificados que posee. Desde esta página puede importar, ver y borrar sus "
 "certificados."
 
-#: C/evolution.xml:6696(title)
+#: C/evolution.xml:7059(title)
 msgid "Contact Certificates:"
 msgstr "Certificados de los contactos:"
 
-#: C/evolution.xml:6697(para)
+#: C/evolution.xml:7060(para)
 msgid ""
 "Click the Contact Certificates tab to display a list of certificates that "
 "you have for contacts. These certificates allow you to decrypt messages as "
@@ -13597,11 +14437,11 @@ msgstr ""
 "página puede importar, ver, respaldar y borrar los certificados de sus "
 "contactos."
 
-#: C/evolution.xml:6700(title)
+#: C/evolution.xml:7063(title)
 msgid "Authorities:"
 msgstr "Autoridades:"
 
-#: C/evolution.xml:6701(para)
+#: C/evolution.xml:7064(para)
 msgid ""
 "Click the Authorities tab to display a list of trusted certificate "
 "authorities who verify that the certificate you have is valid. You can "
@@ -13612,67 +14452,68 @@ msgstr ""
 "es válido. Puede importar, ver, editar y borrar las autoridades de "
 "certificados desde esta página."
 
-#: C/evolution.xml:6707(para)
+#: 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:6710(link) C/evolution.xml:6718(title)
+#: C/evolution.xml:7073(link) C/evolution.xml:7081(title)
 msgid "Creating a Contact"
 msgstr "Crear un contacto"
 
-#: C/evolution.xml:6713(link) C/evolution.xml:6740(title)
+#: C/evolution.xml:7076(link) C/evolution.xml:7103(title)
 msgid "Creating an Address Book"
 msgstr "Crear una libreta de direcciones"
 
-#: C/evolution.xml:6719(para)
+#: C/evolution.xml:7082(para)
 msgid "To add a new contact list, either local or remote:"
 msgstr "Para añadir una nueva lista de contactos, local o remota:"
 
-#: C/evolution.xml:6722(para)
+#: C/evolution.xml:7085(para)
 msgid "Click Contacts in the Switcher."
 msgstr "Pulse Contactos en el Selector."
 
-#: C/evolution.xml:6725(para)
+#: C/evolution.xml:7088(para)
 msgid "Click the down-arrow next to New."
 msgstr "Pulse la flecha abajo junto a Nuevo."
 
-#: C/evolution.xml:6728(para)
+#: C/evolution.xml:7091(para)
 msgid "Select Contact List."
 msgstr "Seleccione una lista de contactos."
 
-#: C/evolution.xml:6731(para)
+#: C/evolution.xml:7094(para)
 msgid "Type a name and location for the Address Book."
 msgstr "Escriba un nombre y un lugar para la libreta de direcciones."
 
-#: C/evolution.xml:6743(para)
+#: C/evolution.xml:7106(para)
 msgid "Click File &gt; New &gt; Address Book."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Libreta de direcciones."
 
-#: C/evolution.xml:6746(para)
+#: C/evolution.xml:7109(para)
 msgid "Select the type of Address Book."
 msgstr "Seleccione el tipo de libreta de direcciones."
 
-#: C/evolution.xml:6748(title)
+#: C/evolution.xml:7111(title)
 msgid "On This Computer:"
 msgstr "En este equipo:"
 
-#: C/evolution.xml:6749(para)
+#: C/evolution.xml:7112(para)
 msgid "Creates a local address book on the computer."
 msgstr "Crea una libreta de direcciones local en el equipo."
 
-#: C/evolution.xml:6752(title)
+#: C/evolution.xml:7115(title)
 msgid "On LDAP Server:"
 msgstr "En un servidor LDAP:"
 
-#: C/evolution.xml:6753(para)
+#: C/evolution.xml:7116(para)
 msgid "Creates an address book on the LDAP server."
 msgstr "Crea una libreta de direcciones en el servidor LDAP."
 
-#: C/evolution.xml:6756(title)
+#: C/evolution.xml:7119(title)
 msgid "Specific Account:"
 msgstr "Cuenta específica:"
 
-#: C/evolution.xml:6757(para)
+#: C/evolution.xml:7120(para)
 msgid ""
 "If you have an account that allows you to create an address book on that "
 "server, you can select that account."
@@ -13680,7 +14521,7 @@ msgstr ""
 "Si tiene una cuenta que le permite crear una libreta de direcciones en ese "
 "servidor, puede seleccionar esa cuenta."
 
-#: C/evolution.xml:6761(para)
+#: C/evolution.xml:7124(para)
 msgid ""
 "If you selected On This Computer, specify the name of the address book, and "
 "choose whether you want to the new address book as your default folder."
@@ -13689,7 +14530,7 @@ msgstr ""
 "direcciones y elija dónde quiere que se almacene su nueva libreta de "
 "direcciones como su carpeta predeterminada."
 
-#: C/evolution.xml:6763(para)
+#: C/evolution.xml:7126(para)
 msgid ""
 "If you are creating an address book on an <link linkend=\"ldap\">LDAP</link> "
 "server, enter the server information as requested by the assistant:"
@@ -13698,19 +14539,19 @@ msgstr ""
 "\"ldap\">LDAP</link>, introduzca la información del servidor solicitada por "
 "el asistente:"
 
-#: C/evolution.xml:6765(title)
+#: C/evolution.xml:7128(title)
 msgid "Server Name:"
 msgstr "Nombre del servidor:"
 
-#: C/evolution.xml:6766(para)
+#: C/evolution.xml:7129(para)
 msgid "The Internet address of the contact server you are using."
 msgstr "La dirección de internet del servidor de contactos que está usando."
 
-#: C/evolution.xml:6769(title)
+#: C/evolution.xml:7132(title)
 msgid "Login Method:"
 msgstr "Método de inicio de sesión:"
 
-#: C/evolution.xml:6770(para)
+#: C/evolution.xml:7133(para)
 msgid ""
 "Specify whether your login is anonymous, uses an email address, or uses a "
 "distinguished name. If the login is not anonymous, specify the email address "
@@ -13721,11 +14562,11 @@ msgstr ""
 "sesión anónimo, especifique la dirección de correo-e o el «nombre "
 "distinguido» (DN) requerido por el servidor."
 
-#: C/evolution.xml:6773(title)
+#: C/evolution.xml:7136(title)
 msgid "Port:"
 msgstr "Puerto:"
 
-#: C/evolution.xml:6774(para)
+#: C/evolution.xml:7137(para)
 msgid ""
 "The Internet port Evolution connects to in order to access the LDAP "
 "database. This is normally 389."
@@ -13733,11 +14574,11 @@ msgstr ""
 "El puerto de Internet al que se conecta Evolution para acceder a la base de "
 "datos LDAP. Normalmente es el puerto 389."
 
-#: C/evolution.xml:6777(title)
+#: C/evolution.xml:7140(title)
 msgid "Use SSL/TLS:"
 msgstr "Usar SSL/TLS:"
 
-#: C/evolution.xml:6778(para)
+#: C/evolution.xml:7141(para)
 msgid ""
 "SSL and TLS are security mechanisms. If you select No Encryption, Evolution "
 "will send your password unencrypted. By using SSL or TLS, a secure "
@@ -13747,11 +14588,11 @@ msgstr ""
 "enviará su contraseña sin cifrar. Usando SSL o TSL se usará una conexión "
 "segura y su contraseña se enviará cifrada."
 
-#: C/evolution.xml:6781(title)
+#: C/evolution.xml:7144(title)
 msgid "Details: Search Base:"
 msgstr "Detalles: Base de búsqueda:"
 
-#: C/evolution.xml:6782(para)
+#: C/evolution.xml:7145(para)
 msgid ""
 "The <link linkend=\"search-base\">search base</link> is the starting point "
 "for a directory search. Contact your network administrator for information "
@@ -13761,11 +14602,11 @@ msgstr ""
 "punto de partida utilizado para las búsquedas en directorios. Consulte a su "
 "administrador para obtener información acerca de los ajustes adecuados."
 
-#: C/evolution.xml:6785(title)
+#: C/evolution.xml:7148(title)
 msgid "Search Scope:"
 msgstr "Rango de búsqueda:"
 
-#: C/evolution.xml:6786(para)
+#: C/evolution.xml:7149(para)
 msgid ""
 "The <link linkend=\"search-scope\">search scope</link> is the breadth of a "
 "given search. The following options are available:"
@@ -13773,27 +14614,27 @@ msgstr ""
 "El <glossterm linkend=\"search-scope\">rango de búsqueda</glossterm> es la "
 "extensión de una búsqueda dada. Están disponibles las siguientes:"
 
-#: C/evolution.xml:6791(title)
+#: C/evolution.xml:7154(title)
 msgid "One:"
 msgstr "Uno:"
 
-#: C/evolution.xml:6792(para)
+#: C/evolution.xml:7155(para)
 msgid "Searches the Search Base and one entry below it."
 msgstr "Busca dentro de la raíz y un nivel de subdirectorios."
 
-#: C/evolution.xml:6797(title)
+#: C/evolution.xml:7160(title)
 msgid "Sub:"
 msgstr "Sub:"
 
-#: C/evolution.xml:6798(para)
+#: C/evolution.xml:7161(para)
 msgid "Searches the Search Base and all entries below it."
 msgstr "Busca dentro de la raíz y en todos los subdirectorios."
 
-#: C/evolution.xml:6803(title)
+#: C/evolution.xml:7166(title)
 msgid "Timeout (minutes):"
 msgstr "Tiempo de expiración (minutos):"
 
-#: C/evolution.xml:6804(para)
+#: C/evolution.xml:7167(para)
 msgid ""
 "The maximum time Evolution attempts to download data from the server before "
 "giving up."
@@ -13801,11 +14642,11 @@ msgstr ""
 "Es el tiempo de espera máximo para descargar los datos del servidor, antes "
 "de abandonar."
 
-#: C/evolution.xml:6809(title)
+#: C/evolution.xml:7172(title)
 msgid "Download Limit:"
 msgstr "Límite de descarga:"
 
-#: C/evolution.xml:6810(para)
+#: C/evolution.xml:7173(para)
 msgid ""
 "The maximum number of results for a given search. Most servers refuse to "
 "send more than 500, but you can set the number lower if you want to shorten "
@@ -13815,11 +14656,11 @@ msgstr ""
 "aceptan enviar más de 500 respuestas, pero puede fijar un número inferior "
 "para reducir el volumen de descargas, en caso de búsquedas muy amplias."
 
-#: C/evolution.xml:6815(title)
+#: C/evolution.xml:7178(title)
 msgid "Display Name:"
 msgstr "Nombre a mostrar:"
 
-#: C/evolution.xml:6816(para)
+#: C/evolution.xml:7179(para)
 msgid ""
 "The name you want to use as a label for this folder. It can be any name you "
 "choose."
@@ -13827,17 +14668,18 @@ msgstr ""
 "Este es el nombre que quiere usar como etiqueta para esta carpeta. Puede ser "
 "cualquier nombre que elija."
 
-#: C/evolution.xml:6821(title)
+#: C/evolution.xml:7184(title)
 msgid "Search Filter:"
 msgstr "Filtro de búsquedas:"
 
-#: C/evolution.xml:6822(para)
-msgid "The search filter can be set here for all the LDAP queries. For example:"
+#: C/evolution.xml:7185(para)
+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:"
 
-#: C/evolution.xml:6824(para)
+#: C/evolution.xml:7187(para)
 msgid ""
 "ObjectClass=*: Lists all the objects from the server.ObjectClass=User: Lists "
 "only the users. Filter (|(ObjectClass=User)(ObjectClass=groupOfNames)): "
@@ -13850,7 +14692,7 @@ msgstr ""
 "de contactos. (&amp;(mail=*)(ObjectClass=*)): Lista los objetos asociados "
 "con las direcciones de correo-e."
 
-#: C/evolution.xml:6826(para)
+#: C/evolution.xml:7189(para)
 msgid ""
 "If you change any LDAP address book configurations, Evolution and the "
 "Evolution Data Server need to be restarted in order to see the changes."
@@ -13858,7 +14700,7 @@ msgstr ""
 "Si cambia cualquier configuración de la libreta de direcciones LDAP deberá "
 "reiniciar Evolution y Evolution Data Server para que puedan ver los cambios."
 
-#: C/evolution.xml:6829(para)
+#: C/evolution.xml:7192(para)
 msgid ""
 "If you are creating the address book for a specific account, type the name "
 "of the address book if you want the address book stored locally when "
@@ -13869,7 +14711,7 @@ msgstr ""
 "direcciones se almacene localmente cuando esté desconectado, y si quiere que "
 "la libreta de direcciones sea su carpeta predeterminada."
 
-#: C/evolution.xml:6840(para)
+#: C/evolution.xml:7203(para)
 msgid ""
 "Evolution allows you to view the error logs and set the display duration for "
 "the error messages that appear in the statusbar. When an error occurs, "
@@ -13881,19 +14723,20 @@ msgstr ""
 "barra de estado muestra el mensaje de error durante el tiempo especificado y "
 "después el mensaje se mueve al archivo de depuración."
 
-#: C/evolution.xml:6843(para)
+#: C/evolution.xml:7206(para)
 msgid "From the Help menu, select Debug Logs."
 msgstr "Desde el menú Ayuda seleccione la Depuración de sucesos."
 
-#: C/evolution.xml:6847(para)
+#: C/evolution.xml:7210(para)
 msgid "Specify the display duration for the error messages."
 msgstr "Especifique la duración del mostrado de los mensajes de error."
 
-#: C/evolution.xml:6848(para)
+#: 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:6852(para)
+#: C/evolution.xml:7215(para)
 msgid ""
 "The <inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-warning.png\"/"
 "> icon indicates that the error message is a warning. The <inlinegraphic "
@@ -13905,7 +14748,7 @@ msgstr ""
 "<inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-info.png\"/> se "
 "muestra con un mensaje «para-su-información»."
 
-#: C/evolution.xml:6859(para)
+#: C/evolution.xml:7222(para)
 msgid ""
 "Synchronization presents you with three issues you need to address. First, "
 "you need to enable synchronization. Second, your computer needs to recognize "
@@ -13919,19 +14762,19 @@ msgstr ""
 "sólo soporta dispositivos Palm OS como PalmPilot* y Handspring Visor. "
 "Tercero, debe decidir que tipo de sincronización quiere."
 
-#: C/evolution.xml:6862(link) C/evolution.xml:6873(title)
+#: C/evolution.xml:7225(link) C/evolution.xml:7236(title)
 msgid "Enabling Synchronization"
 msgstr "Activar la sincronización"
 
-#: C/evolution.xml:6865(link) C/evolution.xml:6878(title)
+#: C/evolution.xml:7228(link) C/evolution.xml:7241(title)
 msgid "Selecting Conduits"
 msgstr "Seleccionar un conducto"
 
-#: C/evolution.xml:6868(link) C/evolution.xml:6901(title)
+#: C/evolution.xml:7231(link) C/evolution.xml:7264(title)
 msgid "Synchronizing Information"
 msgstr "Sincronizar la información"
 
-#: C/evolution.xml:6874(para)
+#: C/evolution.xml:7237(para)
 msgid ""
 "If you haven't used a handheld device with your computer before, you need to "
 "run the GNOME Control Center by clicking System &gt; Settings, and make sure "
@@ -13954,7 +14797,7 @@ msgstr ""
 "crean dos nodos de dispositivo, ttyUSB0 y ttyUSB1. El segundo nodo es el que "
 "se debe usar al configurar el dispositivo."
 
-#: C/evolution.xml:6879(para)
+#: C/evolution.xml:7242(para)
 msgid ""
 "After your computer and your Palm OS device are communicating, select the "
 "<link linkend=\"conduit\">conduits</link> you want under the Pilot Conduits "
@@ -13971,7 +14814,7 @@ msgstr ""
 "libreta de direcciones, ECalendar, para el calendario y ETodo, para la lista "
 "de tareas."
 
-#: C/evolution.xml:6880(para)
+#: C/evolution.xml:7243(para)
 msgid ""
 "Click Enable, then click Settings to change what the conduit does when "
 "activated. Your options can vary depending on the conduit, but typically "
@@ -13981,19 +14824,19 @@ msgstr ""
 "vez activado. Las opciones pueden variar en función del conducto, pero "
 "habitualmente son las siguientes:"
 
-#: C/evolution.xml:6882(title)
+#: C/evolution.xml:7245(title)
 msgid "Disabled:"
 msgstr "Deshabilitado:"
 
-#: C/evolution.xml:6883(para)
+#: C/evolution.xml:7246(para)
 msgid "Do nothing."
 msgstr "No hacer nada."
 
-#: C/evolution.xml:6886(title)
+#: C/evolution.xml:7249(title)
 msgid "Synchronize:"
 msgstr "Sincronizar:"
 
-#: C/evolution.xml:6887(para)
+#: C/evolution.xml:7250(para)
 msgid ""
 "Copy new data from the computer to the handheld, and from the handheld to "
 "the computer. Remove items that were on both systems but have been deleted "
@@ -14003,23 +14846,24 @@ msgstr ""
 "direcciones. Elimina los elementos que se encontraban en los dos sistemas, "
 "pero que fueron eliminados en uno de ellos."
 
-#: C/evolution.xml:6890(title)
+#: C/evolution.xml:7253(title)
 msgid "Copy From Pilot:"
 msgstr "Copiar desde Pilot:"
 
-#: C/evolution.xml:6891(para)
-msgid "If there is any new data on the handheld device, copy it to the computer."
+#: C/evolution.xml:7254(para)
+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:6894(title)
+#: C/evolution.xml:7257(title)
 msgid "Copy To Pilot:"
 msgstr "Copiar hacia Pilot:"
 
-#: C/evolution.xml:6895(para)
+#: C/evolution.xml:7258(para)
 msgid "Copy new data from the computer to the handheld."
 msgstr "Copia los datos nuevos del equipo hacia el dispositivo de mano."
 
-#: C/evolution.xml:6897(para)
+#: C/evolution.xml:7260(para)
 msgid ""
 "Select the behavior you want for each conduit you choose to use. If you're "
 "not sure, use Synchronize."
@@ -14027,7 +14871,7 @@ msgstr ""
 "Seleccione el comportamiento de cada conducto elegido. Si no está seguro, "
 "use Sincronizar."
 
-#: C/evolution.xml:6902(para)
+#: C/evolution.xml:7265(para)
 msgid ""
 "Use the following procedure to synchronize the data on your Palm OS device "
 "with the data you store in Evolution."
@@ -14035,7 +14879,7 @@ msgstr ""
 "Use el siguiente procedimiento para sincronizar los datos en su dispositivo "
 "Palm Os con sus datos almacenados en Evolution."
 
-#: C/evolution.xml:6903(para)
+#: C/evolution.xml:7266(para)
 msgid ""
 "If you want to back up your information before synchronizing, make a copy of "
 "the <command>.evolution</command> directory inside your home directory."
@@ -14044,11 +14888,11 @@ msgstr ""
 "sincronizar, haga una copia del directorio <command>.evolution</command> "
 "dentro de su directorio de inicio."
 
-#: C/evolution.xml:6906(para)
+#: C/evolution.xml:7269(para)
 msgid "Put your handheld device in its cradle and press the HotSync button."
 msgstr "Coloque el dispositivo de mano en su base y pulse el botón HotSync."
 
-#: C/evolution.xml:6907(para)
+#: C/evolution.xml:7270(para)
 msgid ""
 "If you use Palm OS v. 4.0 and have password protection turned on for your "
 "handheld device, you might encounter trouble synchronizing. If this happens, "
@@ -14062,7 +14906,7 @@ msgstr ""
 "dispositivo de mano, realice la sincronización con su equipo de sobremesa y "
 "vuelva a habilitar la protección de su dispositivo."
 
-#: C/evolution.xml:6910(para)
+#: C/evolution.xml:7273(para)
 msgid ""
 "If you have followed the setup instructions properly, your Palm OS device "
 "will synchronize data with Evolution."
@@ -14070,7 +14914,7 @@ msgstr ""
 "Si siguió las instrucciones de configuración adecuadamente, los datos de su "
 "dispositivo Palm OS se podrán sincronizar con Evolution."
 
-#: C/evolution.xml:6916(para)
+#: C/evolution.xml:7279(para)
 msgid ""
 "If you are using Microsoft Outlook, but not Microsoft Exchange, this section "
 "helps you switch to <trademark>Evolution</trademark>."
@@ -14078,11 +14922,11 @@ msgstr ""
 "Si está usando Microsoft Outlook pero no Microsoft Exchange, esta sección le "
 "ayuda a cambiarse a <trademark>Evolution</trademark>."
 
-#: C/evolution.xml:6919(title)
+#: C/evolution.xml:7282(title)
 msgid "Migrating Local Outlook Mail Folders"
 msgstr "Migrar las carpetas de correo locales de Outlook"
 
-#: C/evolution.xml:6920(para)
+#: C/evolution.xml:7283(para)
 msgid ""
 "Exchange and IMAP mail is stored on the server, so you do not need to "
 "migrate it to your Linux* partition. However, if you have stored mail on "
@@ -14092,11 +14936,11 @@ msgstr ""
 "tiene que migrarlo a su partición Linux*. No obstante si ha almacenado "
 "correo en su equipo, quizá quiera hacerlo accesible a Evolution."
 
-#: C/evolution.xml:6921(para)
+#: C/evolution.xml:7284(para)
 msgid "First, while using Windows, prepare your messages for import:"
 msgstr "Primero, mientras usa Windows, prepare sus mensajes para importarlos:"
 
-#: C/evolution.xml:6924(para)
+#: C/evolution.xml:7287(para)
 msgid ""
 "Clean up your mail. Delete messages and folders you do not need, and click "
 "File &gt; Folders &gt; Properties &gt; Advanced &gt; Compact to erase old, "
@@ -14106,7 +14950,7 @@ msgstr ""
 "Archivo &gt; Carpetas &gt; Propiedades &gt; Avanzadas &gt; Compactar para "
 "borrar los mensajes antiguos y borrados de su archivo PST."
 
-#: C/evolution.xml:6927(para)
+#: C/evolution.xml:7290(para)
 msgid ""
 "If you nest your folders one inside another, you might want to rename "
 "subfolders so that you can tell which folder they belong to. You must re-"
@@ -14116,7 +14960,7 @@ msgstr ""
 "subcarpetas para poder saber a qué carpeta pertenecen. Debe volverlas a "
 "anidar después de cargarlas en Evolution."
 
-#: C/evolution.xml:6930(para)
+#: C/evolution.xml:7293(para)
 msgid ""
 "Import the files into Mozilla Mail (or another mailer, such as Netscape or "
 "Eudora, that uses the standard mbox format)."
@@ -14124,7 +14968,7 @@ msgstr ""
 "Importe los archivos en Mozilla Mail (o en otro cliente de correo que "
 "utilice el formato mbox estándar, como Netscape o Eudora)."
 
-#: C/evolution.xml:6931(para)
+#: C/evolution.xml:7294(para)
 msgid ""
 "Linux mailers cannot do this task, because it requires a library available "
 "only under Windows. In Mozilla, import by selecting Window Mail &amp; "
@@ -14134,7 +14978,7 @@ msgstr ""
 "sólo bajo Windows. En Mozilla, importe seleccionando Window Mail &amp; "
 "Newsgroups Tools Import."
 
-#: C/evolution.xml:6934(para)
+#: C/evolution.xml:7297(para)
 msgid ""
 "Mozilla creates a set of files in the directory<command> Windows"
 "\\Application_Data\\Mozilla\\Profiles\\(UserName)\\(Random Letters)\\Mail"
@@ -14146,7 +14990,7 @@ msgstr ""
 "\\Local Folders\\OutlookMail\\</command>. Los archivos de datos son los que "
 "no tienen extensión de archivo."
 
-#: C/evolution.xml:6935(para)
+#: C/evolution.xml:7298(para)
 msgid ""
 "If you are using Windows Vista*, Windows XP* or Windows 2000*, your Windows "
 "hard drive is probably in the NTFS format, which some Linux systems cannot "
@@ -14158,7 +15002,7 @@ msgstr ""
 "pueden leer sin software adicional. Quizá encuentre más fácil copiar las "
 "carpetas de correo a una unidad diferente o grabar un CD."
 
-#: C/evolution.xml:6936(para)
+#: C/evolution.xml:7299(para)
 msgid ""
 "When you have your mail in a format Evolution can understand, reboot to "
 "Linux. Then continue with the following procedure. To create new folders for "
@@ -14168,59 +15012,64 @@ msgstr ""
 "bajo Linux. Continúe entonces con el siguiente procedimiento. Para crear "
 "nuevas carpetas para sus archivos:"
 
-#: C/evolution.xml:6939(para)
+#: C/evolution.xml:7302(para)
 msgid "Mount your Windows drive or the disk where you saved the mail files."
 msgstr ""
 "Monte su unidad Windows o el disco donde tenga guardados los archivos de "
 "correo."
 
-#: C/evolution.xml:6942(para)
-msgid "Copy all the mail files into your home directory or another convenient place."
+#: C/evolution.xml:7305(para)
+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."
 
-#: C/evolution.xml:6945(para)
+#: C/evolution.xml:7308(para)
 msgid "Start Evolution."
 msgstr "Inicie Evolution."
 
-#: C/evolution.xml:6948(para)
+#: 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:6951(para)
+#: C/evolution.xml:7314(para)
 msgid "To import the data files:"
 msgstr "Importar los archivos de datos:"
 
-#: C/evolution.xml:6954(para)
-msgid "In Evolution, open the File Import assistant by clicking File &gt; Import."
+#: C/evolution.xml:7317(para)
+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."
 
-#: C/evolution.xml:6957(para)
+#: C/evolution.xml:7320(para)
 msgid "Click Next, then select Import a single file."
 msgstr "Pulse Siguiente, después seleccione Importar un solo archivo."
 
-#: C/evolution.xml:6960(para)
+#: C/evolution.xml:7323(para)
 msgid "Click on the filechooser to select the data file."
 msgstr "Pulse en el selector de archivos para seleccionar el archivo de datos."
 
-#: C/evolution.xml:6961(para)
+#: C/evolution.xml:7324(para)
 msgid "Remember, the data files are the files that have no file extension."
 msgstr ""
 "Recuerde, los archivos de datos son los archivos que no tienen extensión de "
 "archivo."
 
-#: C/evolution.xml:6964(para)
+#: 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:6970(para)
+#: 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:6978(para)
+#: C/evolution.xml:7341(para)
 msgid ""
 "You can print this section to use it as a quick reference for most of the "
 "things you want to do with <trademark>Evolution</trademark>. You can also "
@@ -14231,23 +15080,23 @@ msgstr ""
 "trademark>. También puede encontrar esta información seleccionando Ayuda "
 "&gt; Referencia rápida en la barra de menú."
 
-#: C/evolution.xml:6981(link) C/evolution.xml:6995(title)
+#: C/evolution.xml:7344(link) C/evolution.xml:7358(title)
 msgid "Opening or Creating Items"
 msgstr "Apertura o cierre de elementos"
 
-#: C/evolution.xml:6984(link) C/evolution.xml:7020(title)
+#: C/evolution.xml:7347(link) C/evolution.xml:7383(title)
 msgid "Mail Tasks"
 msgstr "Tareas de correo"
 
-#: C/evolution.xml:6990(link) C/evolution.xml:7070(title)
+#: C/evolution.xml:7353(link) C/evolution.xml:7433(title)
 msgid "Address Book"
 msgstr "Libreta de direcciones"
 
-#: C/evolution.xml:6998(title)
+#: C/evolution.xml:7361(title)
 msgid "New Item:"
 msgstr "Nuevo elemento:"
 
-#: C/evolution.xml:6999(para)
+#: C/evolution.xml:7362(para)
 msgid ""
 "Press Ctrl+N to open a new item for whatever part of Evolution you're "
 "working in. In mail, this means you create a new message. If you're looking "
@@ -14260,28 +15109,28 @@ msgstr ""
 "direcciones, Ctrl+N creará una nueva tarjeta para un contacto; y en el "
 "calendario se abrirá una nueva cita."
 
-#: C/evolution.xml:7002(title)
+#: C/evolution.xml:7365(title)
 msgid "Creating a New Email Message:"
 msgstr "Crear un nuevo mensaje de correo-e:"
 
-#: C/evolution.xml:7003(para)
-msgid "Click File &gt; New &gt; Mail Message or Shift+Ctrl+M."
-msgstr "Use Archivo &gt; Nuevo &gt; Mensaje de correo o Mayús.+Ctrl+M."
+#: C/evolution.xml:7366(para)
+msgid "Select File &gt; New &gt; Mail Message or Shift+Ctrl+M."
+msgstr "Seleccione Archivo &gt; Nuevo &gt; Mensaje de correo o Mayús.+Ctrl+M."
 
 # index.docbook:41, index.docbook:293
-#: C/evolution.xml:7006(title) C/evolution.xml:7059(title)
+#: C/evolution.xml:7369(title) C/evolution.xml:7422(title)
 msgid "Creating a New Appointment:"
 msgstr "Crear una cita nueva:"
 
-#: C/evolution.xml:7007(para) C/evolution.xml:7060(para)
+#: C/evolution.xml:7370(para) C/evolution.xml:7423(para)
 msgid "Click File &gt; New &gt; Appointment or Shift+Ctrl+A."
 msgstr "Use Archivo &gt; Nuevo &gt; Cita o Mayús+Ctrl+A."
 
-#: C/evolution.xml:7010(title)
+#: C/evolution.xml:7373(title)
 msgid "Entering a New Contact:"
 msgstr "Introducir un contacto nuevo:"
 
-#: C/evolution.xml:7011(para)
+#: C/evolution.xml:7374(para)
 msgid ""
 "Double-click in any blank space in the contact manager to create a new "
 "address card. You can also click File &gt; New &gt; Contact or Shift+Ctrl+C."
@@ -14291,19 +15140,19 @@ msgstr ""
 "Nuevo &gt; Contacto o Mayús.+Ctrl+C."
 
 # index.docbook:41, index.docbook:293
-#: C/evolution.xml:7014(title) C/evolution.xml:7064(title)
+#: C/evolution.xml:7377(title) C/evolution.xml:7427(title)
 msgid "Creating a New Task:"
 msgstr "Crear una tarea nueva:"
 
-#: C/evolution.xml:7015(para) C/evolution.xml:7065(para)
+#: C/evolution.xml:7378(para) C/evolution.xml:7428(para)
 msgid "Click File &gt; New &gt; Task or Shift+Ctrl+T."
 msgstr "Pulse Archivo &gt; Nuevo &gt; Tarea o Mayús.+Ctrl+T."
 
-#: C/evolution.xml:7022(title)
+#: C/evolution.xml:7385(title)
 msgid "Send and Receive Mail:"
 msgstr "Enviar y recibir correo:"
 
-#: C/evolution.xml:7023(para)
+#: C/evolution.xml:7386(para)
 msgid ""
 "Press F9, click the Send/Receive button in the toolbar, or click File &gt; "
 "Send/Receive."
@@ -14311,11 +15160,11 @@ msgstr ""
 "Pulse F9, pulse el botón Enviar/Recibir en la barra de herramientas, o pulse "
 "Archivo &gt; Enviar/Recibir."
 
-#: C/evolution.xml:7026(title)
+#: C/evolution.xml:7389(title)
 msgid "Navigating the Message List with the Keyboard:"
 msgstr "Navegar por la lista de mensajes mediante el teclado:"
 
-#: C/evolution.xml:7027(para)
+#: C/evolution.xml:7390(para)
 msgid ""
 "Press (]) or (.) to jump to the next unread message. ([) or (,) goes to the "
 "previous unread message. Use the arrow keys to move up and down in the list "
@@ -14325,21 +15174,22 @@ msgstr ""
 "al anterior mensaje no leído. Use las teclas del cursor para moverse arriba "
 "y abajo por toda la lista de mensajes."
 
-#: C/evolution.xml:7030(title)
+#: C/evolution.xml:7393(title)
 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:7031(para)
-msgid "Press the Spacebar to move down a page. Press Backspace to move up a page."
+#: C/evolution.xml:7394(para)
+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."
 
-#: C/evolution.xml:7034(title)
+#: C/evolution.xml:7397(title)
 msgid "Replying To a Message:"
 msgstr "Responder un mensaje:"
 
-#: C/evolution.xml:7035(para)
+#: C/evolution.xml:7398(para)
 msgid ""
 "To reply only to the sender of the message, click Reply in the toolbar, or "
 "press Ctrl+R."
@@ -14347,7 +15197,7 @@ msgstr ""
 "Para responder sólo al remitente del mensaje, pulse Responder en la barra de "
 "herramientas o pulse Ctrl+R."
 
-#: C/evolution.xml:7037(para)
+#: C/evolution.xml:7400(para)
 msgid ""
 "To reply to the sender and all the other visible recipients of the message, "
 "click Reply to All or select the message and press Shift+Ctrl+R."
@@ -14355,11 +15205,11 @@ msgstr ""
 "Para responder al remitente y a todos los destinatarios visibles pulse en "
 "Responder a todos o seleccione el mensaje y pulse Mayús.+Ctrl+R."
 
-#: C/evolution.xml:7039(title)
+#: C/evolution.xml:7402(title)
 msgid "Forwarding a Message:"
 msgstr "Reenviar un mensaje:"
 
-#: C/evolution.xml:7040(para)
+#: C/evolution.xml:7403(para)
 msgid ""
 "Select the message or messages you want to forward, then click Forward in "
 "the toolbar, or press Ctrl+F."
@@ -14367,11 +15217,11 @@ msgstr ""
 "Seleccione el o los mensajes que quiera reenviar y pulse en Reenviar en la "
 "barra de herramientas o pulse Ctrl+F."
 
-#: C/evolution.xml:7043(title)
+#: C/evolution.xml:7406(title)
 msgid "Opening a Message In a New Window:"
 msgstr "Abrir un mensaje en una nueva ventana:"
 
-#: C/evolution.xml:7044(para)
+#: C/evolution.xml:7407(para)
 msgid ""
 "Double-click the message you want to view, or select it and press Enter or "
 "Ctrl+O."
@@ -14379,11 +15229,11 @@ msgstr ""
 "Pulse dos veces sobre el mensaje que quiera ver o selecciónelo y pulse Intro "
 "o Ctrl+O."
 
-#: C/evolution.xml:7047(title)
+#: C/evolution.xml:7410(title)
 msgid "Creating Filters and Search Folders:"
 msgstr "Crear filtros y carpetas de búsqueda:"
 
-#: C/evolution.xml:7048(para)
+#: C/evolution.xml:7411(para)
 msgid ""
 "Right-click a message and select Create Rule From Message. You can also "
 "create filters and Search folders in the Edit menu."
@@ -14392,17 +15242,17 @@ msgstr ""
 "mensaje. También puede crear filtros y carpetas de búsqueda desde el menú "
 "Editar."
 
-#: C/evolution.xml:7051(title)
+#: C/evolution.xml:7414(title)
 msgid "Adding a Sender to the Address Book:"
 msgstr "Añadir un remitente a la libreta de direcciones:"
 
-#: C/evolution.xml:7052(para)
+#: C/evolution.xml:7415(para)
 msgid "Right-click on any email address to add it to your address book."
 msgstr ""
 "Pulse con el botón derecho sobre cualquier dirección de correo-e para "
 "añadirla a su libreta de direcciones."
 
-#: C/evolution.xml:7062(para)
+#: C/evolution.xml:7425(para)
 msgid ""
 "You can also click in any blank spot in the calendar and start typing to "
 "create a new appointment entry."
@@ -14410,21 +15260,21 @@ msgstr ""
 "También puede pulsar en cualquier lugar vacío del calendario y empezar a "
 "escribir para crear una nueva cita."
 
-#: C/evolution.xml:7072(title)
+#: C/evolution.xml:7435(title)
 msgid "Editing a Contact:"
 msgstr "Editar un contacto:"
 
-#: C/evolution.xml:7073(para)
+#: C/evolution.xml:7436(para)
 msgid "Double-click the contact's address card to change details."
 msgstr ""
 "Pulse dos veces en la dirección de la tarjeta del contacto para modificar "
 "los detalles."
 
-#: C/evolution.xml:7076(title)
+#: C/evolution.xml:7439(title)
 msgid "Deleting a Contact:"
 msgstr "Borrar un contacto:"
 
-#: C/evolution.xml:7077(para)
+#: C/evolution.xml:7440(para)
 msgid ""
 "Right-click a contact, then click Delete; or select a contact, then click "
 "Delete on the toolbar."
@@ -14433,21 +15283,21 @@ msgstr ""
 "seleccione el contacto y después pulse el botón Borrar en la barra de "
 "herramientas."
 
-#: C/evolution.xml:7080(title)
+#: C/evolution.xml:7443(title)
 msgid "Sending Emails to a Contact:"
 msgstr "Enviar correos-e a un contacto:"
 
-#: C/evolution.xml:7081(para)
+#: C/evolution.xml:7444(para)
 msgid "Right-click a contact, then click Send Message to Contact."
 msgstr ""
 "Pulse con el botón derecho sobre un contacto, después pulse Enviar un "
 "mensaje al contacto."
 
-#: C/evolution.xml:7084(title)
+#: C/evolution.xml:7447(title)
 msgid "Creating a New Contact:"
 msgstr "Crear un contacto nuevo:"
 
-#: C/evolution.xml:7085(para)
+#: C/evolution.xml:7448(para)
 msgid ""
 "Double-click in any blank space in the contact manager to create a new "
 "address card, or right-click anywhere in the address book and select New "
@@ -14458,7 +15308,7 @@ msgstr ""
 "cualquier parte de la libreta de direcciones y seleccione Contacto nuevo. "
 "También puede pulsar Archivo &gt; Nuevo &gt; Contacto o pulsar Mayús+Ctrl+C."
 
-#: C/evolution.xml:7092(para)
+#: C/evolution.xml:7455(para)
 msgid ""
 "<trademark>Evolution</trademark> bug tracking is done at the <ulink url="
 "\"http://bugzilla.gnome.org\">GNOME bug tracking System</ulink>. You can use "
@@ -14472,7 +15322,7 @@ msgstr ""
 "información de errores de GNOME (conocida como bug-buddy en la línea de "
 "comandos)."
 
-#: C/evolution.xml:7093(para)
+#: C/evolution.xml:7456(para)
 msgid ""
 "A complete list of feature requests and other issues with Evolution is "
 "available online in the GNOME bug tracking system. You can learn more about "
@@ -14485,7 +15335,7 @@ msgstr ""
 "\"http://gnome.org/projects/evolution/developer.shtml\">web para "
 "desarrolladores de Evolution</ulink>."
 
-#: C/evolution.xml:7098(para)
+#: C/evolution.xml:7461(para)
 msgid ""
 "Evolution was written by the <trademark>Evolution</trademark> team and "
 "numerous other dedicated GNOME programmers. You can see their names by "
@@ -14496,7 +15346,7 @@ msgstr ""
 "nombres, seleccione Ayuda &gt; Acerca de en cualquiera de las ventanas de "
 "Evolution."
 
-#: C/evolution.xml:7099(para)
+#: C/evolution.xml:7462(para)
 msgid ""
 "The Evolution code owes a great debt to the GNOME-pim and GNOME-Calendar "
 "applications, and to KHTMLW. The developers of Evolution acknowledge the "
@@ -14507,7 +15357,7 @@ msgstr ""
 "reconocen los esfuerzos y contribuciones de todos los que trabajaron en "
 "estos proyectos."
 
-#: C/evolution.xml:7100(para)
+#: C/evolution.xml:7463(para)
 msgid ""
 "For more information please visit the Evolution <ulink url=\"http://www."
 "gnome.org/projects/evolution\">Web page</ulink>. Please send all comments, "
@@ -14525,51 +15375,51 @@ msgstr ""
 "información de errores de GNOME bug-buddy para enviar notificaciones de "
 "fallos."
 
-#: C/evolution.xml:7101(para)
+#: C/evolution.xml:7464(para)
 msgid "This manual was written by:"
 msgstr "Este manual lo escribieron:"
 
-#: C/evolution.xml:7104(para)
+#: C/evolution.xml:7467(para)
 msgid "Radhika PC (pradhika@novell.com)"
 msgstr "Radhika PC (pradhika@novell.com)"
 
-#: C/evolution.xml:7107(para)
+#: C/evolution.xml:7470(para)
 msgid "Srinivasa Ragavan (sragavan@novell.com)"
 msgstr "Srinivasa Ragavan (sragavan@novell.com)"
 
-#: C/evolution.xml:7110(para)
+#: C/evolution.xml:7473(para)
 msgid "Andre Klapper (ak-47@gmx.net)"
 msgstr "Andre Klapper (ak-47@gmx.net)"
 
-#: C/evolution.xml:7113(para)
+#: C/evolution.xml:7476(para)
 msgid "Francisco Javier F. Serrador (serrador@tecknolabs.com)"
 msgstr "Francisco Javier F. Serrador (serrador@tecknolabs.com)"
 
-#: C/evolution.xml:7116(para)
+#: C/evolution.xml:7479(para)
 msgid "Mark Moulder (mmoulder@novell.com)"
 msgstr "Mark Moulder (mmoulder@novell.com)"
 
-#: C/evolution.xml:7119(para)
+#: C/evolution.xml:7482(para)
 msgid "Jessica Prabhakar (jprabhakar@novell.com)"
 msgstr "Jessica Prabhakar (jprabhakar@novell.com)"
 
-#: C/evolution.xml:7122(para)
+#: C/evolution.xml:7485(para)
 msgid "Aaron Weber (aaron@ximian.com)"
 msgstr "Aaron Weber (aaron@ximian.com)"
 
-#: C/evolution.xml:7125(para)
+#: C/evolution.xml:7488(para)
 msgid "Kevin Breit (mrproper@ximian.com)"
 msgstr "Kevin Breit (mrproper@ximian.com)"
 
-#: C/evolution.xml:7128(para)
+#: C/evolution.xml:7491(para)
 msgid "Duncan Mak (duncan@ximian.com)"
 msgstr "Duncan Mak (duncan@ximian.com)"
 
-#: C/evolution.xml:7131(para)
+#: C/evolution.xml:7494(para)
 msgid "Ettore Perazzoli (ettore@ximian.com)"
 msgstr "Ettore Perazzoli (ettore@ximian.com)"
 
-#: C/evolution.xml:7134(para)
+#: C/evolution.xml:7497(para)
 msgid ""
 "With the help of the application programmers and the GNOME Documentation "
 "Project."
@@ -14577,7 +15427,7 @@ msgstr ""
 "Con la ayuda de los programadores de aplicaciones y del Proyecto de "
 "documentación de GNOME."
 
-#: C/evolution.xml:7137(para)
+#: C/evolution.xml:7500(para)
 msgid ""
 "Please file comments and suggestions for this manual as bugs in the GNOME "
 "bug tracking system. If you contributed to this project but do not see your "
@@ -14590,7 +15440,7 @@ msgstr ""
 "com) o Srinivasa Ragavan (sragavan@novell.com) y cualquiera de ellos le "
 "añadirá."
 
-#: C/evolution.xml:7138(para)
+#: C/evolution.xml:7501(para)
 msgid ""
 "Partial list of Documentation Translators (application translated to "
 "numerous additional languages):"
@@ -14598,25 +15448,26 @@ msgstr ""
 "Lista parcial de todos los traductores de la documentación (la aplicación "
 "está traducida a numerosos idiomas adicionales):"
 
-#: C/evolution.xml:7141(para)
+#: C/evolution.xml:7504(para)
 msgid "Daniel Persson for Swedish (.se)"
 msgstr "Daniel Persson al sueco"
 
-#: C/evolution.xml:7144(para)
-msgid "Hector Garcia Alvarez and Francisco Javier F. Serrador for Spanish (.es)"
+#: C/evolution.xml:7507(para)
+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)"
 
-#: C/evolution.xml:7147(para)
+#: C/evolution.xml:7510(para)
 msgid "Kjartan Maraas for Norwegian (.no)"
 msgstr "Kjartan Maraas al noruego"
 
-#: C/evolution.xml:7150(para)
+#: C/evolution.xml:7513(para)
 msgid "Sergey V. Mironov for Russian (.ru)"
 msgstr "Sergey V. Mironov al ruso (.ru)"
 
-#: C/evolution.xml:7157(para)
+#: C/evolution.xml:7520(para)
 msgid ""
 "This glossary contains terms that are frequently used in this guide as well "
 "as in <trademark>Evolution</trademark>."
@@ -14624,11 +15475,11 @@ msgstr ""
 "Este glosario contiene términos que se usan frecuentemente en esta guía así "
 "como en <trademark>Evolution</trademark>."
 
-#: C/evolution.xml:7159(glossterm)
+#: C/evolution.xml:7522(glossterm)
 msgid "Assistant"
 msgstr "Asistente"
 
-#: C/evolution.xml:7161(para)
+#: C/evolution.xml:7524(para)
 msgid ""
 "A tool that guides a user through a series of steps, usually to configure or "
 "set up a program. Equivalent to Wizard and Druid."
@@ -14637,11 +15488,11 @@ msgstr ""
 "generalmente para configurar o ajustar un programa. Es equivalente a un "
 "Druida."
 
-#: C/evolution.xml:7165(glossterm)
+#: C/evolution.xml:7528(glossterm)
 msgid "attachment"
 msgstr "adjunto"
 
-#: C/evolution.xml:7167(para)
+#: C/evolution.xml:7530(para)
 msgid ""
 "Any file sent with an email. Attachments can be embedded in a message or "
 "appended to it."
@@ -14649,21 +15500,21 @@ msgstr ""
 "Cualquier archivo enviado con un correo-e. Los adjuntos se pueden empotrar "
 "en un mensaje o adjuntarse a él."
 
-#: C/evolution.xml:7171(glossterm)
+#: C/evolution.xml:7534(glossterm)
 msgid "automatic indexing"
 msgstr "indexado automático"
 
-#: C/evolution.xml:7173(para)
+#: C/evolution.xml:7536(para)
 msgid "A feature which allows Evolution to quickly find and sort data."
 msgstr ""
 "Una característica que permite a Evolution buscar y ordenar datos "
 "rápidamente."
 
-#: C/evolution.xml:7177(glossterm)
+#: C/evolution.xml:7540(glossterm)
 msgid "Bcc (Blind Carbon Copy)"
 msgstr "Cco (Copia de carbón oculta)"
 
-#: C/evolution.xml:7179(para)
+#: C/evolution.xml:7542(para)
 msgid ""
 "Blind copy recipients (Bcc) receive a copy of an item. Other recipients "
 "receive no information about blind copies. Only the sender and the blind "
@@ -14677,11 +15528,11 @@ msgstr ""
 "Responder a todos, el destinatario en la copia de carbón oculta no recibirá "
 "la respuesta."
 
-#: C/evolution.xml:7183(glossterm)
+#: C/evolution.xml:7546(glossterm)
 msgid "Cc (Carbon Copy)"
 msgstr "Cc (Copia de carbón)"
 
-#: C/evolution.xml:7185(para)
+#: C/evolution.xml:7548(para)
 msgid ""
 "Carbon copy recipients (CC) receive a copy of an item. CC recipients are "
 "users who would benefit from the information in an item, but are not "
@@ -14694,11 +15545,11 @@ msgstr ""
 "Todos los destinatarios pueden ver que se envió la copia de carbón. También "
 "pueden ver todos los nombres de los destinatarios de la Cc."
 
-#: C/evolution.xml:7189(glossterm)
+#: C/evolution.xml:7552(glossterm)
 msgid "conduit"
 msgstr "conducto"
 
-#: C/evolution.xml:7191(para)
+#: C/evolution.xml:7554(para)
 msgid ""
 "A small application that controls the transfer of data between a handheld "
 "device and a desktop computer."
@@ -14706,15 +15557,15 @@ msgstr ""
 "Pequeña aplicación que controla la transferencia de datos entre un "
 "dispositivo portátil y el escritorio del equipo."
 
-#: C/evolution.xml:7197(para)
+#: C/evolution.xml:7560(para)
 msgid "The GNOME groupware application."
 msgstr "La aplicación groupware de GNOME."
 
-#: C/evolution.xml:7201(glossterm)
+#: C/evolution.xml:7564(glossterm)
 msgid "execute"
 msgstr "ejecutar"
 
-#: C/evolution.xml:7203(para)
+#: C/evolution.xml:7566(para)
 msgid ""
 "To run a program. Any file that can be run is called an executable. "
 "Evolution can download executable attachments, but before they can be run, "
@@ -14732,11 +15583,11 @@ msgstr ""
 "archivos consulte la documentación de su administrador de archivos o de su "
 "intérprete de órdenes."
 
-#: C/evolution.xml:7207(glossterm)
+#: C/evolution.xml:7570(glossterm)
 msgid "expunge"
 msgstr "purgar"
 
-#: C/evolution.xml:7209(para)
+#: C/evolution.xml:7572(para)
 msgid ""
 "When messages are marked for deletion, they remain until they are expunged. "
 "When a message is expunged, it is permanently deleted, as long as it was "
@@ -14746,11 +15597,11 @@ msgstr ""
 "purgan. Cuando se purga un mensaje se borra permanentemente, siempre y "
 "cuando estuviese marcado para su borrado."
 
-#: C/evolution.xml:7213(glossterm)
+#: C/evolution.xml:7576(glossterm)
 msgid "file tree"
 msgstr "árbol de archivos"
 
-#: C/evolution.xml:7215(para)
+#: C/evolution.xml:7578(para)
 msgid ""
 "A way of describing a group of files on a computer. The top of the tree is "
 "called the root directory, and is denoted by <command>/</command>. The rest "
@@ -14765,11 +15616,11 @@ msgstr ""
 "(«root») ni con el directorio de inicio del superusuario <command>/root</"
 "command>."
 
-#: C/evolution.xml:7219(glossterm)
+#: C/evolution.xml:7582(glossterm)
 msgid "filter"
 msgstr "filtro"
 
-#: C/evolution.xml:7221(para)
+#: C/evolution.xml:7584(para)
 msgid ""
 "Within Evolution, a filter is a method of sorting mail automatically when it "
 "is downloaded. You can create filters to perform one or more actions on a "
@@ -14780,11 +15631,11 @@ msgstr ""
 "acciones sobre un mensaje que cumpla una (o todas) las condiciones, "
 "definidas entre una amplia gama de posibilidades."
 
-#: C/evolution.xml:7225(glossterm)
+#: C/evolution.xml:7588(glossterm)
 msgid "forward"
 msgstr "reenviar"
 
-#: C/evolution.xml:7227(para)
+#: C/evolution.xml:7590(para)
 msgid ""
 "Forwards a copy of the message and any additional comments to a different "
 "email address."
@@ -14792,11 +15643,11 @@ msgstr ""
 "Reenvía una copia del mensaje y cualquier comentario adicional a distintas "
 "direcciones de correo-e."
 
-#: C/evolution.xml:7231(glossterm)
+#: C/evolution.xml:7594(glossterm)
 msgid "groupware"
 msgstr "groupware"
 
-#: C/evolution.xml:7233(para)
+#: C/evolution.xml:7596(para)
 msgid ""
 "A term describing an application that helps groups of people work together. "
 "Typically, a groupware application has several productivity features built "
@@ -14807,11 +15658,11 @@ msgstr ""
 "varias funciones de productividad integradas en un único programa: correo "
 "electrónico, calendario y gestión de contactos."
 
-#: C/evolution.xml:7237(glossterm)
+#: C/evolution.xml:7600(glossterm)
 msgid "HTML"
 msgstr "HTML"
 
-#: C/evolution.xml:7239(para)
+#: C/evolution.xml:7602(para)
 msgid ""
 "Hypertext Markup Language (HTML) is a language for describing page layout in "
 "electronic documents such as Web pages, help files, and email messages. HTML "
@@ -14824,21 +15675,21 @@ msgstr ""
 "envíos a los grupos de noticias para insertar imágenes y darle formato al "
 "texto."
 
-#: C/evolution.xml:7243(glossterm)
+#: C/evolution.xml:7606(glossterm)
 msgid "iCal"
 msgstr "iCal"
 
-#: C/evolution.xml:7245(para)
+#: C/evolution.xml:7608(para)
 msgid "iCal is a protocol that Evolution uses to manage the calendar section."
 msgstr ""
 "iCal es un protocolo que Evolution usa para gestionar la sección del "
 "calendario."
 
-#: C/evolution.xml:7249(glossterm)
+#: C/evolution.xml:7612(glossterm)
 msgid "IMAP"
 msgstr "IMAP"
 
-#: C/evolution.xml:7251(para)
+#: C/evolution.xml:7614(para)
 msgid ""
 "Internet Mail Access Protocol. It allows access to email that is typically "
 "stored remotely on a server rather than on a local hard disk. Often "
@@ -14848,11 +15699,11 @@ msgstr ""
 "electrónico que normalmente se almacena remotamente en el servidor en lugar "
 "de en el disco duro local. IMAP suele ser la alternativa a POP."
 
-#: C/evolution.xml:7255(glossterm)
+#: C/evolution.xml:7618(glossterm)
 msgid "inline"
 msgstr "en línea"
 
-#: C/evolution.xml:7257(para)
+#: C/evolution.xml:7620(para)
 msgid ""
 "Displayed as part of a message or other document, rather than attached as a "
 "separate file. Contrast with <emphasis>attachment</emphasis>."
@@ -14860,11 +15711,11 @@ msgstr ""
 "Que se muestra empotrado, como parte de un mensaje u otro documento en lugar "
 "de estar anexo a un archivo. Alternativo a <emphasis>adjunto</emphasis>."
 
-#: C/evolution.xml:7261(glossterm)
+#: C/evolution.xml:7624(glossterm)
 msgid "LDAP"
 msgstr "LDAP"
 
-#: C/evolution.xml:7263(para)
+#: C/evolution.xml:7626(para)
 msgid ""
 "Lightweight Directory Access Protocol. Allows a client to search through a "
 "large database of addresses, phone numbers, and people stored on a server."
@@ -14873,11 +15724,11 @@ msgstr ""
 "buscar a través de grandes bases de datos, alojadas en un servidor, de "
 "direcciones, números de teléfono y personas."
 
-#: C/evolution.xml:7267(glossterm)
+#: C/evolution.xml:7630(glossterm)
 msgid "mail client"
 msgstr "cliente de correo"
 
-#: C/evolution.xml:7269(para)
+#: C/evolution.xml:7632(para)
 msgid ""
 "The application with which a person reads and sends email. Its counterparts "
 "are the various types of mail servers, which handle user authentication and "
@@ -14888,11 +15739,11 @@ msgstr ""
 "autenticación de usuarios y dirigen los mensajes del remitente al "
 "destinatario."
 
-#: C/evolution.xml:7273(glossterm)
+#: C/evolution.xml:7636(glossterm)
 msgid "POP"
 msgstr "POP"
 
-#: C/evolution.xml:7275(para)
+#: C/evolution.xml:7638(para)
 msgid ""
 "Post Office Protocol. A mechanism for email transport. In contrast to IMAP, "
 "it is used only to get mail from a server and store it locally on your hard "
@@ -14902,11 +15753,11 @@ msgstr ""
 "electrónico. En contraste con IMAP sólo se usa para descargar el correo y "
 "almacenarlo localmente en el disco duro."
 
-#: C/evolution.xml:7279(glossterm)
+#: C/evolution.xml:7642(glossterm)
 msgid "protocol"
 msgstr "protocolo"
 
-#: C/evolution.xml:7281(para)
+#: C/evolution.xml:7644(para)
 msgid ""
 "An agreed-upon method of communication, especially one for sending "
 "particular types of information between computer systems. Examples include "
@@ -14918,11 +15769,11 @@ msgstr ""
 "POP (Protocolo de Oficina Postal) para correo electrónico y HTTP (Protocolo "
 "de Transferencia de HiperTexto) para páginas web."
 
-#: C/evolution.xml:7285(glossterm)
+#: C/evolution.xml:7648(glossterm)
 msgid "public key encryption"
 msgstr "cifrado de clave pública"
 
-#: C/evolution.xml:7287(para)
+#: C/evolution.xml:7650(para)
 msgid ""
 "A strong encryption method that uses a set of two keys, one of which is made "
 "public, and one of which is kept private. Data encrypted using the public "
@@ -14934,11 +15785,11 @@ msgstr ""
 "pública sólo pueden ser descifrados con la clave privada. Cuanto más largas "
 "sean las claves más difícil será romper el cifrado."
 
-#: C/evolution.xml:7291(glossterm)
+#: C/evolution.xml:7654(glossterm)
 msgid "regular expression"
 msgstr "expresión regular"
 
-#: C/evolution.xml:7293(para)
+#: C/evolution.xml:7656(para)
 msgid ""
 "A regular expression (regex) is a way of describing a string of text using "
 "metacharacters or wildcard symbols. For example, the statement fly.*so[au]p "
@@ -14956,11 +15807,11 @@ msgstr ""
 "<quote>fly in soap</quote>. Para obtener más información introduzca "
 "<command>man grep</command> en la línea de comandos."
 
-#: C/evolution.xml:7297(glossterm)
+#: C/evolution.xml:7660(glossterm)
 msgid "script"
 msgstr "script"
 
-#: C/evolution.xml:7299(para)
+#: C/evolution.xml:7662(para)
 msgid ""
 "A program written in an interpreted (rather than compiled) language. Often "
 "used as a synonym for macro, to denote a series of prerecorded commands or "
@@ -14972,11 +15823,11 @@ msgstr ""
 "órdenes pregrabadas o acciones dentro de una aplicación. Su utilización en "
 "tareas tediosas y repetitivas puede ahorrar mucho tiempo al usuario."
 
-#: C/evolution.xml:7303(glossterm)
+#: C/evolution.xml:7666(glossterm)
 msgid "search base"
 msgstr "base de búsqueda"
 
-#: C/evolution.xml:7305(para)
+#: C/evolution.xml:7668(para)
 msgid ""
 "LDAP can break contact lists into many groups. The search base tells LDAP "
 "the top group to use. How much of the Search Base to search is set by the "
@@ -14986,11 +15837,11 @@ msgstr ""
 "búsqueda le informa a LDAP el número de grupos a usar. La profundidad de la "
 "búsqueda base se ajusta con la opción Rango de búsqueda."
 
-#: C/evolution.xml:7309(glossterm)
+#: C/evolution.xml:7672(glossterm)
 msgid "search folder"
 msgstr "carpeta de búsqueda"
 
-#: C/evolution.xml:7311(para)
+#: C/evolution.xml:7674(para)
 msgid ""
 "An email organization tool. Search folders allow you to create a folder that "
 "contains the results of a complex search. Search folder contents are updated "
@@ -15000,19 +15851,19 @@ msgstr ""
 "permiten crear una carpeta que contenga los resultados de una búsqueda "
 "compleja. El contenido de una carpeta de búsqueda se actualiza dinámicamente."
 
-#: C/evolution.xml:7315(glossterm)
+#: C/evolution.xml:7678(glossterm)
 msgid "search scope"
 msgstr "rango de búsqueda"
 
-#: C/evolution.xml:7317(para)
+#: C/evolution.xml:7680(para)
 msgid "Search Scope states how much of the search base to search."
 msgstr "El rango de búsqueda indica cómo de profunda será la búsqueda base."
 
-#: C/evolution.xml:7321(glossterm)
+#: C/evolution.xml:7684(glossterm)
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: C/evolution.xml:7323(para)
+#: C/evolution.xml:7686(para)
 msgid ""
 "A program that sends mail. Evolution can use it instead of SMTP; some people "
 "prefer it because it offers more flexibility; however, it is more difficult "
@@ -15022,11 +15873,11 @@ msgstr ""
 "de SMTP, algunas personas lo prefieren porque ofrece mayor flexibilidad; no "
 "obstante es más difícil de configurar."
 
-#: C/evolution.xml:7327(glossterm)
+#: C/evolution.xml:7690(glossterm)
 msgid "switcher"
 msgstr "selector"
 
-#: C/evolution.xml:7329(para)
+#: C/evolution.xml:7692(para)
 msgid ""
 "An area of Evolution that offers users fast access to the most frequently "
 "used features of the application."
@@ -15034,11 +15885,11 @@ msgstr ""
 "Un área de Evolution que ofrece a los usuarios acceso rápido a la mayoría de "
 "las características usadas de la aplicación."
 
-#: C/evolution.xml:7333(glossterm)
+#: C/evolution.xml:7696(glossterm)
 msgid "signature"
 msgstr "firma"
 
-#: C/evolution.xml:7335(para)
+#: C/evolution.xml:7698(para)
 msgid ""
 "Text placed at the end of every email sent, similar to a hand-written "
 "signature at the bottom of a written letter. A signature can be anything "
@@ -15050,11 +15901,11 @@ msgstr ""
 "desde una cita favorita hasta un enlace a una página web; la cortesía dicta "
 "que debe tener menos de cuatro líneas de longitud."
 
-#: C/evolution.xml:7339(glossterm)
+#: C/evolution.xml:7702(glossterm)
 msgid "SMTP"
 msgstr "SMTP"
 
-#: C/evolution.xml:7341(para)
+#: C/evolution.xml:7704(para)
 msgid ""
 "Simple Mail Transfer Protocol. The most common way of transporting mail "
 "messages from your computer to the server."
@@ -15062,11 +15913,11 @@ msgstr ""
 "Simple Mail Transfer Protocol. La forma más común de transportar mensajes de "
 "correo desde su equipo al servidor."
 
-#: C/evolution.xml:7345(glossterm)
+#: C/evolution.xml:7708(glossterm)
 msgid "tooltip"
 msgstr "consejo"
 
-#: C/evolution.xml:7347(para)
+#: C/evolution.xml:7710(para)
 msgid ""
 "A small box of explanatory text that appears when the mouse pointer is held "
 "over a button or other interface element."
@@ -15074,11 +15925,11 @@ msgstr ""
 "Una pequeña caja con texto explicativo que aparece cuando el puntero del "
 "ratón se mantiene sobre un botón u otro elemento del interfaz."
 
-#: C/evolution.xml:7351(glossterm)
+#: C/evolution.xml:7714(glossterm)
 msgid "virus"
 msgstr "virus"
 
-#: C/evolution.xml:7353(para)
+#: C/evolution.xml:7716(para)
 msgid ""
 "A program that inserts itself into other files or programs. When executed, "
 "it spreads to more programs and other computers. A virus can cause "
@@ -15090,11 +15941,11 @@ msgstr ""
 "un daño sustancial saturando redes o discos duros, borrando archivos o "
 "abriendo agujeros de seguridad."
 
-#: C/evolution.xml:7357(glossterm)
+#: C/evolution.xml:7720(glossterm)
 msgid "vCard"
 msgstr "vCard"
 
-#: C/evolution.xml:7359(para)
+#: C/evolution.xml:7722(para)
 msgid ""
 "A file format for the exchange of contact information. When you get an "
 "address card attached to an email, it is probably in vCard format."
@@ -15103,11 +15954,11 @@ msgstr ""
 "obtiene una tarjeta de dirección adjuntada a un correo-e, probablemente esté "
 "en formato vCard."
 
-#: C/evolution.xml:7365(title)
+#: C/evolution.xml:7728(title)
 msgid "Legal Notices"
 msgstr "Notas legales"
 
-#: C/evolution.xml:7367(member)
+#: C/evolution.xml:7730(member)
 msgid ""
 "Novell, Inc. makes no representations or warranties with respect to the "
 "contents or use of this documentation, and specifically disclaims any "
@@ -15124,7 +15975,7 @@ msgstr ""
 "momento, sin obligación de notificar a ninguna persona o entidad tales "
 "cambios o revisiones."
 
-#: C/evolution.xml:7368(member)
+#: C/evolution.xml:7731(member)
 msgid ""
 "Further, Novell, Inc. makes no representations or warranties with respect to "
 "any software, and specifically disclaims any express or implied warranties "
@@ -15141,7 +15992,7 @@ msgstr ""
 "software de Novell en cualquier momento, sin obligación de notificar a "
 "ninguna persona o entidad tales cambios o revisiones."
 
-#: C/evolution.xml:7371(member)
+#: C/evolution.xml:7734(member)
 msgid ""
 "You may not use, export, or re-export this product in violation of any "
 "applicable laws or regulations including, without limitation, U.S. export "
@@ -15151,7 +16002,7 @@ msgstr ""
 "regulaciones aplicables incluyendo, sin limitación, las regulaciones de "
 "exportación de los EE.UU. o las leyes del país en el que resida."
 
-#: C/evolution.xml:7374(member)
+#: C/evolution.xml:7737(member)
 msgid ""
 "Copyright 2007 Novell, Inc. Permission is granted to copy, distribute, and/"
 "or modify this document under the terms of the GNU Free Documentation "
@@ -15167,7 +16018,7 @@ msgstr ""
 "portada ni textos de contraportada. Podrá encontrar una copia de la GFDL en "
 "http://www.fsf.org/licenses/fdl.html."
 
-#: C/evolution.xml:7375(member)
+#: C/evolution.xml:7738(member)
 msgid ""
 "THIS DOCUMENT AND MODIFIED VERSIONS OF THIS DOCUMENT ARE PROVIDED UNDER THE "
 "TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING "
@@ -15177,7 +16028,7 @@ msgstr ""
 "LAS CONDICIONES ESTABLECIDAS EN LA LICENCIA DE DOCUMENTACIÓN LIBRE DE GNU "
 "(GFDL) Y TENIENDO EN CUENTA QUE:"
 
-#: C/evolution.xml:7376(member)
+#: C/evolution.xml:7739(member)
 msgid ""
 "1. THE DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY "
 "KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES "
@@ -15204,7 +16055,7 @@ msgstr ""
 "NI VERSIÓN MODIFICADA DE ÉSTE POR EL PRESENTE, SALVO DENTRO DEL CUMPLIMIENTO "
 "DE LA RENUNCIA;Y"
 
-#: C/evolution.xml:7377(member)
+#: C/evolution.xml:7740(member)
 msgid ""
 "2. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT "
 "(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL "
@@ -15229,31 +16080,31 @@ msgstr ""
 "MODIFICADAS, AUNQUE DICHA PARTE HAYA SIDO INFORMADA DE LA POSIBILIDAD DE QUE "
 "SE PRODUJESEN DICHOS DAÑOS."
 
-#: C/evolution.xml:7380(member)
+#: C/evolution.xml:7743(member)
 msgid "Novell, Inc."
 msgstr "Novell, Inc."
 
-#: C/evolution.xml:7381(member)
+#: C/evolution.xml:7744(member)
 msgid "404 Wyman Street, Suite 500"
 msgstr "404 Wyman Street, Suite 500"
 
-#: C/evolution.xml:7382(member)
+#: C/evolution.xml:7745(member)
 msgid "Waltham, MA 02451"
 msgstr "Waltham, MA 02451"
 
-#: C/evolution.xml:7383(member)
+#: C/evolution.xml:7746(member)
 msgid "U.S.A."
 msgstr "EE. UU."
 
-#: C/evolution.xml:7384(member)
+#: C/evolution.xml:7747(member)
 msgid "www.novell.com"
 msgstr "www.novell.com"
 
-#: C/evolution.xml:7387(para)
+#: C/evolution.xml:7750(para)
 msgid "July 2007"
 msgstr "Julio de 2007"
 
-#: C/evolution.xml:7389(member)
+#: C/evolution.xml:7752(member)
 msgid ""
 "To access the online documentation for this and other Novell products, and "
 "to get updates, see www.novell.com/documentation"
@@ -15262,11 +16113,11 @@ msgstr ""
 "Novell así como para obtener actualizaciones, consulte www.novell.com/"
 "documentation."
 
-#: C/evolution.xml:7392(member)
+#: C/evolution.xml:7755(member)
 msgid "Evolution is a trademark of Novell, Inc."
 msgstr "Evolution es una marca comercial de Novell, Inc."
 
-#: C/evolution.xml:7393(member)
+#: C/evolution.xml:7756(member)
 msgid ""
 "GroupWise is a registered trademark of Novell, Inc. in the United States and "
 "other countries."
@@ -15274,7 +16125,7 @@ msgstr ""
 "GroupWise es una marca comercial registrada de Novell, Inc en los Estados "
 "Unidos y otros países."
 
-#: C/evolution.xml:7394(member)
+#: C/evolution.xml:7757(member)
 msgid ""
 "Novell is a registered trademark of Novell, Inc. in the United States and "
 "other countries."
@@ -15282,11 +16133,12 @@ msgstr ""
 "Novell es una marca comercial registrada de Novell, Inc en los Estados "
 "Unidos y otros países."
 
-#: C/evolution.xml:7395(member)
+#: 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:7396(member)
+#: C/evolution.xml:7759(member)
 msgid ""
 "Ximian is a registered trademark of Novell, Inc. in the United States and "
 "other countries."
@@ -15294,7 +16146,7 @@ msgstr ""
 "Ximian es una marca comercial registrada de Novell, Inc en los Estados "
 "Unidos y otros países."
 
-#: C/evolution.xml:7399(member)
+#: C/evolution.xml:7762(member)
 msgid "All third-party trademarks are the property of their respective owners."
 msgstr ""
 "Todas las marcas comerciales de terceras partes son propiedad de sus "
@@ -15307,3 +16159,31 @@ 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/help/es/figures/evo_flag_follow_up_a.png b/help/es/figures/evo_flag_follow_up_a.png
new file mode 100644
index 0000000000..6541b5a6c1
--- /dev/null
+++ b/help/es/figures/evo_flag_follow_up_a.png
diff --git a/help/es/figures/evo_mailnotification.png b/help/es/figures/evo_mailnotification.png
new file mode 100644
index 0000000000..e5fb397910
--- /dev/null
+++ b/help/es/figures/evo_mailnotification.png
diff --git a/help/es/figures/evo_popreceive_a.png b/help/es/figures/evo_popreceive_a.png
new file mode 100644
index 0000000000..ad6a357dae
--- /dev/null
+++ b/help/es/figures/evo_popreceive_a.png
diff --git a/help/es/figures/evo_receive_setup_a.png b/help/es/figures/evo_receive_setup_a.png
new file mode 100644
index 0000000000..0112586066
--- /dev/null
+++ b/help/es/figures/evo_receive_setup_a.png
diff --git a/help/es/figures/evo_rule_a.png b/help/es/figures/evo_rule_a.png
new file mode 100644
index 0000000000..d9261a18ad
--- /dev/null
+++ b/help/es/figures/evo_rule_a.png
diff --git a/help/es/figures/evo_select_add_folder.png b/help/es/figures/evo_select_add_folder.png
new file mode 100644
index 0000000000..9ae97dceed
--- /dev/null
+++ b/help/es/figures/evo_select_add_folder.png
diff --git a/help/es/figures/evo_select_folder.png b/help/es/figures/evo_select_folder.png
new file mode 100644
index 0000000000..0d62497c8b
--- /dev/null
+++ b/help/es/figures/evo_select_folder.png
diff --git a/help/es/figures/evo_send_setup_a.png b/help/es/figures/evo_send_setup_a.png
new file mode 100644
index 0000000000..7e9ad92f53
--- /dev/null
+++ b/help/es/figures/evo_send_setup_a.png
diff --git a/help/es/figures/evo_timezone_a.png b/help/es/figures/evo_timezone_a.png
new file mode 100644
index 0000000000..8ab8d28351
--- /dev/null
+++ b/help/es/figures/evo_timezone_a.png
diff --git a/help/es/figures/evo_usereceive_a.png b/help/es/figures/evo_usereceive_a.png
new file mode 100644
index 0000000000..7078ee71b3
--- /dev/null
+++ b/help/es/figures/evo_usereceive_a.png
diff --git a/help/es/figures/exchng-identity.png b/help/es/figures/exchng-identity.png
new file mode 100644
index 0000000000..21a50fda2e
--- /dev/null
+++ b/help/es/figures/exchng-identity.png
diff --git a/help/es/figures/exchng-rec-mails.png b/help/es/figures/exchng-rec-mails.png
new file mode 100644
index 0000000000..fad8d3e9e3
--- /dev/null
+++ b/help/es/figures/exchng-rec-mails.png
diff --git a/help/es/figures/filter-new-fig.png b/help/es/figures/filter-new-fig.png
new file mode 100644
index 0000000000..794e7f924f
--- /dev/null
+++ b/help/es/figures/filter-new-fig.png
diff --git a/help/es/figures/google_cal_view.png b/help/es/figures/google_cal_view.png
new file mode 100644
index 0000000000..0c6c7df0e7
--- /dev/null
+++ b/help/es/figures/google_cal_view.png
diff --git a/help/es/figures/mailer_preferences.png b/help/es/figures/mailer_preferences.png
new file mode 100644
index 0000000000..7dad2793d7
--- /dev/null
+++ b/help/es/figures/mailer_preferences.png
diff --git a/help/es/figures/quick_add_a.png b/help/es/figures/quick_add_a.png
new file mode 100644
index 0000000000..c45da56ddc
--- /dev/null
+++ b/help/es/figures/quick_add_a.png
diff --git a/help/es/figures/quick_reference.png b/help/es/figures/quick_reference.png
new file mode 100644
index 0000000000..8675c6c526
--- /dev/null
+++ b/help/es/figures/quick_reference.png
diff --git a/help/fr/figures/evo_cal_ prop_a.png b/help/fr/figures/evo_cal_ prop_a.png
deleted file mode 100644
index 49d1c98aec..0000000000
--- a/help/fr/figures/evo_cal_ prop_a.png
+++ /dev/null
diff --git a/help/fr/figures/evo_mailnotification.png b/help/fr/figures/evo_mailnotification.png
new file mode 100644
index 0000000000..0fc8b7d3ab
--- /dev/null
+++ b/help/fr/figures/evo_mailnotification.png
diff --git a/help/fr/fr.po b/help/fr/fr.po
index 4158769a3b..9c4195a3f4 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Evolution doc fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-28 19:40+0200\n"
-"PO-Revision-Date: 2008-07-28 19:46+0200\n"
-"Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
+"POT-Creation-Date: 2008-09-20 17:40+0200\n"
+"PO-Revision-Date: 2008-09-23 17:28+0200\n"
+"Last-Translator: Bruno Brouard <annoa.b@gmail.com>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@ 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:233(None)
+#: ../C/evolution.xml:230(None)
 msgid ""
 "@@image: 'figures/evo_identity_a.png'; md5=51fef803bd3083b0b2c2583221d1c151"
 msgstr ""
@@ -29,7 +29,7 @@ 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:263(None)
+#: ../C/evolution.xml:260(None)
 msgid ""
 "@@image: 'figures/evo_receive_setup_a.png'; "
 "md5=5add6d290b2df212516dda2463930759"
@@ -39,7 +39,7 @@ 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:425(None)
+#: ../C/evolution.xml:418(None)
 msgid ""
 "@@image: 'figures/evo_gwreceive_a.png'; md5=ef64e581e652d0f03e4e6dd4a3b6d5a2"
 msgstr ""
@@ -47,7 +47,7 @@ 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:435(None)
+#: ../C/evolution.xml:428(None)
 msgid ""
 "@@image: 'figures/evo_mereceive_a.png'; md5=c3c759f902c2584ee218dc40d6e46806"
 msgstr ""
@@ -55,7 +55,7 @@ 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:476(None)
+#: ../C/evolution.xml:469(None)
 msgid ""
 "@@image: 'figures/evo_imapreceive_a.png'; "
 "md5=5948a0fbc61dc3b0efa0e4229f1fbf29"
@@ -65,7 +65,7 @@ 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:519(None)
+#: ../C/evolution.xml:512(None)
 msgid ""
 "@@image: 'figures/evo_popreceive_a.png'; md5=a635f0e8d9bb4f0bcda34221c258f273"
 msgstr ""
@@ -73,7 +73,7 @@ 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:541(None)
+#: ../C/evolution.xml:534(None)
 msgid ""
 "@@image: 'figures/evo_usereceive_a.png'; md5=3c14cafdde81fca95d480851aee9db0f"
 msgstr ""
@@ -81,7 +81,7 @@ 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:591(None)
+#: ../C/evolution.xml:584(None)
 msgid ""
 "@@image: 'figures/evo_mhreceive_a.png'; md5=c7b97b4a2e9b9cf1c550244cca15a189"
 msgstr ""
@@ -89,7 +89,7 @@ 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:612(None)
+#: ../C/evolution.xml:605(None)
 msgid ""
 "@@image: 'figures/evo_maildirreceive_a.png'; "
 "md5=bdd9dfc00800338dc906e2fd12b07f62"
@@ -99,7 +99,7 @@ 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:634(None) ../C/evolution.xml:657(None)
+#: ../C/evolution.xml:627(None) ../C/evolution.xml:650(None)
 msgid ""
 "@@image: 'figures/evo_mboxreceive_a.png'; "
 "md5=a04753f7615eab6ac349f50caa39a7a8"
@@ -109,7 +109,7 @@ 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:685(None)
+#: ../C/evolution.xml:678(None)
 msgid ""
 "@@image: 'figures/evo_send_setup_a.png'; md5=82760a1733ccb49ffa8424d265278b42"
 msgstr ""
@@ -117,7 +117,7 @@ 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:732(None)
+#: ../C/evolution.xml:725(None)
 msgid ""
 "@@image: 'figures/evo_timezone_a.png'; md5=4ee80aae45be18c238c25329ab5ce59a"
 msgstr ""
@@ -125,7 +125,7 @@ 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:760(None)
+#: ../C/evolution.xml:753(None)
 msgid ""
 "@@image: 'figures/evo_mail_callout_a.png'; "
 "md5=4fa6dda9663d554197736dd2feb79575"
@@ -135,14 +135,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:935(None)
+#: ../C/evolution.xml:928(None)
 msgid "@@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.
-#: ../C/evolution.xml:953(None)
+#: ../C/evolution.xml:946(None)
 msgid ""
 "@@image: 'figures/evo_cal_callout_a.png'; "
 "md5=6de000ad9c7b3fe42ed1996cad46432f"
@@ -152,7 +152,7 @@ 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:973(None)
+#: ../C/evolution.xml:966(None)
 msgid ""
 "@@image: 'figures/contacts_mainwindow_a.png'; "
 "md5=41335f17f056cb0b06e3df4900d08865"
@@ -162,14 +162,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:987(None)
+#: ../C/evolution.xml:980(None)
 msgid "@@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.
-#: ../C/evolution.xml:990(None)
+#: ../C/evolution.xml:983(None)
 msgid ""
 "@@image: 'figures/evo_backup_warning.png'; "
 "md5=80e1ce9a9be3f660bdfbae7dd7b9488b"
@@ -179,7 +179,7 @@ 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:998(None)
+#: ../C/evolution.xml:991(None)
 msgid ""
 "@@image: 'figures/evo_backup_prgsbar.png'; "
 "md5=046642d35e096154508269063d672b07"
@@ -189,7 +189,7 @@ 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:1016(None)
+#: ../C/evolution.xml:1009(None)
 msgid ""
 "@@image: 'figures/evo_restore.png'; md5=95ef78344a50e05dbf01da9633dcd71f"
 msgstr ""
@@ -197,32 +197,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:1026(None)
+#: ../C/evolution.xml:1181(None)
 msgid ""
-"@@image: 'figures/evo_crash_recovery.png'; "
-"md5=6bfa921910f94e5845f893a6308169a6"
+"@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
 msgstr ""
-"@@image: 'figures/evo_crash_recovery.png'; "
-"md5=6bfa921910f94e5845f893a6308169a6"
+"@@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.
-#: ../C/evolution.xml:1190(None)
+#: ../C/evolution.xml:1183(None)
 msgid ""
-"@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
+"@@image: 'figures/evo_mailnotification.png'; "
+"md5=3ec09c3f9b49aee5be6f5fc2df69350d"
 msgstr ""
-"@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000"
+"@@image: 'figures/evo_mailnotification.png'; "
+"md5=3ec09c3f9b49aee5be6f5fc2df69350d"
 
 #. 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:1207(None)
+#: ../C/evolution.xml:1258(None)
 msgid "@@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:1222(None)
+#: ../C/evolution.xml:1273(None)
 msgid ""
 "@@image: 'figures/collap_head_a.png'; md5=82c5d5ae3f5499f17bdb08eebfe9c557"
 msgstr ""
@@ -230,7 +230,7 @@ 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:1397(None)
+#: ../C/evolution.xml:1448(None)
 msgid ""
 "@@image: 'figures/evo_newmess_a.png'; md5=3bd7f656fa4d7fa3d5b337241e56f575"
 msgstr ""
@@ -238,7 +238,22 @@ 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:1485(None)
+#: ../C/evolution.xml:1506(None)
+msgid ""
+"@@image: 'figures/evo_customheader.png'; md5=469f72793711212ce624d602e08e3a98"
+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:1514(None)
+msgid ""
+"@@image: 'figures/evo_custom_header.png'; "
+"md5=10dfa4db26e3354551653fffb9ec23de"
+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 ""
@@ -246,17 +261,17 @@ 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:1539(None)
+#: ../C/evolution.xml:1614(None)
 msgid ""
-"@@image: 'figures/attach_reminder_a.png.png'; "
+"@@image: 'figures/attach_reminder_a.png'; "
 "md5=66e32d56d961c67ff24d8b1c4ac6c9eb"
 msgstr ""
-"@@image: 'figures/attach_reminder_a.png.png'; "
+"@@image: 'figures/attach_reminder_a.png'; "
 "md5=66e32d56d961c67ff24d8b1c4ac6c9eb"
 
 #. 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:1552(None)
+#: ../C/evolution.xml:1627(None)
 msgid ""
 "@@image: 'figures/evo_attachreminder_plugin.png'; "
 "md5=25f7db7cd7d310110847354c62702ecf"
@@ -266,7 +281,7 @@ 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:1880(None)
+#: ../C/evolution.xml:1955(None)
 msgid ""
 "@@image: 'figures/evo_account_editor_a.png'; "
 "md5=39b83104a4e6ecb9473cbb84121e6be3"
@@ -276,7 +291,7 @@ 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:1920(None)
+#: ../C/evolution.xml:1995(None)
 msgid ""
 "@@image: 'figures/account_editor_a.png'; md5=cd9c4e71a53f8f03424c1432d7d46e30"
 msgstr ""
@@ -284,7 +299,7 @@ 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:2361(None)
+#: ../C/evolution.xml:2537(None)
 msgid ""
 "@@image: 'figures/evo_import_asst_a.png'; "
 "md5=e86638d0b3a01478fd4f12e33781a8a0"
@@ -294,7 +309,7 @@ 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:2388(None)
+#: ../C/evolution.xml:2564(None)
 msgid ""
 "@@image: 'figures/mail-threaded.png'; md5=ab1b9eb0f0735f4fcc4c51ead5ce1ff2"
 msgstr ""
@@ -302,7 +317,7 @@ 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:2539(None)
+#: ../C/evolution.xml:2715(None)
 msgid ""
 "@@image: 'figures/evo_flag_follow_up_a.png'; "
 "md5=6a4790a789cf4b3b8b73cb43aa8d065b"
@@ -312,7 +327,7 @@ 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:2556(None)
+#: ../C/evolution.xml:2732(None)
 msgid ""
 "@@image: 'figures/evo_select_folder.png'; "
 "md5=7b99ef6be9990bc1c1d869512ae2f617"
@@ -322,7 +337,7 @@ 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:2559(None)
+#: ../C/evolution.xml:2735(None)
 msgid ""
 "@@image: 'figures/evo_message_filters_a.png'; "
 "md5=3b7067638063c6aad2c316db838d2273"
@@ -332,7 +347,7 @@ 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:2722(None)
+#: ../C/evolution.xml:2898(None)
 msgid ""
 "@@image: 'figures/evo_adv_search_a.png'; md5=676d35d686745650c9bcfa832763362c"
 msgstr ""
@@ -340,7 +355,7 @@ 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:2752(None)
+#: ../C/evolution.xml:2928(None)
 msgid ""
 "@@image: 'figures/evo_edit_search.png'; md5=2ce150b3eb63cc4ec0f0292e13167be8"
 msgstr ""
@@ -348,7 +363,7 @@ 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:2758(None)
+#: ../C/evolution.xml:2934(None)
 msgid ""
 "@@image: 'figures/evo_edit_rule_a.png'; md5=0ae423517b27dfd34cfcb54550335fbb"
 msgstr ""
@@ -356,7 +371,7 @@ 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:2785(None)
+#: ../C/evolution.xml:2961(None)
 msgid ""
 "@@image: 'figures/filter-new-fig.png'; md5=75a2b8ccfe0f7a4982859827c867d578"
 msgstr ""
@@ -364,14 +379,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:3033(None)
+#: ../C/evolution.xml:3209(None)
 msgid "@@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.
-#: ../C/evolution.xml:3124(None)
+#: ../C/evolution.xml:3300(None)
 msgid ""
 "@@image: 'figures/evo_select_add_folder.png'; "
 "md5=01d57d01ff1650d91c1d73de1f4301ab"
@@ -381,7 +396,7 @@ 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:3217(None)
+#: ../C/evolution.xml:3393(None)
 msgid ""
 "@@image: 'figures/evo_contacteditor_a.png'; "
 "md5=4f188bd5d34a9fea7d91fdf5fb943f28"
@@ -391,7 +406,7 @@ 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:3255(None)
+#: ../C/evolution.xml:3431(None)
 msgid ""
 "@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252"
 msgstr ""
@@ -399,7 +414,15 @@ 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:3511(None)
+#: ../C/evolution.xml:3452(None)
+msgid ""
+"@@image: 'figures/evo_googlecontacts.png'; "
+"md5=2357233124d1191cdbb2279f6f998207"
+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 ""
@@ -407,13 +430,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:3666(None)
+#: ../C/evolution.xml:3899(None)
 msgid "@@image: 'figures/evo_cal_a.png'; md5=08a60dd21a8c52bace4a9d1d606b3ff5"
 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:3689(None)
+#: ../C/evolution.xml:3922(None)
 msgid ""
 "@@image: 'figures/evo_cal_prop_a.png'; md5=f28511f098847b4fc9278ba6c54c9c3d"
 msgstr ""
@@ -421,7 +444,7 @@ 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:3721(None)
+#: ../C/evolution.xml:3954(None)
 msgid ""
 "@@image: 'figures/google_cal_view.png'; md5=6574c207d4b219a80da96982ee650ce2"
 msgstr ""
@@ -429,7 +452,7 @@ 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:3820(None)
+#: ../C/evolution.xml:4053(None)
 msgid ""
 "@@image: 'figures/evo_calender_appointmnt.png'; "
 "md5=730ed74addbca4b0638f03cbcde99e71"
@@ -439,7 +462,7 @@ 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:3888(None)
+#: ../C/evolution.xml:4121(None)
 msgid ""
 "@@image: 'figures/evo_allday_a.png'; md5=3641b70c5110bb275d553c00d559636f"
 msgstr ""
@@ -447,15 +470,15 @@ 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:4084(None) ../C/evolution.xml:5359(None)
-#: ../C/evolution.xml:5745(None)
+#: ../C/evolution.xml:4317(None) ../C/evolution.xml:5592(None)
+#: ../C/evolution.xml:5978(None)
 msgid "@@image: 'figures/free_busy.png'; md5=e9401be3e2c00fa9389a81aa438bc67d"
 msgstr "@@image: 'figures/free_busy.png'; md5=e9401be3e2c00fa9389a81aa438bc67d"
 
 #. 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:4180(None) ../C/evolution.xml:4494(None)
-#: ../C/evolution.xml:4732(None)
+#: ../C/evolution.xml:4413(None) ../C/evolution.xml:4727(None)
+#: ../C/evolution.xml:4965(None)
 msgid ""
 "@@image: 'figures/evo_cal_advsearch.png'; "
 "md5=a99f9f9f5c13ba8cf237b7a79a5af7f1"
@@ -465,14 +488,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:4643(None)
+#: ../C/evolution.xml:4876(None)
 msgid "@@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:5039(None)
+#: ../C/evolution.xml:5272(None)
 msgid ""
 "@@image: 'figures/exchng-identity.png'; md5=51fef803bd3083b0b2c2583221d1c151"
 msgstr ""
@@ -480,7 +503,7 @@ 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:5044(None)
+#: ../C/evolution.xml:5277(None)
 msgid ""
 "@@image: 'figures/exchng-rec-mails.png'; md5=29dcaf684be7ea3554afe4f96885bc4e"
 msgstr ""
@@ -488,7 +511,7 @@ 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:5051(None)
+#: ../C/evolution.xml:5284(None)
 msgid ""
 "@@image: 'figures/exchng-rec-options.png'; "
 "md5=c3c759f902c2584ee218dc40d6e46806"
@@ -498,7 +521,7 @@ 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:5065(None)
+#: ../C/evolution.xml:5298(None)
 msgid ""
 "@@image: 'figures/exchg-identity.png'; md5=3733884734da6765870c652f1651bbd2"
 msgstr ""
@@ -506,7 +529,7 @@ 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:5073(None)
+#: ../C/evolution.xml:5306(None)
 msgid ""
 "@@image: 'figures/exchng-rec-mail.png'; md5=fe7f5e7b758b0306998ec477abf790f3"
 msgstr ""
@@ -514,7 +537,7 @@ 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:5081(None)
+#: ../C/evolution.xml:5314(None)
 msgid ""
 "@@image: 'figures/exchng-rec-option.png'; "
 "md5=6c0f84b7541a044e900d9d7c5fc4a49b"
@@ -524,7 +547,7 @@ 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:5114(None) ../C/evolution.xml:5351(None)
+#: ../C/evolution.xml:5347(None) ../C/evolution.xml:5584(None)
 msgid ""
 "@@image: 'figures/exchng-settings.png'; md5=7e82c0934afd2de5fca76c164d6342f4"
 msgstr ""
@@ -532,7 +555,7 @@ 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:5156(None)
+#: ../C/evolution.xml:5389(None)
 msgid ""
 "@@image: 'figures/evo_send_option_a.png'; "
 "md5=c1cca904625d1a7de13c851cd15235f6"
@@ -542,13 +565,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:5236(None)
+#: ../C/evolution.xml:5469(None)
 msgid "@@image: 'figures/delgt-add.png'; md5=9bf1f22c67551ad910cd3749f216c2b7"
 msgstr "@@image: 'figures/delgt-add.png'; md5=c1ee3dd81e07610258461637d4834936"
 
 #. 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:5245(None)
+#: ../C/evolution.xml:5478(None)
 msgid ""
 "@@image: 'figures/evo_delegate_permission_a.png'; "
 "md5=05df38ad69b20f9bd7c1e14044ca10fd"
@@ -556,7 +579,7 @@ 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:5280(None)
+#: ../C/evolution.xml:5513(None)
 msgid ""
 "@@image: 'figures/sub-others-folder.png'; "
 "md5=5e385ee9524f93b65b307f83e1888138"
@@ -566,7 +589,7 @@ 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:5310(None)
+#: ../C/evolution.xml:5543(None)
 msgid ""
 "@@image: 'figures/sub-pub-fold.png'; md5=e8e8b7d0b6ae8214ca1ef51dac06a1f7"
 msgstr ""
@@ -574,7 +597,7 @@ 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:5639(None)
+#: ../C/evolution.xml:5872(None)
 msgid ""
 "@@image: 'figures/evo_identityedit_a.png'; "
 "md5=78418c3f6214b7494c323df12bc6921f"
@@ -584,7 +607,7 @@ 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:5647(None)
+#: ../C/evolution.xml:5880(None)
 msgid ""
 "@@image: 'figures/evo_gwreceiveedit_a.png'; "
 "md5=3f5fc5b802eba3ef1a68e6ff675577b0"
@@ -594,7 +617,7 @@ 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:5660(None)
+#: ../C/evolution.xml:5893(None)
 msgid ""
 "@@image: 'figures/evo_gwreceiveoptedit_a.png'; "
 "md5=1c9e818bb39bb288511cf1cebdd83569"
@@ -604,14 +627,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:5706(None)
+#: ../C/evolution.xml:5939(None)
 msgid ""
 "@@image: 'figures/evo_rmdrnotes_a.png'; md5=ae24ed3554b8359af96ef2374ccd261a"
 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:5738(None)
+#: ../C/evolution.xml:5971(None)
 msgid ""
 "@@image: 'figures/evo_shd_memo_a.png'; md5=dd7069c9f52641dd13101c1dd935feb8"
 msgstr ""
@@ -619,7 +642,7 @@ 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:5809(None)
+#: ../C/evolution.xml:6042(None)
 msgid ""
 "@@image: 'figures/evo_gwstatustrack.png'; "
 "md5=d4eb84e2d55870af1408c430ce8c0e66"
@@ -629,7 +652,7 @@ 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:5864(None)
+#: ../C/evolution.xml:6097(None)
 msgid ""
 "@@image: 'figures/evo_sendstatus_a.png'; md5=36ca2211056c859eb776124bfc364705"
 msgstr ""
@@ -637,7 +660,7 @@ 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:5922(None)
+#: ../C/evolution.xml:6155(None)
 msgid ""
 "@@image: 'figures/evo_calstatus_a.png'; md5=99fb98faa3e644f6433c078ba71a0353"
 msgstr ""
@@ -645,37 +668,37 @@ 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:6063(None)
+#: ../C/evolution.xml:6296(None)
 msgid ""
 "@@image: 'figures/evo_proxyadd_a.png'; md5=51357617967f0610eb95dab5814540ad"
 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:6086(None)
+#: ../C/evolution.xml:6319(None)
 msgid ""
 "@@image: 'figures/proxy-login.png'; md5=7adee93cffbeea4636df9bb1a8923b07"
 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:6095(None)
+#: ../C/evolution.xml:6328(None)
 msgid "@@image: 'figures/proxy-cal.png'; md5=8e1f3438047198a963e7642d5ff9cac6"
 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:6255(None)
+#: ../C/evolution.xml:6471(None)
 msgid ""
 "@@image: 'figures/mailer_preferences.png'; "
-"md5=4141df4bf4b2dc4e82a0bad514714194"
+"md5=ad0be84fb36edefd01851653b69b65bb"
 msgstr ""
 "@@image: 'figures/mailer_preferences.png'; "
 "md5=4141df4bf4b2dc4e82a0bad514714194"
 
 #. 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:6364(None)
+#: ../C/evolution.xml:6573(None)
 msgid ""
 "@@image: 'figures/evo_imapheader_a.png'; md5=b11aa6167ce03769ce3084d32f4b4459"
 msgstr ""
@@ -683,7 +706,7 @@ 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:6459(None)
+#: ../C/evolution.xml:6668(None)
 msgid ""
 "@@image: 'figures/evo_labels_a.png'; md5=847d1bebd5d64b9f63e14d6d88f741de"
 msgstr ""
@@ -691,7 +714,7 @@ 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:6485(None)
+#: ../C/evolution.xml:6694(None)
 msgid ""
 "@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa"
 msgstr ""
@@ -699,14 +722,21 @@ 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:6530(None)
+#: ../C/evolution.xml:6739(None)
 msgid "@@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:6874(None)
+#: ../C/evolution.xml:6930(None)
+msgid ""
+"@@image: 'figures/network_pref.png'; md5=477a6b35cd47e61b32b9aee6451ec2e1"
+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:7207(None)
 msgid ""
 "@@image: 'figures/evo_debuglogs_a.png'; md5=07f28e4574670558cf11897915b2ce7e"
 msgstr ""
@@ -714,15 +744,15 @@ 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:7026(None)
+#: ../C/evolution.xml:7359(None)
 msgid ""
 "@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
 msgstr ""
 "@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5"
 
-#: ../C/evolution.xml:15(title) ../C/evolution.xml:7416(para)
-msgid "Evolution 2.22 User Guide"
-msgstr "Manuel d'utilisation d'Evolution 2.22"
+#: ../C/evolution.xml:15(title) ../C/evolution.xml:7749(para)
+msgid "Evolution 2.24 User Guide"
+msgstr "Manuel d'utilisation d'Evolution 2.24"
 
 #: ../C/evolution.xml:20(firstname) ../C/evolution.xml:22(corpauthor)
 #: ../C/evolution.xml:38(para) ../C/evolution.xml:46(para)
@@ -739,8 +769,8 @@ msgid "2002-2008"
 msgstr "2002-2008"
 
 #: ../C/evolution.xml:34(revnumber) ../C/evolution.xml:77(productnumber)
-msgid "2.22"
-msgstr "2.22"
+msgid "2.24"
+msgstr "2.24"
 
 #: ../C/evolution.xml:35(date)
 msgid "March 2008"
@@ -780,8 +810,8 @@ msgid "October 5, 2006"
 msgstr "5 octobre 2006"
 
 #: ../C/evolution.xml:67(releaseinfo)
-msgid "This manual describes version 2.22 of Evolution"
-msgstr "Ce manuel documente la version 2.22 d'Evolution"
+msgid "This manual describes version 2.24 of Evolution"
+msgstr "Ce manuel documente la version 2.24 d'Evolution"
 
 #: ../C/evolution.xml:71(para)
 msgid ""
@@ -792,8 +822,8 @@ msgstr ""
 "fonctionnalités de courriels, de calendrier, de contacts et de gestion des "
 "tâches."
 
-#: ../C/evolution.xml:76(productname) ../C/evolution.xml:5543(para)
-#: ../C/evolution.xml:7225(glossterm)
+#: ../C/evolution.xml:76(productname) ../C/evolution.xml:5776(para)
+#: ../C/evolution.xml:7558(glossterm)
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -812,82 +842,78 @@ msgstr "À propos de ce guide"
 #: ../C/evolution.xml:85(para)
 msgid ""
 "This guide describes how to use and manage <trademark>Evolution</trademark> "
-"2.22 client software. This guide is intended for users and is divided into "
+"2.24 client software. This guide is intended for users and is divided into "
 "the following sections:"
 msgstr ""
 "Ce guide explique comment utiliser et comment gérer le logiciel client "
-"<trademark>Evolution</trademark> 2.22. Ce guide est dédié aux utilisateurs "
+"<trademark>Evolution</trademark> 2.24. Ce guide est dédié aux utilisateurs "
 "et comporte les chapitres suivants :"
 
-#: ../C/evolution.xml:88(link) ../C/evolution.xml:152(title)
+#: ../C/evolution.xml:88(link) ../C/evolution.xml:149(title)
 msgid "Getting Started"
 msgstr "Premiers pas"
 
-#: ../C/evolution.xml:91(link) ../C/evolution.xml:1120(title)
+#: ../C/evolution.xml:91(link) ../C/evolution.xml:1107(title)
 msgid "Sending and Receiving Email"
 msgstr "Réception et envoi de courriels"
 
-#: ../C/evolution.xml:94(link) ../C/evolution.xml:2264(title)
+#: ../C/evolution.xml:94(link) ../C/evolution.xml:2440(title)
 msgid "Organizing Your Email"
 msgstr "Organisation des courriels"
 
-#: ../C/evolution.xml:97(link) ../C/evolution.xml:3158(title)
+#: ../C/evolution.xml:97(link) ../C/evolution.xml:3334(title)
 msgid "Evolution Contacts: the Address Book"
 msgstr "Evolution Contacts : le carnet d'adresses"
 
-#: ../C/evolution.xml:100(link) ../C/evolution.xml:3567(title)
+#: ../C/evolution.xml:100(link) ../C/evolution.xml:3800(title)
 msgid "Evolution Calendar"
 msgstr "Calendrier Evolution"
 
-#: ../C/evolution.xml:103(link) ../C/evolution.xml:4860(title)
+#: ../C/evolution.xml:103(link) ../C/evolution.xml:5093(title)
 msgid "Connecting to Exchange Servers"
 msgstr "Connexion aux serveurs Exchange"
 
-#: ../C/evolution.xml:106(link) ../C/evolution.xml:5415(title)
+#: ../C/evolution.xml:106(link) ../C/evolution.xml:5648(title)
 msgid "Connecting to GroupWise"
 msgstr "Connexion à GroupWise"
 
-#: ../C/evolution.xml:109(link) ../C/evolution.xml:6209(title)
-msgid "Connecting to Hula"
-msgstr "Connexion à Hula"
-
-#: ../C/evolution.xml:112(link) ../C/evolution.xml:6226(title)
+#: ../C/evolution.xml:109(link) ../C/evolution.xml:6442(title)
 msgid "Advanced Configuration"
 msgstr "Configuration avancée"
 
-#: ../C/evolution.xml:115(link) ../C/evolution.xml:6888(title)
+#: ../C/evolution.xml:112(link) ../C/evolution.xml:7221(title)
 msgid "Synchronizing Your Handheld Device"
 msgstr "Synchronisation avec un PAD"
 
-#: ../C/evolution.xml:118(link) ../C/evolution.xml:6945(title)
+#: ../C/evolution.xml:115(link) ../C/evolution.xml:7278(title)
 msgid "Migration from Outlook to Evolution"
 msgstr "Migration d'Outlook à Evolution"
 
-#: ../C/evolution.xml:121(link) ../C/evolution.xml:7007(title)
+#: ../C/evolution.xml:118(link) ../C/evolution.xml:7340(title)
 msgid "Quick Reference"
 msgstr "Référence rapide"
 
-#: ../C/evolution.xml:124(link) ../C/evolution.xml:7121(title)
+#: ../C/evolution.xml:121(link) ../C/evolution.xml:7454(title)
 msgid "Known Bugs and Limitations"
 msgstr "Problèmes connus et limitations"
 
-#: ../C/evolution.xml:127(link) ../C/evolution.xml:7127(title)
+#: ../C/evolution.xml:124(link) ../C/evolution.xml:7460(title)
 msgid "Authors"
 msgstr "Auteurs"
 
-#: ../C/evolution.xml:130(link) ../C/evolution.xml:7186(title)
+#: ../C/evolution.xml:127(link) ../C/evolution.xml:7519(title)
 msgid "Glossary"
 msgstr "Glossaire"
 
-#: ../C/evolution.xml:134(title)
+#: ../C/evolution.xml:131(title)
 msgid "Additional Documentation:"
 msgstr "Documentation supplémentaire :"
 
-#: ../C/evolution.xml:135(para)
+#: ../C/evolution.xml:132(para)
 msgid "You can find additional help in three places:"
 msgstr "Vous pourrez trouver des aides supplémentaires dans ces trois sites :"
 
-#: ../C/evolution.xml:139(para)
+#: ../C/evolution.xml:136(para)
 msgid ""
 "Evolution has a number of command line options that you can use. For "
 "information about command line options, open a terminal window and type "
@@ -897,16 +923,16 @@ msgstr ""
 "obtenir des informations concernant ces options, ouvrez un terminal et tapez "
 "<command>evolution --help</command>."
 
-#: ../C/evolution.xml:142(para)
+#: ../C/evolution.xml:139(para)
 msgid "In the Evolution interface, click Help &gt; Contents."
 msgstr ""
 "Dans l'interface graphique d'Evolution, cliquez sur Aide &gt; Sommaire."
 
-#: ../C/evolution.xml:146(title)
+#: ../C/evolution.xml:143(title)
 msgid "Documentation Conventions:"
 msgstr "Conventions utilisées dans la documentation :"
 
-#: ../C/evolution.xml:147(para)
+#: ../C/evolution.xml:144(para)
 msgid ""
 "In Novell documentation, a greater-than symbol (&gt;) is used to separate "
 "actions within a step and items in a cross-reference path. A trademark "
@@ -920,7 +946,7 @@ msgstr ""
 "<trademark/>, etc.) désigne une marque déposée par Novell. Un astérisque (*) "
 "désigne une autre marque déposée."
 
-#: ../C/evolution.xml:153(para)
+#: ../C/evolution.xml:150(para)
 msgid ""
 "<trademark>Evolution</trademark> is a <link linkend=\"groupware\">groupware</"
 "link> application that helps you work in a group by handling email, address, "
@@ -935,49 +961,49 @@ msgstr ""
 "recherche des informations personnelles. La collaboration et la "
 "communication s'en trouvent renforcées dans le cadre du travail d'équipe."
 
-#: ../C/evolution.xml:156(link) ../C/evolution.xml:164(title)
+#: ../C/evolution.xml:153(link) ../C/evolution.xml:161(title)
 msgid "Starting Evolution for the First Time"
 msgstr "Premier lancement d'Evolution"
 
-#: ../C/evolution.xml:159(link) ../C/evolution.xml:758(title)
+#: ../C/evolution.xml:156(link) ../C/evolution.xml:751(title)
 msgid "Using Evolution: An Overview"
 msgstr "Utilisation d'Evolution : un aperçu"
 
-#: ../C/evolution.xml:167(para)
+#: ../C/evolution.xml:164(para)
 msgid "Start the Evolution client."
 msgstr "Démarrez le client Evolution."
 
-#: ../C/evolution.xml:175(para)
+#: ../C/evolution.xml:172(para)
 msgid "GNOME:"
 msgstr "GNOME :"
 
-#: ../C/evolution.xml:178(para)
+#: ../C/evolution.xml:175(para)
 msgid "Click Applications &gt; Office &gt; Evolution."
 msgstr "Cliquez sur Applications &gt; Bureautique &gt; Evolution."
 
-#: ../C/evolution.xml:183(para)
+#: ../C/evolution.xml:180(para)
 msgid "KDE:"
 msgstr "KDE :"
 
-#: ../C/evolution.xml:186(para)
+#: ../C/evolution.xml:183(para)
 msgid "Click the K menu &gt; Office &gt; More Programs &gt; Evolution."
 msgstr ""
 "Cliquez sur le menu K &gt; Bureautique &gt; Plus de programmes &gt; "
 "Evolution."
 
-#: ../C/evolution.xml:191(para)
+#: ../C/evolution.xml:188(para)
 msgid "Command Line:"
 msgstr "Ligne de commande :"
 
-#: ../C/evolution.xml:194(para)
+#: ../C/evolution.xml:191(para)
 msgid "Enter <command>evolution</command>."
 msgstr "Saisissez <command>evolution</command>."
 
-#: ../C/evolution.xml:204(title)
+#: ../C/evolution.xml:201(title)
 msgid "Using the First-Run Assistant"
 msgstr "Assistant de configuration"
 
-#: ../C/evolution.xml:205(para)
+#: ../C/evolution.xml:202(para)
 msgid ""
 "The first time you run Evolution, it creates a directory <emphasis>."
 "evolution</emphasis> in your home directory, where it stores all of its "
@@ -990,12 +1016,12 @@ msgstr ""
 "configuration pour vous aider à configurer les comptes de messagerie et pour "
 "importer des données provenant d'autres applications."
 
-#: ../C/evolution.xml:206(para)
+#: ../C/evolution.xml:203(para)
 msgid "Using the first-run assistant takes two to five minutes."
 msgstr ""
 "L'utilisation de l'assistant de configuration prend de deux à cinq minutes."
 
-#: ../C/evolution.xml:207(para)
+#: ../C/evolution.xml:204(para)
 msgid ""
 "Later on, if you want to change this account, or if you want to create a new "
 "one, click Edit &gt; Preferences, then click Mail Accounts. Select the "
@@ -1010,7 +1036,7 @@ msgstr ""
 "<link linkend=\"config-prefs-mail\">préférences de courrier</link> pour plus "
 "de détails."
 
-#: ../C/evolution.xml:208(para)
+#: ../C/evolution.xml:205(para)
 msgid ""
 "The First-Run Assistant helps you provide the information Evolution needs to "
 "get started."
@@ -1018,37 +1044,37 @@ msgstr ""
 "L'assistant de configuration vous aide à fournir à Evolution toutes les "
 "informations nécessaires pour démarrer."
 
-#: ../C/evolution.xml:211(link) ../C/evolution.xml:231(title)
+#: ../C/evolution.xml:208(link) ../C/evolution.xml:228(title)
 msgid "Defining Your Identity"
 msgstr "Définition de votre identité"
 
-#: ../C/evolution.xml:214(link) ../C/evolution.xml:261(title)
+#: ../C/evolution.xml:211(link) ../C/evolution.xml:258(title)
 msgid "Receiving Mail"
 msgstr "Réception de courriel"
 
-#: ../C/evolution.xml:217(link) ../C/evolution.xml:360(title)
+#: ../C/evolution.xml:214(link) ../C/evolution.xml:353(title)
 msgid "Receiving Mail Options"
 msgstr "Options de réception des courriels"
 
-#: ../C/evolution.xml:220(link) ../C/evolution.xml:666(title)
+#: ../C/evolution.xml:217(link) ../C/evolution.xml:659(title)
 msgid "Sending Mail"
 msgstr "Envoi de courriel"
 
-#: ../C/evolution.xml:223(link) ../C/evolution.xml:720(title)
+#: ../C/evolution.xml:220(link) ../C/evolution.xml:713(title)
 msgid "Account Management"
 msgstr "Gestion de compte"
 
-#: ../C/evolution.xml:226(link) ../C/evolution.xml:726(title)
+#: ../C/evolution.xml:223(link) ../C/evolution.xml:719(title)
 msgid "Time Zone"
 msgstr "Fuseau horaire"
 
-#: ../C/evolution.xml:232(para)
+#: ../C/evolution.xml:229(para)
 msgid "The Identity window is the first step in the assistant."
 msgstr ""
 "La première étape de l'assistant se présente sous la forme de la fenêtre de "
 "saisie de l'identité."
 
-#: ../C/evolution.xml:234(para)
+#: ../C/evolution.xml:231(para)
 msgid ""
 "Here, you enter some basic personal information. You can define multiple "
 "identities later by clicking Edit &gt; Preferences, then clicking Mail "
@@ -1058,7 +1084,7 @@ msgstr ""
 "pouvez définir d'autres identités plus tard en cliquant sur Édition &gt; "
 "Préférences, puis sur Comptes de messagerie."
 
-#: ../C/evolution.xml:235(para)
+#: ../C/evolution.xml:232(para)
 msgid ""
 "When the First-Run Assistant starts, the Welcome page is displayed. Click "
 "Forward to proceed to the Identity window."
@@ -1066,38 +1092,38 @@ msgstr ""
 "Quand l'assistant de configuration démarre, la page de bienvenue apparaît. "
 "Cliquez sur « Suivant » pour activer la fenêtre d'identité."
 
-#: ../C/evolution.xml:238(para)
+#: ../C/evolution.xml:235(para)
 msgid "Type your full name in the Full Name field."
 msgstr "Saisissez votre nom complet dans le champ Nom complet."
 
-#: ../C/evolution.xml:241(para)
+#: ../C/evolution.xml:238(para)
 msgid "Type your email address in the Email Address field."
 msgstr "Saisissez votre adresse de courriel dans le champ Courriel."
 
-#: ../C/evolution.xml:244(para)
+#: ../C/evolution.xml:241(para)
 msgid "(Optional) Select if this account is your default account."
 msgstr "Cochez si votre compte est le compte par défaut (facultatif)."
 
-#: ../C/evolution.xml:247(para)
+#: ../C/evolution.xml:244(para)
 msgid "(Optional) Type a reply to address in the Reply-To field."
 msgstr ""
 "Saisissez une adresse de réponse dans le champ Adresse de retour "
 "(facultatif)."
 
-#: ../C/evolution.xml:248(para)
+#: ../C/evolution.xml:245(para)
 msgid ""
 "Use this field if you want replies to messages sent to a different address."
 msgstr ""
 "Utilisez ce champ si vous souhaitez que les réponses à vos courriels soient "
 "envoyés à une adresse différente."
 
-#: ../C/evolution.xml:251(para)
+#: ../C/evolution.xml:248(para)
 msgid "(Optional) Type your organization name in the Organization field."
 msgstr ""
 "Saisissez le nom de l'organisme auquel vous appartenez dans le champ "
 "« Organisme » (facultatif)."
 
-#: ../C/evolution.xml:252(para)
+#: ../C/evolution.xml:249(para)
 msgid ""
 "This is the company where you work, or the organization you represent when "
 "you send email."
@@ -1105,24 +1131,24 @@ msgstr ""
 "C'est la société dans laquelle vous travaillez, ou l'organisme que vous "
 "représentez quand vous envoyez un courriel."
 
-#: ../C/evolution.xml:255(para) ../C/evolution.xml:346(para)
-#: ../C/evolution.xml:424(para) ../C/evolution.xml:467(para)
-#: ../C/evolution.xml:511(para) ../C/evolution.xml:533(para)
-#: ../C/evolution.xml:557(para) ../C/evolution.xml:572(para)
-#: ../C/evolution.xml:590(para) ../C/evolution.xml:611(para)
-#: ../C/evolution.xml:633(para) ../C/evolution.xml:656(para)
-#: ../C/evolution.xml:712(para) ../C/evolution.xml:2331(para)
-#: ../C/evolution.xml:2353(para)
+#: ../C/evolution.xml:252(para) ../C/evolution.xml:339(para)
+#: ../C/evolution.xml:417(para) ../C/evolution.xml:460(para)
+#: ../C/evolution.xml:504(para) ../C/evolution.xml:526(para)
+#: ../C/evolution.xml:550(para) ../C/evolution.xml:565(para)
+#: ../C/evolution.xml:583(para) ../C/evolution.xml:604(para)
+#: ../C/evolution.xml:626(para) ../C/evolution.xml:649(para)
+#: ../C/evolution.xml:705(para) ../C/evolution.xml:2507(para)
+#: ../C/evolution.xml:2529(para)
 msgid "Click Forward."
 msgstr "Cliquez sur le bouton Suivant."
 
-#: ../C/evolution.xml:262(para)
+#: ../C/evolution.xml:259(para)
 msgid "The Receiving Email option lets you determine where you get your email."
 msgstr ""
 "L'option des courriels en réception vous laisse la possibilité de définir où "
 "recevoir vos courriels."
 
-#: ../C/evolution.xml:264(para)
+#: ../C/evolution.xml:261(para)
 msgid ""
 "You need to specify the type of server you want to receive mail with. If you "
 "are unsure about the type of server to choose, ask your system administrator "
@@ -1132,19 +1158,19 @@ msgstr ""
 "courriels. Si vous ne savez pas quoi répondre, posez la question à votre "
 "administrateur système ou à votre fournisseur d'accès."
 
-#: ../C/evolution.xml:267(para)
+#: ../C/evolution.xml:264(para)
 msgid "Select a server type in the Server Type list."
 msgstr "Choisissez un type de serveur dans la liste des types de serveur."
 
-#: ../C/evolution.xml:268(para)
+#: ../C/evolution.xml:265(para)
 msgid "The following is a list of server types that are available:"
 msgstr "La liste suivante énumère les serveurs disponibles :"
 
-#: ../C/evolution.xml:270(title)
+#: ../C/evolution.xml:267(title)
 msgid "Novell GroupWise:"
 msgstr "Novell Groupwise :"
 
-#: ../C/evolution.xml:271(para)
+#: ../C/evolution.xml:268(para)
 msgid ""
 "Select this option if you connect to Novell <trademark class=\"registered"
 "\">GroupWise</trademark>. Novell GroupWise keeps email, calendar, and "
@@ -1157,11 +1183,11 @@ msgstr ""
 "instructions de configuration, consultez <link linkend=\"bstfw13\">Options "
 "de configuration distantes</link>."
 
-#: ../C/evolution.xml:274(title)
+#: ../C/evolution.xml:271(title)
 msgid "Microsoft Exchange:"
 msgstr "Microsoft·Exchange :"
 
-#: ../C/evolution.xml:275(para)
+#: ../C/evolution.xml:272(para)
 msgid ""
 "Available only if you have installed the Connector for Microsoft* Exchange. "
 "It allows you to connect to a Microsoft Exchange 2000 or 2003 server, which "
@@ -1175,11 +1201,11 @@ msgstr ""
 "de configuration, consultez <link linkend=\"bstfw13\">Options de "
 "configuration distantes</link>."
 
-#: ../C/evolution.xml:278(title)
+#: ../C/evolution.xml:275(title)
 msgid "IMAP:"
 msgstr "IMAP :"
 
-#: ../C/evolution.xml:279(para)
+#: ../C/evolution.xml:276(para)
 msgid ""
 "Keeps the email on your server so you can access your email from multiple "
 "systems. For configuration instructions, see <link linkend=\"bstfw13"
@@ -1189,11 +1215,11 @@ msgstr ""
 "plusieurs endroits. Pour des instructions de configuration, consultez <link "
 "linkend=\"bstfw13\">Options de configuration distantes</link>."
 
-#: ../C/evolution.xml:282(title)
+#: ../C/evolution.xml:279(title)
 msgid "POP:"
 msgstr "POP :"
 
-#: ../C/evolution.xml:283(para)
+#: ../C/evolution.xml:280(para)
 msgid ""
 "Downloads your email to your hard disk for permanent storage, freeing up "
 "space on the email server. For configuration instructions, see <link linkend="
@@ -1204,28 +1230,11 @@ msgstr ""
 "configuration, consultez <link linkend=\"bstfw13\">Options de configuration "
 "distantes</link>."
 
-#: ../C/evolution.xml:286(title)
-msgid "Hula:"
-msgstr "Hula :"
-
-#: ../C/evolution.xml:287(para)
-msgid ""
-"Select this option if you want to use a Hula account. Evolution provides you "
-"connectivity to <trademark class=\"registered\">Hula</trademark> servers "
-"through IMAP and calendaring support through CalDAV. For more information "
-"refer <link linkend=\"b1012tkg\">Connecting to Hula</link>."
-msgstr ""
-"Cochez cette option si vous souhaitez utiliser un compte Hula. Evolution "
-"permet la connectivité aux serveurs <trademark class=\"registered\">Hula</"
-"trademark> via IMAP et prend en charge le calendrier via CalDAV. Pour des "
-"instructions de configuration, consultez <link linkend=\"bstfw13\">Options "
-"de configuration distantes</link>."
-
-#: ../C/evolution.xml:290(title)
+#: ../C/evolution.xml:283(title)
 msgid "USENET News:"
 msgstr "Nouvelles USENET :"
 
-#: ../C/evolution.xml:291(para)
+#: ../C/evolution.xml:284(para)
 msgid ""
 "Connects to the news server and downloads a list of available news digests. "
 "For configuration instructions, see <link linkend=\"bstfw13\">Remote "
@@ -1235,11 +1244,11 @@ msgstr ""
 "nouvelles. Pour des instructions de configuration, consultez <link linkend="
 "\"bstfw13\">Options de configuration distantes</link>."
 
-#: ../C/evolution.xml:294(title)
+#: ../C/evolution.xml:287(title)
 msgid "Local Delivery:"
 msgstr "Distribution locale :"
 
-#: ../C/evolution.xml:295(para)
+#: ../C/evolution.xml:288(para)
 msgid ""
 "Choose this option if you want to move email from the spool (the location "
 "where mail waits for delivery) and store it in your home directory. You need "
@@ -1256,11 +1265,11 @@ msgstr ""
 "« Répertoire ou stockage Unix Mbox ». Pour des instructions de configuration, "
 "consultez <link linkend=\"bstgbqn\">Options de configuration locales</link>."
 
-#: ../C/evolution.xml:298(title)
+#: ../C/evolution.xml:291(title)
 msgid "MH Format Mail Directories:"
 msgstr "Répertoires au format MH :"
 
-#: ../C/evolution.xml:299(para)
+#: ../C/evolution.xml:292(para)
 msgid ""
 "If you download your email using mh or another MH-style program, you should "
 "use this option. You need to provide the path to the mail directory you want "
@@ -1273,11 +1282,11 @@ msgstr ""
 "configuration, consultez <link linkend=\"bstgbqn\">Options de configuration "
 "locales</link>."
 
-#: ../C/evolution.xml:302(title)
+#: ../C/evolution.xml:295(title)
 msgid "Maildir Format Mail Directories:"
 msgstr "Répertoires au format Maildir :"
 
-#: ../C/evolution.xml:303(para)
+#: ../C/evolution.xml:296(para)
 msgid ""
 "If you download your email using Qmail or another maildir-style program, you "
 "should use this option. You need to provide the path to the mail directory "
@@ -1290,11 +1299,11 @@ msgstr ""
 "configuration, consultez <link linkend=\"bstgbqn\">Options de configuration "
 "locales</link>."
 
-#: ../C/evolution.xml:306(title)
+#: ../C/evolution.xml:299(title)
 msgid "Standard Unix mbox spool file:"
 msgstr "Fichier de stockage Unix Mbox standard :"
 
-#: ../C/evolution.xml:307(para)
+#: ../C/evolution.xml:300(para)
 msgid ""
 "If you want to read and store email in the mail spool file on your local "
 "system, choose this option. You need to provide the path to the mail spool "
@@ -1307,11 +1316,11 @@ msgstr ""
 "instructions de configuration, consultez <link linkend=\"bstgbqn\">Options "
 "de configuration locales</link>."
 
-#: ../C/evolution.xml:310(title)
+#: ../C/evolution.xml:303(title)
 msgid "Standard Unix mbox spool directory:"
 msgstr "Répertoire de stockage Unix Mbox standard :"
 
-#: ../C/evolution.xml:311(para)
+#: ../C/evolution.xml:304(para)
 msgid ""
 "If you want to read and store email in the mail spool directory on your "
 "local system, choose this option. You need to provide the path to the mail "
@@ -1324,11 +1333,11 @@ msgstr ""
 "instructions de configuration, consultez <link linkend=\"bstgbqn\">Options "
 "de configuration locales</link>."
 
-#: ../C/evolution.xml:314(title) ../C/evolution.xml:5251(title)
+#: ../C/evolution.xml:307(title) ../C/evolution.xml:5484(title)
 msgid "None:"
 msgstr "Aucun :"
 
-#: ../C/evolution.xml:315(para)
+#: ../C/evolution.xml:308(para)
 msgid ""
 "Select this if you do not plan to check email with this account. If you "
 "select this, there are no configuration options."
@@ -1336,11 +1345,11 @@ msgstr ""
 "Cochez ceci si vous ne souhaitez pas relever vos courriels avec ce compte. "
 "Si vous choisissez cette option, aucune autre configuration n'est nécessaire."
 
-#: ../C/evolution.xml:321(title)
+#: ../C/evolution.xml:314(title)
 msgid "Remote Configuration Options"
 msgstr "Options de configuration distantes"
 
-#: ../C/evolution.xml:322(para)
+#: ../C/evolution.xml:315(para)
 msgid ""
 "If you selected Novell GroupWise, IMAP, POP, or USENET News as your server, "
 "you need to specify additional information."
@@ -1348,11 +1357,11 @@ msgstr ""
 "Si vous choisissez un serveur parmi Novell GroupWise, IMAP, POP ou les news "
 "USENET, vous devez définir des informations supplémentaires."
 
-#: ../C/evolution.xml:325(para) ../C/evolution.xml:688(para)
+#: ../C/evolution.xml:318(para) ../C/evolution.xml:681(para)
 msgid "Type the server name of your email server in the Server field."
 msgstr "Saisissez le nom du serveur de courriel dans le champ « Serveur »."
 
-#: ../C/evolution.xml:326(para) ../C/evolution.xml:689(para)
+#: ../C/evolution.xml:319(para) ../C/evolution.xml:682(para)
 msgid ""
 "If you are unsure what your Server address is, contact your system "
 "administrator."
@@ -1360,19 +1369,19 @@ msgstr ""
 "Si vous n'êtes pas certain de l'adresse du serveur, contactez votre "
 "administrateur système."
 
-#: ../C/evolution.xml:329(para) ../C/evolution.xml:701(para)
+#: ../C/evolution.xml:322(para) ../C/evolution.xml:694(para)
 msgid "Type your username in the Username field."
 msgstr "Saisissez votre nom d'utilisateur dans le champ « Nom d'utilisateur »."
 
-#: ../C/evolution.xml:332(para) ../C/evolution.xml:709(para)
+#: ../C/evolution.xml:325(para) ../C/evolution.xml:702(para)
 msgid "Select if you want to use a secure connection (SSL or TLS)."
 msgstr "Cochez si vous voulez utiliser une connexion sécurisée (SSL ou TLS)."
 
-#: ../C/evolution.xml:333(para)
+#: ../C/evolution.xml:326(para)
 msgid "You should enable this option if your server supports it."
 msgstr "Vous devriez activer cette option si votre serveur la prend en charge."
 
-#: ../C/evolution.xml:334(para) ../C/evolution.xml:340(para)
+#: ../C/evolution.xml:327(para) ../C/evolution.xml:333(para)
 msgid ""
 "Free webmail providers usually supply information about which of these "
 "options can be used. If you are in an organizational environment, you may "
@@ -1383,34 +1392,34 @@ msgstr ""
 "environnement organisationnel, contactez votre administrateur système pour "
 "obtenir de plus amples informations."
 
-#: ../C/evolution.xml:337(para) ../C/evolution.xml:696(para)
-#: ../C/evolution.xml:5080(para)
+#: ../C/evolution.xml:330(para) ../C/evolution.xml:689(para)
+#: ../C/evolution.xml:5313(para)
 msgid "Select your authentication type in the Authentication list."
 msgstr ""
 "Choisissez le type d'authentification dans la liste des types "
 "d'authentification."
 
-#: ../C/evolution.xml:338(para) ../C/evolution.xml:697(para)
-#: ../C/evolution.xml:730(para) ../C/evolution.xml:1946(para)
-#: ../C/evolution.xml:2070(para) ../C/evolution.xml:2078(para)
-#: ../C/evolution.xml:2245(para) ../C/evolution.xml:3023(para)
-#: ../C/evolution.xml:3028(para) ../C/evolution.xml:3454(para)
-#: ../C/evolution.xml:3469(para) ../C/evolution.xml:3477(para)
-#: ../C/evolution.xml:3810(para) ../C/evolution.xml:3812(para)
-#: ../C/evolution.xml:3814(para) ../C/evolution.xml:3834(para)
-#: ../C/evolution.xml:3845(para) ../C/evolution.xml:3850(para)
-#: ../C/evolution.xml:3871(para) ../C/evolution.xml:3879(para)
-#: ../C/evolution.xml:3995(para) ../C/evolution.xml:4006(para)
-#: ../C/evolution.xml:4011(para) ../C/evolution.xml:4022(para)
-#: ../C/evolution.xml:4030(para) ../C/evolution.xml:4035(para)
-#: ../C/evolution.xml:4381(para) ../C/evolution.xml:4400(para)
-#: ../C/evolution.xml:4432(para) ../C/evolution.xml:4445(para)
-#: ../C/evolution.xml:4667(para) ../C/evolution.xml:6109(para)
-#: ../C/evolution.xml:6792(para) ../C/evolution.xml:6858(para)
+#: ../C/evolution.xml:331(para) ../C/evolution.xml:690(para)
+#: ../C/evolution.xml:723(para) ../C/evolution.xml:2021(para)
+#: ../C/evolution.xml:2246(para) ../C/evolution.xml:2254(para)
+#: ../C/evolution.xml:2421(para) ../C/evolution.xml:3199(para)
+#: ../C/evolution.xml:3204(para) ../C/evolution.xml:3687(para)
+#: ../C/evolution.xml:3702(para) ../C/evolution.xml:3710(para)
+#: ../C/evolution.xml:4043(para) ../C/evolution.xml:4045(para)
+#: ../C/evolution.xml:4047(para) ../C/evolution.xml:4067(para)
+#: ../C/evolution.xml:4078(para) ../C/evolution.xml:4083(para)
+#: ../C/evolution.xml:4104(para) ../C/evolution.xml:4112(para)
+#: ../C/evolution.xml:4228(para) ../C/evolution.xml:4239(para)
+#: ../C/evolution.xml:4244(para) ../C/evolution.xml:4255(para)
+#: ../C/evolution.xml:4263(para) ../C/evolution.xml:4268(para)
+#: ../C/evolution.xml:4614(para) ../C/evolution.xml:4633(para)
+#: ../C/evolution.xml:4665(para) ../C/evolution.xml:4678(para)
+#: ../C/evolution.xml:4900(para) ../C/evolution.xml:6342(para)
+#: ../C/evolution.xml:7125(para) ../C/evolution.xml:7191(para)
 msgid "or"
 msgstr "ou"
 
-#: ../C/evolution.xml:339(para) ../C/evolution.xml:698(para)
+#: ../C/evolution.xml:332(para) ../C/evolution.xml:691(para)
 msgid ""
 "Click Check for Supported Types to have Evolution check for supported types. "
 "Some servers do not announce the authentication mechanisms they support, so "
@@ -1423,12 +1432,12 @@ msgstr ""
 "fonction ne garantit pas que les mécanismes disponibles fonctionnent "
 "réellement."
 
-#: ../C/evolution.xml:343(para) ../C/evolution.xml:704(para)
+#: ../C/evolution.xml:336(para) ../C/evolution.xml:697(para)
 msgid "Select if you want Evolution to remember your password."
 msgstr ""
 "Cochez si vous souhaitez qu'Evolution se souvienne de votre mot de passe."
 
-#: ../C/evolution.xml:349(para)
+#: ../C/evolution.xml:342(para)
 msgid ""
 "(Conditional) If you chose Microsoft Exchange as the server type, provide "
 "your username in the Username field and your Outlook Web Access (OWA) URL in "
@@ -1446,7 +1455,7 @@ msgstr ""
 "<varname>nom du serveur</varname>/exchange/<varname>chemin vers la boîte de "
 "messagerie</varname>."
 
-#: ../C/evolution.xml:350(para)
+#: ../C/evolution.xml:343(para)
 msgid ""
 "When you have finished, continue with <link linkend=\"more-mail-options"
 "\">Receiving Mail Options</link>."
@@ -1454,11 +1463,11 @@ msgstr ""
 "Lorsque vous avez terminé, continuez avec <link linkend=\"more-mail-options"
 "\">Options de réception des messages</link>."
 
-#: ../C/evolution.xml:354(title)
+#: ../C/evolution.xml:347(title)
 msgid "Local Configuration Options"
 msgstr "Options de configuration locales"
 
-#: ../C/evolution.xml:355(para)
+#: ../C/evolution.xml:348(para)
 msgid ""
 "If you selected Local Delivery, MH-Format Mail Directories, Maildir-Format "
 "Mail Directories, Standard Unix mbox spool file or Standard Unix mbox spool "
@@ -1472,7 +1481,7 @@ msgstr ""
 "sous la rubrique Chemin. Poursuivez ensuite avec <link linkend=\"more-mail-"
 "options\">Options de réception des messages</link>."
 
-#: ../C/evolution.xml:361(para)
+#: ../C/evolution.xml:354(para)
 msgid ""
 "After you have selected a mail delivery mechanism, you can set some "
 "preferences for its behavior."
@@ -1480,43 +1489,43 @@ msgstr ""
 "Après avoir choisi un moyen de distribution des messages, vous pouvez "
 "définir certaines préférences de fonctionnement."
 
-#: ../C/evolution.xml:364(link) ../C/evolution.xml:393(title)
+#: ../C/evolution.xml:357(link) ../C/evolution.xml:386(title)
 msgid "Novell GroupWise Receiving Options"
 msgstr "Options de réception Novell GroupWise"
 
-#: ../C/evolution.xml:367(link) ../C/evolution.xml:433(title)
+#: ../C/evolution.xml:360(link) ../C/evolution.xml:426(title)
 msgid "Microsoft Exchange Receiving Options"
 msgstr "Options de réception Microsoft Exchange"
 
-#: ../C/evolution.xml:370(link) ../C/evolution.xml:474(title)
+#: ../C/evolution.xml:363(link) ../C/evolution.xml:467(title)
 msgid "IMAP Receiving Options"
 msgstr "Options de réception IMAP"
 
-#: ../C/evolution.xml:373(link) ../C/evolution.xml:518(title)
+#: ../C/evolution.xml:366(link) ../C/evolution.xml:511(title)
 msgid "POP Receiving Options"
 msgstr "Options de réception POP"
 
-#: ../C/evolution.xml:376(link) ../C/evolution.xml:540(title)
+#: ../C/evolution.xml:369(link) ../C/evolution.xml:533(title)
 msgid "USENET News Receiving Options"
 msgstr "Options de réception USENET News"
 
-#: ../C/evolution.xml:379(link) ../C/evolution.xml:564(title)
+#: ../C/evolution.xml:372(link) ../C/evolution.xml:557(title)
 msgid "Local Delivery Receiving Options"
 msgstr "Options de réception de la distribution locale des messages"
 
-#: ../C/evolution.xml:382(link) ../C/evolution.xml:579(title)
+#: ../C/evolution.xml:375(link) ../C/evolution.xml:572(title)
 msgid "MH-Format Mail Directories Receiving Options"
 msgstr "Options de réception utilisant le format de courrier MH"
 
-#: ../C/evolution.xml:385(link) ../C/evolution.xml:599(title)
+#: ../C/evolution.xml:378(link) ../C/evolution.xml:592(title)
 msgid "Maildir-Format Mail Directories Receiving Options"
 msgstr "Options de réception utilisant le format de courrier Maildir"
 
-#: ../C/evolution.xml:388(link) ../C/evolution.xml:620(title)
+#: ../C/evolution.xml:381(link) ../C/evolution.xml:613(title)
 msgid "Standard Unix mbox spool file Receiving Options"
 msgstr "Options de réception utilisant le standard Unix Mbox"
 
-#: ../C/evolution.xml:394(para)
+#: ../C/evolution.xml:387(para)
 msgid ""
 "If you select Novell GroupWise as your receiving server type, you need to "
 "specify the following options:"
@@ -1524,23 +1533,23 @@ msgstr ""
 "Si vous choisissez Novell GroupWise comme type de serveur pour la réception, "
 "vous devez compléter les options suivantes :"
 
-#: ../C/evolution.xml:397(para) ../C/evolution.xml:438(para)
-#: ../C/evolution.xml:479(para) ../C/evolution.xml:523(para)
-#: ../C/evolution.xml:545(para) ../C/evolution.xml:568(para)
-#: ../C/evolution.xml:583(para) ../C/evolution.xml:603(para)
-#: ../C/evolution.xml:623(para) ../C/evolution.xml:646(para)
-#: ../C/evolution.xml:5658(para)
+#: ../C/evolution.xml:390(para) ../C/evolution.xml:431(para)
+#: ../C/evolution.xml:472(para) ../C/evolution.xml:516(para)
+#: ../C/evolution.xml:538(para) ../C/evolution.xml:561(para)
+#: ../C/evolution.xml:576(para) ../C/evolution.xml:596(para)
+#: ../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 ""
 "Choisissez si vous voulez qu'Evolution relève automatiquement les nouveaux "
 "messages."
 
-#: ../C/evolution.xml:398(para) ../C/evolution.xml:439(para)
-#: ../C/evolution.xml:480(para) ../C/evolution.xml:524(para)
-#: ../C/evolution.xml:546(para) ../C/evolution.xml:569(para)
-#: ../C/evolution.xml:584(para) ../C/evolution.xml:604(para)
-#: ../C/evolution.xml:624(para) ../C/evolution.xml:647(para)
-#: ../C/evolution.xml:5659(para)
+#: ../C/evolution.xml:391(para) ../C/evolution.xml:432(para)
+#: ../C/evolution.xml:473(para) ../C/evolution.xml:517(para)
+#: ../C/evolution.xml:539(para) ../C/evolution.xml:562(para)
+#: ../C/evolution.xml:577(para) ../C/evolution.xml:597(para)
+#: ../C/evolution.xml:617(para) ../C/evolution.xml:640(para)
+#: ../C/evolution.xml:5892(para)
 msgid ""
 "If you select this option, you need to specify how often Evolution should "
 "check for new messages."
@@ -1548,17 +1557,17 @@ msgstr ""
 "Avec cette option, vous devez aussi indiquer la fréquence de la recherche de "
 "nouveaux messages."
 
-#: ../C/evolution.xml:401(para) ../C/evolution.xml:442(para)
-#: ../C/evolution.xml:5664(para)
+#: ../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 ""
 "Choisissez si vous voulez relever les nouveaux messages dans tous les "
 "dossiers."
 
-#: ../C/evolution.xml:404(para) ../C/evolution.xml:460(para)
-#: ../C/evolution.xml:495(para) ../C/evolution.xml:607(para)
-#: ../C/evolution.xml:627(para) ../C/evolution.xml:650(para)
-#: ../C/evolution.xml:5667(para)
+#: ../C/evolution.xml:397(para) ../C/evolution.xml:453(para)
+#: ../C/evolution.xml:488(para) ../C/evolution.xml:600(para)
+#: ../C/evolution.xml:620(para) ../C/evolution.xml:643(para)
+#: ../C/evolution.xml:5900(para)
 msgid ""
 "Select Apply filters to new messages in inbox on this server if you want to "
 "apply filters."
@@ -1566,8 +1575,8 @@ msgstr ""
 "Cochez « Appliquer les filtres aux nouveaux messages dans la boîte de "
 "réception sur ce serveur »pour appliquer les filtres."
 
-#: ../C/evolution.xml:405(para) ../C/evolution.xml:496(para)
-#: ../C/evolution.xml:608(para) ../C/evolution.xml:5668(para)
+#: ../C/evolution.xml:398(para) ../C/evolution.xml:489(para)
+#: ../C/evolution.xml:601(para) ../C/evolution.xml:5901(para)
 msgid ""
 "For additional information on filtering, see <link linkend=\"usage-mail-org-"
 "filters-new\">Creating New Filter Rules</link>."
@@ -1576,15 +1585,15 @@ msgstr ""
 "<link linkend=\"usage-mail-org-filters-new\">Création de nouvelles règles de "
 "filtrage</link>."
 
-#: ../C/evolution.xml:408(para) ../C/evolution.xml:463(para)
-#: ../C/evolution.xml:499(para) ../C/evolution.xml:5671(para)
+#: ../C/evolution.xml:401(para) ../C/evolution.xml:456(para)
+#: ../C/evolution.xml:492(para) ../C/evolution.xml:5904(para)
 msgid "Select if you want to check new messages for junk content."
 msgstr ""
 "Choisissez si vous voulez vérifier si les nouveaux messages contiennent du "
 "pourriel."
 
-#: ../C/evolution.xml:409(para) ../C/evolution.xml:464(para)
-#: ../C/evolution.xml:500(para)
+#: ../C/evolution.xml:402(para) ../C/evolution.xml:457(para)
+#: ../C/evolution.xml:493(para)
 msgid ""
 "For additional information on junk content, see <link linkend=\"usage-mail-"
 "organize-spam\">Stopping Junk Mail (Spam)</link> and <link linkend=\"mail-"
@@ -1594,14 +1603,14 @@ msgstr ""
 "<link linkend=\"usage-mail-organize-spam\">Lutte contre le pourriel (spam)</"
 "link> et <link linkend=\"mail-prefs-junk\">Pourriel</link>."
 
-#: ../C/evolution.xml:412(para) ../C/evolution.xml:5675(para)
+#: ../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 ""
 "Choisissez si vous ne souhaitez contrôler le pourriel que dans la boîte de "
 "réception."
 
-#: ../C/evolution.xml:415(para) ../C/evolution.xml:457(para)
-#: ../C/evolution.xml:506(para)
+#: ../C/evolution.xml:408(para) ../C/evolution.xml:450(para)
+#: ../C/evolution.xml:499(para)
 msgid ""
 "Select Automatically synchronize remote mail locally to download the "
 "messages to your local system."
@@ -1609,7 +1618,7 @@ msgstr ""
 "Cochez « Synchroniser automatiquement le compte en local » pour télécharger "
 "les messages sur votre système local."
 
-#: ../C/evolution.xml:416(para) ../C/evolution.xml:507(para)
+#: ../C/evolution.xml:409(para) ../C/evolution.xml:500(para)
 msgid ""
 "Evolution, by default downloads only the header information such as From, "
 "Subject, and Date. The body of the message and the attachments are "
@@ -1624,7 +1633,7 @@ msgstr ""
 "particulièrement utile lorsque vous ne lisez pas tous les messages que vous "
 "recevez."
 
-#: ../C/evolution.xml:417(para) ../C/evolution.xml:508(para)
+#: ../C/evolution.xml:410(para) ../C/evolution.xml:501(para)
 msgid ""
 "If you check this option, evolution fetches the headers as well as the body "
 "of the message simultaneously. In this case, the time taken to open a "
@@ -1636,7 +1645,7 @@ msgstr ""
 "message est plus faible. De plus, avec cette option activée, il est alors "
 "possible de télécharger les messages afin de les lire en mode déconnecté."
 
-#: ../C/evolution.xml:420(para)
+#: ../C/evolution.xml:413(para)
 msgid ""
 "Type your Post Office Agent SOAP port in the Post Office Agent SOAP Port "
 "field."
@@ -1644,7 +1653,7 @@ msgstr ""
 "Saisissez le port SOAP de l'agent de bureau de poste dans le champ "
 "correspondant."
 
-#: ../C/evolution.xml:421(para) ../C/evolution.xml:5686(para)
+#: ../C/evolution.xml:414(para) ../C/evolution.xml:5919(para)
 msgid ""
 "If you are unsure what your Post Office Agent SOAP port is, contact your "
 "system administrator."
@@ -1652,11 +1661,11 @@ msgstr ""
 "Si vous n'êtes pas certain de ce qu'est le port SOAP de l'agent de bureau de "
 "poste, contactez votre administrateur système."
 
-#: ../C/evolution.xml:429(para) ../C/evolution.xml:470(para)
-#: ../C/evolution.xml:514(para) ../C/evolution.xml:536(para)
-#: ../C/evolution.xml:560(para) ../C/evolution.xml:575(para)
-#: ../C/evolution.xml:595(para) ../C/evolution.xml:616(para)
-#: ../C/evolution.xml:638(para) ../C/evolution.xml:661(para)
+#: ../C/evolution.xml:422(para) ../C/evolution.xml:463(para)
+#: ../C/evolution.xml:507(para) ../C/evolution.xml:529(para)
+#: ../C/evolution.xml:553(para) ../C/evolution.xml:568(para)
+#: ../C/evolution.xml:588(para) ../C/evolution.xml:609(para)
+#: ../C/evolution.xml:631(para) ../C/evolution.xml:654(para)
 msgid ""
 "When you have finished, continue with <link linkend=\"third-step\">Sending "
 "Mail</link>."
@@ -1664,7 +1673,7 @@ msgstr ""
 "Lorsque vous avez terminé, poursuivez avec <link linkend=\"third-step"
 "\">Envoi de messages</link>."
 
-#: ../C/evolution.xml:434(para)
+#: ../C/evolution.xml:427(para)
 msgid ""
 "If you select Microsoft Exchange as your receiving server type, you need to "
 "specify the following options:"
@@ -1672,14 +1681,14 @@ msgstr ""
 "Si vous choisissez Microsoft Exchange comme type de serveur pour la "
 "réception, vous devez compléter les options suivantes :"
 
-#: ../C/evolution.xml:445(para)
+#: ../C/evolution.xml:438(para)
 msgid ""
 "Specify the Global Catalog server name in the Global Catalog Server Name "
 "field."
 msgstr ""
 "Indiquez le nom du serveur de catalogue global dans le champ correspondant."
 
-#: ../C/evolution.xml:446(para)
+#: ../C/evolution.xml:439(para)
 msgid ""
 "The Global Catalog Server contains the user information for users. If you "
 "are unsure what your Global Catalog server name is, contact your system "
@@ -1689,13 +1698,13 @@ msgstr ""
 "utilisateurs. Si vous n'êtes pas certain de connaître le nom de ce serveur, "
 "contactez votre administrateur système."
 
-#: ../C/evolution.xml:449(para)
+#: ../C/evolution.xml:442(para)
 msgid "Select if you want to limit the number of Global Address Lists (GAL)."
 msgstr ""
 "Choisissez si vous souhaitez limiter le nombre de réponses de liste "
 "d'adresses globale (GAL)."
 
-#: ../C/evolution.xml:450(para)
+#: ../C/evolution.xml:443(para)
 msgid ""
 "The GAL contains a list of all email addresses. If you select this option, "
 "you need to specify the maximum number of responses."
@@ -1704,13 +1713,13 @@ msgstr ""
 "électroniques. Si vous choisissez cette option, vous devez indiquer le "
 "nombre maximum de réponses."
 
-#: ../C/evolution.xml:453(para)
+#: ../C/evolution.xml:446(para)
 msgid "Select if you want to use a password expire warning time period."
 msgstr ""
 "Choisissez si vous voulez activer une période d'avertissement d'expiration "
 "du mot de passe."
 
-#: ../C/evolution.xml:454(para)
+#: ../C/evolution.xml:447(para)
 msgid ""
 "If you select this option, you need to specify how often Evolution should "
 "send the password expire message."
@@ -1718,7 +1727,7 @@ msgstr ""
 "Si vous choisissez cette option, vous devez indiquer la fréquence de l'envoi "
 "par Evolution du message d'expiration du mot de passe."
 
-#: ../C/evolution.xml:475(para)
+#: ../C/evolution.xml:468(para)
 msgid ""
 "If you select IMAP as your receiving server type, you need to specify the "
 "following options:"
@@ -1726,7 +1735,7 @@ msgstr ""
 "Si vous choisissez IMAP comme type de serveur pour la réception, vous devez "
 "compléter les options suivantes :"
 
-#: ../C/evolution.xml:483(para)
+#: ../C/evolution.xml:476(para)
 msgid ""
 "Select if you want Evolution to use custom commands to connect to the IMAP "
 "server."
@@ -1734,7 +1743,7 @@ msgstr ""
 "Choisissez si vous voulez qu'Evolution utilise une commande personnalisée "
 "pour se connecter au serveur IMAP."
 
-#: ../C/evolution.xml:484(para)
+#: ../C/evolution.xml:477(para)
 msgid ""
 "If you select this option, specify the custom command you want Evolution to "
 "use."
@@ -1742,12 +1751,12 @@ msgstr ""
 "Si vous choisissez cette option, indiquez la commande personnalisée "
 "qu'Evolution doit utiliser."
 
-#: ../C/evolution.xml:487(para)
+#: ../C/evolution.xml:480(para)
 msgid "Select if you want Evolution to show only subscribed folders."
 msgstr ""
 "Choisissez si vous voulez qu'Evolution n'affiche que les dossiers abonnés."
 
-#: ../C/evolution.xml:488(para)
+#: ../C/evolution.xml:481(para)
 msgid ""
 "Subscribed folders are folders that you have chosen to receive mail from by "
 "subscribing to them."
@@ -1755,14 +1764,14 @@ msgstr ""
 "Les dossiers abonnés sont des dossiers dont vous avez choisi de recevoir les "
 "messages en vous y abonnant."
 
-#: ../C/evolution.xml:491(para)
+#: ../C/evolution.xml:484(para)
 msgid ""
 "Select if you want Evolution to override server-supplied folder namespaces."
 msgstr ""
 "Choisissez si vous voulez qu'Evolution outrepasse l'espace de noms de "
 "dossiers fourni par le serveur."
 
-#: ../C/evolution.xml:492(para)
+#: ../C/evolution.xml:485(para)
 msgid ""
 "By choosing this option you can rename the folders that the server provides. "
 "If you select this option, you need to specify the namespace to use."
@@ -1771,13 +1780,13 @@ msgstr ""
 "serveur. Si vous choisissez cette option, vous devez indiquer l'espace de "
 "nom à utiliser."
 
-#: ../C/evolution.xml:503(para)
+#: ../C/evolution.xml:496(para)
 msgid "Select if you want to check for junk messages in the Inbox folder."
 msgstr ""
 "Choisissez si vous voulez activer la détection du pourriel dans la boîte de "
 "réception."
 
-#: ../C/evolution.xml:520(para)
+#: ../C/evolution.xml:513(para)
 msgid ""
 "If you select POP as your receiving server type, you need to specify the "
 "following options:"
@@ -1785,18 +1794,18 @@ msgstr ""
 "Si vous choisissez POP comme type de serveur pour la réception, vous devez "
 "compléter les options suivantes :"
 
-#: ../C/evolution.xml:527(para)
+#: ../C/evolution.xml:520(para)
 msgid "Select if you want to leave messages on the server."
 msgstr ""
 "Choisissez si vous voulez laisser une copie des messages sur le serveur."
 
-#: ../C/evolution.xml:530(para)
+#: ../C/evolution.xml:523(para)
 msgid "Select if you want to disable support for all POP3 extensions."
 msgstr ""
 "Choisissez si vous voulez désactiver la prise en charge de toutes les "
 "extensions POP3."
 
-#: ../C/evolution.xml:542(para)
+#: ../C/evolution.xml:535(para)
 msgid ""
 "If you select USENET News as your receiving server type, you need to specify "
 "the following options:"
@@ -1804,16 +1813,16 @@ msgstr ""
 "Si vous choisissez Nouvelles USENET comme type de serveur pour la réception, "
 "vous devez compléter les options suivantes :"
 
-#: ../C/evolution.xml:549(para)
+#: ../C/evolution.xml:542(para)
 msgid "Select if you want to show folders in short notation."
 msgstr ""
 "Choisissez si vous voulez que les dossiers s'affichent en notation abrégée."
 
-#: ../C/evolution.xml:550(para)
+#: ../C/evolution.xml:543(para)
 msgid "For example, comp.os.linux would appear as c.o.linux."
 msgstr "Par exemple, comp.os.linux est affiché sous la forme c.o.linux."
 
-#: ../C/evolution.xml:553(para)
+#: ../C/evolution.xml:546(para)
 msgid ""
 "Select if you want to show relative folder names in the subscription dialog "
 "box."
@@ -1821,7 +1830,7 @@ msgstr ""
 "Choisissez si vous voulez afficher les noms de dossiers relatifs dans la "
 "boîte de dialogue d'abonnement."
 
-#: ../C/evolution.xml:554(para)
+#: ../C/evolution.xml:547(para)
 msgid ""
 "If you select to show relative folder names in the subscription page, only "
 "the name of the folder is displayed. For example the folder evolution.mail "
@@ -1831,7 +1840,7 @@ msgstr ""
 "d'abonnement, seuls les noms des dossiers sont affichés. Par exemple, le "
 "dossier « evolution.mail » apparaît sous la forme « evolution »."
 
-#: ../C/evolution.xml:565(para)
+#: ../C/evolution.xml:558(para)
 msgid ""
 "If you select Local Delivery as your receiving server type, you need to "
 "specify the following options:"
@@ -1839,7 +1848,7 @@ msgstr ""
 "Si vous choisissez Distribution locale comme type de serveur pour la "
 "réception, vous devez compléter les options suivantes :"
 
-#: ../C/evolution.xml:580(para)
+#: ../C/evolution.xml:573(para)
 msgid ""
 "If you select MH-Format Mail Directories as your receiving server type, you "
 "need to specify the following options:"
@@ -1847,14 +1856,14 @@ msgstr ""
 "Si vous choisissez Répertoires de courriels au format MH comme type de "
 "serveur pour la réception, vous devez compléter les options suivantes :"
 
-#: ../C/evolution.xml:587(para)
+#: ../C/evolution.xml:580(para)
 msgid ""
 "Select if you want to use the <emphasis>.folders</emphasis> summary file."
 msgstr ""
 "Choisissez si vous voulez utiliser le fichier de résumé de dossiers "
 "<emphasis>.folders</emphasis>."
 
-#: ../C/evolution.xml:600(para)
+#: ../C/evolution.xml:593(para)
 msgid ""
 "If you select Maildir-Format Mail Directories as your receiving server type, "
 "you need to specify the following options:"
@@ -1862,18 +1871,18 @@ msgstr ""
 "Si vous choisissez Répertoires de courriels au format Maildir comme type de "
 "serveur pour la réception, vous devez compléter les options suivantes :"
 
-#: ../C/evolution.xml:630(para) ../C/evolution.xml:653(para)
+#: ../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."
 msgstr ""
 "Choisissez si vous voulez stocker les en-têtes de statut au format Elm, Pine "
 "et Mutt."
 
-#: ../C/evolution.xml:642(title)
+#: ../C/evolution.xml:635(title)
 msgid "Standard Unix mbox spool directory Receiving Options"
 msgstr "Options de réception utilisant le répertoire standard Unix Mbox"
 
-#: ../C/evolution.xml:643(para)
+#: ../C/evolution.xml:636(para)
 msgid ""
 "If you select Standard Unix mbox Spool directory as your receiving server "
 "type, you need to specify the following options:"
@@ -1881,7 +1890,7 @@ msgstr ""
 "Si vous choisissez Répertoire spool au standard Unix Mbox comme type de "
 "serveur pour la réception, vous devez compléter les options suivantes :"
 
-#: ../C/evolution.xml:667(para)
+#: ../C/evolution.xml:660(para)
 msgid ""
 "Now that you have entered information about how you plan to get mail, "
 "Evolution needs to know about how you want to send it."
@@ -1889,19 +1898,19 @@ msgstr ""
 "Après avoir saisi les informations concernant la manière de recevoir les "
 "messages, Evolution doit être renseigné sur la manière de les envoyer."
 
-#: ../C/evolution.xml:670(para)
+#: ../C/evolution.xml:663(para)
 msgid "Select a server type from the Server Type list."
 msgstr "Sélectionnez un type de serveur dans la liste « Type de serveur »."
 
-#: ../C/evolution.xml:671(para)
+#: ../C/evolution.xml:664(para)
 msgid "The following server types are available:"
 msgstr "Voici les types de serveur disponibles :"
 
-#: ../C/evolution.xml:673(title)
+#: ../C/evolution.xml:666(title)
 msgid "Sendmail:"
 msgstr "Sendmail :"
 
-#: ../C/evolution.xml:674(para)
+#: ../C/evolution.xml:667(para)
 msgid ""
 "Uses the Sendmail program to send mail from your system. Sendmail is more "
 "flexible, but is not as easy to configure, so you should select this option "
@@ -1912,11 +1921,11 @@ msgstr ""
 "option ne devrait donc être choisie que si vous savez comment configurer un "
 "service Sendmail."
 
-#: ../C/evolution.xml:677(title)
+#: ../C/evolution.xml:670(title)
 msgid "SMTP:"
 msgstr "SMTP :"
 
-#: ../C/evolution.xml:678(para)
+#: ../C/evolution.xml:671(para)
 msgid ""
 "Sends mail using an outbound mail server. This is the most common choice for "
 "sending mail. If you choose SMTP, there are additional configuration "
@@ -1928,15 +1937,15 @@ msgstr ""
 "options de configuration supplémentaires s'offrent à vous. Consultez <link "
 "linkend=\"bsthwzo\">Configuration SMTP</link> pour en savoir plus à ce sujet."
 
-#: ../C/evolution.xml:684(title)
+#: ../C/evolution.xml:677(title)
 msgid "SMTP Configuration"
 msgstr "Configuration SMTP"
 
-#: ../C/evolution.xml:692(para)
+#: ../C/evolution.xml:685(para)
 msgid "Select if your server requires authentication."
 msgstr "Cochez si votre serveur demande une authentification."
 
-#: ../C/evolution.xml:693(para)
+#: ../C/evolution.xml:686(para)
 msgid ""
 "If you selected that your server requires authentication, you need to "
 "provide the following information:"
@@ -1944,11 +1953,11 @@ msgstr ""
 "Si vous avez indiqué que votre serveur demande une authentification, vous "
 "devez fournir les informations suivantes :"
 
-#: ../C/evolution.xml:715(para)
+#: ../C/evolution.xml:708(para)
 msgid "Continue with <link linkend=\"bsti1ty\">Account Management</link>."
 msgstr "Poursuivez avec <link linkend=\"bsti1ty\">Gestion du compte</link>."
 
-#: ../C/evolution.xml:721(para)
+#: ../C/evolution.xml:714(para)
 msgid ""
 "Now that you have finished the email configuration process you need to give "
 "the account a name. The name can be any name you prefer. Type your account "
@@ -1958,7 +1967,7 @@ msgstr ""
 "nommer le compte. Vous pouvez choisir le nom qui vous convient. Saisissez le "
 "nom du compte dans le champ « Nom », puis cliquez sur « Suivant »."
 
-#: ../C/evolution.xml:722(para)
+#: ../C/evolution.xml:715(para)
 msgid ""
 "Continue with <link linkend=\"step-three-b\">Time Zone</link><link linkend="
 "\"step-three-b\"/>."
@@ -1966,23 +1975,23 @@ msgstr ""
 "Poursuivez avec <link linkend=\"step-three-b\">Fuseau horaire</link><link "
 "linkend=\"step-three-b\"/>."
 
-#: ../C/evolution.xml:729(para)
+#: ../C/evolution.xml:722(para)
 msgid "Select your time zone on the map."
 msgstr "Sélectionnez votre fuseau horaire sur la carte."
 
-#: ../C/evolution.xml:731(para)
+#: ../C/evolution.xml:724(para)
 msgid "Select from the time zone drop-down list."
 msgstr "Faites un choix dans la zone de liste déroulante."
 
-#: ../C/evolution.xml:736(para)
+#: ../C/evolution.xml:729(para)
 msgid "Click OK, then click Apply."
 msgstr "Cliquez sur « Valider », puis sur « Appliquer »."
 
-#: ../C/evolution.xml:737(para)
+#: ../C/evolution.xml:730(para)
 msgid "Evolution opens with your new account created."
 msgstr "Evolution s'ouvre avec le nouveau compte créé."
 
-#: ../C/evolution.xml:740(para)
+#: ../C/evolution.xml:733(para)
 msgid ""
 "If you want to import email from another email client, continue with <link "
 "linkend=\"fourth-step\">Importing Mail (Optional)</link>. If not, skip to "
@@ -1993,11 +2002,11 @@ msgstr ""
 "link>. Dans le cas contraire, allez directement à <link linkend=\"ui-intro"
 "\">Utilisation d'Evolution : un aperçu</link>."
 
-#: ../C/evolution.xml:744(title)
+#: ../C/evolution.xml:737(title)
 msgid "Importing Mail (Optional)"
 msgstr "Importation de courriels (facultatif)"
 
-#: ../C/evolution.xml:745(para)
+#: ../C/evolution.xml:738(para)
 msgid ""
 "After selecting your time zone, if Evolution finds email or address files "
 "from another application, it offers to import them. For a full description "
@@ -2010,7 +2019,7 @@ msgstr ""
 "d'importation, consultez <link linkend=\"importing-mail\">Importation d'un "
 "seul fichier</link>."
 
-#: ../C/evolution.xml:746(para) ../C/evolution.xml:2362(para)
+#: ../C/evolution.xml:739(para) ../C/evolution.xml:2538(para)
 msgid ""
 "Microsoft Outlook* and versions of Outlook Express after version 4 use "
 "proprietary formats that Evolution cannot read or import."
@@ -2018,7 +2027,7 @@ msgstr ""
 "Microsoft Outlook* et Outlook Express à partir de la version 4 utilisent des "
 "formats propriétaires qu'Evolution n'est pas en mesure de lire ou d'importer."
 
-#: ../C/evolution.xml:747(para)
+#: ../C/evolution.xml:740(para)
 msgid ""
 "To import information, you might want to use the Export tool under Windows*. "
 "See the instructions in <link linkend=\"outlook-migration-mail\">Migrating "
@@ -2029,7 +2038,7 @@ msgstr ""
 "\"outlook-migration-mail\">Migration de fichiers de messages Outlook locaux</"
 "link>."
 
-#: ../C/evolution.xml:748(para) ../C/evolution.xml:2367(para)
+#: ../C/evolution.xml:741(para) ../C/evolution.xml:2543(para)
 msgid ""
 "Before importing email from Netscape*, Mozilla and Netscape users need to "
 "click File &gt; Compact &gt; All Folders from within the Netscape or Mozilla "
@@ -2041,7 +2050,7 @@ msgstr ""
 "composant de messagerie de Netscape ou Mozilla. Sinon, Evolution importe et "
 "récupère les messages que vous aviez mis à la corbeille."
 
-#: ../C/evolution.xml:750(para)
+#: ../C/evolution.xml:743(para)
 msgid ""
 "Evolution uses standard file types for email and calendar information, so "
 "you can copy those files from your <command>~/.evolution</command> "
@@ -2054,7 +2063,7 @@ msgstr ""
 "fichiers sont <command>mbox</command> pour les courriels et iCal pour le "
 "calendrier."
 
-#: ../C/evolution.xml:751(para)
+#: ../C/evolution.xml:744(para)
 msgid ""
 "Contacts files are stored in a database, but can be saved as a standard "
 "vCard*. To export an addressbook, click File &gt; Save Address Book As VCard"
@@ -2067,7 +2076,7 @@ msgstr ""
 "VCard. Si vous ne souhaitez exporter qu'un seul contact, choisissez Fichier "
 "&gt; Enregistrer le contact comme VCard."
 
-#: ../C/evolution.xml:759(para)
+#: ../C/evolution.xml:752(para)
 msgid ""
 "Now that the first-run configuration has finished, you're ready to begin "
 "using Evolution. Here's a quick explanation of what's happening in your main "
@@ -2077,11 +2086,11 @@ msgstr ""
 "utiliser Evolution. Voici une brève présentation de ce qui se trouve dans la "
 "fenêtre principale d'Evolution."
 
-#: ../C/evolution.xml:762(title)
+#: ../C/evolution.xml:755(title)
 msgid "Menu Bar:"
 msgstr "Barre de menus :"
 
-#: ../C/evolution.xml:763(para)
+#: ../C/evolution.xml:756(para)
 msgid ""
 "The menu bar gives you access to most Evolution features. For additional "
 "information, see <link linkend=\"usage-mainwindow-menubar\">The Menu Bar</"
@@ -2091,11 +2100,11 @@ msgstr ""
 "Pour des informations supplémentaires, consultez <link linkend=\"usage-"
 "mainwindow-menubar\">La barre de menus</link>."
 
-#: ../C/evolution.xml:766(title)
+#: ../C/evolution.xml:759(title)
 msgid "Folder List:"
 msgstr "Liste des dossiers :"
 
-#: ../C/evolution.xml:767(para)
+#: ../C/evolution.xml:760(para)
 msgid ""
 "The folder list gives you a list of the available folders for each account. "
 "To see the contents of a folder, click the folder name and the contents are "
@@ -2105,11 +2114,11 @@ msgstr ""
 "compte. Pour voir le contenu d'un dossier, cliquez sur le nom du dossier et "
 "son contenu s'affiche dans la liste des messages."
 
-#: ../C/evolution.xml:770(title)
+#: ../C/evolution.xml:763(title)
 msgid "Toolbar:"
 msgstr "Barre d'outils :"
 
-#: ../C/evolution.xml:771(para)
+#: ../C/evolution.xml:764(para)
 msgid ""
 "The toolbar gives you fast and easy access to the frequently used features "
 "in each component."
@@ -2117,11 +2126,11 @@ msgstr ""
 "La barre d'outils offre un accès simple et rapide aux fonctionnalités "
 "couramment utilisées de chaque composant."
 
-#: ../C/evolution.xml:774(title)
+#: ../C/evolution.xml:767(title)
 msgid "Search Tool:"
 msgstr "Outil de recherche :"
 
-#: ../C/evolution.xml:775(para)
+#: ../C/evolution.xml:768(para)
 msgid ""
 "The search tool lets you search your email, contacts, calendar, and tasks to "
 "easily find what you're looking for."
@@ -2129,11 +2138,11 @@ msgstr ""
 "L'outil de recherche permet de rechercher dans les courriels, les contacts, "
 "le calendrier et les tâches pour retrouver facilement ce que vous recherchez."
 
-#: ../C/evolution.xml:778(title) ../C/evolution.xml:937(title)
+#: ../C/evolution.xml:771(title) ../C/evolution.xml:930(title)
 msgid "Message List:"
 msgstr "Liste des messages :"
 
-#: ../C/evolution.xml:779(para)
+#: ../C/evolution.xml:772(para)
 msgid ""
 "The message list displays a list of email that you have received. To view an "
 "email in the preview pane, click the email in the message list."
@@ -2142,11 +2151,11 @@ msgstr ""
 "courriel dans le panneau d'aperçu, cliquez sur le courriel dans la liste des "
 "messages."
 
-#: ../C/evolution.xml:782(title)
+#: ../C/evolution.xml:775(title)
 msgid "Side bar:"
 msgstr "Barre latérale :"
 
-#: ../C/evolution.xml:783(para)
+#: ../C/evolution.xml:776(para)
 msgid ""
 "The side bar lets you switch between folders and between Evolution tools. At "
 "the bottom of the side bar is the switcher that let you switch Evolution "
@@ -2161,11 +2170,11 @@ msgstr ""
 "d'informations, consultez <link linkend=\"usage-mainwindow-shortcutbar\">La "
 "barre latérale</link>."
 
-#: ../C/evolution.xml:786(title)
+#: ../C/evolution.xml:779(title)
 msgid "Switcher:"
 msgstr "Sélecteur :"
 
-#: ../C/evolution.xml:787(para)
+#: ../C/evolution.xml:780(para)
 msgid ""
 "The switcher at the bottom of the side bar lets you switch between the "
 "Evolution tools - Mail, Contacts, Calendars, Memos and Tasks."
@@ -2173,11 +2182,11 @@ msgstr ""
 "Le sélecteur au bas de la barre latérale permet de passer d'un composant "
 "Evolution à un autre : Courriel, Contacts, Calendriers, Mémos et Tâches."
 
-#: ../C/evolution.xml:790(title)
+#: ../C/evolution.xml:783(title)
 msgid "Status Bar:"
 msgstr "Barre d'état :"
 
-#: ../C/evolution.xml:791(para)
+#: ../C/evolution.xml:784(para)
 msgid ""
 "The status bar periodically displays a message, or tells you the progress of "
 "a task. This most often happens when you're checking or sending email. These "
@@ -2190,11 +2199,11 @@ msgstr ""
 "figure précédente. L'indicateur en ligne/hors ligne se situe également à cet "
 "endroit, dans le coin inférieur gauche de la fenêtre."
 
-#: ../C/evolution.xml:794(title) ../C/evolution.xml:941(title)
+#: ../C/evolution.xml:787(title) ../C/evolution.xml:934(title)
 msgid "Preview Pane:"
 msgstr "Panneau d'aperçu :"
 
-#: ../C/evolution.xml:795(para)
+#: ../C/evolution.xml:788(para)
 msgid ""
 "The preview pane displays the contents of the email that is selected in the "
 "message list."
@@ -2202,11 +2211,11 @@ msgstr ""
 "Le panneau d'aperçu affiche le contenu du courriel sélectionné dans la liste "
 "des messages."
 
-#: ../C/evolution.xml:799(title)
+#: ../C/evolution.xml:792(title)
 msgid "The Menu Bar"
 msgstr "La barre de menus"
 
-#: ../C/evolution.xml:800(para)
+#: ../C/evolution.xml:793(para)
 msgid ""
 "The menu bar's contents always provide all the possible actions for any "
 "given view of your data. If you're looking at your Inbox, most of the menu "
@@ -2220,11 +2229,11 @@ msgstr ""
 "d'autres, particulièrement le menu Fichier, se rapportent à l'application "
 "dans son ensemble."
 
-#: ../C/evolution.xml:802(title)
+#: ../C/evolution.xml:795(title)
 msgid "File:"
 msgstr "Fichier :"
 
-#: ../C/evolution.xml:803(para)
+#: ../C/evolution.xml:796(para)
 msgid ""
 "Anything related to a file or to the operations of the application is listed "
 "in this menu, such as creating things, saving them to disk, printing them, "
@@ -2234,11 +2243,11 @@ msgstr ""
 "présent dans ce menu, comme la création d'éléments, leur enregistrement, "
 "leur impression ainsi que la fermeture de l'application elle-même."
 
-#: ../C/evolution.xml:806(title)
+#: ../C/evolution.xml:799(title)
 msgid "Edit:"
 msgstr "Édition :"
 
-#: ../C/evolution.xml:807(para)
+#: ../C/evolution.xml:800(para)
 msgid ""
 "Holds useful tools that help you edit text and move it around. Lets you "
 "access the settings and configuration options in the Edit menu."
@@ -2246,11 +2255,11 @@ msgstr ""
 "Contient des outils utiles à l'édition de texte et au déplacement. Le menu "
 "Édition vous donne accès aux paramètres et aux options de configuration."
 
-#: ../C/evolution.xml:810(title)
+#: ../C/evolution.xml:803(title)
 msgid "View:"
 msgstr "Affichage :"
 
-#: ../C/evolution.xml:811(para)
+#: ../C/evolution.xml:804(para)
 msgid ""
 "Lets you decide how Evolution should look. Some of the features control the "
 "appearance of Evolution as a whole, and others the way a particular kind of "
@@ -2260,11 +2269,11 @@ msgstr ""
 "affectent l'ensemble d'Evolution alors que d'autres gèrent l'apparence d'un "
 "type d'information bien précis."
 
-#: ../C/evolution.xml:814(title)
+#: ../C/evolution.xml:807(title)
 msgid "Folder:"
 msgstr "Dossier :"
 
-#: ../C/evolution.xml:815(para)
+#: ../C/evolution.xml:808(para)
 msgid ""
 "Holds actions that can be performed on folders. You can find things like "
 "copy, rename, delete, and so on."
@@ -2272,11 +2281,11 @@ msgstr ""
 "Contient des actions qui s'appliquent aux dossiers. Vous y trouvez des "
 "éléments comme copier, renommer, supprimer, etc."
 
-#: ../C/evolution.xml:818(title)
+#: ../C/evolution.xml:811(title)
 msgid "Message:"
 msgstr "Message :"
 
-#: ../C/evolution.xml:819(para)
+#: ../C/evolution.xml:812(para)
 msgid ""
 "Holds actions that can be applied to a message. If there is only one target "
 "for the action, such as replying to a message, you can normally find it in "
@@ -2286,11 +2295,11 @@ msgstr ""
 "l'action, comme par exemple répondre à un message, vous la trouvez "
 "normalement dans le menu Message."
 
-#: ../C/evolution.xml:822(title)
+#: ../C/evolution.xml:815(title)
 msgid "Search:"
 msgstr "Recherche :"
 
-#: ../C/evolution.xml:823(para)
+#: ../C/evolution.xml:816(para)
 msgid ""
 "Lets you search for messages, or for phrases within a message. You can also "
 "see previous searches you have made. In addition to the Search menu, there "
@@ -2303,19 +2312,19 @@ msgstr ""
 "de rechercher des messages. Il est aussi possible de créer un dossier de "
 "recherche à partir d'une recherche."
 
-#: ../C/evolution.xml:826(title)
+#: ../C/evolution.xml:819(title)
 msgid "Help:"
 msgstr "Aide :"
 
-#: ../C/evolution.xml:827(para)
+#: ../C/evolution.xml:820(para)
 msgid "Opens the Evolution Help files."
 msgstr "Ouvre les fichiers d'aide d'Evolution."
 
-#: ../C/evolution.xml:832(title)
+#: ../C/evolution.xml:825(title)
 msgid "The Sidebar"
 msgstr "La barre latérale"
 
-#: ../C/evolution.xml:833(para)
+#: ../C/evolution.xml:826(para)
 msgid ""
 "Sidebar is the vertical panel on the left side of the Evolution main window. "
 "At the bottom of the sidebar is the Switcher, that lets you switch between "
@@ -2328,7 +2337,7 @@ msgstr ""
 "Tâches et Contacts. Au-dessus du sélecteur se trouve une liste de dossiers "
 "se rapportant au composant d'Evolution actuellement visible."
 
-#: ../C/evolution.xml:834(para)
+#: ../C/evolution.xml:827(para)
 msgid ""
 "The folder list organizes your email, calendars, address books, task lists "
 "and memo lists in a tree, similar to a <link linkend=\"filetree\">file tree</"
@@ -2352,7 +2361,7 @@ msgstr ""
 "à la section <link linkend=\"usage-mail-organize-vfolders\">Utilisation des "
 "dossiers de recherche</link>."
 
-#: ../C/evolution.xml:835(para)
+#: ../C/evolution.xml:828(para)
 msgid ""
 "If you get large amounts of email, you might want more folders than just "
 "your Inbox. You can create multiple calendar, task, or contacts folders."
@@ -2361,54 +2370,55 @@ msgstr ""
 "besoin de plus de dossiers qu'une simple boîte de réception. Vous pouvez "
 "créer plusieurs dossiers de calendrier, de tâches ou de contacts."
 
-#: ../C/evolution.xml:836(para)
+#: ../C/evolution.xml:829(para)
 msgid "To create a new folder:"
 msgstr "Pour créer un nouveau dossier :"
 
-#: ../C/evolution.xml:839(para)
+#: ../C/evolution.xml:832(para)
 msgid "Click Folder &gt; New."
 msgstr "Cliquez sur Dossier &gt; Nouveau."
 
-#: ../C/evolution.xml:842(para)
+#: ../C/evolution.xml:835(para)
 msgid "Type the name of the folder in the Folder Name field."
 msgstr "Sasisissez le nom du dossier dans le champ « Nom du dossier »."
 
-#: ../C/evolution.xml:845(para)
+#: ../C/evolution.xml:838(para)
 msgid "Select the location of the new folder."
 msgstr "Sélectionnez l'emplacement du nouveau dossier."
 
-#: ../C/evolution.xml:848(para) ../C/evolution.xml:1257(para)
-#: ../C/evolution.xml:1283(para) ../C/evolution.xml:1295(para)
-#: ../C/evolution.xml:1530(para) ../C/evolution.xml:1812(para)
-#: ../C/evolution.xml:1914(para) ../C/evolution.xml:1930(para)
-#: ../C/evolution.xml:2147(para) ../C/evolution.xml:2186(para)
-#: ../C/evolution.xml:2252(para) ../C/evolution.xml:2732(para)
-#: ../C/evolution.xml:2765(para) ../C/evolution.xml:2961(para)
-#: ../C/evolution.xml:3003(para) ../C/evolution.xml:3136(para)
-#: ../C/evolution.xml:3230(para) ../C/evolution.xml:3245(para)
-#: ../C/evolution.xml:3263(para) ../C/evolution.xml:3310(para)
-#: ../C/evolution.xml:3524(para) ../C/evolution.xml:3528(para)
-#: ../C/evolution.xml:3755(para) ../C/evolution.xml:4124(para)
-#: ../C/evolution.xml:4190(para) ../C/evolution.xml:4312(para)
-#: ../C/evolution.xml:4355(para) ../C/evolution.xml:4687(para)
-#: ../C/evolution.xml:4742(para) ../C/evolution.xml:5193(para)
-#: ../C/evolution.xml:5268(para) ../C/evolution.xml:5290(para)
-#: ../C/evolution.xml:5314(para) ../C/evolution.xml:5348(para)
-#: ../C/evolution.xml:5692(para) ../C/evolution.xml:5827(para)
-#: ../C/evolution.xml:5854(para) ../C/evolution.xml:5874(para)
-#: ../C/evolution.xml:5889(para) ../C/evolution.xml:5912(para)
-#: ../C/evolution.xml:5938(para) ../C/evolution.xml:6070(para)
-#: ../C/evolution.xml:6093(para) ../C/evolution.xml:6171(para)
-#: ../C/evolution.xml:6201(para) ../C/evolution.xml:6764(para)
-#: ../C/evolution.xml:6862(para) ../C/evolution.xml:6997(para)
+#: ../C/evolution.xml:841(para) ../C/evolution.xml:1308(para)
+#: ../C/evolution.xml:1334(para) ../C/evolution.xml:1346(para)
+#: ../C/evolution.xml:1521(para) ../C/evolution.xml:1605(para)
+#: ../C/evolution.xml:1887(para) ../C/evolution.xml:1989(para)
+#: ../C/evolution.xml:2005(para) ../C/evolution.xml:2323(para)
+#: ../C/evolution.xml:2362(para) ../C/evolution.xml:2428(para)
+#: ../C/evolution.xml:2908(para) ../C/evolution.xml:2941(para)
+#: ../C/evolution.xml:3137(para) ../C/evolution.xml:3179(para)
+#: ../C/evolution.xml:3312(para) ../C/evolution.xml:3406(para)
+#: ../C/evolution.xml:3421(para) ../C/evolution.xml:3439(para)
+#: ../C/evolution.xml:3497(para) ../C/evolution.xml:3543(para)
+#: ../C/evolution.xml:3757(para) ../C/evolution.xml:3761(para)
+#: ../C/evolution.xml:3988(para) ../C/evolution.xml:4357(para)
+#: ../C/evolution.xml:4423(para) ../C/evolution.xml:4545(para)
+#: ../C/evolution.xml:4588(para) ../C/evolution.xml:4920(para)
+#: ../C/evolution.xml:4975(para) ../C/evolution.xml:5426(para)
+#: ../C/evolution.xml:5501(para) ../C/evolution.xml:5523(para)
+#: ../C/evolution.xml:5547(para) ../C/evolution.xml:5581(para)
+#: ../C/evolution.xml:5925(para) ../C/evolution.xml:6060(para)
+#: ../C/evolution.xml:6087(para) ../C/evolution.xml:6107(para)
+#: ../C/evolution.xml:6122(para) ../C/evolution.xml:6145(para)
+#: ../C/evolution.xml:6171(para) ../C/evolution.xml:6303(para)
+#: ../C/evolution.xml:6326(para) ../C/evolution.xml:6404(para)
+#: ../C/evolution.xml:6434(para) ../C/evolution.xml:7097(para)
+#: ../C/evolution.xml:7195(para) ../C/evolution.xml:7330(para)
 msgid "Click OK."
 msgstr "Cliquez sur « Créer »."
 
-#: ../C/evolution.xml:853(title)
+#: ../C/evolution.xml:846(title)
 msgid "Changing Switcher Appearance:"
 msgstr "Modification de l'apparence du sélecteur :"
 
-#: ../C/evolution.xml:854(para)
+#: ../C/evolution.xml:847(para)
 msgid ""
 "To change the appearance of your switcher click <emphasis>View &gt; Switcher "
 "Appearance</emphasis> from the Menu bar. Under Switcher Appearance you can "
@@ -2418,51 +2428,51 @@ msgstr ""
 "Apparence du sélecteur<emphasis> dans la barre de menus. Le sous-menu "
 "présente les options suivantes :"
 
-#: ../C/evolution.xml:856(title)
+#: ../C/evolution.xml:849(title)
 msgid "Icons and Text:"
 msgstr "Icônes et texte :"
 
-#: ../C/evolution.xml:857(para)
+#: ../C/evolution.xml:850(para)
 msgid "Displays buttons with the label and the icon corresponding to it."
 msgstr "Affiche les boutons avec l'icône et le texte correspondant."
 
-#: ../C/evolution.xml:860(title)
+#: ../C/evolution.xml:853(title)
 msgid "Icons Only:"
 msgstr "Icônes uniquement :"
 
-#: ../C/evolution.xml:861(para)
+#: ../C/evolution.xml:854(para)
 msgid "Shows only the icons."
 msgstr "Affiche uniquement les icônes."
 
-#: ../C/evolution.xml:864(title)
+#: ../C/evolution.xml:857(title)
 msgid "Texts Only:"
 msgstr "Texte uniquement :"
 
-#: ../C/evolution.xml:865(para)
+#: ../C/evolution.xml:858(para)
 msgid "Displays buttons with the label, not the icons."
 msgstr "Affiche les boutons avec le texte, sans les icônes."
 
-#: ../C/evolution.xml:868(title)
+#: ../C/evolution.xml:861(title)
 msgid "Toolbar Style:"
 msgstr "Style de la barre d'outils :"
 
-#: ../C/evolution.xml:869(para)
+#: ../C/evolution.xml:862(para)
 msgid "Shows buttons using the desktop toolbar settings."
 msgstr "Affiche les boutons avec les paramètres de barre d'outils du bureau."
 
-#: ../C/evolution.xml:872(title)
+#: ../C/evolution.xml:865(title)
 msgid "Hide Buttons:"
 msgstr "Masquer les boutons :"
 
-#: ../C/evolution.xml:873(para)
+#: ../C/evolution.xml:866(para)
 msgid "This option hides all the shortcut buttons of switcher."
 msgstr "Cette option masque tous les boutons de raccourcis du sélecteur."
 
-#: ../C/evolution.xml:878(title)
+#: ../C/evolution.xml:871(title)
 msgid "Folder Management"
 msgstr "Gestion des dossiers"
 
-#: ../C/evolution.xml:879(para)
+#: ../C/evolution.xml:872(para)
 msgid ""
 "Right-click a folder or subfolder to display a menu with the following "
 "options:"
@@ -2470,11 +2480,11 @@ msgstr ""
 "Faites un clic droit sur un dossier ou un sous-dossier pour afficher un menu "
 "avec les options suivantes :"
 
-#: ../C/evolution.xml:881(title)
+#: ../C/evolution.xml:874(title)
 msgid "Copy:"
 msgstr "Copier :"
 
-#: ../C/evolution.xml:882(para)
+#: ../C/evolution.xml:875(para)
 msgid ""
 "Copies the folder to a different location. When you select this item, "
 "Evolution offers a choice of locations to copy the folder to."
@@ -2482,59 +2492,59 @@ msgstr ""
 "Copie le dossier à un emplacement différent. Lorsque vous sélectionnez cet "
 "élément, Evolution présente un choix d'emplacements pour la copie."
 
-#: ../C/evolution.xml:885(title)
+#: ../C/evolution.xml:878(title)
 msgid "Move:"
 msgstr "Déplacer :"
 
-#: ../C/evolution.xml:886(para)
+#: ../C/evolution.xml:879(para)
 msgid "Moves the folder to another location."
 msgstr "Déplace le dossier à un autre emplacement."
 
-#: ../C/evolution.xml:889(title)
+#: ../C/evolution.xml:882(title)
 msgid "Mark Messages As Read:"
 msgstr "Marquer les messages comme lus :"
 
-#: ../C/evolution.xml:890(para)
+#: ../C/evolution.xml:883(para)
 msgid "Marks all the messages in the folder as read."
 msgstr "Marque tous les messages du dossier comme lus."
 
-#: ../C/evolution.xml:893(title)
+#: ../C/evolution.xml:886(title)
 msgid "New Folder:"
 msgstr "Nouveau dossier :"
 
-#: ../C/evolution.xml:894(para)
+#: ../C/evolution.xml:887(para)
 msgid "Creates another folder in the same location."
 msgstr "Crée un nouveau dossier au même endroit."
 
-#: ../C/evolution.xml:897(title) ../C/evolution.xml:2891(title)
+#: ../C/evolution.xml:890(title) ../C/evolution.xml:3067(title)
 msgid "Delete:"
 msgstr "Supprimer :"
 
-#: ../C/evolution.xml:898(para)
+#: ../C/evolution.xml:891(para)
 msgid "Deletes the folder and all its contents."
 msgstr "Supprime le dossier et tout son contenu."
 
-#: ../C/evolution.xml:901(title)
+#: ../C/evolution.xml:894(title)
 msgid "Rename:"
 msgstr "Renommer :"
 
-#: ../C/evolution.xml:902(para)
+#: ../C/evolution.xml:895(para)
 msgid "Lets you change the name of the folder."
 msgstr "Permet de changer le nom du dossier."
 
-#: ../C/evolution.xml:905(title)
+#: ../C/evolution.xml:898(title)
 msgid "Disable:"
 msgstr "Désactiver :"
 
-#: ../C/evolution.xml:906(para)
+#: ../C/evolution.xml:899(para)
 msgid "Disables the account."
 msgstr "Désactive le compte."
 
-#: ../C/evolution.xml:909(title)
+#: ../C/evolution.xml:902(title)
 msgid "Properties:"
 msgstr "Propriétés :"
 
-#: ../C/evolution.xml:910(para)
+#: ../C/evolution.xml:903(para)
 msgid ""
 "Checks the number of total and unread messages in a folder, and, for remote "
 "folders, lets you select whether to copy the folder to your local system for "
@@ -2544,14 +2554,14 @@ msgstr ""
 "et pour les dossiers distants, permet de choisir de copier le dossier en "
 "local pour des opérations hors ligne."
 
-#: ../C/evolution.xml:912(para)
+#: ../C/evolution.xml:905(para)
 msgid ""
 "You can also rearrange folders and messages by dragging and dropping them."
 msgstr ""
 "Il est aussi possible de réorganiser les dossiers et les messages par "
 "glisser-déposer."
 
-#: ../C/evolution.xml:913(para)
+#: ../C/evolution.xml:906(para)
 msgid ""
 "Any time new email arrives in a email folder, that folder label is displayed "
 "in bold text, along with the number of new messages in that folder."
@@ -2560,17 +2570,17 @@ msgstr ""
 "nom de ce dossier apparaît en gras et le nombre de nouveaux messages "
 "s'affiche à la suite du nom."
 
-#: ../C/evolution.xml:918(title)
+#: ../C/evolution.xml:911(title)
 msgid "Email"
 msgstr "Courriel"
 
-#: ../C/evolution.xml:919(para)
+#: ../C/evolution.xml:912(para)
 msgid "Evolution email is like other email programs in several ways:"
 msgstr ""
 "Le logiciel de messagerie Evolution est comparable à d'autres programmes de "
 "messagerie sous plusieurs aspects :"
 
-#: ../C/evolution.xml:922(para)
+#: ../C/evolution.xml:915(para)
 msgid ""
 "It can send and receive email in HTML or as plain text, and makes it easy to "
 "send and receive multiple file attachments."
@@ -2578,7 +2588,7 @@ msgstr ""
 "Il peut envoyer et recevoir des courriels en HTML ou en texte brut et il "
 "permet d'envoyer et de recevoir facilement de multiples pièces jointes."
 
-#: ../C/evolution.xml:925(para)
+#: ../C/evolution.xml:918(para)
 msgid ""
 "It supports multiple email sources, including <link linkend=\"imap\">IMAP</"
 "link>, <link linkend=\"pop\">POP3</link>, and local mbox or mh spools and "
@@ -2589,7 +2599,7 @@ msgstr ""
 "des boîtes locales mbox ou des ensembles de boîtes mh et des fichiers créés "
 "par d'autres logiciels de messagerie."
 
-#: ../C/evolution.xml:928(para)
+#: ../C/evolution.xml:921(para)
 msgid ""
 "It can sort and organize your email in a wide variety of ways with folders, "
 "searches, and filters."
@@ -2597,11 +2607,11 @@ msgstr ""
 "Il peut trier et organiser vos courriels de nombreuses manières avec des "
 "dossiers, des recherches et des filtres."
 
-#: ../C/evolution.xml:931(para)
+#: ../C/evolution.xml:924(para)
 msgid "It lets you guard your privacy with encryption."
 msgstr "Il vous permet de garantir la confidentialité par le chiffrement."
 
-#: ../C/evolution.xml:934(para)
+#: ../C/evolution.xml:927(para)
 msgid ""
 "However, Evolution has some important differences from other email programs. "
 "First, It is built to handle very large amounts of email. The <link linkend="
@@ -2629,7 +2639,7 @@ msgstr ""
 "particulièrement utile. Voici une explication rapide de ce qui se trouve "
 "dans la fenêtre principale de la messagerie Evolution."
 
-#: ../C/evolution.xml:938(para)
+#: ../C/evolution.xml:931(para)
 msgid ""
 "The message list displays all the messages that you have. This includes all "
 "your read and unread messages, and email that is flagged to be deleted."
@@ -2637,7 +2647,7 @@ msgstr ""
 "La liste des messages affiche tous vos courriels. Cela comprend tous les "
 "messages lus et non lus, ainsi que les messages marqués pour la suppression."
 
-#: ../C/evolution.xml:942(para)
+#: ../C/evolution.xml:935(para)
 msgid ""
 "The preview pane displays the message that is currently chosen in the "
 "message list."
@@ -2645,7 +2655,7 @@ msgstr ""
 "Le panneau d'aperçu affiche le contenu du courriel sélectionné dans la liste "
 "des messages."
 
-#: ../C/evolution.xml:944(para)
+#: ../C/evolution.xml:937(para)
 msgid ""
 "If you find the preview pane too small, you can resize the pane, enlarge the "
 "whole window, or double-click the message in the message list to have it "
@@ -2658,7 +2668,7 @@ msgstr ""
 "Pour modifier la taille d'un panneau, faites glisser la séparation entre les "
 "deux panneaux."
 
-#: ../C/evolution.xml:945(para)
+#: ../C/evolution.xml:938(para)
 msgid ""
 "As with folders, you can right-click messages in the message list and get a "
 "menu of possible actions, including moving or deleting them, creating "
@@ -2669,7 +2679,7 @@ msgstr ""
 "possibles, comprenant le déplacement, la suppression, la création de filtres "
 "ou de dossiers de recherche ou encore le marquage comme pourriel."
 
-#: ../C/evolution.xml:946(para)
+#: ../C/evolution.xml:939(para)
 msgid ""
 "Most of the email-related actions you want to perform are listed in the "
 "Message Menu and Folder Menu in the menu bar. The most frequently used ones, "
@@ -2682,7 +2692,7 @@ msgstr ""
 "boutons dans la barre d'outils. Pour la plupart, elles se trouvent également "
 "dans le menu contextuel et disposent de raccourcis clavier."
 
-#: ../C/evolution.xml:947(para)
+#: ../C/evolution.xml:940(para)
 msgid ""
 "For an in-depth guide to the email capabilities of Evolution, read <link "
 "linkend=\"usage-mail\">Sending and Receiving Email</link>."
@@ -2691,11 +2701,11 @@ msgstr ""
 "messagerie d'Evolution, consultez <link linkend=\"usage-mail\">Envoi et "
 "réception de courriels</link>."
 
-#: ../C/evolution.xml:951(title)
+#: ../C/evolution.xml:944(title)
 msgid "The Calendar"
 msgstr "Le calendrier"
 
-#: ../C/evolution.xml:952(para)
+#: ../C/evolution.xml:945(para)
 msgid ""
 "To begin using the calendar, click Calendar in the switcher. By default, the "
 "calendar shows today's schedule on a ruled background. At the left bottom, "
@@ -2710,21 +2720,21 @@ msgstr ""
 "permet de conserver une liste de tâches indépendamment des rendez-vous. En-"
 "dessous se trouve une liste de mémos."
 
-#: ../C/evolution.xml:955(title)
+#: ../C/evolution.xml:948(title)
 msgid "Appointment List:"
 msgstr "Liste des rendez-vous :"
 
-#: ../C/evolution.xml:956(para)
+#: ../C/evolution.xml:949(para)
 msgid "The appointment list displays all your scheduled appointments."
 msgstr ""
 "La liste des rendez-vous présente une liste de tous les rendez-vous "
 "planifiés."
 
-#: ../C/evolution.xml:959(title)
+#: ../C/evolution.xml:952(title)
 msgid "Month Pane:"
 msgstr "Panneau des mois :"
 
-#: ../C/evolution.xml:960(para)
+#: ../C/evolution.xml:953(para)
 msgid ""
 "The month pane is a small view of a calendar month. To display additional "
 "months, drag the column border to the right. You can also select a range of "
@@ -2737,11 +2747,11 @@ msgstr ""
 "mois pour afficher une sélection personnalisée de jours dans la liste des "
 "rendez-vous."
 
-#: ../C/evolution.xml:963(title)
+#: ../C/evolution.xml:956(title)
 msgid "Task List:"
 msgstr "Liste des tâches :"
 
-#: ../C/evolution.xml:964(para)
+#: ../C/evolution.xml:957(para)
 msgid ""
 "Tasks are distinct from appointments because they generally don't have times "
 "associated with them. You can use the list in a larger window by clicking "
@@ -2751,7 +2761,7 @@ msgstr ""
 "de date associée. Vous pouvez obtenir un affichage plus grand des tâches en "
 "cliquant sur le bouton Tâches dans la barre latérale."
 
-#: ../C/evolution.xml:966(para)
+#: ../C/evolution.xml:959(para)
 msgid ""
 "For more information about the calendar, see <link linkend=\"usage-calendar"
 "\">Evolution Calendar</link>."
@@ -2759,11 +2769,11 @@ msgstr ""
 "Pour plus d'informations sur le calendrier, consultez <link linkend=\"usage-"
 "calendar\">Calendrier Evolution</link>."
 
-#: ../C/evolution.xml:970(title)
+#: ../C/evolution.xml:963(title)
 msgid "The Contacts"
 msgstr "Les contacts"
 
-#: ../C/evolution.xml:971(para)
+#: ../C/evolution.xml:964(para)
 msgid ""
 "The Evolution contacts can handle all of the functions of an address book or "
 "phone book. However, it is easier to update Evolution than it is to change "
@@ -2777,7 +2787,7 @@ msgstr ""
 "qu'Evolution peut se synchroniser avec des appareils PalmOS* et utiliser des "
 "annuaires <link linkend=\"ldap\">LDAP</link> sur un réseau."
 
-#: ../C/evolution.xml:972(para)
+#: ../C/evolution.xml:965(para)
 msgid ""
 "To use the contacts tool, click Contacts in the switcher. By default, the "
 "display shows all your contacts in alphabetical order, in a minicard view. "
@@ -2790,7 +2800,7 @@ msgstr ""
 "dans le menu Affichage et ajuster la largeur des colonnes en cliquant et "
 "glissant les séparateurs de colonnes grisés."
 
-#: ../C/evolution.xml:974(para)
+#: ../C/evolution.xml:967(para)
 msgid ""
 "Another advantage of the Evolution contacts is its integration with the rest "
 "of the application. For example, you can right-click an email address in "
@@ -2801,11 +2811,11 @@ msgstr ""
 "adresse électronique dans la messagerie Evolution pour créer immédiatement "
 "un nouveau contact."
 
-#: ../C/evolution.xml:975(emphasis)
+#: ../C/evolution.xml:968(emphasis)
 msgid "Contact List"
 msgstr "Liste de contacts"
 
-#: ../C/evolution.xml:976(para)
+#: ../C/evolution.xml:969(para)
 msgid ""
 "The largest section of the contacts display shows a list of individual "
 "contacts. You can also search the contacts in the same way that you search "
@@ -2816,7 +2826,7 @@ msgstr ""
 "même manière que l'on recherche dans les dossiers de courriels, à l'aide de "
 "l'outil de recherche à droite de la barre d'outils."
 
-#: ../C/evolution.xml:977(para)
+#: ../C/evolution.xml:970(para)
 msgid ""
 "For detailed instructions on how to use the address book, read <link linkend="
 "\"usage-contact\">Evolution Contacts: the Address Book</link>."
@@ -2825,11 +2835,11 @@ msgstr ""
 "consultez <link linkend=\"usage-contact\">Contacts Evolution : le carnet "
 "d'adresses</link>."
 
-#: ../C/evolution.xml:982(title)
+#: ../C/evolution.xml:975(title)
 msgid "Backing Up And Restoring Evolution"
 msgstr "Sauvegarde et restauration d'Evolution"
 
-#: ../C/evolution.xml:983(para)
+#: ../C/evolution.xml:976(para)
 msgid ""
 "With the Backup and Restore plug-in enabled, you can successfully back up "
 "Evolution to your machine and restore it whenever it is required. The backup "
@@ -2841,7 +2851,7 @@ msgstr ""
 "losrque vous en avez besoin. La sauvegarde enregistre vos paramètres "
 "Evolution dans GConf ainsi que vos courriels, puis crée une archive."
 
-#: ../C/evolution.xml:986(para)
+#: ../C/evolution.xml:979(para)
 msgid ""
 "Select File &gt; Backup Settings to select the folder where you want to save "
 "the backup."
@@ -2849,13 +2859,13 @@ msgstr ""
 "Choisissez Fichier &gt; Sauvegarder les paramètres afin de choisir le "
 "dossier de destination de la sauvegarde."
 
-#: ../C/evolution.xml:988(para)
+#: ../C/evolution.xml:981(para)
 msgid "Evolution is always backed up as evolution-backup.tar.gz."
 msgstr ""
 "Une sauvegarde d'Evolution se trouve toujours dans un fichier nommé "
 "evolution-backup.tar.gz."
 
-#: ../C/evolution.xml:989(para)
+#: ../C/evolution.xml:982(para)
 msgid ""
 "Before the backup process starts, it asks you to close Evolution and "
 "displays a warning as shown below:"
@@ -2863,7 +2873,7 @@ msgstr ""
 "Avant que le processus de sauvegarde ne démarre, vous devrez quitter "
 "Evolution et vous verrez apparaître un avertissement comme celui-ci :"
 
-#: ../C/evolution.xml:994(para)
+#: ../C/evolution.xml:987(para)
 msgid ""
 "Select Restart Evolution after backup to restart Evolution immediately after "
 "the backup process."
@@ -2871,23 +2881,23 @@ msgstr ""
 "Cochez « Redémarrer Evolution après la sauvegarde » pour qu'Evolution "
 "redémarre automatiquement dès la fin de la sauvegarde."
 
-#: ../C/evolution.xml:997(para)
+#: ../C/evolution.xml:990(para)
 msgid "Click Yes to close Evolution and start the backup."
 msgstr "Cliquez sur Oui pour fermer Evolution et démarrer la sauvegarde."
 
-#: ../C/evolution.xml:999(para) ../C/evolution.xml:1017(para)
+#: ../C/evolution.xml:992(para) ../C/evolution.xml:1010(para)
 msgid "Evolution will auto-restart after the process."
 msgstr "Evolution redémarre automatiquement après le processus."
 
-#: ../C/evolution.xml:1004(title)
+#: ../C/evolution.xml:997(title)
 msgid "Restoring Evolution"
 msgstr "Restauration d'Evolution"
 
-#: ../C/evolution.xml:1005(para)
+#: ../C/evolution.xml:998(para)
 msgid "This feature restores your settings from the archive."
 msgstr "Cette fonctionnalité restaure vos paramètres à partir de l'archive."
 
-#: ../C/evolution.xml:1008(para)
+#: ../C/evolution.xml:1001(para)
 msgid ""
 "Select File &gt; Restore Settings to open the available evolution.tar.gz "
 "files."
@@ -2895,11 +2905,11 @@ msgstr ""
 "Choisissez Fichier &gt; Restaurer les paramètres pour ouvrir les fichiers "
 "evolution.tar.gz disponibles."
 
-#: ../C/evolution.xml:1011(para)
+#: ../C/evolution.xml:1004(para)
 msgid "Select the evolution.tar.gz and click Save."
 msgstr "Sélectionnez le fichier evolution.tar.gz et cliquez sur Enregistrer."
 
-#: ../C/evolution.xml:1012(para)
+#: ../C/evolution.xml:1005(para)
 msgid ""
 "Before the process starts, a pop-up window appears and asks you to close "
 "Evolution. Close all the windows and then click Restore in the pop-up window."
@@ -2908,7 +2918,7 @@ msgstr ""
 "fermer Evolution. Fermez toutes les fenêtres et cliquez sur Restaurer pour "
 "lancer la restauration."
 
-#: ../C/evolution.xml:1014(para)
+#: ../C/evolution.xml:1007(para)
 msgid ""
 "If you are creating your first account via the Startup Wizard, you can use "
 "the option to restore from the archive if it is available locally."
@@ -2917,32 +2927,11 @@ msgstr ""
 "de démarrage, vous avez la possibilité de restaurer les paramètres d'un "
 "fichier archive si vous en avez un en local."
 
-#: ../C/evolution.xml:1024(title)
-msgid "Crash Recovery"
-msgstr "Récupération après un arrêt forcé"
-
-#: ../C/evolution.xml:1025(para)
-msgid ""
-"Evolution displays a crash detection message when you restart it after a "
-"crash."
-msgstr ""
-"Evolution affiche un message de détection d'arrêt brutal lorsque vous le "
-"redémarrez après un arrêt forcé (plantage)."
-
-#: ../C/evolution.xml:1027(para)
-msgid ""
-"Click Ignore to restore the preview pane displayed when Evolution crashed. "
-"If you click Recover, Evolution opens with all preview panes hidden."
-msgstr ""
-"Cliquez sur Ignorer pour rétablir le panneau d'aperçu affiché au moment de "
-"l'arrêt brutal d'Evolution. Si vous cliquez sur Récupérer, Evolution s'ouvre "
-"avec tous les panneaux d'aperçu masqués."
-
-#: ../C/evolution.xml:1030(title)
+#: ../C/evolution.xml:1017(title)
 msgid "Command Line Options"
 msgstr "Options de ligne de commande"
 
-#: ../C/evolution.xml:1031(para)
+#: ../C/evolution.xml:1018(para)
 msgid ""
 "Evolution has a number of command line options that you can use. For more "
 "information about command line options, open a terminal window and type "
@@ -2952,35 +2941,36 @@ msgstr ""
 "obtenir des informations concernant ces options, ouvrez un terminal et tapez "
 "<command>evolution --help</command>."
 
-#: ../C/evolution.xml:1032(para)
+#: ../C/evolution.xml:1019(para)
 msgid "The most important command line options are:"
 msgstr "Les options en ligne de commande les plus importantes sont :"
 
-#: ../C/evolution.xml:1040(para)
+#: ../C/evolution.xml:1027(para)
 msgid "Command"
 msgstr "Commande"
 
-#: ../C/evolution.xml:1043(para) ../C/evolution.xml:1717(para)
+#: ../C/evolution.xml:1030(para) ../C/evolution.xml:1792(para)
+#: ../C/evolution.xml:6957(para)
 msgid "Description"
 msgstr "Description"
 
-#: ../C/evolution.xml:1050(para)
+#: ../C/evolution.xml:1037(para)
 msgid "evolution --offline"
 msgstr "evolution·--offline"
 
-#: ../C/evolution.xml:1053(para)
+#: ../C/evolution.xml:1040(para)
 msgid "Starts Evolution in offline mode."
 msgstr "Démarre Evolution en mode hors ligne."
 
-#: ../C/evolution.xml:1058(para)
+#: ../C/evolution.xml:1045(para)
 msgid "evolution --disable-preview"
 msgstr "evolution --disable-preview"
 
-#: ../C/evolution.xml:1061(para)
+#: ../C/evolution.xml:1048(para)
 msgid "Disables all the preview panes when you launch Evolution."
 msgstr "Désactive tous les panneaux d'aperçu lors du démarrage d'Evolution."
 
-#: ../C/evolution.xml:1062(para)
+#: ../C/evolution.xml:1049(para)
 msgid ""
 "It lets Evolution not to open the last crashed message, task or contact when "
 "you restart Evolution. Thus, it provides a way to avoid system crash caused "
@@ -2991,54 +2981,54 @@ msgstr ""
 "possibilité d'éviter le blocage du système causé par l'aperçu de messages, "
 "de tâches ou de contacts."
 
-#: ../C/evolution.xml:1067(para)
+#: ../C/evolution.xml:1054(para)
 msgid "evolution mailto:<varname>joe@somewhere.net</varname>"
 msgstr "evolution mailto:<varname>jean@quelquepart.net</varname>"
 
-#: ../C/evolution.xml:1070(para)
+#: ../C/evolution.xml:1057(para)
 msgid ""
 "Starts Evolution and begins composing a message to the email address listed."
 msgstr ""
 "Démarre Evolution et ouvre un nouveau message avec l'adresse électronique "
 "mentionnée comme destinataire."
 
-#: ../C/evolution.xml:1075(para)
+#: ../C/evolution.xml:1062(para)
 msgid "evolution -c mail"
 msgstr "evolution·-c·mail"
 
-#: ../C/evolution.xml:1078(para)
+#: ../C/evolution.xml:1065(para)
 msgid "Starts Evolution in mail mode."
 msgstr "Démarre Evolution en mode Courriel."
 
-#: ../C/evolution.xml:1083(para)
+#: ../C/evolution.xml:1070(para)
 msgid "evolution -c calendar"
 msgstr "evolution·-c·calendar"
 
-#: ../C/evolution.xml:1086(para)
+#: ../C/evolution.xml:1073(para)
 msgid "Starts Evolution in calendar mode."
 msgstr "Démarre Evolution en mode Calendriers."
 
-#: ../C/evolution.xml:1091(para)
+#: ../C/evolution.xml:1078(para)
 msgid "evolution -c contacts"
 msgstr "evolution·-c·contacts"
 
-#: ../C/evolution.xml:1094(para)
+#: ../C/evolution.xml:1081(para)
 msgid "Starts Evolution in contacts mode."
 msgstr "Démarre Evolution en mode Contacts."
 
-#: ../C/evolution.xml:1099(para)
+#: ../C/evolution.xml:1086(para)
 msgid "evolution --force-shutdown"
 msgstr "evolution·--force-shutdown"
 
-#: ../C/evolution.xml:1102(para)
+#: ../C/evolution.xml:1089(para)
 msgid "Forces every part of Evolution to shut down immediately."
 msgstr "Force tous les composants d'Evolution à se fermer immédiatement."
 
-#: ../C/evolution.xml:1107(para)
+#: ../C/evolution.xml:1094(para)
 msgid "evolution <quote>%s</quote>"
 msgstr "evolution <quote>%s</quote>"
 
-#: ../C/evolution.xml:1110(para)
+#: ../C/evolution.xml:1097(para)
 msgid ""
 "Makes Evolution your default email handler for your Web browser and in the "
 "GNOME* Control Center."
@@ -3046,7 +3036,7 @@ msgstr ""
 "Fait d'Evolution le gestionnaire de courriels par défaut pour votre "
 "navigateur Web et dans le Centre de contrôle GNOME*."
 
-#: ../C/evolution.xml:1121(para)
+#: ../C/evolution.xml:1108(para)
 msgid ""
 "This section, and <link linkend=\"usage-mail-organize\">Organizing Your "
 "Email</link>, provide you with an in-depth guide to the capabilities of "
@@ -3061,27 +3051,31 @@ msgstr ""
 "messagerie, consultez <link linkend=\"config-prefs-mail\">Préférences du "
 "courriel</link>."
 
-#: ../C/evolution.xml:1124(link) ../C/evolution.xml:1141(title)
+#: ../C/evolution.xml:1111(link) ../C/evolution.xml:1131(title)
 msgid "Reading Mail"
 msgstr "Lectures des courriels"
 
-#: ../C/evolution.xml:1127(link) ../C/evolution.xml:1393(title)
+#: ../C/evolution.xml:1114(link) ../C/evolution.xml:1444(title)
 msgid "Composing New Email Messages"
 msgstr "Écriture de nouveaux courriels"
 
-#: ../C/evolution.xml:1130(link) ../C/evolution.xml:1989(title)
+#: ../C/evolution.xml:1117(link) ../C/evolution.xml:2064(title)
+msgid "Templates"
+msgstr "Modèles"
+
+#: ../C/evolution.xml:1120(link) ../C/evolution.xml:2165(title)
 msgid "Sending Invitations by Mail"
 msgstr "Envoi d'invitations par courriel"
 
-#: ../C/evolution.xml:1133(link) ../C/evolution.xml:2012(title)
+#: ../C/evolution.xml:1123(link) ../C/evolution.xml:2188(title)
 msgid "IMAP Subscriptions Manager"
 msgstr "Gestionnaire d'abonnements IMAP"
 
-#: ../C/evolution.xml:1136(link) ../C/evolution.xml:2036(title)
+#: ../C/evolution.xml:1126(link) ../C/evolution.xml:2212(title)
 msgid "Encryption"
 msgstr "Chiffrement"
 
-#: ../C/evolution.xml:1142(para)
+#: ../C/evolution.xml:1132(para)
 msgid ""
 "If you are not already viewing mail, switch to the mail tool by clicking the "
 "Mail shortcut button, or press Ctrl+1. To read a message, select it in the "
@@ -3094,7 +3088,7 @@ msgstr ""
 "messages ; si vous préférez le voir dans une fenêtre indépendante, double-"
 "cliquez sur le message ou appyuez sur Entrée ou sur Ctrl+O."
 
-#: ../C/evolution.xml:1144(para)
+#: ../C/evolution.xml:1134(para)
 msgid ""
 "To read mail with the keyboard, you can click the Spacebar to page down and "
 "press Backspace to page up while reading an email. Ensure that you use the "
@@ -3105,7 +3099,7 @@ msgstr ""
 "faire défiler vers le haut. Prenez bien soin d'utiliser ces touches lorsque "
 "la liste des messages est active."
 
-#: ../C/evolution.xml:1145(para)
+#: ../C/evolution.xml:1135(para)
 msgid ""
 "Navigate the message list by using the arrow keys on the keyboard. To go to "
 "the next and previous unread messages, press the period (.) or comma (,) "
@@ -3123,11 +3117,11 @@ msgstr ""
 "pouvez aussi utiliser le crochet droit (]) pour le prochain message non lu "
 "et le crochet gauche ([) pour le message non lu précédent."
 
-#: ../C/evolution.xml:1149(title)
+#: ../C/evolution.xml:1139(title)
 msgid "Magic Spacebar For Reading Mail"
 msgstr "Barre d'espace magique pour la lecture des messages"
 
-#: ../C/evolution.xml:1150(para)
+#: ../C/evolution.xml:1140(para)
 msgid ""
 "With Magic Spacebar, you can easily read the unread messages in all the mail "
 "folders. You can read mail, scroll through mail and switch folders by using "
@@ -3138,30 +3132,30 @@ msgstr ""
 "texte des messages et changer de dossier, tout cela à l'aide de la barre "
 "d'espace de votre clavier."
 
-#: ../C/evolution.xml:1151(para)
+#: ../C/evolution.xml:1141(para)
 msgid "To enable Magic Spacebar:"
 msgstr "Pour activer la barre d'espace magique :"
 
-#: ../C/evolution.xml:1154(para) ../C/evolution.xml:1250(para)
-#: ../C/evolution.xml:2135(para) ../C/evolution.xml:2174(para)
-#: ../C/evolution.xml:2235(para) ../C/evolution.xml:5060(para)
-#: ../C/evolution.xml:5333(para) ../C/evolution.xml:5616(para)
-#: ../C/evolution.xml:5632(para) ../C/evolution.xml:6050(para)
+#: ../C/evolution.xml:1144(para) ../C/evolution.xml:1301(para)
+#: ../C/evolution.xml:2311(para) ../C/evolution.xml:2350(para)
+#: ../C/evolution.xml:2411(para) ../C/evolution.xml:5293(para)
+#: ../C/evolution.xml:5566(para) ../C/evolution.xml:5849(para)
+#: ../C/evolution.xml:5865(para) ../C/evolution.xml:6283(para)
 msgid "Select Edit &gt; Preferences, then select Mail Accounts."
 msgstr ""
 "Choisissez Édition &gt; Préférences, puis sélectionnez Comptes de messagerie."
 
-#: ../C/evolution.xml:1157(para)
+#: ../C/evolution.xml:1147(para)
 msgid "Select the Enable Magic Spacebar check box."
 msgstr "Cochez la case « Activer la barre d'espace magique »."
 
-#: ../C/evolution.xml:1160(para)
+#: ../C/evolution.xml:1150(para)
 msgid "When you are in the Mail view, the Spacebar has the following behavior:"
 msgstr ""
 "Lorsque vous vous trouvez dans le mode « Courriel », la barre d'espace "
 "présente le comportement suivant :"
 
-#: ../C/evolution.xml:1163(para)
+#: ../C/evolution.xml:1153(para)
 msgid ""
 "When you press the Spacebar for the first time, it takes you to the next "
 "unread message."
@@ -3169,7 +3163,7 @@ msgstr ""
 "En appuyant sur la barre d'espace pour la première fois, vous arrivez sur le "
 "prochain message non lu."
 
-#: ../C/evolution.xml:1166(para)
+#: ../C/evolution.xml:1156(para)
 msgid ""
 "If the message is more than one screen long, the Spacebar works as Page Down "
 "key."
@@ -3177,7 +3171,7 @@ msgstr ""
 "Si le texte du message dépasse la hauteur d'un écran, la barre d'espace "
 "fonctionne comme la touche Page suivante."
 
-#: ../C/evolution.xml:1169(para)
+#: ../C/evolution.xml:1159(para)
 msgid ""
 "If you press the Spacebar after you reach the bottom of the page, it takes "
 "you to the next unread message."
@@ -3185,7 +3179,7 @@ msgstr ""
 "Si vous appuyez sur la barre d'espace alors que vous vous trouvez en fin de "
 "message, vous arrivez sur le prochain message non lu."
 
-#: ../C/evolution.xml:1172(para)
+#: ../C/evolution.xml:1162(para)
 msgid ""
 "If there are no more unread messages in the mailbox, pressing the Spacebar "
 "takes you to the next unread message in the next folder."
@@ -3194,7 +3188,7 @@ msgstr ""
 "appui sur la barre d'espace vous amène au prochain message non lu du dossier "
 "suivant."
 
-#: ../C/evolution.xml:1175(para)
+#: ../C/evolution.xml:1165(para)
 msgid ""
 "If new messages arrive in a number of folders, the Spacebar toggles between "
 "those folders. This feature allows you to switch to the next unread message "
@@ -3205,11 +3199,11 @@ msgstr ""
 "au prochain message non lu dans un autre dossier sans devoir cliquer sur ce "
 "dossier."
 
-#: ../C/evolution.xml:1181(title)
+#: ../C/evolution.xml:1171(title)
 msgid "Checking for New Mail"
 msgstr "Relève des nouveaux messages"
 
-#: ../C/evolution.xml:1182(para)
+#: ../C/evolution.xml:1172(para)
 msgid ""
 "To check your mail, click Send/Receive in the toolbar. If you haven't "
 "created any mail accounts yet, the setup assistant asks you for the "
@@ -3224,7 +3218,7 @@ msgstr ""
 "messagerie, consultez <link linkend=\"usage-mainwindow-starting\">Premier "
 "lancement d'Evolution</link>."
 
-#: ../C/evolution.xml:1183(para)
+#: ../C/evolution.xml:1173(para)
 msgid ""
 "If this is your first time checking mail, or you haven't asked Evolution to "
 "store your password, you are prompted for the password. Enter your password "
@@ -3234,7 +3228,7 @@ msgstr ""
 "pas demandé à Evolution de conserver votre mot de passe, vous devez le "
 "saisir. Saisissez votre mot de passe pour télécharger vos courriels."
 
-#: ../C/evolution.xml:1184(para)
+#: ../C/evolution.xml:1174(para)
 msgid ""
 "If you get an error message instead of mail, you probably need to check your "
 "network settings. To learn how to do that, see <link linkend=\"mail-prefs-"
@@ -3245,38 +3239,161 @@ msgstr ""
 "consultez les <link linkend=\"mail-prefs-headers\"/>Préférences des en-têtes "
 "de messages</link> ou demandez à votre administrateur système."
 
-#: ../C/evolution.xml:1188(title)
+#: ../C/evolution.xml:1178(title)
 msgid "New Mail Notification"
 msgstr "Notification des nouveaux courriels"
 
-#: ../C/evolution.xml:1189(para)
+#: ../C/evolution.xml:1179(para)
 msgid ""
-"Evolution notifies you of new email. When you receive a new mail in your "
-"inbox, a blinking icon appears on the Switcher."
+"Evolution can notify you of new messages. When you receive a new message in "
+"your inbox, a blinking icon appears on the Switcher."
 msgstr ""
-"Evolution vous avertit lorsque vous recevez de nouveaux courriels. Lorsqu'un "
+"Evolution peut vous avertir lorsque vous recevez de nouveaux courriels. Lorsqu'un "
 "nouveau courriel arrive dans votre boîte de réception, une icône se met à "
 "clignoter dans le sélecteur."
 
-#: ../C/evolution.xml:1191(para)
+#: ../C/evolution.xml:1180(para)
 msgid ""
-"You can also see a blinking icon <inlinegraphic format=\"PNG\" fileref="
+"You can also view a blinking icon<inlinegraphic format=\"PNG\" fileref="
 "\"figures/evo_blink.png\"/> in the notification area that disappears when "
-"you open the new email. You can keep the mouse over the <inlinegraphic "
-"format=\"PNG\" fileref=\"figures/evo_blink.png\"/> icon to view the "
-"notification message."
+"you open the new message. Mouse over the icon to view the notification "
+"message."
 msgstr ""
 "Vous pouvez également voir une icône <inlinegraphic format=\"PNG\" fileref="
 "\"figures/evo_blink.png\"/> clignotante dans la zone de notification. Celle-"
 "ci disparaît au moment où vous ouvrez le nouveau courriel. Vous pouvez "
-"placer la souris sur l'icône <inlinegraphic format=\"PNG\" fileref=\"figures/"
-"evo_blink.png\"/> pour voir s'afficher la notification."
+"placer la souris sur l'icône pour voir s'afficher la notification."
+
+#: ../C/evolution.xml:1182(para)
+msgid ""
+"To enable this feature, select Edit &gt; Plugins, then select the Mail "
+"Notification check box. You can configure the plugin by specifing the "
+"following in the Plugin Manager."
+msgstr ""
+"Pour activer cette fonctionnalité, choisissez Édition &gt; Greffons, puis "
+"cochez la case « Notification de nouveau courriel ». Vous pouvez configurer "
+"ce greffon en indiquant ce qui suit dans le gestionnaire de greffons."
+
+#: ../C/evolution.xml:1185(title)
+msgid "Notify new messages for Inbox only:"
+msgstr "Avertir uniquement des nouveaux messages de la Boîte de réception"
+
+#: ../C/evolution.xml:1186(para)
+msgid ""
+"Select this option to restrict the mail notification to Inbox. With this "
+"option enabled, you are notified of each new message arrival in the Inbox."
+msgstr ""
+"Cochez cette option pour limiter les notifications de nouveaux messages à "
+"la boîte de réception. Vous serez averti lors de chaque arrivée de message "
+"dans la boîte de réception."
+
+#: ../C/evolution.xml:1189(title)
+msgid "Generate D-Bus message:"
+msgstr "Générer un message D-Bus"
+
+#: ../C/evolution.xml:1190(para)
+msgid ""
+"D-Bus is a fast, lightweight message bus system that allows applications to "
+"communicate with each other. Select this option to generate a D-Bus message "
+"on the session bus whenever a new message arrives."
+msgstr ""
+"D-Bus est un système de bus de messages rapide et léger permettant aux "
+"applications de communiquer entre elles. Cochez cette option pour générer "
+"un message D-Bus sur le bus de session à chaque arrivée de message."
+
+#: ../C/evolution.xml:1193(title)
+msgid "Show icon in the notification area:"
+msgstr "Afficher une icône dans la zone de notification"
+
+#: ../C/evolution.xml:1194(para)
+msgid ""
+"Select this option to display a new mail icon in the notification area when "
+"a new message arrives. You have two options to select from:"
+msgstr ""
+"Cochez cette option pour afficher une icône de nouveau message dans la zone de "
+"notification lorsqu'un nouveau message arrive. Vous pouvez choisir deux options :"
+
+#: ../C/evolution.xml:1199(title)
+msgid "Blinking icon in the notification area:"
+msgstr "Icône clignotante dans la zone de notification"
+
+#: ../C/evolution.xml:1200(para)
+msgid ""
+"Select this option to make the new mail icon blink in the notification area "
+"on arrival of a new message."
+msgstr ""
+"Cochez cette option pour que l'icône de nouveau message dans la zone de "
+"notification se mette à clignoter à l'arrivée d'un nouveau message."
 
-#: ../C/evolution.xml:1195(title)
+#: ../C/evolution.xml:1205(title)
+msgid "Popup message together with the icon:"
+msgstr "Message contextuel avec l'icône"
+
+#: ../C/evolution.xml:1206(para)
+msgid ""
+"Select this option to make the new message pop up along with the new mail "
+"icon."
+msgstr ""
+"Cochez cette option pour qu'un message contextuel apparaisse en même temps "
+"que l'icône de nouveau message."
+
+#: ../C/evolution.xml:1211(title)
+msgid "Play sound when new messages arrive:"
+msgstr "Jouer un son à la réception d'un nouveau message"
+
+#: ../C/evolution.xml:1212(para)
+msgid "You have two options to select from:"
+msgstr "Vous pouvez sélectionner deux options :"
+
+#: ../C/evolution.xml:1217(title) ../C/evolution.xml:3109(title)
+msgid "Beep:"
+msgstr "Bip :"
+
+#: ../C/evolution.xml:1218(para)
+msgid ""
+"Select this option to play a beep sound on the arrival of a new message."
+msgstr ""
+"Cochez cette option pour qu'un signal sonore soit émis à l'arrivée d'un "
+"nouveau message."
+
+#: ../C/evolution.xml:1223(title)
+msgid "Play sound file:"
+msgstr "Jouer un fichier son :"
+
+#: ../C/evolution.xml:1224(para)
+msgid ""
+"Select this option to play a sound file of your choice on the arrival of a "
+"new message."
+msgstr ""
+"Cochez cette option pour qu'un fichier son de votre choix soit émis à l'arrivée "
+"d'un nouveau message."
+
+#: ../C/evolution.xml:1228(para)
+msgid "To specify the sound file you want to play:"
+msgstr "Pour indiquer le fichier son que vous souhaitez émettre :"
+
+#: ../C/evolution.xml:1231(para)
+msgid "Click None to open the Select Sound File browser window."
+msgstr ""
+"Cliquez sur « (Aucun) » pour ouvrir la fenêtre de sélection du fichier son."
+
+#: ../C/evolution.xml:1234(para)
+msgid "Browse to find the sound file of your choice."
+msgstr "Choisissez un fichier son dans le navigateur de fichiers."
+
+#: ../C/evolution.xml:1237(para)
+msgid "Click Open to select the sound file."
+msgstr "Cliquez sur Ouvrir pour sélectionner le fichier son."
+
+#: ../C/evolution.xml:1240(para)
+msgid "Click Play to confirm the selection."
+msgstr "Cliquez sur Jouer pour vérifier que vous avez fait le bon choix."
+
+#: ../C/evolution.xml:1246(title)
 msgid "Vertical View Versus Classical View"
 msgstr "Affichage vertical ou affichage classique"
 
-#: ../C/evolution.xml:1196(para)
+#: ../C/evolution.xml:1247(para)
 msgid ""
 "Evolution provides you vertical view in addition to the classical view. In "
 "the vertical view, message preview pane is located at the right side of the "
@@ -3290,19 +3407,19 @@ msgstr ""
 "en-dessous de la liste des messages. L'affichage vertical vous permet "
 "d'exploiter la largeur supplémentaire des écrans au format écran large."
 
-#: ../C/evolution.xml:1198(title)
+#: ../C/evolution.xml:1249(title)
 msgid "Vertical View:"
 msgstr "Affichage vertical :"
 
-#: ../C/evolution.xml:1199(para)
+#: ../C/evolution.xml:1250(para)
 msgid "To switch to vertical view"
 msgstr "Pour passer à l'affichage vertical"
 
-#: ../C/evolution.xml:1203(para)
+#: ../C/evolution.xml:1254(para)
 msgid "Click View &gt; Preview &gt; Vertical View"
 msgstr "Choisissez Affichage &gt; Aperçu &gt; Affichage vertical"
 
-#: ../C/evolution.xml:1206(para)
+#: ../C/evolution.xml:1257(para)
 msgid ""
 "In Vertical view, default message list contains a double line compressed "
 "headers, which enables you to consume the extra width in the preview column. "
@@ -3315,23 +3432,23 @@ msgstr ""
 "courriel de l'expéditeur, l'icône de pièces jointes, la date ainsi que le "
 "sujet en deuxième ligne."
 
-#: ../C/evolution.xml:1209(title)
+#: ../C/evolution.xml:1260(title)
 msgid "Classical View:"
 msgstr "Affichage classique :"
 
-#: ../C/evolution.xml:1210(para)
+#: ../C/evolution.xml:1261(para)
 msgid "To switch to classical view,"
 msgstr "Pour passer à l'affichage classique,"
 
-#: ../C/evolution.xml:1214(para)
+#: ../C/evolution.xml:1265(para)
 msgid "Click View &gt; Preview &gt; Classical View"
 msgstr "Choisissez Affichage &gt; Aperçu &gt; Affichage classique"
 
-#: ../C/evolution.xml:1220(title)
+#: ../C/evolution.xml:1271(title)
 msgid "Collapsible Message Headers"
 msgstr "En-têtes de message réduits"
 
-#: ../C/evolution.xml:1221(para)
+#: ../C/evolution.xml:1272(para)
 msgid ""
 "Evolution compresses the TO, CC, BCC headers of received mail and shows only "
 "limited addresses. You can set the limit of the number of addresses to be "
@@ -3341,24 +3458,24 @@ msgstr ""
 "qu'une partie des adresses. Vous pouvez définir la limite du nombre "
 "d'adresses affichées dans le panneau d'aperçu."
 
-#: ../C/evolution.xml:1223(para)
+#: ../C/evolution.xml:1274(para)
 msgid ""
 "Use the following procedure to set the limit of addresses to be displayed:"
 msgstr ""
 "Utilisez la procédure suivante pour définir la limite des adresses à "
 "afficher :"
 
-#: ../C/evolution.xml:1226(para) ../C/evolution.xml:1884(para)
-#: ../C/evolution.xml:2211(para) ../C/evolution.xml:5035(para)
-#: ../C/evolution.xml:5229(para) ../C/evolution.xml:6357(para)
+#: ../C/evolution.xml:1277(para) ../C/evolution.xml:1959(para)
+#: ../C/evolution.xml:2387(para) ../C/evolution.xml:5268(para)
+#: ../C/evolution.xml:5462(para) ../C/evolution.xml:6566(para)
 msgid "Select Edit &gt; Preferences."
 msgstr "Choisissez Édition &gt; Préférences."
 
-#: ../C/evolution.xml:1229(para)
+#: ../C/evolution.xml:1280(para)
 msgid "Select Mail Preferences."
 msgstr "Sélectionnez Préférences du courriel."
 
-#: ../C/evolution.xml:1232(para)
+#: ../C/evolution.xml:1283(para)
 msgid ""
 "Check <guilabel>Shrink To/CC/Bcc headers to column</guilabel> to limit the "
 "address."
@@ -3366,11 +3483,11 @@ msgstr ""
 "Cochez « Réduire les en-têtes À / Cc / Cci à » pour limiter les adresses "
 "affichées."
 
-#: ../C/evolution.xml:1235(para)
+#: ../C/evolution.xml:1286(para)
 msgid "Enter the limit in the field."
 msgstr "Saisissez la limite dans le champ correspondant."
 
-#: ../C/evolution.xml:1238(para)
+#: ../C/evolution.xml:1289(para)
 msgid ""
 "You can expand the message headers by clicking the <inlinegraphic format="
 "\"PNG\" fileref=\"figures/plus.png\"/> icon or the <guilabel>...</guilabel> "
@@ -3383,11 +3500,11 @@ msgstr ""
 "<inlinegraphic format=\"PNG\" fileref=\"figures/minus.png\"/> dans le "
 "panneau d'aperçu."
 
-#: ../C/evolution.xml:1242(title)
+#: ../C/evolution.xml:1293(title)
 msgid "Sharing Mailboxes with Other Mail Programs"
 msgstr "Partage de boîte aux lettres avec d'autres programmes"
 
-#: ../C/evolution.xml:1243(para)
+#: ../C/evolution.xml:1294(para)
 msgid ""
 "If you want to use Evolution and another email client, such as Mutt, at the "
 "same time, use the following procedure:"
@@ -3395,15 +3512,15 @@ msgstr ""
 "Si vous voulez utiliser Evolution en même temps qu'un autre programme, comme "
 "Mutt par exemple, utilisez la procédure suivante :"
 
-#: ../C/evolution.xml:1246(para)
+#: ../C/evolution.xml:1297(para)
 msgid "Download your mail in the other application as you would normally."
 msgstr "Téléchargez vos courriels dans l'autre application, comme d'habitude."
 
-#: ../C/evolution.xml:1249(para)
+#: ../C/evolution.xml:1300(para)
 msgid "In Evolution:"
 msgstr "Dans Evolution :"
 
-#: ../C/evolution.xml:1251(para)
+#: ../C/evolution.xml:1302(para)
 msgid ""
 "Select the account you want to use to share mail and click Edit. Instead of "
 "Edit, you might want to create a new account just for this source of mail by "
@@ -3414,7 +3531,7 @@ msgstr ""
 "nouveau compte uniquement pour cette source de messages en cliquant sur "
 "Nouveau."
 
-#: ../C/evolution.xml:1254(para)
+#: ../C/evolution.xml:1305(para)
 msgid ""
 "Under the Receiving Mail tab, select the type of mail file that your other "
 "mail application uses, then specify the full path to that location. A "
@@ -3427,7 +3544,7 @@ msgstr ""
 "classique, avec un chemin d'accès vers /home/<varname>nom d'utilisateur</"
 "varname>/Mail/."
 
-#: ../C/evolution.xml:1260(para)
+#: ../C/evolution.xml:1311(para)
 msgid ""
 "You can only use one mail client at a time. The mail files are locked by the "
 "mail program that is currently using them, so the mail files can't be "
@@ -3438,11 +3555,11 @@ msgstr ""
 "actuellement, ils ne sont donc pas accessibles par un autre logiciel de "
 "messagerie."
 
-#: ../C/evolution.xml:1264(title)
+#: ../C/evolution.xml:1315(title)
 msgid "Working with Attachments and HTML Mail"
 msgstr "Gestion des pièces jointes et du courriel HTML"
 
-#: ../C/evolution.xml:1265(para)
+#: ../C/evolution.xml:1316(para)
 msgid ""
 "If someone sends you an <link linkend=\"attachment\">attachment</link>, "
 "Evolution displays a file icon at the end of the message to which it is "
@@ -3462,11 +3579,11 @@ msgstr ""
 "sur son icône. Cliquez sur le bouton Tout enregistrer pour enregistrer "
 "toutes les pièces jointes."
 
-#: ../C/evolution.xml:1268(title)
+#: ../C/evolution.xml:1319(title)
 msgid "Saving or Opening Attachments"
 msgstr "Enregistrement et ouverture des pièces jointes"
 
-#: ../C/evolution.xml:1269(para)
+#: ../C/evolution.xml:1320(para)
 msgid ""
 "If you get an email message with an attachment, Evolution can help you save "
 "the attachment or open it with the appropriate applications."
@@ -3474,7 +3591,7 @@ msgstr ""
 "Si vous recevez un courriel avec une pièce jointe, Evolution vous aide à "
 "l'enregistrer ou à l'ouvrir avec l'application appropriée."
 
-#: ../C/evolution.xml:1270(para)
+#: ../C/evolution.xml:1321(para)
 msgid ""
 "Evolution shows a right-arrow icon, the number of attachments, and a Save or "
 "Save All button to save all the attachments. Click the right-arrow icon to "
@@ -3484,11 +3601,11 @@ msgstr ""
 "bouton Enregistrer ou Tout enregistrer pour enregistrer les pièces jointes. "
 "Cliquez sur l'icône flèche droite pour afficher la barre des pièces jointes."
 
-#: ../C/evolution.xml:1271(para)
+#: ../C/evolution.xml:1322(para)
 msgid "To save an attachment to disk:"
 msgstr "Pour enregistrer une pièce jointe sur le disque :"
 
-#: ../C/evolution.xml:1274(para) ../C/evolution.xml:1289(para)
+#: ../C/evolution.xml:1325(para) ../C/evolution.xml:1340(para)
 msgid ""
 "Click the down-arrow on the attachment icon or right-click the attachment "
 "icon in the attachment bar."
@@ -3496,23 +3613,23 @@ msgstr ""
 "Cliquez sur la flèche bas sur l'icône de pièce jointe ou faites un clic "
 "droit sur l'icône de la pièce jointe dans la barre des pièces jointes."
 
-#: ../C/evolution.xml:1277(para)
+#: ../C/evolution.xml:1328(para)
 msgid "Click Save As."
 msgstr "Cliquez sur « Enregistrer sous »."
 
-#: ../C/evolution.xml:1280(para)
+#: ../C/evolution.xml:1331(para)
 msgid "Select a location and name for the file."
 msgstr "Choisissez un emplacement et un nom pour le fichier."
 
-#: ../C/evolution.xml:1286(para)
+#: ../C/evolution.xml:1337(para)
 msgid "To open an attachment using another application:"
 msgstr "Pour ouvrir une pièce jointe avec une autre application :"
 
-#: ../C/evolution.xml:1292(para)
+#: ../C/evolution.xml:1343(para)
 msgid "Select the application to open the attachment."
 msgstr "Sélectionnez l'application qui ouvrira la pièce jointe."
 
-#: ../C/evolution.xml:1298(para)
+#: ../C/evolution.xml:1349(para)
 msgid ""
 "The options available for an attachment vary depending on the type of "
 "attachment and the applications your system has installed. For example, "
@@ -3526,11 +3643,11 @@ msgstr ""
 "par un autre traitement de texte, les fichiers d'archives compressées "
 "peuvent être ouverts par le Gestionnaire d'archives."
 
-#: ../C/evolution.xml:1302(title)
+#: ../C/evolution.xml:1353(title)
 msgid "Inline Images in HTML Mail"
 msgstr "Images intégrées dans les courriels HTML"
 
-#: ../C/evolution.xml:1303(para)
+#: ../C/evolution.xml:1354(para)
 msgid ""
 "When someone sends you HTML mail that includes an image in the body of the "
 "message (for example, the welcome message in your Inbox), Evolution displays "
@@ -3545,7 +3662,7 @@ msgstr ""
 "messages. Il est aussi possible de glisser une image dans la zone d'édition "
 "du message."
 
-#: ../C/evolution.xml:1304(para)
+#: ../C/evolution.xml:1355(para)
 msgid ""
 "Some images are links in a message, rather than being part of the message. "
 "Evolution can download those images from the Internet, but does not do so "
@@ -3561,29 +3678,29 @@ msgstr ""
 "pour savoir qui lit les messages. Le chargement manuel des images favorise "
 "la protection de votre vie privée."
 
-#: ../C/evolution.xml:1305(para)
+#: ../C/evolution.xml:1356(para)
 msgid "To load the images for one message:"
 msgstr "Pour charger les images d'un message :"
 
-#: ../C/evolution.xml:1308(para)
+#: ../C/evolution.xml:1359(para)
 msgid "Click View &gt; Load Images."
 msgstr "Choisissez Affichage &gt; Charger les images."
 
-#: ../C/evolution.xml:1311(para)
+#: ../C/evolution.xml:1362(para)
 msgid "To set the default action for loading images:"
 msgstr "Pour définir l'action par défaut de chargement des images :"
 
-#: ../C/evolution.xml:1314(para)
+#: ../C/evolution.xml:1365(para)
 msgid "Select Edit &gt; Preferences, then select Mail Preferences."
 msgstr ""
 "Choisissez Édition &gt; Préférences, puis cliquez sur Préférences du "
 "courriel."
 
-#: ../C/evolution.xml:1317(para)
+#: ../C/evolution.xml:1368(para)
 msgid "Click the HTML Mail tab."
 msgstr "Cliquez sur l'onglet Courriel HTML."
 
-#: ../C/evolution.xml:1320(para)
+#: ../C/evolution.xml:1371(para)
 msgid ""
 "Select one of the items: Never Load Images Off the Net, Load Images in Mail "
 "From Contacts, or Always Load Images Off the Net."
@@ -3592,28 +3709,28 @@ msgstr ""
 "d'Internet, Ouvrir les images dans les courriels des contacts ou Toujours "
 "charger les images à partir d'Internet."
 
-#: ../C/evolution.xml:1323(para) ../C/evolution.xml:1371(para)
-#: ../C/evolution.xml:1562(para) ../C/evolution.xml:1797(para)
-#: ../C/evolution.xml:1831(para) ../C/evolution.xml:1854(para)
-#: ../C/evolution.xml:2150(para) ../C/evolution.xml:2189(para)
-#: ../C/evolution.xml:2223(para) ../C/evolution.xml:2255(para)
-#: ../C/evolution.xml:5693(para) ../C/evolution.xml:6071(para)
+#: ../C/evolution.xml:1374(para) ../C/evolution.xml:1422(para)
+#: ../C/evolution.xml:1637(para) ../C/evolution.xml:1872(para)
+#: ../C/evolution.xml:1906(para) ../C/evolution.xml:1929(para)
+#: ../C/evolution.xml:2326(para) ../C/evolution.xml:2365(para)
+#: ../C/evolution.xml:2399(para) ../C/evolution.xml:2431(para)
+#: ../C/evolution.xml:5926(para) ../C/evolution.xml:6304(para)
 msgid "Click Close."
 msgstr "Cliquez sur Fermer."
 
-#: ../C/evolution.xml:1326(para)
+#: ../C/evolution.xml:1377(para)
 msgid "To set your proxy in KDE:"
 msgstr "Pour définir votre proxy dans KDE :"
 
-#: ../C/evolution.xml:1329(para)
+#: ../C/evolution.xml:1380(para)
 msgid "Click the menu icon &gt; System &gt; Configuration &gt; Yast."
 msgstr "Cliquez sur l'icône du menu &gt; Système &gt; Configuration &gt; Yast."
 
-#: ../C/evolution.xml:1332(para) ../C/evolution.xml:1347(para)
+#: ../C/evolution.xml:1383(para) ../C/evolution.xml:1398(para)
 msgid "Click Network Services, then click Proxy."
 msgstr "Cliquez sur Services réseau, puis sur Proxy."
 
-#: ../C/evolution.xml:1335(para) ../C/evolution.xml:1350(para)
+#: ../C/evolution.xml:1386(para) ../C/evolution.xml:1401(para)
 msgid ""
 "Specify your proxy settings (if you don't know your proxy settings, contact "
 "your ISP or system administrator)."
@@ -3622,15 +3739,15 @@ msgstr ""
 "de votre proxy, contactez votre fournisseur d'accès ou votre administrateur "
 "système)."
 
-#: ../C/evolution.xml:1338(para) ../C/evolution.xml:1353(para)
+#: ../C/evolution.xml:1389(para) ../C/evolution.xml:1404(para)
 msgid "Click Finish, then click Close."
 msgstr "Cliquez sur Terminer, puis sur Fermer."
 
-#: ../C/evolution.xml:1341(para)
+#: ../C/evolution.xml:1392(para)
 msgid "To set your proxy in GNOME:"
 msgstr "Pour définir votre proxy dans GNOME :"
 
-#: ../C/evolution.xml:1344(para)
+#: ../C/evolution.xml:1395(para)
 msgid ""
 "Click System &gt; Administrative Settings (enter your root password if "
 "needed)."
@@ -3638,11 +3755,11 @@ msgstr ""
 "Cliquez sur Système &gt; Administration (saisissez le mot de passe "
 "d'administration si nécessaire)."
 
-#: ../C/evolution.xml:1360(title)
+#: ../C/evolution.xml:1411(title)
 msgid "Using Evolution for News"
 msgstr "Utilisation d'Evolution pour les nouvelles"
 
-#: ../C/evolution.xml:1361(para)
+#: ../C/evolution.xml:1412(para)
 msgid ""
 "USENET newsgroups are similar to mail, so it is often convenient to read "
 "news and mail side by side. You can add a news source, called an NNTP "
@@ -3661,7 +3778,7 @@ msgstr ""
 "Lorsque vous cliquez sur Envoyer/Recevoir, Evolution relève également les "
 "messages de nouvelles."
 
-#: ../C/evolution.xml:1362(para)
+#: ../C/evolution.xml:1413(para)
 msgid ""
 "When you create a newsgroup account, you are not subscribed to any groups. "
 "To subscribe to a newsgroup:"
@@ -3669,11 +3786,11 @@ msgstr ""
 "Lorsque vous créez un compte de groupe de nouvelles, vous n'êtes inscrit à "
 "aucun groupe. Pour vous inscrire à un groupe de nouvelles :"
 
-#: ../C/evolution.xml:1365(para) ../C/evolution.xml:5303(para)
+#: ../C/evolution.xml:1416(para) ../C/evolution.xml:5536(para)
 msgid "Click Folder &gt; Subscriptions."
 msgstr "Choisissez Dossier &gt; Abonnements."
 
-#: ../C/evolution.xml:1368(para)
+#: ../C/evolution.xml:1419(para)
 msgid ""
 "Select your NNTP account, select the groups you want to subscribe to, then "
 "click Subscribe."
@@ -3681,11 +3798,11 @@ msgstr ""
 "Sélectionnez votre compte NNTP, sélectionnez les groupes auxquels vous "
 "voulez vous abonner, puis cliquez sur S'abonner."
 
-#: ../C/evolution.xml:1377(title)
+#: ../C/evolution.xml:1428(title)
 msgid "Deleting Mail"
 msgstr "Suppression de courriels"
 
-#: ../C/evolution.xml:1378(para)
+#: ../C/evolution.xml:1429(para)
 msgid ""
 "Evolution allows you to delete unwanted messages. To delete a message, "
 "select it and press the Delete key, or click the delete tool in the toolbar, "
@@ -3696,7 +3813,7 @@ msgstr ""
 "cliquez sur le bouton Supprimer de la barre d'outils ou appuyez sur Ctrl+D "
 "ou faites un clic droit sur le message et choisissez Supprimer."
 
-#: ../C/evolution.xml:1379(para)
+#: ../C/evolution.xml:1430(para)
 msgid ""
 "When you press Delete or click the Trash folder, your mail is not actually "
 "deleted, but is marked for deletion. Your email is recoverable until you "
@@ -3715,7 +3832,7 @@ msgstr ""
 "menu Affichage. Ces messages apparaissent barrés. Vous pouvez également "
 "afficher ces messages dans le dossier Corbeille."
 
-#: ../C/evolution.xml:1380(para)
+#: ../C/evolution.xml:1431(para)
 msgid ""
 "To permanently erase all the deleted messages in a folder, click Folder &gt; "
 "Expunge or press Ctrl+E."
@@ -3723,7 +3840,7 @@ msgstr ""
 "Pour effacer définitivement les messages supprimés d'un dossier, choisissez "
 "Dossier &gt; Nettoyer ou appuyez sur Ctrl+E."
 
-#: ../C/evolution.xml:1381(para)
+#: ../C/evolution.xml:1432(para)
 msgid ""
 "Trash folders in GroupWise, local and IMAP accounts are actually virtual "
 "search folders that display all messages you have marked for later deletion. "
@@ -3736,7 +3853,7 @@ msgstr ""
 "n'est rien d'autre que le nettoyage des courriels supprimés dans tous les "
 "dossiers du compte."
 
-#: ../C/evolution.xml:1382(para)
+#: ../C/evolution.xml:1433(para)
 msgid ""
 "However, this is not true for the Trash folder on Exchange servers, which "
 "behaves just the same as it does in Outlook. It is a normal folder with "
@@ -3750,11 +3867,11 @@ msgstr ""
 "\"usage-mail-organize-vfolders\">Utilisation des dossiers de recherche</"
 "link>."
 
-#: ../C/evolution.xml:1386(title)
+#: ../C/evolution.xml:1437(title)
 msgid "Undeleting Messages"
 msgstr "Récupération de messages"
 
-#: ../C/evolution.xml:1387(para)
+#: ../C/evolution.xml:1438(para)
 msgid ""
 "You can undelete a message that has been deleted but not expunged. To "
 "undelete a message, select the message, click Edit &gt; Undelete. Note that "
@@ -3766,7 +3883,7 @@ msgstr ""
 "supprimés dans la barre de menus doit être désactivé pour que cela "
 "fonctionne."
 
-#: ../C/evolution.xml:1388(para)
+#: ../C/evolution.xml:1439(para)
 msgid ""
 "If you have marked a message for deletion, undeleting it unmarks it, and the "
 "message is removed from the Trash folder."
@@ -3774,7 +3891,7 @@ msgstr ""
 "Si vous avez marqué un message pour la suppression, la récupération enlève "
 "cette marque et le message n'apparaît plus dans le dossier Corbeille."
 
-#: ../C/evolution.xml:1394(para)
+#: ../C/evolution.xml:1445(para)
 msgid ""
 "You can start writing a new email message by clicking File &gt; New &gt; "
 "Mail Message, by pressing Ctrl+N when in the mailing tool, or by clicking "
@@ -3784,7 +3901,7 @@ msgstr ""
 "&gt; Nouveau &gt; Message, ou en appuyant sur Ctrl+N dans le composant "
 "Courriel ou en cliquant sur Nouveau dans la barre d'outils."
 
-#: ../C/evolution.xml:1395(para)
+#: ../C/evolution.xml:1446(para)
 msgid ""
 "Enter an address in the To field. If you want to enter multiple email "
 "addresses, type in the addresses separated by comma. You can also use a "
@@ -3799,63 +3916,63 @@ msgstr ""
 "message dans la zone du bas de la fenêtre. Après avoir écrit votre message, "
 "cliquez sur Envoyer."
 
-#: ../C/evolution.xml:1396(para)
+#: ../C/evolution.xml:1447(para)
 msgid "New mail message window look like this:"
 msgstr "La fenêtre d'édition d'un nouveau message ressemble à ceci :"
 
-#: ../C/evolution.xml:1398(para) ../C/evolution.xml:5951(para)
+#: ../C/evolution.xml:1449(para) ../C/evolution.xml:6184(para)
 msgid "This section contains the following topics:"
 msgstr "Cette section contient les sujets suivants :"
 
-#: ../C/evolution.xml:1401(link) ../C/evolution.xml:1439(title)
+#: ../C/evolution.xml:1452(link) ../C/evolution.xml:1490(title)
 msgid "Unicode, ASCII, and Non-Latin Alphabets"
 msgstr "Unicode, ASCII et alphabets non latins"
 
-#: ../C/evolution.xml:1404(link) ../C/evolution.xml:1451(title)
+#: ../C/evolution.xml:1455(link) ../C/evolution.xml:1526(title)
 msgid "Sending Composed Messages Later"
 msgstr "Envoi différé de messages"
 
-#: ../C/evolution.xml:1407(link) ../C/evolution.xml:1467(title)
+#: ../C/evolution.xml:1458(link) ../C/evolution.xml:1542(title)
 msgid "Working Offline"
 msgstr "Travail hors ligne"
 
-#: ../C/evolution.xml:1410(link) ../C/evolution.xml:1520(title)
+#: ../C/evolution.xml:1461(link) ../C/evolution.xml:1595(title)
 msgid "Attachments"
 msgstr "Pièces jointes"
 
-#: ../C/evolution.xml:1413(link) ../C/evolution.xml:1567(title)
+#: ../C/evolution.xml:1464(link) ../C/evolution.xml:1642(title)
 msgid "Specifying Additional Recipients for Email"
 msgstr "Ajout de destinataires supplémentaires"
 
-#: ../C/evolution.xml:1416(link) ../C/evolution.xml:1592(title)
+#: ../C/evolution.xml:1467(link) ../C/evolution.xml:1667(title)
 msgid "Choosing Recipients Quickly"
 msgstr "Sélection rapide de destinataires"
 
-#: ../C/evolution.xml:1419(link) ../C/evolution.xml:1600(title)
+#: ../C/evolution.xml:1470(link) ../C/evolution.xml:1675(title)
 msgid "Replying to Email Messages"
 msgstr "Réponses aux courriels"
 
-#: ../C/evolution.xml:1422(link) ../C/evolution.xml:1666(title)
+#: ../C/evolution.xml:1473(link) ../C/evolution.xml:1741(title)
 msgid "Searching and Replacing with the Composer"
 msgstr "Recherche et remplacement avec l'éditeur"
 
-#: ../C/evolution.xml:1425(link) ../C/evolution.xml:1688(title)
+#: ../C/evolution.xml:1476(link) ../C/evolution.xml:1763(title)
 msgid "Enhancing Your Email with HTML"
 msgstr "Amélioration des courriels avec le HTML"
 
-#: ../C/evolution.xml:1428(link) ../C/evolution.xml:1862(title)
+#: ../C/evolution.xml:1479(link) ../C/evolution.xml:1937(title)
 msgid "Mail Send Options"
 msgstr "Options d'envoi des messages"
 
-#: ../C/evolution.xml:1431(link) ../C/evolution.xml:1940(title)
+#: ../C/evolution.xml:1482(link) ../C/evolution.xml:2015(title)
 msgid "Forwarding Mail"
 msgstr "Transfert de courriels"
 
-#: ../C/evolution.xml:1434(link) ../C/evolution.xml:1961(title)
+#: ../C/evolution.xml:1485(link) ../C/evolution.xml:2036(title)
 msgid "Tips for Email Courtesy"
 msgstr "Principes de politesse dans le courriel"
 
-#: ../C/evolution.xml:1440(para)
+#: ../C/evolution.xml:1491(para)
 msgid ""
 "If you want to write in a non-Latin alphabet while using a Latin keyboard, "
 "try selecting a different input method in the message composer. Right-click "
@@ -3878,7 +3995,7 @@ msgstr ""
 "les caractères cyrilliques uniques appropriés, et l'apostrophe simple (') "
 "produit un caractère doux."
 
-#: ../C/evolution.xml:1441(para)
+#: ../C/evolution.xml:1492(para)
 msgid ""
 "For greater language display capabilities, click Edit &gt; Preferences, then "
 "select the character set choices in the Mail Preferences and Composer "
@@ -3892,11 +4009,11 @@ msgstr ""
 "UTF-8, car c'est celui qui présente la plus grande gamme de caractères pour "
 "le plus grand nombre de langues."
 
-#: ../C/evolution.xml:1444(title)
+#: ../C/evolution.xml:1495(title)
 msgid "Using Character Sets"
 msgstr "Utilisation des jeux de caractères"
 
-#: ../C/evolution.xml:1445(para)
+#: ../C/evolution.xml:1496(para)
 msgid ""
 "A character set is a computer's version of an alphabet. In the past, the "
 "ASCII character set was used almost universally. However, it contains only "
@@ -3919,7 +4036,7 @@ msgstr ""
 "les organisations de standardisation ont développé le jeu de caractères "
 "Unicode* UTF-8 pour fournir un jeu de codes unique et compatible pour tous."
 
-#: ../C/evolution.xml:1446(para)
+#: ../C/evolution.xml:1497(para)
 msgid ""
 "Most email messages state in advance which character set they use, so "
 "Evolution usually can display those messages correctly. However, if you find "
@@ -3944,7 +4061,72 @@ msgstr ""
 "propose la plus grande gamme de caractères pour le plus grand nombre de "
 "langues."
 
-#: ../C/evolution.xml:1452(para)
+#: ../C/evolution.xml:1502(title)
+msgid "Custom Header"
+msgstr "En-tête personnalisé"
+
+#: ../C/evolution.xml:1503(para)
+msgid "To enable the Custom Header plugin:"
+msgstr "Pour activer le greffon En-tête personnalisé :"
+
+#: ../C/evolution.xml:1504(para) ../C/evolution.xml:6717(para)
+msgid "Select Edit &gt; Plugins."
+msgstr "Choisissez Édition &gt; Greffons."
+
+#: ../C/evolution.xml:1505(para)
+msgid ""
+"Then select Custom Header. You can configure custom headers to set "
+"sensitivity and caveats to the outgoing messages."
+msgstr ""
+"Cochez ensuite « En-tête personnalisé ». Vous pouvez configurer des "
+"en-têtes personnalisés pour définir certaines propriétés des "
+"messages sortants."
+
+#: ../C/evolution.xml:1507(para)
+msgid ""
+"In the Plugin Manager, select the Configuration tab to customize your header "
+"fields. You can add, edit, or remove the header fields. For every header "
+"field you add, you can specify the keys and values. The key is used as the "
+"title of the Custom Header. You can enter multiple values for the keys. You "
+"must use a semicolon to separate every value you enter."
+msgstr ""
+"Dans le gestionnaire de greffons, sélectionnez l'onglet Configuration pour "
+"personnaliser les champs d'en-têtes. Vous pouvez ajouter, modifier ou supprimer "
+"des paires clé-valeur. La clé est utilisée comme titre de l'en-tête "
+"personnalisé. Vous pouvez saisir plusieurs valeurs pour les clés. Vous devez "
+"utiliser un point-virgule pour séparer chaque valeur saisie."
+
+#: ../C/evolution.xml:1510(para)
+msgid ""
+"Select New &gt; Mail Message or Shift+Ctrl+M to open a Compose Message "
+"window."
+msgstr ""
+"Choisissez Nouveau &gt; Message ou appuyez sur les touches Ctrl"
+"+Maj+M pour ouvrir une nouvelle fenêtre de composition de message."
+
+#: ../C/evolution.xml:1513(para)
+msgid ""
+"Select Insert &gt; Custom Header to open the Email Custom Header window."
+msgstr ""
+"Choisissez Insérer &gt; En-tête personnalisé pour ouvrir la fenêtre "
+"des en-têtes de courriel personnalisés."
+
+#: ../C/evolution.xml:1515(para)
+msgid ""
+"In the Email Custom Header window, you can view all the header fields and "
+"values you add."
+msgstr ""
+"Dans la fenêtre des en-têtes de courriel personnalisés, vous pouvez voir "
+"tous les champs et valeurs d'en-têtes que vous ajoutez."
+
+#: ../C/evolution.xml:1518(para)
+msgid ""
+"Set the values for the header fields by using the respective drop-down list."
+msgstr ""
+"Définissez les valeurs des champs d'en-tête en utilisant les listes déroulantes "
+"correspondantes."
+
+#: ../C/evolution.xml:1527(para)
 msgid ""
 "Evolution normally sends mail as soon as you click Send. However, can save a "
 "message to be sent later:"
@@ -3952,7 +4134,7 @@ msgstr ""
 "Evolution envoie habituellement un message dès que vous cliquez sur Envoyer. "
 "Cependant, vous pouvez enregistrer un message pour un envoi ultérieur :"
 
-#: ../C/evolution.xml:1455(para)
+#: ../C/evolution.xml:1530(para)
 msgid ""
 "If you are offline when you click Send, Evolution adds your message to the "
 "Outbox queue. The next time you connect to the Internet and send or receive "
@@ -3963,7 +4145,7 @@ msgstr ""
 "prochaine connexion à Internet et de l'envoi/réception de messages, ce "
 "message sera envoyé."
 
-#: ../C/evolution.xml:1458(para)
+#: ../C/evolution.xml:1533(para)
 msgid ""
 "Click File &gt; Save Draft to store your messages in the drafts folder for "
 "later revision."
@@ -3971,7 +4153,7 @@ msgstr ""
 "Choisissez Fichier &gt; Enregistrer le brouillon pour stocker votre message "
 "dans le dossier Brouillons afin de le retravailler plus tard."
 
-#: ../C/evolution.xml:1461(para)
+#: ../C/evolution.xml:1536(para)
 msgid ""
 "If you prefer to save your message as a text file, click File &gt; Save As, "
 "then specify a filename."
@@ -3979,7 +4161,7 @@ msgstr ""
 "Si vous préférez enregistrer votre message dans un fichier texte, choisissez "
 "Fichier &gt; Enregistrer sous, puis indiquez un nom de fichier."
 
-#: ../C/evolution.xml:1468(para)
+#: ../C/evolution.xml:1543(para)
 msgid ""
 "Offline mode helps you communicate with remote mail storage systems like "
 "<trademark class=\"registered\">GroupWise</trademark>, IMAP or Exchange, in "
@@ -3995,7 +4177,7 @@ msgstr ""
 "les stocker dans la boîte d'envoi en vue de leur expédition lors de votre "
 "prochaine connexion."
 
-#: ../C/evolution.xml:1469(para)
+#: ../C/evolution.xml:1544(para)
 msgid ""
 "POP mail downloads all messages to your local system, but other connections "
 "usually download just the headers, and get the rest only when you want to "
@@ -4008,21 +4190,21 @@ msgstr ""
 "de se mettre hors ligne, Evolution télécharge les messages non lus se "
 "trouvant dans les dossiers que vous avez choisis de conserver."
 
-#: ../C/evolution.xml:1470(para)
+#: ../C/evolution.xml:1545(para)
 msgid "To mark a folder for offline use,"
 msgstr "Pour marquer un dossier apte à une utilisation hors ligne,"
 
-#: ../C/evolution.xml:1473(para)
+#: ../C/evolution.xml:1548(para)
 msgid "Right-click the folder, then click Properties."
 msgstr "Faites un clic droit sur le dossier, puis choisissez Propriétés."
 
-#: ../C/evolution.xml:1476(para)
+#: ../C/evolution.xml:1551(para)
 msgid "Click Copy Folder Content Locally for Offline Operation."
 msgstr ""
 "Cochez « Copier localement le contenu du dossier pour les opérations hors-"
 "ligne »."
 
-#: ../C/evolution.xml:1479(para)
+#: ../C/evolution.xml:1554(para)
 msgid ""
 "Your connection status is shown by the small icon in the lower left border "
 "of the Evolution main window. When you are online, it displays two connected "
@@ -4033,12 +4215,12 @@ msgstr ""
 "ligne, cette icône montre deux câbles connectés. Lorsque vous vous "
 "déconnectez, les deux câbles se séparent."
 
-#: ../C/evolution.xml:1480(para)
+#: ../C/evolution.xml:1555(para)
 msgid "To cache your selected folders and disconnect from the network,"
 msgstr ""
 "Pour mettre en cache les dossiers sélectionnés et vous déconnecter du réseau,"
 
-#: ../C/evolution.xml:1483(para)
+#: ../C/evolution.xml:1558(para)
 msgid ""
 "Click File &gt; Work Offline, or click the connection status icon in the "
 "lower left of the screen."
@@ -4046,7 +4228,7 @@ msgstr ""
 "Choisissez Fichier &gt; Travailler hors ligne ou cliquez sur l'icône d'état "
 "de connexion dans le coin inférieur gauche de l'écran."
 
-#: ../C/evolution.xml:1484(para)
+#: ../C/evolution.xml:1559(para)
 msgid ""
 "A message pop-ups and asks you whether you want to go offline immediately or "
 "cache before you go offline."
@@ -4055,7 +4237,7 @@ msgstr ""
 "hors ligne ou si vous voulez mettre les données en cache avant de passer en "
 "mode hors ligne."
 
-#: ../C/evolution.xml:1489(para)
+#: ../C/evolution.xml:1564(para)
 msgid ""
 "Click Synchronize to download all the messages to the folders marked for "
 "offline."
@@ -4063,11 +4245,11 @@ msgstr ""
 "Cliquez sur Synchroniser pour télécharger tous les messages vers les "
 "dossiers marqués pour une utilisation hors ligne."
 
-#: ../C/evolution.xml:1490(para) ../C/evolution.xml:3703(para)
+#: ../C/evolution.xml:1565(para) ../C/evolution.xml:3936(para)
 msgid "Or"
 msgstr "Ou"
 
-#: ../C/evolution.xml:1491(para)
+#: ../C/evolution.xml:1566(para)
 msgid ""
 "Click Do not synchronize to go offline immediately, without downloading the "
 "messages locally for offline operations."
@@ -4075,7 +4257,7 @@ msgstr ""
 "Cliquez sur Ne pas synchroniser pour passer immédiatement hors ligne, sans "
 "télécharger localement les messages pour les opérations hors ligne."
 
-#: ../C/evolution.xml:1492(para)
+#: ../C/evolution.xml:1567(para)
 msgid ""
 "Select Do not show this message again to switch off this popup. The default "
 "is to not synchronize while going offline."
@@ -4084,21 +4266,21 @@ msgstr ""
 "comportement par défaut est de ne pas synchroniser au moment de passer hors "
 "ligne."
 
-#: ../C/evolution.xml:1495(para)
+#: ../C/evolution.xml:1570(para)
 msgid "When you want to reconnect,"
 msgstr "Lorsque vous voulez vous reconnecter,"
 
-#: ../C/evolution.xml:1498(para)
+#: ../C/evolution.xml:1573(para)
 msgid "Click File &gt; Work Online, or click the connection status icon again."
 msgstr ""
 "Choisissez Fichier &gt; Travailler en ligne ou cliquez à nouveau sur l'icône "
 "d'état de connexion."
 
-#: ../C/evolution.xml:1503(title)
+#: ../C/evolution.xml:1578(title)
 msgid "Download Messages for Offline Operations"
 msgstr "Téléchargement des messages pour les opérations hors ligne"
 
-#: ../C/evolution.xml:1504(para)
+#: ../C/evolution.xml:1579(para)
 msgid ""
 "This features prepares you for going offline and for offline operations. It "
 "helps you download all the messages locally before you go offline. If "
@@ -4111,20 +4293,20 @@ msgstr ""
 "passe en mode hors ligne dès que vous le lui demandez, sans télécharger les "
 "messages en local."
 
-#: ../C/evolution.xml:1505(para)
+#: ../C/evolution.xml:1580(para)
 msgid "To download messages for offline operations,"
 msgstr "Pour télécharger les messages en vue d'une utilisation hors ligne,"
 
-#: ../C/evolution.xml:1508(para)
+#: ../C/evolution.xml:1583(para)
 msgid "Select File &gt; Download messages for offline."
 msgstr ""
 "Choisissez Fichier &gt; Télécharger les messages pour utilisation hors ligne."
 
-#: ../C/evolution.xml:1514(title)
+#: ../C/evolution.xml:1589(title)
 msgid "Automatic Network State Handling"
 msgstr "Gestion automatique de l'état du réseau"
 
-#: ../C/evolution.xml:1515(para)
+#: ../C/evolution.xml:1590(para)
 msgid ""
 "Evolution automatically understands the network state and acts accordingly. "
 "For instance, Evolution switches to offline mode when the network goes down "
@@ -4137,20 +4319,20 @@ msgstr ""
 "opérationnel. Pour activer cette fonctionnalité, assurez-vous que Network "
 "Manager est installé sur votre système."
 
-#: ../C/evolution.xml:1521(para)
+#: ../C/evolution.xml:1596(para)
 msgid "To attach a file to your email:"
 msgstr "Pour joindre un fichier à un courriel :"
 
-#: ../C/evolution.xml:1524(para)
+#: ../C/evolution.xml:1599(para)
 msgid "Click the Attach icon in the composer toolbar."
 msgstr ""
 "Cliquez sur l'icône de pièce jointe dans la barre d'outils de l'éditeur."
 
-#: ../C/evolution.xml:1527(para)
+#: ../C/evolution.xml:1602(para)
 msgid "Select the file you want to attach."
 msgstr "Sélectionnez le fichier à joindre."
 
-#: ../C/evolution.xml:1533(para)
+#: ../C/evolution.xml:1608(para)
 msgid ""
 "You can also drag a file to the attachment bar of the composer window. If "
 "you want to send it as an inline attachment, right-click the attachment and "
@@ -4161,7 +4343,7 @@ msgstr ""
 "intégrée, faites un clic droit sur la pièce jointe, choisissez Propriétés et "
 "cochez « Suggérer l'affichage automatique de la pièce jointe »."
 
-#: ../C/evolution.xml:1534(para)
+#: ../C/evolution.xml:1609(para)
 msgid ""
 "When you send the message, a copy of the attached file goes with it. Be "
 "aware that large attachments can take a long time to send and receive."
@@ -4170,11 +4352,11 @@ msgstr ""
 "envoyée. Il faut être conscient que de gros fichiers joints peuvent prendre "
 "beaucoup de temps à envoyer et à recevoir."
 
-#: ../C/evolution.xml:1537(title)
+#: ../C/evolution.xml:1612(title)
 msgid "Attachment Reminder:"
 msgstr "Oubli des pièces jointes :"
 
-#: ../C/evolution.xml:1538(para)
+#: ../C/evolution.xml:1613(para)
 msgid ""
 "Evolution has an Attachment Reminder plugin you can use to remind yourself "
 "to attach a file to an email. If it determines that you have not attached "
@@ -4184,7 +4366,7 @@ msgstr ""
 "rappeler d'ajouter un fichier à un courriel. S'il détermine que vous avez "
 "oublié de joindre un fichier, le message ci-dessous apparaît :"
 
-#: ../C/evolution.xml:1542(para)
+#: ../C/evolution.xml:1617(para)
 msgid ""
 "Click Continue Editing to attach the missing file, or click Send to send the "
 "message without any attachment."
@@ -4192,15 +4374,15 @@ msgstr ""
 "Cliquez sur Continuer l'édition pour joindre un fichier manquant, ou cliquez "
 "sur Envoyer pour envoyer le message sans pièce jointe."
 
-#: ../C/evolution.xml:1545(para)
+#: ../C/evolution.xml:1620(para)
 msgid "To enable the Attachment Reminder:"
 msgstr "Pour activer le greffon Oubli des pièces jointes :"
 
-#: ../C/evolution.xml:1548(para)
+#: ../C/evolution.xml:1623(para)
 msgid "Select Edit &gt; Plugins &gt; Attachment Reminder."
 msgstr "Choisissez Édition &gt; Greffons &gt; Greffon de pièce jointe."
 
-#: ../C/evolution.xml:1551(para)
+#: ../C/evolution.xml:1626(para)
 msgid ""
 "Click Configuration, then make sure that Remind Missing Attachments is "
 "selected."
@@ -4208,7 +4390,7 @@ msgstr ""
 "Cliquez sur Configuration, puis assurez-vous que « Signaler les pièces "
 "jointes manquantes » est coché."
 
-#: ../C/evolution.xml:1555(para)
+#: ../C/evolution.xml:1630(para)
 msgid ""
 "Select keywords such as <quote>Attach</quote> or <quote>Attachment</quote> "
 "and click Add."
@@ -4216,7 +4398,7 @@ msgstr ""
 "Choisissez des mots-clés tels que <quote>Ci-joint</quote> ou <quote>Fichier "
 "joint</quote>, ou cliquez sur Ajouter pour en ajouter de nouveaux."
 
-#: ../C/evolution.xml:1556(para)
+#: ../C/evolution.xml:1631(para)
 msgid ""
 "Based on the keywords you have added here, it searches every mail you are "
 "sending. If it finds the keywords such as <quote>attach</quote> in your mail "
@@ -4228,7 +4410,7 @@ msgstr ""
 "qu'aucune pièce jointe n'a été ajoutée, il vous avertit que des pièces "
 "jointes sont peut-être manquantes."
 
-#: ../C/evolution.xml:1559(para)
+#: ../C/evolution.xml:1634(para)
 msgid ""
 "To edit any of the existing keywords, select the keyword, click Edit, then "
 "modify the word as desired."
@@ -4236,7 +4418,7 @@ msgstr ""
 "Pour modifier un des mots-clés existants, sélectionnez-le, cliquez sur "
 "Modifier et modifiez le mot comme vous le souhaitez."
 
-#: ../C/evolution.xml:1568(para)
+#: ../C/evolution.xml:1643(para)
 msgid ""
 "<trademark>Evolution</trademark>, like most email programs, recognizes three "
 "types of addresses: primary recipients, secondary recipients, and hidden "
@@ -4251,7 +4433,7 @@ msgstr ""
 "champ « À: », qui correspond aux destinataires principaux. Utilisez le champ "
 "« Cc: » pour envoyer un message à des destinataires secondaires."
 
-#: ../C/evolution.xml:1569(para)
+#: ../C/evolution.xml:1644(para)
 msgid ""
 "Addresses on the Bcc: list are hidden from the other recipients of the "
 "message. You can use it to send mail to large groups of people, especially "
@@ -4264,7 +4446,7 @@ msgstr ""
 "pas ou si la confidentialité est importante. Si le champ « Cci: » n'apparaît "
 "pas, choisissez Affichage &gt; Champ Cci."
 
-#: ../C/evolution.xml:1570(para)
+#: ../C/evolution.xml:1645(para)
 msgid ""
 "If you frequently write email to the same groups of people, you can create "
 "address lists in the contacts tool, and then send them mail as though they "
@@ -4278,41 +4460,42 @@ msgstr ""
 "\"usage-contact-organize-group-list\">Création d'une liste de contacts</"
 "link>."
 
-#: ../C/evolution.xml:1571(para)
+#: ../C/evolution.xml:1646(para)
 msgid ""
 "Evolution has the ability to let you specify the Reply-To in an email. Using "
-"this, you can set up a special Reply-To for an email.To do this:"
+"this, you can set up a special Reply-To for an email. To do this:"
 msgstr ""
 "Evolution donne la possibilité de spécifier l'adresse de réponse d'un "
 "courriel. Ainsi, vous pouvez définir une adresse de réponse spécifique pour "
 "un courriel. Pour faire cela :"
 
-#: ../C/evolution.xml:1574(para)
+#: ../C/evolution.xml:1649(para)
 msgid "Open a compose window."
 msgstr "Ouvrez une fenêtre d'édition."
 
-#: ../C/evolution.xml:1577(para)
+#: ../C/evolution.xml:1652(para)
 msgid "Open the Reply-To field by clicking View &gt; Reply To."
 msgstr ""
 "Affichez le champ « Répondre à » en choisissant Affichage &gt; Champ Répondre "
 "à."
 
-#: ../C/evolution.xml:1580(para)
+#: ../C/evolution.xml:1655(para)
 msgid ""
 "Specify the address you want as the Reply-To address in the new Reply-To "
 "field."
 msgstr "Indiquez l'adresse de réponse souhaitée dans le champ « Répondre à »."
 
-#: ../C/evolution.xml:1583(para)
+#: ../C/evolution.xml:1658(para)
 msgid "Complete the rest of your message."
 msgstr "Complétez le reste de votre message."
 
-#: ../C/evolution.xml:1586(para) ../C/evolution.xml:1954(para)
-#: ../C/evolution.xml:2168(para) ../C/evolution.xml:5213(para)
+#: ../C/evolution.xml:1661(para) ../C/evolution.xml:2029(para)
+#: ../C/evolution.xml:2137(para) ../C/evolution.xml:2344(para)
+#: ../C/evolution.xml:5446(para)
 msgid "Click Send."
 msgstr "Cliquez sur Envoyer."
 
-#: ../C/evolution.xml:1593(para)
+#: ../C/evolution.xml:1668(para)
 msgid ""
 "Address auto completion is by default enabled in Evolution when you create "
 "contacts. Evolution makes it easy for you to quickly fill in the address "
@@ -4331,7 +4514,7 @@ msgstr ""
 "nom ou un pseudonyme correspondant à plus d'une adresse, Evolution ouvre une "
 "boîte de dialogue pour vous demander de préciser la personne exacte."
 
-#: ../C/evolution.xml:1594(para)
+#: ../C/evolution.xml:1669(para)
 msgid ""
 "If Evolution does not complete addresses automatically, click Edit &gt; "
 "Preferences, then click Autocompletion. There, select the address book you "
@@ -4342,7 +4525,7 @@ msgstr ""
 "sélectionnez le carnet d'adresses à utiliser pour la complétion automatique "
 "des adresses dans l'éditeur."
 
-#: ../C/evolution.xml:1595(para)
+#: ../C/evolution.xml:1670(para)
 msgid ""
 "Alternately, you can click the To:, Cc:, or Bcc: buttons to get a list of "
 "the email addresses in your contacts. Select addresses and click the arrows "
@@ -4353,7 +4536,7 @@ msgstr ""
 "les adresses et cliquez sur les flèches pour les placer dans les cases "
 "d'adresses adéquates."
 
-#: ../C/evolution.xml:1596(para)
+#: ../C/evolution.xml:1671(para)
 msgid ""
 "For more information about using email with the contact manager and the "
 "calendar, see <link linkend=\"contact-automation-basic\">Send Me a Card: "
@@ -4366,7 +4549,7 @@ msgstr ""
 "link> et <link linkend=\"usage-calendar-apts\">Planification avec le "
 "Calendrier d'Evolution</link>."
 
-#: ../C/evolution.xml:1601(para)
+#: ../C/evolution.xml:1676(para)
 msgid ""
 "To reply to a message, click the message to reply to in the message list and "
 "click the Reply button in the toolbar, or right-click within the message and "
@@ -4387,7 +4570,7 @@ msgstr ""
 "devant chaque ligne (en mode texte brut), pour indiquer que cela fait partie "
 "du message précédent."
 
-#: ../C/evolution.xml:1602(para)
+#: ../C/evolution.xml:1677(para)
 msgid ""
 "If you're reading a message with several recipients, you can use Reply to "
 "All instead of Reply. If there are large numbers of people in the Cc: or To: "
@@ -4398,11 +4581,11 @@ msgstr ""
 "Cc: comportent un grand nombre de personnes, cela peut vous faire gagner un "
 "temps non négligeable."
 
-#: ../C/evolution.xml:1605(title)
+#: ../C/evolution.xml:1680(title)
 msgid "Using the Reply To All Feature"
 msgstr "Utilisation de la fonctionnalité Répondre à tous"
 
-#: ../C/evolution.xml:1606(para)
+#: ../C/evolution.xml:1681(para)
 msgid ""
 "Susan sends an email to a client and sends copies to Tim and to an internal "
 "company mailing list of co-workers. If Tim wants to make a comment for all "
@@ -4418,7 +4601,7 @@ msgstr ""
 "mentionnée dans le champ Cci: du message de Susanne, car le contenu de ce "
 "champ n'est partagé avec personne."
 
-#: ../C/evolution.xml:1607(para)
+#: ../C/evolution.xml:1682(para)
 msgid ""
 "If you subscribe to a mailing list, and want your reply to go just to the "
 "list, rather than to the sender, select Reply to List instead of Reply or "
@@ -4428,71 +4611,71 @@ msgstr ""
 "qu'à la liste, plutôt qu'à l'expéditeur, cliquez sur « Répondre à la liste » "
 "au lieu de « Répondre » ou « Répondre à tous »."
 
-#: ../C/evolution.xml:1611(title)
+#: ../C/evolution.xml:1686(title)
 msgid "Keyboard shortcuts"
 msgstr "Raccourcis clavier"
 
-#: ../C/evolution.xml:1619(para)
+#: ../C/evolution.xml:1694(para)
 msgid "Tools"
 msgstr "Outils"
 
-#: ../C/evolution.xml:1622(para)
+#: ../C/evolution.xml:1697(para)
 msgid "Shortcuts"
 msgstr "Raccourcis"
 
-#: ../C/evolution.xml:1629(para)
+#: ../C/evolution.xml:1704(para)
 msgid "Reply to sender"
 msgstr "Répondre à l'expéditeur"
 
-#: ../C/evolution.xml:1632(para)
+#: ../C/evolution.xml:1707(para)
 msgid "Ctrl+R"
 msgstr "Ctrl+R"
 
-#: ../C/evolution.xml:1637(para)
+#: ../C/evolution.xml:1712(para)
 msgid "Reply to List"
 msgstr "Répondre à la liste"
 
-#: ../C/evolution.xml:1640(para)
+#: ../C/evolution.xml:1715(para)
 msgid "Clrl+L"
 msgstr "Ctrl+L"
 
-#: ../C/evolution.xml:1645(para)
+#: ../C/evolution.xml:1720(para)
 msgid "Reply to All"
 msgstr "Répondre à tous"
 
-#: ../C/evolution.xml:1648(para)
+#: ../C/evolution.xml:1723(para)
 msgid "Shift+Ctrl+R"
 msgstr "Maj+Ctrl+R"
 
-#: ../C/evolution.xml:1653(para)
+#: ../C/evolution.xml:1728(para)
 msgid "Forward"
 msgstr "Faire suivre"
 
-#: ../C/evolution.xml:1656(para)
+#: ../C/evolution.xml:1731(para)
 msgid "Ctrl+F"
 msgstr "Ctrl+F"
 
-#: ../C/evolution.xml:1667(para)
+#: ../C/evolution.xml:1742(para)
 msgid ""
 "The message composer makes several text searching features available to you."
 msgstr ""
 "L'éditeur de messages met à votre disposition plusieurs fonctions de "
 "recherche de texte."
 
-#: ../C/evolution.xml:1669(title)
+#: ../C/evolution.xml:1744(title)
 msgid "Find:"
 msgstr "Rechercher :"
 
-#: ../C/evolution.xml:1670(para)
+#: ../C/evolution.xml:1745(para)
 msgid "Enter a word or phrase, and Evolution finds it in your message."
 msgstr ""
 "Saisissez un mot ou une phrase et Evolution la recherche dans votre message."
 
-#: ../C/evolution.xml:1673(title)
+#: ../C/evolution.xml:1748(title)
 msgid "Find Regex:"
 msgstr "Rechercher une expression régulière :"
 
-#: ../C/evolution.xml:1674(para)
+#: ../C/evolution.xml:1749(para)
 msgid ""
 "You can search for a complex pattern of characters, called a <link linkend="
 "\"regular-expression\">regular expression</link> or <quote>regex</quote> in "
@@ -4504,26 +4687,26 @@ msgstr ""
 "la fenêtre d'édition. Si vous ne savez pas ce qu'est une expression "
 "régulière, vous pouvez ignorer cette fonctionnalité."
 
-#: ../C/evolution.xml:1677(title)
+#: ../C/evolution.xml:1752(title)
 msgid "Find Again:"
 msgstr "Rechercher de nouveau :"
 
-#: ../C/evolution.xml:1678(para)
+#: ../C/evolution.xml:1753(para)
 msgid "Select this item to repeat the last search you performed."
 msgstr ""
 "Sélectionnez cet élément pour répéter la recherche que vous venez de faire."
 
-#: ../C/evolution.xml:1681(title)
+#: ../C/evolution.xml:1756(title)
 msgid "Replace:"
 msgstr "Remplacer :"
 
-#: ../C/evolution.xml:1682(para)
+#: ../C/evolution.xml:1757(para)
 msgid "Find a word or phrase, and replace it with something else."
 msgstr ""
 "Recherche un mot ou une phrase et le ou la remplace par quelque chose "
 "d'autre."
 
-#: ../C/evolution.xml:1684(para)
+#: ../C/evolution.xml:1759(para)
 msgid ""
 "For all of these menu items, you can choose whether to search backwards in "
 "the document from the point where your cursor is. You can also determine "
@@ -4534,7 +4717,7 @@ msgstr ""
 "aussi déterminer si la recherche doit tenir compte de la casse (minuscules/"
 "majuscules) dans la recherche d'une correspondance."
 
-#: ../C/evolution.xml:1689(para)
+#: ../C/evolution.xml:1764(para)
 msgid ""
 "Normally, you can't set text styles or insert pictures in email. However, "
 "most newer email programs can display images and text styles in addition to "
@@ -4547,7 +4730,7 @@ msgstr ""
 "plus de l'alignement de base et du formatage des paragraphes. Ils le font "
 "avec le <link linkend=\"html\">HTML</link>, à la manière des pages Web."
 
-#: ../C/evolution.xml:1690(para)
+#: ../C/evolution.xml:1765(para)
 msgid ""
 "Some people do not have HTML-capable mail clients, or prefer not to receive "
 "HTML-enhanced mail because it is slower to download and display. Because of "
@@ -4559,11 +4742,11 @@ msgstr ""
 "envoie les messages en texte simple, sauf si vous lui demandez explicitement "
 "d'utiliser le HTML."
 
-#: ../C/evolution.xml:1693(title)
+#: ../C/evolution.xml:1768(title)
 msgid "Basic HTML Formatting"
 msgstr "Formatage HTML de base"
 
-#: ../C/evolution.xml:1694(para)
+#: ../C/evolution.xml:1769(para)
 msgid ""
 "You can change the format of an email message from plain text to HTML by "
 "choosing Format &gt; HTML from the menu bar."
@@ -4571,7 +4754,7 @@ msgstr ""
 "Vous pouvez modifier le format d'un courriel et passer du format texte "
 "simple au HTML en choisissant Format &gt; HTML dans la barre de menus."
 
-#: ../C/evolution.xml:1695(para)
+#: ../C/evolution.xml:1770(para)
 msgid ""
 "To send all your mail as HTML by default, set your mail format preferences "
 "in the mail configuration dialog box. See <link linkend=\"config-prefs-mail-"
@@ -4582,7 +4765,7 @@ msgstr ""
 "configuration des messages. Voir <link linkend=\"config-prefs-mail-composer"
 "\">Préférences de l'éditeur</link> pour plus d'informations."
 
-#: ../C/evolution.xml:1696(para)
+#: ../C/evolution.xml:1771(para)
 msgid ""
 "HTML formatting tools are located in the toolbar just above the space where "
 "you actually compose the message. They also appear in the Insert and Format "
@@ -4592,7 +4775,7 @@ msgstr ""
 "dessus de la zone d'édition des messages. Ils apparaissent également dans "
 "les menus Insérer et Format."
 
-#: ../C/evolution.xml:1697(para)
+#: ../C/evolution.xml:1772(para)
 msgid ""
 "The icons in the toolbar are explained in <link linkend=\"tooltip\">tool-"
 "tips</link>, which appear when you hold your mouse pointer over the buttons. "
@@ -4603,11 +4786,11 @@ msgstr ""
 "le pointeur de la souris au-dessus des boutons. Les boutons peuvent être "
 "classés dans cinq catégories :"
 
-#: ../C/evolution.xml:1699(title)
+#: ../C/evolution.xml:1774(title)
 msgid "Headers and Lists:"
 msgstr "En-têtes et listes :"
 
-#: ../C/evolution.xml:1700(para)
+#: ../C/evolution.xml:1775(para)
 msgid ""
 "At the left edge of the toolbar, you can choose Normal for a default text "
 "style or Header 1 through Header 6 for varying sizes of header from large "
@@ -4620,7 +4803,7 @@ msgstr ""
 "aussi le style Préformaté qui correspond à la balise HTML utilisée pour les "
 "blocs de texte préformatés, et trois types de listes à puces."
 
-#: ../C/evolution.xml:1702(para)
+#: ../C/evolution.xml:1777(para)
 msgid ""
 "For instance, instead of using asterisks to mark a bulleted list, you can "
 "use the Bulleted List style from the style drop-down list. Evolution uses "
@@ -4632,11 +4815,11 @@ msgstr ""
 "styles. Evolution propose différents styles de listes et gère les retours de "
 "ligne et plusieurs niveaux d'indentation."
 
-#: ../C/evolution.xml:1704(title)
+#: ../C/evolution.xml:1779(title)
 msgid "Text Styles:"
 msgstr "Styles de texte :"
 
-#: ../C/evolution.xml:1705(para)
+#: ../C/evolution.xml:1780(para)
 msgid ""
 "Use these buttons to determine the way your email looks. If you have text "
 "selected, the style applies to the selected text. If you do not have text "
@@ -4646,15 +4829,15 @@ msgstr ""
 "est sélectionné, le style s'applique à ce texte. Dans le cas contraire, le "
 "style s'applique à tout le texte que vous allez saisir ensuite."
 
-#: ../C/evolution.xml:1714(para)
+#: ../C/evolution.xml:1789(para)
 msgid "Button"
 msgstr "Bouton"
 
-#: ../C/evolution.xml:1724(para)
+#: ../C/evolution.xml:1799(para)
 msgid "TT"
 msgstr "TT"
 
-#: ../C/evolution.xml:1727(para)
+#: ../C/evolution.xml:1802(para)
 msgid ""
 "Typewriter text, which is approximately the same as the Courier monospace "
 "font."
@@ -4662,43 +4845,43 @@ msgstr ""
 "Texte de machine à écrire, qui correspond à peu près à la police à largeur "
 "fixe Courier."
 
-#: ../C/evolution.xml:1732(para)
+#: ../C/evolution.xml:1807(para)
 msgid "Bold A"
 msgstr "A gras"
 
-#: ../C/evolution.xml:1735(para)
+#: ../C/evolution.xml:1810(para)
 msgid "Bolds the text."
 msgstr "Met le texte en gras."
 
-#: ../C/evolution.xml:1740(para)
+#: ../C/evolution.xml:1815(para)
 msgid "Italic A"
 msgstr "A italique"
 
-#: ../C/evolution.xml:1743(para)
+#: ../C/evolution.xml:1818(para)
 msgid "Italicizes the text."
 msgstr "Met le texte en italique."
 
-#: ../C/evolution.xml:1748(para)
+#: ../C/evolution.xml:1823(para)
 msgid "Underlined A"
 msgstr "A souligné"
 
-#: ../C/evolution.xml:1751(para)
+#: ../C/evolution.xml:1826(para)
 msgid "Underlines the text."
 msgstr "Souligne le texte."
 
-#: ../C/evolution.xml:1756(para)
+#: ../C/evolution.xml:1831(para)
 msgid "Strike through A"
 msgstr "A barré"
 
-#: ../C/evolution.xml:1759(para)
+#: ../C/evolution.xml:1834(para)
 msgid "Marks a line through the text."
 msgstr "Trace une ligne par-dessus le texte."
 
-#: ../C/evolution.xml:1766(title)
+#: ../C/evolution.xml:1841(title)
 msgid "Alignment:"
 msgstr "Alignement :"
 
-#: ../C/evolution.xml:1767(para)
+#: ../C/evolution.xml:1842(para)
 msgid ""
 "Located next to the text style buttons, the three paragraph icons should be "
 "familiar to users of most word processing software. The left most button "
@@ -4711,11 +4894,11 @@ msgstr ""
 "marge gauche, le bouton du milieu centre le texte et le bouton de droite "
 "aligne le texte sur la marge droite."
 
-#: ../C/evolution.xml:1770(title)
+#: ../C/evolution.xml:1845(title)
 msgid "Indentation Rules:"
 msgstr "Règles d'indentation :"
 
-#: ../C/evolution.xml:1771(para)
+#: ../C/evolution.xml:1846(para)
 msgid ""
 "The button with the arrow pointing left decreases a paragraph's indentation, "
 "and the right arrow increases its indentation."
@@ -4723,11 +4906,11 @@ msgstr ""
 "Le bouton comportant une flèche gauche diminue l'indentation d'un "
 "paragraphe, et celui comportant une flèche droite augmente l'indentation."
 
-#: ../C/evolution.xml:1774(title)
+#: ../C/evolution.xml:1849(title)
 msgid "Color Selection:"
 msgstr "Sélection de couleur :"
 
-#: ../C/evolution.xml:1775(para)
+#: ../C/evolution.xml:1850(para)
 msgid ""
 "At the far right is the color section tool, where a box displays the current "
 "text color. To choose a new color, click the arrow button to the right. If "
@@ -4744,11 +4927,11 @@ msgstr ""
 "couleur ou une image d'arrière-plan en cliquant avec le bouton droit sur "
 "l'arrière-plan du message, puis en choisissant Style &gt; Style de la page."
 
-#: ../C/evolution.xml:1780(title)
+#: ../C/evolution.xml:1855(title)
 msgid "Advanced HTML Formatting"
 msgstr "Formatage HTML avancé"
 
-#: ../C/evolution.xml:1781(para)
+#: ../C/evolution.xml:1856(para)
 msgid ""
 "Under the Insert menu, there are several more items you can use to style "
 "your email. To use these and other HTML formatting tools, make sure you have "
@@ -4759,11 +4942,11 @@ msgstr ""
 "que les autres outils de formatage HTML, assurez-vous d'avoir activé le mode "
 "HTML en choisissant Format &gt; HTML dans la barre de menus."
 
-#: ../C/evolution.xml:1784(title)
+#: ../C/evolution.xml:1859(title)
 msgid "Inserting a Link"
 msgstr "Insertion d'un lien"
 
-#: ../C/evolution.xml:1785(para)
+#: ../C/evolution.xml:1860(para)
 msgid ""
 "Use the Insert a Link tool to put hyperlinks in your HTML messages. If you "
 "don't want special link text, you can just enter the address directly, and "
@@ -4774,78 +4957,78 @@ msgstr ""
 "texte du lien, vous pouvez simplement saisir l'adresse telle quelle et "
 "Evolution reconnaît qu'il s'agit d'un lien."
 
-#: ../C/evolution.xml:1788(para)
+#: ../C/evolution.xml:1863(para)
 msgid "Select the text you want to link from."
 msgstr "Sélectionnez le texte qui formera le contenu du lien."
 
-#: ../C/evolution.xml:1791(para)
+#: ../C/evolution.xml:1866(para)
 msgid "Right-click in the text, then click Insert Link."
 msgstr "Faites un clic droit sur le texte, puis choisissez Insérer un lien."
 
-#: ../C/evolution.xml:1794(para)
+#: ../C/evolution.xml:1869(para)
 msgid "Type the URL in the URL field."
 msgstr "Saisissez l'URL dans le champ URL."
 
-#: ../C/evolution.xml:1803(title)
+#: ../C/evolution.xml:1878(title)
 msgid "Inserting an Image"
 msgstr "Insertion d'une image"
 
-#: ../C/evolution.xml:1806(para)
+#: ../C/evolution.xml:1881(para)
 msgid "Click Insert &gt; Image in the menubar."
 msgstr "Choisissez Insertion &gt; Image dans la barre de menus."
 
-#: ../C/evolution.xml:1809(para)
+#: ../C/evolution.xml:1884(para)
 msgid "Browse to and select the image file."
 msgstr "Parcourez vos fichiers pour choisir une image."
 
-#: ../C/evolution.xml:1818(title)
+#: ../C/evolution.xml:1893(title)
 msgid "Inserting a Rule"
 msgstr "Insertion d'un filet"
 
-#: ../C/evolution.xml:1819(para)
+#: ../C/evolution.xml:1894(para)
 msgid ""
 "You can insert a horizontal line into the text to help divide two sections:"
 msgstr ""
 "Vous pouvez insérer une ligne horizontale dans le texte pour aider à diviser "
 "deux sections :"
 
-#: ../C/evolution.xml:1822(para)
+#: ../C/evolution.xml:1897(para)
 msgid "Click Insert &gt; Rule in the menubar."
 msgstr "Choisissez Insertion &gt; Filet dans la barre de menus."
 
-#: ../C/evolution.xml:1825(para)
+#: ../C/evolution.xml:1900(para)
 msgid "Select the width, size, and alignment."
 msgstr "Choisissez la largeur, la taille et l'alignement."
 
-#: ../C/evolution.xml:1828(para)
+#: ../C/evolution.xml:1903(para)
 msgid "Select Shade if necessary."
 msgstr "Cochez Ombragé si vous le souhaitez."
 
-#: ../C/evolution.xml:1837(title)
+#: ../C/evolution.xml:1912(title)
 msgid "Inserting a Table"
 msgstr "Insertion d'un tableau"
 
-#: ../C/evolution.xml:1838(para)
+#: ../C/evolution.xml:1913(para)
 msgid "You can insert a table into the text:"
 msgstr "Vous pouvez insérer un tableau dans le texte :"
 
-#: ../C/evolution.xml:1841(para)
+#: ../C/evolution.xml:1916(para)
 msgid "Click Insert &gt; Table in the menubar."
 msgstr "Choisissez Insertion &gt; Tableau dans la barre de menus."
 
-#: ../C/evolution.xml:1844(para)
+#: ../C/evolution.xml:1919(para)
 msgid "Select the number of rows and columns."
 msgstr "Choisissez le nombre de lignes et de colonnes."
 
-#: ../C/evolution.xml:1847(para)
+#: ../C/evolution.xml:1922(para)
 msgid "Select the type of layout for the table."
 msgstr "Choisissez le type de disposition du tableau."
 
-#: ../C/evolution.xml:1850(para)
+#: ../C/evolution.xml:1925(para)
 msgid "Select a background for the table."
 msgstr "Choisissez un arrière-plan pour le tableau."
 
-#: ../C/evolution.xml:1851(para)
+#: ../C/evolution.xml:1926(para)
 msgid ""
 "To insert a picture for the background, click the filechooser button and "
 "select the desired image."
@@ -4853,17 +5036,17 @@ msgstr ""
 "Pour insérer une image en tant qu'arrière-plan, cliquez sur le bouton de "
 "sélection de fichiers et choisissez l'image souhaitée."
 
-#: ../C/evolution.xml:1863(para)
+#: ../C/evolution.xml:1938(para)
 msgid "You can set the following options when sending mail in Evolution."
 msgstr ""
 "Vous pouvez définir les options ci-après lorsque vous envoyez des courriels "
 "avec Evolution."
 
-#: ../C/evolution.xml:1865(title)
+#: ../C/evolution.xml:1940(title)
 msgid "Read Receipts:"
 msgstr "Accusés de lecture :"
 
-#: ../C/evolution.xml:1866(para)
+#: ../C/evolution.xml:1941(para)
 msgid ""
 "Evolution allows you to request a receipt for your sent messages to indicate "
 "when your message is being viewed by the recipient. Receipts are useful when "
@@ -4876,11 +5059,11 @@ msgstr ""
 "demander un accusé, choisissez Insérer &gt; Demander un accusé de lecture "
 "dans la fenêtre de l'éditeur."
 
-#: ../C/evolution.xml:1869(title)
+#: ../C/evolution.xml:1944(title)
 msgid "Prioritize Message:"
 msgstr "Priorité des messages :"
 
-#: ../C/evolution.xml:1870(para)
+#: ../C/evolution.xml:1945(para)
 msgid ""
 "You can prioritize a message to be sent, so that the recipient sees its "
 "relative importance.To prioritize a message, click Insert &gt; Prioritize "
@@ -4891,7 +5074,7 @@ msgstr ""
 "d'un message, choisissez Insérer &gt; Prioriser le message dans la fenêtre "
 "de l'éditeur."
 
-#: ../C/evolution.xml:1873(para)
+#: ../C/evolution.xml:1948(para)
 msgid ""
 "Evolution will ignore the message priority, because it assumes that the "
 "recipient should decide whether the message is important or not."
@@ -4899,11 +5082,11 @@ msgstr ""
 "Evolution ignore la priorité d'un message, parce qu'il estime que c'est au "
 "destinataire de décider si le message est important ou non."
 
-#: ../C/evolution.xml:1878(title)
+#: ../C/evolution.xml:1953(title)
 msgid "Default Settings"
 msgstr "Paramètres par défaut"
 
-#: ../C/evolution.xml:1879(para)
+#: ../C/evolution.xml:1954(para)
 msgid ""
 "Evolution allows you to change the default settings. You can organize your "
 "draft folder and sent folder, set the addresses to which you want to sent "
@@ -4916,25 +5099,25 @@ msgstr ""
 "aussi changer les paramètres d'accusés de réception des messages dans la "
 "fenêtre des Valeurs par défaut."
 
-#: ../C/evolution.xml:1881(para)
+#: ../C/evolution.xml:1956(para)
 msgid "To change your default settings,"
 msgstr "Pour modifier vos paramètres par défaut,"
 
-#: ../C/evolution.xml:1887(para)
+#: ../C/evolution.xml:1962(para)
 msgid "Select the mail account whose default settings you want to change."
 msgstr ""
 "Sélectionnez le compte de messagerie dont vous voulez modifier les "
 "paramètres par défaut."
 
-#: ../C/evolution.xml:1890(para)
+#: ../C/evolution.xml:1965(para)
 msgid "Click Edit to open Account Editor window."
 msgstr "Cliquez sur Édition pour ouvrir la fenêtre d'édition du compte."
 
-#: ../C/evolution.xml:1893(para)
+#: ../C/evolution.xml:1968(para)
 msgid "Click Default tab."
 msgstr "Cliquez sur l'onglet Valeurs par défaut."
 
-#: ../C/evolution.xml:1896(para)
+#: ../C/evolution.xml:1971(para)
 msgid ""
 "Click the respective check boxes and enter the email addresses you want CC "
 "and BCC to."
@@ -4942,20 +5125,20 @@ msgstr ""
 "Cochez les cases adéquates et saisissez les adresses électroniques "
 "souhaitées pour les copies et les copies cachées. "
 
-#: ../C/evolution.xml:1899(para)
+#: ../C/evolution.xml:1974(para)
 msgid ""
 "Select the desired option for send message receipts from the drop-down list."
 msgstr ""
 "Choisissez l'option souhaitée pour les accusés de réception des messages "
 "dans la liste déroulante correspondante."
 
-#: ../C/evolution.xml:1904(title)
+#: ../C/evolution.xml:1979(title)
 msgid "Changing Default Folder for Sent and Draft Items"
 msgstr ""
 "Changement des dossiers par défaut pour les éléments envoyés et les "
 "brouillons"
 
-#: ../C/evolution.xml:1905(para)
+#: ../C/evolution.xml:1980(para)
 msgid ""
 "By default, all the sent messages directly goes to Sent folder and those "
 "messages marked as drafts are saved in Draft folder. To change the default "
@@ -4966,32 +5149,32 @@ msgstr ""
 "dans le dossier Brouillons. Pour modifier le dossier par défaut pour les "
 "brouillons,"
 
-#: ../C/evolution.xml:1908(para)
+#: ../C/evolution.xml:1983(para)
 msgid "Click Drafts button to open Folder view."
 msgstr "Cliquez sur le bouton Brouillons pour ouvrir l'affichage des dossiers."
 
-#: ../C/evolution.xml:1911(para)
+#: ../C/evolution.xml:1986(para)
 msgid "Select the folder you want to save the drafts to."
 msgstr ""
 "Sélectionnez le dossier dans lequel vous voulez enregistrer les brouillons."
 
-#: ../C/evolution.xml:1917(para) ../C/evolution.xml:1933(para)
+#: ../C/evolution.xml:1992(para) ../C/evolution.xml:2008(para)
 msgid "Click Revert button to revert back to previous settings."
 msgstr "Cliquez sur le bouton Rétablir pour revenir aux réglages précédents."
 
-#: ../C/evolution.xml:1921(para)
+#: ../C/evolution.xml:1996(para)
 msgid "To change the default folder for sent items,"
 msgstr "Pour modifier le dossier par défaut pour les éléments envoyés,"
 
-#: ../C/evolution.xml:1924(para)
+#: ../C/evolution.xml:1999(para)
 msgid "Click Sent button to open the Folder view."
 msgstr "Cliquez sur le bouton Envoyé pour ouvrir l'affichage des dossiers."
 
-#: ../C/evolution.xml:1927(para)
+#: ../C/evolution.xml:2002(para)
 msgid "Select the desired folder for sent items."
 msgstr "Sélectionnez le dossier souhaité pour les éléments envoyés."
 
-#: ../C/evolution.xml:1941(para)
+#: ../C/evolution.xml:2016(para)
 msgid ""
 "When you receive an email, you can forward it to other individuals or groups "
 "that might be interested. You can forward a message as an attachment to a "
@@ -5015,15 +5198,15 @@ msgstr ""
 "du message original. N'oubliez pas d'indiquer l'expéditeur original du "
 "message et si vous avez enlevé ou modifié du contenu."
 
-#: ../C/evolution.xml:1942(para)
+#: ../C/evolution.xml:2017(para)
 msgid "To forward a message you are reading:"
 msgstr "Pour faire suivre un message que vous êtes en train de lire :"
 
-#: ../C/evolution.xml:1945(para)
+#: ../C/evolution.xml:2020(para)
 msgid "Click Forward on the toolbar."
 msgstr "Cliquez sur Faire suivre dans la barre d'outils."
 
-#: ../C/evolution.xml:1947(para)
+#: ../C/evolution.xml:2022(para)
 msgid ""
 "If you prefer to forward the message <link linkend=\"inline\">inline</link> "
 "instead of attached, click Message &gt; Forward As &gt; Inline from the menu."
@@ -5032,7 +5215,7 @@ msgstr ""
 "link> au lieu de joint, choisissez Message &gt; Faire suivre comme &gt; Dans "
 "le corps."
 
-#: ../C/evolution.xml:1950(para)
+#: ../C/evolution.xml:2025(para)
 msgid ""
 "Select an addressee as you would when sending a new message; the subject is "
 "already entered, although you can alter it if you want."
@@ -5040,11 +5223,11 @@ msgstr ""
 "Sélectionnez un destinataire comme pour l'envoi d'un nouveau message ; le "
 "sujet figure déjà, mais vous pouvez le modifier si nécessaire."
 
-#: ../C/evolution.xml:1953(para)
+#: ../C/evolution.xml:2028(para)
 msgid "Add your comments on the message in the composition frame"
 msgstr "Ajoutez vos commentaires sur le message dans la zone d'édition."
 
-#: ../C/evolution.xml:1957(para)
+#: ../C/evolution.xml:2032(para)
 msgid ""
 "Attachments to a message you are forwarding are forwarded only when you send "
 "the original message as an attachment. Inline messages do not forward any "
@@ -5054,7 +5237,7 @@ msgstr ""
 "message original en tant que pièce jointe. Pour les messages intégrés, les "
 "pièces jointes ne sont pas retransmises."
 
-#: ../C/evolution.xml:1964(para)
+#: ../C/evolution.xml:2039(para)
 msgid ""
 "Don't forward chain letters. If you must, watch out for hoaxes and urban "
 "legends, and make sure the message doesn't have multiple layers of greater-"
@@ -5066,7 +5249,7 @@ msgstr ""
 "« plus grand que » (&gt;), ce qui révélerait plusieurs couches de transferts "
 "négligents."
 
-#: ../C/evolution.xml:1967(para)
+#: ../C/evolution.xml:2042(para)
 msgid ""
 "Always begin and close with a salutation. Say <quote>please</quote> and "
 "<quote>thank you,</quote> just like you do in real life. You can keep your "
@@ -5076,7 +5259,7 @@ msgstr ""
 "vous plaît » et « merci », comme dans la vie de tous les jours. Vous pouvez "
 "placer de courtes plaisanteries, mais restez poli."
 
-#: ../C/evolution.xml:1970(para)
+#: ../C/evolution.xml:2045(para)
 msgid ""
 "WRITING IN CAPITAL LETTERS MEANS YOU'RE SHOUTING! Don't write a whole "
 "message in capital letters. It hurts people's ears."
@@ -5084,7 +5267,7 @@ msgstr ""
 "ÉCRIRE EN MAJUSCULES SIGNIFIE QUE VOUS CRIEZ ! N'écrivez pas un message "
 "complet en majuscules. Cela fait mal aux oreilles."
 
-#: ../C/evolution.xml:1973(para)
+#: ../C/evolution.xml:2048(para)
 msgid ""
 "Check your spelling and use complete sentences. By default, Evolution puts a "
 "red line beneath words it doesn't recognize, as you type them."
@@ -5093,13 +5276,13 @@ msgstr ""
 "Evolution souligne en rouge les mots qu'il ne reconnaît pas, au fur et à "
 "mesure de la frappe."
 
-#: ../C/evolution.xml:1976(para)
+#: ../C/evolution.xml:2051(para)
 msgid "Don't send nasty emails (flames). If you get one, don't write back."
 msgstr ""
 "N'envoyez pas de courriels désagréables (disputes). Si vous en recevez un, "
 "ne répondez pas."
 
-#: ../C/evolution.xml:1979(para)
+#: ../C/evolution.xml:2054(para)
 msgid ""
 "When you reply or forward, include enough of the previous message to provide "
 "context."
@@ -5107,11 +5290,185 @@ msgstr ""
 "Lorsque vous répondez ou que vous faites suivre, laissez assez de contenu du "
 "message précédent afin de garder le contexte."
 
-#: ../C/evolution.xml:1982(para)
+#: ../C/evolution.xml:2057(para)
 msgid "Don't send spam."
 msgstr "N'envoyez pas de pourriel (spam)."
 
-#: ../C/evolution.xml:1990(para)
+#: ../C/evolution.xml:2065(para)
+msgid ""
+"A message template is a standard message that you can use at any time to "
+"send mail with the same pattern. Evolution allows you to create and edit "
+"message templates."
+msgstr ""
+"Un modèle de message est un message standard qui vous permet d'envoyer "
+"en tout temps des messages ayant la même structure. Evolution permet de "
+"créer et de modifier des modèles de message."
+
+#: ../C/evolution.xml:2068(link) ../C/evolution.xml:2088(title)
+msgid "Creating a Message Template from an Existing Message"
+msgstr "Création d'un modèle de message à partir d'un message existant"
+
+#: ../C/evolution.xml:2071(link) ../C/evolution.xml:2115(title)
+msgid "Saving a New Message as a Template"
+msgstr "Enregistrement d'un nouveau message comme modèle"
+
+#: ../C/evolution.xml:2074(link) ../C/evolution.xml:2127(title)
+msgid "Using a Message Template as a Reply"
+msgstr "Emploi d'un modèle de message comme réponse"
+
+#: ../C/evolution.xml:2077(link) ../C/evolution.xml:2144(title)
+msgid "Configuring Message Templates"
+msgstr "Configuration des modèles de message"
+
+#: ../C/evolution.xml:2080(para)
+msgid "To enable the Message Template Plugin:"
+msgstr "Pour activer le greffon des modèles de message :"
+
+#: ../C/evolution.xml:2083(para)
+msgid "Select Edit &gt; Plugins, then select Templates."
+msgstr ""
+"Choisissez Édition &gt; Greffons, puis sélectionnez Modèles."
+
+#: ../C/evolution.xml:2091(para)
+msgid "Select the message."
+msgstr "Sélectionnez le message."
+
+#: ../C/evolution.xml:2094(para)
+msgid "Right-click &gt; Move to folder / Copy to folder."
+msgstr "Faites un clic droit sur le message et choisissez « Déplacer vers "
+"le dossier » ou « Copier vers le dossier »."
+
+#: ../C/evolution.xml:2097(para)
+msgid "Select the Template local folder."
+msgstr "Sélectionnez le dossier local Modèles."
+
+#: ../C/evolution.xml:2100(para)
+msgid "You can also edit an existing message and save it as a template."
+msgstr "Vous pouvez aussi modifier un message existant et l'enregistrer comme modèle."
+
+#: ../C/evolution.xml:2103(para)
+msgid "Open the message and click Reply."
+msgstr "Ouvrez le message et cliquez sur Répondre."
+
+#: ../C/evolution.xml:2106(para)
+msgid "Edit the message body or the addresses according to your requirements."
+msgstr "Modifiez le corps ou les adresses du message selon vos besoins."
+
+#: ../C/evolution.xml:2109(para) ../C/evolution.xml:2121(para)
+msgid "Select File &gt; Save as Template."
+msgstr "Choisissez Fichier &gt; Enregistrer comme modèle."
+
+#: ../C/evolution.xml:2118(para)
+msgid ""
+"Click New and enter the information in the New Message window, according to "
+"your requirements."
+msgstr ""
+"Cliquez sur Nouveau et saisissez les informations souhaitées dans la fenêtre "
+"d'édition du nouveau message."
+
+#: ../C/evolution.xml:2130(para)
+msgid "Right-click the message you are replying to, then click Templates."
+msgstr ""
+"Faites un clic droit sur le message auquel vous souhaitez répondre, "
+"puis choisissez Modèles."
+
+#: ../C/evolution.xml:2131(para)
+msgid "This option lists all the message templates in the Template folder."
+msgstr "Cette option liste tous les modèles de message du dossier Modèles."
+
+#: ../C/evolution.xml:2134(para)
+msgid ""
+"Select Open the message template of your choice and make changes if required."
+msgstr ""
+"Ouvrez le modèle de message de votre choix et modifiez-le si nécessaire."
+
+#: ../C/evolution.xml:2138(para)
+msgid ""
+"When you select a message template for replying, the subject of the reply is "
+"preserved."
+msgstr ""
+"Lorsque vous choisissez un modèle de message comme réponse, le sujet original "
+"de la réponse est conservé."
+
+#: ../C/evolution.xml:2145(para)
+msgid ""
+"In the Plugin Manager, select the Configuration tab to customize your "
+"message templates. You can add, edit or remove the key-value pairs. You can "
+"specify any number of key-value pairs."
+msgstr ""
+"Dans le gestionnaire de greffons, sélectionnez l'onglet Configuration pour "
+"personnaliser vos modèles de message. Vous pouvez ajouter, modifier ou "
+"supprimer des paires clé-valeur. Vous pouvez définir autant de paires clé-"
+"valeur que souhaité."
+
+#: ../C/evolution.xml:2146(para)
+msgid ""
+"In any template, the occurrence of every $key is replaced by the value it "
+"has in the configuration. For example, if you set the key to Manager and the "
+"value to Harry, any occurrence of $Manager is replaced by Harry in the "
+"message."
+msgstr ""
+"Dans tout modèle, chaque occurrence de « $clé » est remplacée par la valeur indiquée "
+"dans la configuration. Par exemple, si vous définissez une clé à « Directeur » et "
+"la valeur à « Jean », chaque occurrence de $Directeur est remplacée par Jean "
+"dans le message."
+
+#: ../C/evolution.xml:2147(para)
+msgid ""
+"Assume that you have 1000 message templates with your current manager's name "
+"has a reference in them. When the current manager is replaced by a new one, "
+"it's not easy for you to manually replace the manager's name in all the 1000 "
+"messages. If the messages have a $Manager key value, you can reset the value "
+"in the Configuration tab of this plugin."
+msgstr ""
+"Supposons que vous ayez 1000 modèles de message qui référencent le nom de votre "
+"directeur actuel. Si votre directeur est remplacé, il est fastidieux de devoir "
+"modifier manuellement le nom du directeur dans les 1000 messages. Si les messages "
+"contiennent une clé $Directeur, vous pouvez facilement modifier la valeur "
+"correspondante dans l'onglet Configuration de ce greffon."
+
+#: ../C/evolution.xml:2148(para)
+msgid ""
+"By default, the entire environment variables are used as a key-value pair. "
+"An occurrence of $env_variable is replaced by the value it carries. For "
+"example, an occurrence of $PATH in your template is replaced by its value "
+"when the template is used."
+msgstr ""
+"Par défaut, toutes les variables d'environnement existantes sont utilisées "
+"comme paires clé-valeur. Chaque apparition de $VARIABLE_D'ENVIRONNEMENT est "
+"substituée par sa valeur. Par exemple, si un de vos modèles contient « $PATH », "
+"c'est la valeur de cette variable qui apparaîtra dans le modèle lorsqu'il sera "
+"utilisé." 
+
+#: ../C/evolution.xml:2149(para)
+msgid "The replacement process uses the following order of precedence:"
+msgstr "L'algorithme de substitution utilise l'ordre de priorités suivant :"
+
+#: ../C/evolution.xml:2152(para)
+msgid ""
+"$key is replaced by the value set for it in the Configuration tab of the "
+"Templates plugin."
+msgstr ""
+"$clé est remplacée par la valeur correspondante dans l'onglet Configuration "
+"du greffon Modèles."
+
+#: ../C/evolution.xml:2155(para)
+msgid ""
+"If the key is not found, it is then replaced with the value of its "
+"environment variable."
+msgstr ""
+"Si la clé n'est pas trouvée, elle est alors remplacée par la valeur "
+"correspondant à la variable d'environnement éponyme."
+
+#: ../C/evolution.xml:2158(para)
+msgid ""
+"If key is neither a configuration option nor an environment variable, no "
+"changes are made."
+msgstr ""
+"Si la clé n'est ni une option de configuration, ni une variable d'environnement, "
+"aucune substitution n'est effectuée."
+
+#: ../C/evolution.xml:2166(para)
 msgid ""
 "If you create an event in the calendar component, you can then send "
 "invitations to the attendee list through the Evolution email tool. The "
@@ -5122,7 +5479,7 @@ msgstr ""
 "Courriel d'Evolution. La carte d'invitation est envoyée comme pièce jointe "
 "au format iCal."
 
-#: ../C/evolution.xml:1991(para)
+#: ../C/evolution.xml:2167(para)
 msgid ""
 "To send an invitation, right click on the calendar item and click Forward as "
 "iCalendar."
@@ -5130,15 +5487,15 @@ msgstr ""
 "Pour envoyer une invitation, faites un clic droit sur l'élément de "
 "calendrier et choisissez Faire suivre comme iCalendar."
 
-#: ../C/evolution.xml:1992(para)
+#: ../C/evolution.xml:2168(para)
 msgid "When you receive an invitation, you have several options:"
 msgstr "Lorsque vous recevez une invitation, vous avez plusieurs options :"
 
-#: ../C/evolution.xml:1994(title)
+#: ../C/evolution.xml:2170(title)
 msgid "Accept:"
 msgstr "Accepter :"
 
-#: ../C/evolution.xml:1995(para)
+#: ../C/evolution.xml:2171(para)
 msgid ""
 "Indicates you will attend the meeting. When you click the OK button, the "
 "meeting is entered into your calendar."
@@ -5146,11 +5503,11 @@ msgstr ""
 "Indique que vous allez participer à la rencontre. Au moment de cliquer sur "
 "le bouton Valider, le rendez-vous est ajouté à votre calendrier."
 
-#: ../C/evolution.xml:1998(title)
+#: ../C/evolution.xml:2174(title)
 msgid "Tentatively Accept:"
 msgstr "Accepter provisoirement :"
 
-#: ../C/evolution.xml:1999(para)
+#: ../C/evolution.xml:2175(para)
 msgid ""
 "Indicates you will probably attend the meeting. When you click the OK "
 "button, the meeting is entered into your calendar, but is marked as "
@@ -5160,11 +5517,11 @@ msgstr ""
 "cliquer sur le bouton Valider, le rendez-vous est ajouté à votre calendrier, "
 "mais il reçoit l'attribut Provisoire."
 
-#: ../C/evolution.xml:2002(title)
+#: ../C/evolution.xml:2178(title)
 msgid "Decline:"
 msgstr "Refuser :"
 
-#: ../C/evolution.xml:2003(para)
+#: ../C/evolution.xml:2179(para)
 msgid ""
 "Indicates you are unable to attend the meeting. The meeting is not entered "
 "into your calendar when you click OK, although your response is sent to the "
@@ -5175,18 +5532,18 @@ msgstr ""
 "Valider, bien que votre réponse est envoyée au créateur du rendez-vous si "
 "vous avez coché l'option « Répondre à l'expéditeur »."
 
-#: ../C/evolution.xml:2006(title)
+#: ../C/evolution.xml:2182(title)
 msgid "Send reply to sender:"
 msgstr "Répondre à l'expéditeur :"
 
-#: ../C/evolution.xml:2007(para)
+#: ../C/evolution.xml:2183(para)
 msgid ""
 "Select this option if you want your response sent to the meeting organizers."
 msgstr ""
 "Cochez cette option si vous souhaitez que votre réponse soit envoyée aux "
 "organisateurs des rendez-vous."
 
-#: ../C/evolution.xml:2013(para)
+#: ../C/evolution.xml:2189(para)
 msgid ""
 "Because IMAP folders exist on the server, and opening them or checking them "
 "takes time, you need fine-grained control over the way that you use IMAP "
@@ -5204,11 +5561,11 @@ msgstr ""
 "en exclure d'autres, vous pouvez utiliser l'outil de gestion des abonnements "
 "à cet effet."
 
-#: ../C/evolution.xml:2016(para)
+#: ../C/evolution.xml:2192(para)
 msgid "Select Folder &gt; Subscriptions."
 msgstr "Choisissez Dossier &gt; Abonnements."
 
-#: ../C/evolution.xml:2019(para)
+#: ../C/evolution.xml:2195(para)
 msgid ""
 "If you have accounts on multiple IMAP servers, select the server where you "
 "want to manage your subscriptions."
@@ -5216,15 +5573,15 @@ msgstr ""
 "Si vous possédez des comptes sur plusieurs serveurs IMAP, sélectionnez le "
 "serveur dont vous voulez gérer les abonnements."
 
-#: ../C/evolution.xml:2020(para)
+#: ../C/evolution.xml:2196(para)
 msgid "Evolution displays a list of available files and folders."
 msgstr "Evolution affiche une liste des fichiers et dossiers disponibles."
 
-#: ../C/evolution.xml:2023(para)
+#: ../C/evolution.xml:2199(para)
 msgid "Select a file or folder by clicking it."
 msgstr "Sélectionnez un fichier ou un dossier en cliquant dessus."
 
-#: ../C/evolution.xml:2024(para)
+#: ../C/evolution.xml:2200(para)
 msgid ""
 "You should select at least the Inbox folder. Depending upon the way your "
 "IMAP server is configured, the list of available files might include non-"
@@ -5235,19 +5592,19 @@ msgstr ""
 "contenir des dossiers qui ne contiennent pas de messages. Si c'est le cas, "
 "vous pouvez les ignorer."
 
-#: ../C/evolution.xml:2027(para)
+#: ../C/evolution.xml:2203(para)
 msgid ""
 "Enable the corresponding checkbox to add a folder to the subscribed list."
 msgstr ""
 "Cochez la case correspondante pour ajouter un dossier à la liste des "
 "abonnements."
 
-#: ../C/evolution.xml:2030(para)
+#: ../C/evolution.xml:2206(para)
 msgid "When you have subscribed to the folders you want, close the window."
 msgstr ""
 "Lorsque vous vous êtes abonné aux dossiers souhaités, fermez la fenêtre."
 
-#: ../C/evolution.xml:2037(para)
+#: ../C/evolution.xml:2213(para)
 msgid ""
 "To protect and encode your email transmissions, Evolution offers two "
 "encryption methods:"
@@ -5255,15 +5612,15 @@ msgstr ""
 "Afin de protéger et de coder la transmission de vos courriels, Evolution met "
 "à disposition deux méthodes de chiffrement :"
 
-#: ../C/evolution.xml:2040(para)
+#: ../C/evolution.xml:2216(para)
 msgid "GPG Encryption"
 msgstr "Chiffrement GPG"
 
-#: ../C/evolution.xml:2043(para) ../C/evolution.xml:2201(title)
+#: ../C/evolution.xml:2219(para) ../C/evolution.xml:2377(title)
 msgid "S/MIME Encryption"
 msgstr "Chiffrement S/MIME"
 
-#: ../C/evolution.xml:2046(para)
+#: ../C/evolution.xml:2222(para)
 msgid ""
 "Evolution helps you protect your privacy by using GNU Privacy Guard (GPG), "
 "an implementation of strong <link linkend=\"public-key-encryption\">Public "
@@ -5273,36 +5630,38 @@ msgstr ""
 "Privacy Guard), une implémentation du solide <link linkend=\"public-key-"
 "encryption\">chiffrement à clé publique</link>."
 
-#: ../C/evolution.xml:2047(para)
+#: ../C/evolution.xml:2223(para)
 msgid ""
-"In order to encrypt and decrypt emails using GPG, it is necessary to use two "
-"kinds of encryption keys: public and private. Private keys are used to "
-"encrypt messages and public keys to decrypt them. Private keys should not be "
-"shared with others, while public keys can be shared with those you want to "
-"send encrypted messages to. You may also place them on a public key server."
+"In order to send and receive encrypted emails using GPG, it is necessary to "
+"use two kinds of encryption keys: public and private. Public keys are used "
+"to encrypt messages and private keys to decrypt them. To send encrypted "
+"email, you must have the recepient's public key, which is used to encrypt "
+"the message. The recipient then uses his/her private key to decrypt (and "
+"read) the encrypted message."
 msgstr ""
 "Afin de chiffrer et de déchiffrer des courriels avec GPG, il est nécessaire "
 "d'utiliser deux sortes de clés de chiffrement : clé publique et clé privée. "
-"Les clés privées servent à chiffrer les messages et les clés publiques à les "
-"déchiffrer. Les clés privées ne doivent pas être communiquées, alors que les "
-"clés publiques peuvent être échangées avec les personnes auxquelles vous "
-"destinez des messages chiffrés. Vous pouvez également déposer ces dernières "
-"sur un serveur de clés publiques."
+"Les clés publiques servent à chiffrer les messages et les clés privées à les "
+"déchiffrer. Pour envoyer des courriels chiffrés, vous devez disposer de la clé "
+"publique du destinataire qui servira à chiffrer le message. Le destinataire "
+"utilise sa clé privée pour déchiffrer et lire le message chiffré."
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=544886
-#: ../C/evolution.xml:2048(para)
+#: ../C/evolution.xml:2224(para)
 msgid ""
-"To send encrypted email, you must have your own private key on your keyring, "
-"and the person you are sending it to must have your public key in order to "
-"decrypt and read it. To decrypt and read someone else's encrypted email, you "
-"must first have a copy of their public key on your keyring."
+"Those who wish to send you encrypted email must first have a copy of your "
+"public key on your keyring. To this end, public keys can be shared with "
+"those who want to send encrypted messages to you. In order to do this, you "
+"may place your public key on a public key server. Private keys should not be "
+"shared with others."
 msgstr ""
-"Pour envoyer des messages chiffrés, vous devez disposer de la clé publique "
-"du destinataire dans votre trousseau, et le destinataire pourra déchiffrer "
-"et lire le message grâce à sa clé privée. Pour déchiffrer et lire un message "
-"reçu chiffré, vous devez disposer de votre clé privée dans votre trousseau."
+"Ceux qui souhaitent vous envoyer des messages chiffrés doivent posséder "
+"une copie de votre clé publique dans leur trousseau. À cet effet, les "
+"clés publiques peuvent être partagées avec les personnes qui souhaitent "
+"vous envoyer des messages chiffrés. Pour cela, vous pouvez par exemple "
+"placer votre clé publique sur un serveur de clés publiques. Les clés "
+"privées ne doivent jamais être partagées avec d'autres personnes."
 
-#: ../C/evolution.xml:2049(para)
+#: ../C/evolution.xml:2225(para)
 msgid ""
 "Evolution does not support older versions of PGP, such as OpenPGP and Inline "
 "PGP."
@@ -5310,11 +5669,11 @@ msgstr ""
 "Evolution ne prend pas en charge des versions plus anciennes de PGP, telles "
 "que OpenPGP ou Inline PGP."
 
-#: ../C/evolution.xml:2050(para)
+#: ../C/evolution.xml:2226(para)
 msgid "You can use encryption in two different ways:"
 msgstr "Vous pouvez utiliser le chiffrement de deux manières différentes :"
 
-#: ../C/evolution.xml:2053(para)
+#: ../C/evolution.xml:2229(para)
 msgid ""
 "You can encrypt the entire message, so that nobody but the recipient can "
 "read it."
@@ -5322,7 +5681,7 @@ msgstr ""
 "Vous pouvez chiffrer le message complet afin que personne ne puisse le lire "
 "à l'exception du destinataire."
 
-#: ../C/evolution.xml:2056(para)
+#: ../C/evolution.xml:2232(para)
 msgid ""
 "You can attach an encrypted signature to a plain text message, so that the "
 "recipient can read the message without decrypting it, and needs decrypting "
@@ -5333,7 +5692,7 @@ msgstr ""
 "qu'il n'ait besoin de déchiffrer que s'il souhaite vérifier l'identité de "
 "l'expéditeur."
 
-#: ../C/evolution.xml:2059(para)
+#: ../C/evolution.xml:2235(para)
 msgid ""
 "For example, suppose that Kevin wants to send an encrypted message to his "
 "friend Rachel. He looks up her public key on a general key server, and then "
@@ -5349,11 +5708,11 @@ msgstr ""
 "information, elle la déchiffre avec sa clé privée et le message reprend sa "
 "forme lisible."
 
-#: ../C/evolution.xml:2062(title)
+#: ../C/evolution.xml:2238(title)
 msgid "Making a GPG Encryption Key"
 msgstr "Création d'une clé de chiffrement GPG"
 
-#: ../C/evolution.xml:2063(para)
+#: ../C/evolution.xml:2239(para)
 msgid ""
 "Before you can get or send encrypted mail, you need to generate your public "
 "and private keys with GPG. This procedure covers version 1.2.4 of GPG. If "
@@ -5366,16 +5725,16 @@ msgstr ""
 "cette procédure varie légèrement. Vous pouvez obtenir le numéro de version "
 "en tapant <command>gpg --version</command>."
 
-#: ../C/evolution.xml:2066(para)
+#: ../C/evolution.xml:2242(para)
 msgid "Open a terminal and enter <command>gpg --gen-key</command>."
 msgstr ""
 "Ouvrez une fenêtre de terminal et saisissez <command>gpg --gen-key</command>."
 
-#: ../C/evolution.xml:2069(para)
+#: ../C/evolution.xml:2245(para)
 msgid "Select an algorithm, then press Enter."
 msgstr "Choisissez un algorithme, puis appuyez sur Entrée."
 
-#: ../C/evolution.xml:2071(para)
+#: ../C/evolution.xml:2247(para)
 msgid ""
 "To accept the default algorithm of DSA and ElGamal, press Enter "
 "(recommended)."
@@ -5383,7 +5742,7 @@ msgstr ""
 "Pour accepter l'algorithme par défaut DSA et ElGamal, appuyez sur Entrée "
 "(recommandé)."
 
-#: ../C/evolution.xml:2074(para)
+#: ../C/evolution.xml:2250(para)
 msgid ""
 "Select a key length, then press Enter. To accept the default, 1024 bits, "
 "press Enter."
@@ -5391,11 +5750,11 @@ msgstr ""
 "Choisissez une longueur de clé, puis appuyez sur Entrée. Pour accepter la "
 "valeur par défaut de 1024 bits, appuyez sur Entrée."
 
-#: ../C/evolution.xml:2077(para)
+#: ../C/evolution.xml:2253(para)
 msgid "Enter how long your key should be valid for."
 msgstr "Saisissez la durée de validité de votre clé."
 
-#: ../C/evolution.xml:2079(para)
+#: ../C/evolution.xml:2255(para)
 msgid ""
 "To accept the default of no expiration, press Enter, then press Y when you "
 "are prompted to verify the selection."
@@ -5403,33 +5762,33 @@ msgstr ""
 "Pour accepter la valeur par défaut de non expiration, appuyez sur Entrée, "
 "puis appuyez sur Y lorsqu'on vous demande de vérifier ce choix."
 
-#: ../C/evolution.xml:2082(para)
+#: ../C/evolution.xml:2258(para)
 msgid "Type your real name, then press Enter."
 msgstr "Saisissez votre nom réel, puis appuyez sur Entrée."
 
-#: ../C/evolution.xml:2085(para)
+#: ../C/evolution.xml:2261(para)
 msgid "Type your email address, then press Enter."
 msgstr "Saisissez votre adresse électronique, puis appuyez sur Entrée."
 
-#: ../C/evolution.xml:2088(para)
+#: ../C/evolution.xml:2264(para)
 msgid "(Optional) Type a comment, then press Enter."
 msgstr "Saisissez un commentaire (facultatif), puis appuyez sur Entrée."
 
-#: ../C/evolution.xml:2091(para)
+#: ../C/evolution.xml:2267(para)
 msgid "Review your selected user ID. If it is correct, press O."
 msgstr ""
 "Relisez l'identifiant utilisateur sélectionné. S'il est correct, appuyez sur "
 "O."
 
-#: ../C/evolution.xml:2094(para)
+#: ../C/evolution.xml:2270(para)
 msgid "Type a passphrase, then press Enter."
 msgstr "Saisissez une phrase de passe, puis appuyez sur Entrée."
 
-#: ../C/evolution.xml:2097(para)
+#: ../C/evolution.xml:2273(para)
 msgid "Move your mouse randomly to generate the keys."
 msgstr "Déplacez votre souris au hasard pour générer les clés."
 
-#: ../C/evolution.xml:2100(para)
+#: ../C/evolution.xml:2276(para)
 msgid ""
 "After the keys are generated, you can view your key information by entering "
 "<command>gpg --list-keys</command>. You should see something similar to "
@@ -5445,7 +5804,7 @@ msgstr ""
 "&lt;vous@exemple.com&gt;  sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-"
 "14]  </computeroutput>"
 
-#: ../C/evolution.xml:2101(para)
+#: ../C/evolution.xml:2277(para)
 msgid ""
 "GPG creates one list, or keyring, for your public keys and one for your "
 "private keys. All the public keys you know are stored in the file ~/.gnupg/"
@@ -5456,12 +5815,12 @@ msgstr ""
 "sont stockées dans le fichier ~/.gnupg/pubring.gpg. Si vous voulez donnez "
 "vos clés à d'autres personnes, envoyez-leur ce fichier."
 
-#: ../C/evolution.xml:2102(para)
+#: ../C/evolution.xml:2278(para)
 msgid "If you want, you can upload your keys to a key server."
 msgstr ""
 "Si vous le souhaitez, vous pouvez placer vos clés sur un serveur de clés."
 
-#: ../C/evolution.xml:2105(para)
+#: ../C/evolution.xml:2281(para)
 msgid ""
 "Check your public key ID with gpg--list-keys. It is the string after 1024D "
 "on the line beginning with pub. In the example above, it is 32j38dk2."
@@ -5470,7 +5829,7 @@ msgstr ""
 "chaîne de caractères après 1024D dans la ligne qui commence par pub. Dans "
 "l'exemple ci-dessus, c'est 32j38dk2."
 
-#: ../C/evolution.xml:2108(para)
+#: ../C/evolution.xml:2284(para)
 msgid ""
 "Enter the command <command>gpg --send-keys --keyserver wwwkeys.pgp.net "
 "<varname>32j38dk2</varname></command>. Substitute your key ID for "
@@ -5481,7 +5840,7 @@ msgstr ""
 "par votre identifiant de clé. Vous avez besoin de votre mot de passe pour "
 "effectuer cela."
 
-#: ../C/evolution.xml:2111(para)
+#: ../C/evolution.xml:2287(para)
 msgid ""
 "Key servers store your public keys for you so that your friends can decrypt "
 "your messages. If you choose not to use a key server, you can manually send "
@@ -5497,7 +5856,7 @@ msgstr ""
 "fois pour toutes, ce qui permet aux autres de la télécharger d'un endroit "
 "centralisé lorsqu'ils en ont besoin."
 
-#: ../C/evolution.xml:2112(para)
+#: ../C/evolution.xml:2288(para)
 msgid ""
 "If you don't have a key to unlock or encrypt a message, you can set your "
 "encryption tool to look it up automatically. If it can't find the key, an "
@@ -5507,11 +5866,11 @@ msgstr ""
 "vous pouvez configurer votre outil de déchiffrement afin qu'il la recherche "
 "automatiquement. S'il ne peut trouver la clé, un message d'erreur apparaîtra."
 
-#: ../C/evolution.xml:2116(title)
+#: ../C/evolution.xml:2292(title)
 msgid "Getting and Using GPG Public Keys"
 msgstr "Recherche et utilisation de clés publiques GPG"
 
-#: ../C/evolution.xml:2117(para)
+#: ../C/evolution.xml:2293(para)
 msgid ""
 "To send an encrypted message, you need to use the recipient's public key in "
 "combination with your private key. Evolution handles the encryption, but you "
@@ -5522,7 +5881,7 @@ msgstr ""
 "chiffrement, mais vous devez obtenir la clé publique et l'ajouter à votre "
 "trousseau de clés."
 
-#: ../C/evolution.xml:2118(para)
+#: ../C/evolution.xml:2294(para)
 msgid ""
 "To get public keys from a public key server, enter the command<command> gpg "
 "--recv-keys --keyserver wwwkeys.pgp.net <varname>keyid</varname></command>, "
@@ -5535,7 +5894,7 @@ msgstr ""
 "l'identifiant de votre destinataire. Vous devez saisir votre mot de passe, "
 "puis l'identifiant est automatiquement ajouté à votre trousseau."
 
-#: ../C/evolution.xml:2120(para)
+#: ../C/evolution.xml:2296(para)
 msgid ""
 "The domain <quote><emphasis>wwwkeys.pgp.net</emphasis></quote> is assigned "
 "to multiple hosts in various networks. The gpg utility tries to connect to "
@@ -5547,7 +5906,7 @@ msgstr ""
 "connecter à l'un d'entre eux dans le réseau où il se trouve ; et si cet hôte "
 "est hors service, il échoue après un délai d'expiration."
 
-#: ../C/evolution.xml:2123(para)
+#: ../C/evolution.xml:2299(para)
 msgid ""
 "To avoid this, Type <command>$ host wwwkeys.pgp.net</command> in a terminal "
 "console and get the IP address of the hosts. You can ping each of them to "
@@ -5562,7 +5921,7 @@ msgstr ""
 "net dans la commande « gpg --recv-keys --keyserver wwwkeys.pgp.net keyid » "
 "par le numéro IP que vous avez identifié à l'étape précédente."
 
-#: ../C/evolution.xml:2128(para)
+#: ../C/evolution.xml:2304(para)
 msgid ""
 "If someone sends you a public key directly, save it as a plain text file and "
 "enter the command <command>gpg <varname>--import</varname></command> to add "
@@ -5572,26 +5931,26 @@ msgstr ""
 "un fichier texte et saisissez la commande <command>gpg <varname>--import</"
 "varname></command> pour l'ajouter à votre trousseau."
 
-#: ../C/evolution.xml:2132(title)
+#: ../C/evolution.xml:2308(title)
 msgid "Setting up GPG Encryption"
 msgstr "Configuration du chiffrement GPG"
 
-#: ../C/evolution.xml:2138(para) ../C/evolution.xml:2177(para)
+#: ../C/evolution.xml:2314(para) ../C/evolution.xml:2353(para)
 msgid "Select the account you want to use securely, then click Edit."
 msgstr ""
 "Sélectionnez le compte pour lequel vous voulez ajouter la sécurité, puis "
 "cliquez sur Édition."
 
-#: ../C/evolution.xml:2141(para) ../C/evolution.xml:2180(para)
+#: ../C/evolution.xml:2317(para) ../C/evolution.xml:2356(para)
 msgid "Click the Security tab."
 msgstr "Cliquez sur l'onglet Sécurité."
 
-#: ../C/evolution.xml:2144(para)
+#: ../C/evolution.xml:2320(para)
 msgid "Specify your key ID in the PGP/GPG Key ID field."
 msgstr ""
 "Indiquez votre identifiant de clé dans le champ « ID de la clé PGP/GPG »."
 
-#: ../C/evolution.xml:2153(para)
+#: ../C/evolution.xml:2329(para)
 msgid ""
 "Evolution requires that you know your key ID. If you don't remember it, you "
 "can find it by typing <command>gpg --list-keys</command> in a terminal "
@@ -5604,41 +5963,41 @@ msgstr ""
 "est une chaîne de huit caractères composée de nombres et de lettres "
 "aléatoires."
 
-#: ../C/evolution.xml:2157(title)
+#: ../C/evolution.xml:2333(title)
 msgid "Encrypting Messages"
 msgstr "Chiffrement des messages"
 
-#: ../C/evolution.xml:2158(para)
+#: ../C/evolution.xml:2334(para)
 msgid "To encrypt a single message:"
 msgstr "Pour chiffrer un message unique :"
 
-#: ../C/evolution.xml:2161(para)
+#: ../C/evolution.xml:2337(para)
 msgid "Open a Compose a Message window."
 msgstr "Ouvrez une fenêtre d'édition de message."
 
-#: ../C/evolution.xml:2164(para)
+#: ../C/evolution.xml:2340(para)
 msgid "Click Security &gt; PGP Encrypt."
 msgstr "Choisissez Sécurité &gt; Chiffrer avec PGP."
 
-#: ../C/evolution.xml:2167(para)
+#: ../C/evolution.xml:2343(para)
 msgid "Compose your message."
 msgstr "Écrivez votre message."
 
-#: ../C/evolution.xml:2171(para)
+#: ../C/evolution.xml:2347(para)
 msgid "You can set Evolution to always sign your email messages:"
 msgstr "Vous pouvez configurer Evolution pour qu'il signe tous vos courriels :"
 
-#: ../C/evolution.xml:2183(para)
+#: ../C/evolution.xml:2359(para)
 msgid "Select Always Sign Outgoing Messages When Using This Account."
 msgstr ""
 "Cochez l'option Toujours signer les messages sortants lors de l'utilisation "
 "de ce compte."
 
-#: ../C/evolution.xml:2195(title)
+#: ../C/evolution.xml:2371(title)
 msgid "Unencrypting a Received Message"
 msgstr "Déchiffrement d'un message reçu"
 
-#: ../C/evolution.xml:2196(para)
+#: ../C/evolution.xml:2372(para)
 msgid ""
 "If you receive an encrypted message, you need to decrypt it before you read "
 "it. Remember, the sender must have your public key before they can send you "
@@ -5648,7 +6007,7 @@ msgstr ""
 "pouvoir le lire. Rappelez-vous que l'expéditeur doit disposer de votre clé "
 "publique avant de pouvoir vous envoyer un message chiffré."
 
-#: ../C/evolution.xml:2197(para)
+#: ../C/evolution.xml:2373(para)
 msgid ""
 "When you view the message, Evolution prompts you for your PGP password. "
 "Enter it, and the unencrypted message is displayed."
@@ -5656,7 +6015,7 @@ msgstr ""
 "Lorsque vous affichez le message, Evolution vous demande votre mot de passe "
 "PGP. Saisissez-le et le message déchiffré apparaîtra."
 
-#: ../C/evolution.xml:2202(para)
+#: ../C/evolution.xml:2378(para)
 msgid ""
 "S/MIME encryption also uses a key-based approach, but it has some "
 "significant advantages in convenience and security. S/MIME uses "
@@ -5679,7 +6038,7 @@ msgstr ""
 "automatiquement la partie publique du certificat et déchiffre ou vérifie le "
 "message."
 
-#: ../C/evolution.xml:2203(para)
+#: ../C/evolution.xml:2379(para)
 msgid ""
 "S/MIME is used most often in corporate settings. In these cases, "
 "administrators supply certificates that they have purchased from a "
@@ -5696,7 +6055,7 @@ msgstr ""
 "cas, c'est l'administrateur système qui vous fournit un fichier de "
 "certificat."
 
-#: ../C/evolution.xml:2204(para)
+#: ../C/evolution.xml:2380(para)
 msgid ""
 "If you want to use S/MIME independently, you can extract an identification "
 "certificate from your Mozilla* or Netscape* Web browser. See the <ulink url="
@@ -5709,29 +6068,29 @@ msgstr ""
 "pki/psm/help_21/using_certs_help.html\">aide de Mozilla</ulink> (en anglais) "
 "pour plus d'informations sur les certificats de sécurité."
 
-#: ../C/evolution.xml:2205(para)
+#: ../C/evolution.xml:2381(para)
 msgid "The certificate file is a password-protected file on your computer."
 msgstr ""
 "Le fichier de certificat est un fichier protégé par mot de passe sur votre "
 "ordinateur."
 
-#: ../C/evolution.xml:2208(title)
+#: ../C/evolution.xml:2384(title)
 msgid "Adding a Signing Certificate"
 msgstr "Ajout d'un certificat de signature"
 
-#: ../C/evolution.xml:2214(para)
+#: ../C/evolution.xml:2390(para)
 msgid "Click Certificates."
 msgstr "Cliquez sur Certificats."
 
-#: ../C/evolution.xml:2217(para) ../C/evolution.xml:2340(para)
+#: ../C/evolution.xml:2393(para) ../C/evolution.xml:2516(para)
 msgid "Click Import."
 msgstr "Cliquez sur Importer."
 
-#: ../C/evolution.xml:2220(para)
+#: ../C/evolution.xml:2396(para)
 msgid "Select the file to import, then click Open."
 msgstr "Sélectionnez le fichier à importer, puis cliquez sur Ouvrir."
 
-#: ../C/evolution.xml:2226(para)
+#: ../C/evolution.xml:2402(para)
 msgid ""
 "Similarly, you can add certificates that are sent to you independently of "
 "any authority by clicking the Contact Certificates tab and using the same "
@@ -5744,11 +6103,11 @@ msgstr ""
 "vous pouvez aussi ajouter de nouvelles autorités de certification disposant "
 "de leurs propres fichiers de certificat."
 
-#: ../C/evolution.xml:2230(title)
+#: ../C/evolution.xml:2406(title)
 msgid "Signing or Encrypting Every Message"
 msgstr "Signature et chiffrement de tous les messages"
 
-#: ../C/evolution.xml:2231(para)
+#: ../C/evolution.xml:2407(para)
 msgid ""
 "After you have added your certificate, you can sign or encrypt a message by "
 "clicking Security &gt; S/MIME Sign or S/MIME Encrypt in the message composer."
@@ -5757,20 +6116,20 @@ msgstr ""
 "message en choisissant Sécurité &gt; Signer avec S/MIME ou Chiffre avec S/"
 "MIME dans l'éditeur de messages."
 
-#: ../C/evolution.xml:2232(para)
+#: ../C/evolution.xml:2408(para)
 msgid "To have every message signed or encrypted:"
 msgstr "Pour que tous les messages soient signés ou chiffrés :"
 
-#: ../C/evolution.xml:2238(para)
+#: ../C/evolution.xml:2414(para)
 msgid "Select the account to encrypt the messages in."
 msgstr ""
 "Sélectionnez le compte dans lequel vous souhaitez chiffrer les messages."
 
-#: ../C/evolution.xml:2241(para)
+#: ../C/evolution.xml:2417(para)
 msgid "Click Edit, then click Security."
 msgstr "Cliquez sur Édition, puis sur Sécurité."
 
-#: ../C/evolution.xml:2244(para)
+#: ../C/evolution.xml:2420(para)
 msgid ""
 "Click Select next to Signing Certificate and specify the path to your "
 "signing certificate."
@@ -5778,7 +6137,7 @@ msgstr ""
 "Cliquez sur Sélectionner en regard de Certificat de signature et indiquez le "
 "chemin d'accès vers votre certificat de signature."
 
-#: ../C/evolution.xml:2246(para)
+#: ../C/evolution.xml:2422(para)
 msgid ""
 "Click Select next to Encryption Certificate and specify the path to your "
 "encryption certificate."
@@ -5786,11 +6145,11 @@ msgstr ""
 "Cliquez sur Sélectionner en regard de Certificat de chiffrement et indiquez "
 "le chemin d'accès vers votre certificat de chiffrement."
 
-#: ../C/evolution.xml:2249(para)
+#: ../C/evolution.xml:2425(para)
 msgid "Select the appropriate options."
 msgstr "Cochez les options adéquates."
 
-#: ../C/evolution.xml:2265(para)
+#: ../C/evolution.xml:2441(para)
 msgid ""
 "Whether you only get a few email messages a day, or you receive hundreds, "
 "you probably want to sort and organize them. <trademark>Evolution</"
@@ -5801,35 +6160,35 @@ msgstr ""
 "<trademark>Evolution</trademark> dispose des outils pour vous aider à faire "
 "cela."
 
-#: ../C/evolution.xml:2268(link) ../C/evolution.xml:2291(title)
+#: ../C/evolution.xml:2444(link) ../C/evolution.xml:2467(title)
 msgid "Importing Your Old Email"
 msgstr "Importation d'anciens courriels"
 
-#: ../C/evolution.xml:2271(link) ../C/evolution.xml:2381(title)
+#: ../C/evolution.xml:2447(link) ../C/evolution.xml:2557(title)
 msgid "Sorting the Message List"
 msgstr "Tri de la liste des messages"
 
-#: ../C/evolution.xml:2274(link) ../C/evolution.xml:2552(title)
+#: ../C/evolution.xml:2450(link) ../C/evolution.xml:2728(title)
 msgid "Getting Organized with Folders"
 msgstr "Organisation par dossiers"
 
-#: ../C/evolution.xml:2277(link) ../C/evolution.xml:2567(title)
+#: ../C/evolution.xml:2453(link) ../C/evolution.xml:2743(title)
 msgid "Searching for Messages"
 msgstr "Recherche de messages"
 
-#: ../C/evolution.xml:2280(link) ../C/evolution.xml:2771(title)
+#: ../C/evolution.xml:2456(link) ../C/evolution.xml:2947(title)
 msgid "Create Rules to Automatically Organize Mail"
 msgstr "Création de règles pour l'organisation automatique des courriels"
 
-#: ../C/evolution.xml:2283(link) ../C/evolution.xml:3010(title)
+#: ../C/evolution.xml:2459(link) ../C/evolution.xml:3186(title)
 msgid "Using Search Folders"
 msgstr "Utilisation des dossiers de recherche"
 
-#: ../C/evolution.xml:2286(link) ../C/evolution.xml:3143(title)
+#: ../C/evolution.xml:2462(link) ../C/evolution.xml:3319(title)
 msgid "Stopping Junk Mail (Spam)"
 msgstr "Blocage des messages indésirables (pourriel)"
 
-#: ../C/evolution.xml:2292(para)
+#: ../C/evolution.xml:2468(para)
 msgid ""
 "Evolution allows you to import old email and contacts so that you don't need "
 "to worry about losing your old information."
@@ -5837,19 +6196,19 @@ msgstr ""
 "Evolution permet d'importer d'anciens courriels et contacts ; il n'y a donc "
 "pas de crainte à avoir sur la perte d'anciennes informations."
 
-#: ../C/evolution.xml:2295(title)
+#: ../C/evolution.xml:2471(title)
 msgid "Importing Single Files"
 msgstr "Importation de fichiers isolés"
 
-#: ../C/evolution.xml:2296(para)
+#: ../C/evolution.xml:2472(para)
 msgid "Evolution can import the following types of files:"
 msgstr "Evolution est capable d'importer les types de fichiers suivants :"
 
-#: ../C/evolution.xml:2298(title)
+#: ../C/evolution.xml:2474(title)
 msgid "vCard (.vcf, .gcrd):"
 msgstr "vCard (.vcf, .gcrd) :"
 
-#: ../C/evolution.xml:2299(para)
+#: ../C/evolution.xml:2475(para)
 msgid ""
 "The address book format used by the GNOME, KDE, and many other contact "
 "management applications. You should be able to export to vCard format from "
@@ -5860,11 +6219,11 @@ msgstr ""
 "d'exporter au format vCard depuis n'importe quel programme de carnet "
 "d'adresses."
 
-#: ../C/evolution.xml:2302(title)
+#: ../C/evolution.xml:2478(title)
 msgid "vCalendar:"
 msgstr "vCalendar :"
 
-#: ../C/evolution.xml:2303(para)
+#: ../C/evolution.xml:2479(para)
 msgid ""
 "A format for storing calender files, which is generally used by Evolution, "
 "Microsoft Outlook, Sunbird, and Korganizer."
@@ -5872,11 +6231,11 @@ msgstr ""
 "Un format de stockage de fichiers calendrier, utilisé généralement par "
 "Evolution, MS Outlook, Sunbird et Korganizer."
 
-#: ../C/evolution.xml:2306(title)
+#: ../C/evolution.xml:2482(title)
 msgid "iCalendar or iCal (.ics):"
 msgstr "iCalendar ou iCal (.ics) :"
 
-#: ../C/evolution.xml:2307(para)
+#: ../C/evolution.xml:2483(para)
 msgid ""
 "A format for storing calendar files. iCalendar is used by Palm OS handhelds, "
 "Evolution, and Microsoft Outlook."
@@ -5884,21 +6243,21 @@ msgstr ""
 "Un format de stockage de fichiers calendrier. iCalendar est utilisé par les "
 "appareils Palm OS, par Evolution et par MS Outlook."
 
-#: ../C/evolution.xml:2310(title)
+#: ../C/evolution.xml:2486(title)
 msgid "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):"
 msgstr "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab) :"
 
-#: ../C/evolution.xml:2311(para)
+#: ../C/evolution.xml:2487(para)
 msgid ""
 "CSV or Tab files saved by using Evolution, Microsoft Outlook and Mozilla."
 msgstr ""
 "Les fichiers Tab ou CSV enregistrés par Evolution, MS Outlook et Mozilla."
 
-#: ../C/evolution.xml:2314(title)
+#: ../C/evolution.xml:2490(title)
 msgid "Microsoft Outlook Express 4 (.mbx):"
 msgstr "Microsoft Outlook Express 4 (.mbx) :"
 
-#: ../C/evolution.xml:2315(para)
+#: ../C/evolution.xml:2491(para)
 msgid ""
 "The email file format used by Microsoft Outlook Express 4. For other "
 "versions of Microsoft Outlook and Outlook Express, see the workaround "
@@ -5908,19 +6267,19 @@ msgstr ""
 "Concernant les autres versions de MS Outlook et Outlook Express, consultez "
 "l'astuce présentée à l'<link linkend=\"bsawgkk\">étape 1</link>."
 
-#: ../C/evolution.xml:2318(title)
+#: ../C/evolution.xml:2494(title)
 msgid "LDAP Data Interchange Format (.LDIF):"
 msgstr "LDAP Data Interchange Format (.LDIF) :"
 
-#: ../C/evolution.xml:2319(para)
+#: ../C/evolution.xml:2495(para)
 msgid "A standard data format for contact cards."
 msgstr "Un format de données standard pour les cartes de contacts."
 
-#: ../C/evolution.xml:2322(title)
+#: ../C/evolution.xml:2498(title)
 msgid "Berkley Mailbox (.mbox or null extension):"
 msgstr "Berkley Mailbox (.mbox ou sans extension) :"
 
-#: ../C/evolution.xml:2323(para)
+#: ../C/evolution.xml:2499(para)
 msgid ""
 "The email format used by Mozilla, Netscape, Evolution, Eudora*, and many "
 "other email clients."
@@ -5928,28 +6287,28 @@ msgstr ""
 "Le format de courriels utilisé par Mozilla, Netscape, Evolution, Eudora* et "
 "bien d'autres logiciels de messagerie."
 
-#: ../C/evolution.xml:2325(para)
+#: ../C/evolution.xml:2501(para)
 msgid "To import your old email:"
 msgstr "Pour importer vos anciens courriels :"
 
-#: ../C/evolution.xml:2328(para) ../C/evolution.xml:2350(para)
-#: ../C/evolution.xml:3453(para)
+#: ../C/evolution.xml:2504(para) ../C/evolution.xml:2526(para)
+#: ../C/evolution.xml:3686(para)
 msgid "Click File &gt; Import."
 msgstr "Cliquez sur Fichier &gt; Importer."
 
-#: ../C/evolution.xml:2334(para)
+#: ../C/evolution.xml:2510(para)
 msgid "Select Import a Single File, then click Forward."
 msgstr "Sélectionnez « Importer un seul fichier », puis cliquez sur Suivant."
 
-#: ../C/evolution.xml:2337(para)
+#: ../C/evolution.xml:2513(para)
 msgid "Select the file to import, then click Forward."
 msgstr "Sélectionnez le fichier à importer, puis cliquez sur Suivant."
 
-#: ../C/evolution.xml:2346(title)
+#: ../C/evolution.xml:2522(title)
 msgid "Importing Multiple Files"
 msgstr "Importation de plusieurs fichiers"
 
-#: ../C/evolution.xml:2347(para)
+#: ../C/evolution.xml:2523(para)
 msgid ""
 "Evolution automates the import process for several applications it can "
 "recognize."
@@ -5957,14 +6316,14 @@ msgstr ""
 "Evolution automatise le processus d'importation pour plusieurs applications "
 "qu'il reconnaît."
 
-#: ../C/evolution.xml:2356(para)
+#: ../C/evolution.xml:2532(para)
 msgid ""
 "Select Import Data and Settings From Older Programs, then click Forward."
 msgstr ""
 "Sélectionnez « Importer les données et les paramètres d'anciens programmes », "
 "puis cliquez sur Suivant."
 
-#: ../C/evolution.xml:2357(para)
+#: ../C/evolution.xml:2533(para)
 msgid ""
 "Follow the steps <link linkend=\"bsawely\">Step 3</link> through <link "
 "linkend=\"bsawf2t\">Step 5</link> to import."
@@ -5972,7 +6331,7 @@ msgstr ""
 "Suivez les procédures de l'<link linkend=\"bsawely\">étape 3</link> jusqu'à "
 "l'<link linkend=\"bsawf2t\">étape 5</link> pour effectuer l'importation."
 
-#: ../C/evolution.xml:2358(para)
+#: ../C/evolution.xml:2534(para)
 msgid ""
 "Evolution searches for old mail programs and, if possible, imports the data "
 "from them."
@@ -5980,7 +6339,7 @@ msgstr ""
 "Evolution recherche d'anciens programmes de messagerie et, si possible, "
 "importe les données qu'il trouve."
 
-#: ../C/evolution.xml:2363(para)
+#: ../C/evolution.xml:2539(para)
 msgid ""
 "One migration method that works well is to use the Outport application. See "
 "<ulink url=\"http://outport.sourceforge.net\">outport.sourceforge.net</"
@@ -5993,7 +6352,7 @@ msgstr ""
 "aussi importer les données dans un autre logiciel de messagerie sous "
 "Windows, comme Mozilla par exemple."
 
-#: ../C/evolution.xml:2366(para)
+#: ../C/evolution.xml:2542(para)
 msgid ""
 "While in Windows, import your .pst files into Mozilla Mail (or another mail "
 "program such as Netscape or Eudora that uses the standard mbox format)."
@@ -6002,17 +6361,17 @@ msgstr ""
 "logiciel de messagerie qui utilise le format mbox standard, comme Netscape "
 "ou Eudora)."
 
-#: ../C/evolution.xml:2370(para)
+#: ../C/evolution.xml:2546(para)
 msgid ""
 "Copy the files to the system or partition that Evolution is installed on."
 msgstr ""
 "Copiez les fichiers sur le système ou la partition où se trouve Evolution."
 
-#: ../C/evolution.xml:2373(para)
+#: ../C/evolution.xml:2549(para)
 msgid "Use the Evolution import tool to import the files."
 msgstr "Utilisez l'outil d'importation d'Evolution pour importer les fichiers."
 
-#: ../C/evolution.xml:2376(para)
+#: ../C/evolution.xml:2552(para)
 msgid ""
 "For POP mail, filters are applied as messages are downloaded. For IMAP mail, "
 "filters are applied to new messages when you open the Inbox folder. On "
@@ -6030,7 +6389,7 @@ msgstr ""
 "tous les messages d'un dossier, sélectionnez tout le dossier en appuyant sur "
 "Ctrl+A, puis appliquez les filtres en appuyant sur Ctrl+Y."
 
-#: ../C/evolution.xml:2382(para)
+#: ../C/evolution.xml:2558(para)
 msgid ""
 "Evolution helps you work by letting you sort your email. To sort by sender, "
 "subject, or date, click the bars with those labels at the top of the message "
@@ -6052,7 +6411,7 @@ msgstr ""
 "droit sur l'en-tête de colonne pour obtenir quelques options de tri, ainsi "
 "que pour ajouter ou enlever des colonnes de la liste des messages."
 
-#: ../C/evolution.xml:2383(para)
+#: ../C/evolution.xml:2559(para)
 msgid ""
 "To look at the complete headers for a message, click View &gt; All Message "
 "Headers. To see all message data, click View &gt; Message Source."
@@ -6061,11 +6420,11 @@ msgstr ""
 "Tous les en-têtes du message. Pour voir toutes les données du message, "
 "cliquez sur Affichage &gt; Source du message."
 
-#: ../C/evolution.xml:2386(title)
+#: ../C/evolution.xml:2562(title)
 msgid "Sorting Mail In Email Threads"
 msgstr "Tri des messages dans les fils de discussion"
 
-#: ../C/evolution.xml:2387(para)
+#: ../C/evolution.xml:2563(para)
 msgid ""
 "You can also choose a threaded message view. Click View &gt; Group By "
 "Threads to turn the threaded view on or off. When you select this option, "
@@ -6078,7 +6437,7 @@ msgstr ""
 "groupe les réponses à un message avec le message original, afin que vous "
 "puissiez suivre le fil d'une conversation d'un message à l'autre."
 
-#: ../C/evolution.xml:2389(para)
+#: ../C/evolution.xml:2565(para)
 msgid ""
 "In a thread of conversation view, each new message is stacked below of the "
 "ones that arrived before it, so that the newest message is always the one "
@@ -6094,7 +6453,7 @@ msgstr ""
 "automatiquement remonté en tête de liste. Les fils de discussion sont "
 "toujours triés en fonction de la date de leur message le plus récent."
 
-#: ../C/evolution.xml:2391(para)
+#: ../C/evolution.xml:2567(para)
 msgid ""
 "There is a gconf key to toggle between the collapsed or expanded state of "
 "mail thread. By default, it is collapsed and you can change this at /apps/"
@@ -6111,11 +6470,11 @@ msgstr ""
 "et que vous redémarrez Evolution, tous les fils sont dans le nouvel état. "
 "Ceci est une fonctionnalité avancée réservée aux utilisateurs experts."
 
-#: ../C/evolution.xml:2396(title)
+#: ../C/evolution.xml:2572(title)
 msgid "Sorting Mail with Column Headers"
 msgstr "Tri des messages avec les en-têtes de colonne"
 
-#: ../C/evolution.xml:2397(para)
+#: ../C/evolution.xml:2573(para)
 msgid ""
 "The message list normally has columns to indicate whether a message has been "
 "read, whether it has attachments, how important it is, and the sender, date, "
@@ -6127,11 +6486,11 @@ msgstr ""
 "l'expéditeur, la date et le sujet. Vous pouvez changer l'ordre des colonnes "
 "et ajouter ou enlever des colonnes par glisser-déposer."
 
-#: ../C/evolution.xml:2401(title)
+#: ../C/evolution.xml:2577(title)
 msgid "Sorting Mail With Column Headers"
 msgstr "Tri des messages avec les en-têtes de colonne"
 
-#: ../C/evolution.xml:2402(para)
+#: ../C/evolution.xml:2578(para)
 msgid ""
 "In addition to it, Evolution enables you to sort your messages by using Sort-"
 "by list. You can use any of the criteria given in the Sort-by list such as "
@@ -6145,99 +6504,99 @@ msgstr ""
 "emphasis> etc. Cela trie la liste des courriels selon le critère que vous "
 "aurez sélectionné."
 
-#: ../C/evolution.xml:2403(para)
+#: ../C/evolution.xml:2579(para)
 msgid "To sort messages, perform the following procedure:"
 msgstr "Pour trier les courriels, effectuez la procédure suivante :"
 
-#: ../C/evolution.xml:2406(para)
-msgid "Right click message header bar."
+#: ../C/evolution.xml:2582(para)
+msgid "Right-click message header bar."
 msgstr "Faites un clic droit sur la barre des en-têtes de colonne."
 
-#: ../C/evolution.xml:2409(para)
+#: ../C/evolution.xml:2585(para)
 msgid "Click Sort by to get a list of options."
 msgstr "Choisissez « Trier par » pour obtenir une liste d'options."
 
-#: ../C/evolution.xml:2411(title)
+#: ../C/evolution.xml:2587(title)
 msgid "Sort by:"
 msgstr "Trier par :"
 
-#: ../C/evolution.xml:2412(para)
+#: ../C/evolution.xml:2588(para)
 msgid "Sorts the message by different criteria as listed below:"
 msgstr ""
 "Trie les messages selon différents critères, comme le présente la liste ci-"
 "dessous :"
 
-#: ../C/evolution.xml:2416(para)
+#: ../C/evolution.xml:2592(para)
 msgid "Recipients"
 msgstr "Destinataires"
 
-#: ../C/evolution.xml:2419(para) ../C/evolution.xml:2425(para)
+#: ../C/evolution.xml:2595(para) ../C/evolution.xml:2601(para)
 msgid "Sender"
 msgstr "Expéditeur"
 
-#: ../C/evolution.xml:2422(para)
+#: ../C/evolution.xml:2598(para)
 msgid "Location"
 msgstr "Emplacement"
 
-#: ../C/evolution.xml:2428(para)
+#: ../C/evolution.xml:2604(para)
 msgid "Due By"
 msgstr "Date d'échéance"
 
-#: ../C/evolution.xml:2431(para)
+#: ../C/evolution.xml:2607(para)
 msgid "Follow Up Flag"
 msgstr "Indicateur de suivi"
 
-#: ../C/evolution.xml:2434(para)
+#: ../C/evolution.xml:2610(para)
 msgid "Flag Status"
 msgstr "État des marqueurs"
 
-#: ../C/evolution.xml:2437(para)
+#: ../C/evolution.xml:2613(para)
 msgid "Size"
 msgstr "Taille"
 
-#: ../C/evolution.xml:2440(para)
+#: ../C/evolution.xml:2616(para)
 msgid "To"
 msgstr "À"
 
-#: ../C/evolution.xml:2443(para)
+#: ../C/evolution.xml:2619(para)
 msgid "Received"
 msgstr "Reçu"
 
-#: ../C/evolution.xml:2446(para)
+#: ../C/evolution.xml:2622(para)
 msgid "Date"
 msgstr "Date"
 
-#: ../C/evolution.xml:2449(para)
+#: ../C/evolution.xml:2625(para)
 msgid "Subject"
 msgstr "Sujet"
 
-#: ../C/evolution.xml:2452(para)
+#: ../C/evolution.xml:2628(para)
 msgid "From"
 msgstr "De"
 
-#: ../C/evolution.xml:2455(para)
+#: ../C/evolution.xml:2631(para)
 msgid "Attachment"
 msgstr "Pièce jointe"
 
-#: ../C/evolution.xml:2458(para)
+#: ../C/evolution.xml:2634(para)
 msgid "Score"
 msgstr "Score"
 
-#: ../C/evolution.xml:2461(para)
+#: ../C/evolution.xml:2637(para)
 msgid "Flagged"
 msgstr "Marqué"
 
-#: ../C/evolution.xml:2464(para) ../C/evolution.xml:3375(para)
-#: ../C/evolution.xml:4265(para) ../C/evolution.xml:4616(para)
-#: ../C/evolution.xml:4811(para)
+#: ../C/evolution.xml:2640(para) ../C/evolution.xml:3608(para)
+#: ../C/evolution.xml:4498(para) ../C/evolution.xml:4849(para)
+#: ../C/evolution.xml:5044(para)
 msgid "Status"
 msgstr "État"
 
-#: ../C/evolution.xml:2467(para)
+#: ../C/evolution.xml:2643(para)
 msgid "Custom"
 msgstr "Personnalisé"
 
-#: ../C/evolution.xml:2471(para)
+#: ../C/evolution.xml:2647(para)
 msgid ""
 "Clicking each sort criteria cycles take you through three possibilities. "
 "Sort by criteria in ascending or descending order or unsort the message. "
@@ -6253,11 +6612,11 @@ msgstr ""
 "selon les destinataires par ordre croissant. Au deuxième clic, il trie par "
 "ordre décroissant, et au troisième clic, il ne trie plus rien."
 
-#: ../C/evolution.xml:2474(title)
+#: ../C/evolution.xml:2650(title)
 msgid "Sort Ascending:"
 msgstr "Tri croissant :"
 
-#: ../C/evolution.xml:2475(para)
+#: ../C/evolution.xml:2651(para)
 msgid ""
 "Sorts the messages top to bottom and returns you the sorted message list in "
 "the order of oldest to the latest."
@@ -6265,11 +6624,11 @@ msgstr ""
 "Trie les messages du haut en bas et génère une liste de courriels triés du "
 "plus ancien au plus récent."
 
-#: ../C/evolution.xml:2478(title)
+#: ../C/evolution.xml:2654(title)
 msgid "Sort Descending:"
 msgstr "Tri décroissant :"
 
-#: ../C/evolution.xml:2479(para)
+#: ../C/evolution.xml:2655(para)
 msgid ""
 "Sort descending revers the order and returns you the sorted message list in "
 "the order of newest to oldest."
@@ -6277,11 +6636,11 @@ msgstr ""
 "Trie les messages dans l'ordre inverse et génère une liste de courriels "
 "triés du plus récent au plus ancien."
 
-#: ../C/evolution.xml:2482(title)
+#: ../C/evolution.xml:2658(title)
 msgid "Unsort:"
 msgstr "Ne pas trier :"
 
-#: ../C/evolution.xml:2483(para)
+#: ../C/evolution.xml:2659(para)
 msgid ""
 "Unsort removes sorting from this column, reverting to the order of messages "
 "as they were added to the folder."
@@ -6289,11 +6648,11 @@ msgstr ""
 "Enlève le tri selon cette colonne, revenant à l'état de tri des messages "
 "selon leur ordre d'arrivée dans le dossier."
 
-#: ../C/evolution.xml:2486(title)
+#: ../C/evolution.xml:2662(title)
 msgid "Removing a Column:"
 msgstr "Enlever cette colonne :"
 
-#: ../C/evolution.xml:2487(para)
+#: ../C/evolution.xml:2663(para)
 msgid ""
 "Remove this column from the display. You can also remove columns by dragging "
 "the header off the list and letting it drop."
@@ -6301,11 +6660,11 @@ msgstr ""
 "Enlève la colonne de l'affichage. Vous pouvez aussi enlever des colonnes en "
 "faisant glisser leur en-tête hors de la liste."
 
-#: ../C/evolution.xml:2490(title)
+#: ../C/evolution.xml:2666(title)
 msgid "Adding a Column:"
 msgstr "Ajouter une colonne :"
 
-#: ../C/evolution.xml:2491(para)
+#: ../C/evolution.xml:2667(para)
 msgid ""
 "When you select this item, a dialog box appears, listing the possible "
 "columns. Drag the column you want into a space between existing column "
@@ -6316,11 +6675,11 @@ msgstr ""
 "sur une limite entre deux en-têtes de colonne existante. Une flèche rouge "
 "montre où la colonne sera insérée."
 
-#: ../C/evolution.xml:2494(title)
+#: ../C/evolution.xml:2670(title)
 msgid "Best Fit:"
 msgstr "Meilleur ajustement :"
 
-#: ../C/evolution.xml:2495(para)
+#: ../C/evolution.xml:2671(para)
 msgid ""
 "Automatically adjusts the widths of the columns for the most efficient use "
 "of space."
@@ -6328,11 +6687,11 @@ msgstr ""
 "Ajuste automatiquement la largeur des colonnes pour un usage optimal de "
 "l'espace disponible."
 
-#: ../C/evolution.xml:2498(title)
+#: ../C/evolution.xml:2674(title)
 msgid "Customizing the Current View:"
 msgstr "Personnaliser la vue en cours :"
 
-#: ../C/evolution.xml:2499(para)
+#: ../C/evolution.xml:2675(para)
 msgid ""
 "Choose this item to pick a more complex sort order for messages, or to "
 "choose which columns of information about your messages you want to display."
@@ -6341,21 +6700,21 @@ msgstr ""
 "complexe, ou pour choisir quelle(s) colonne(s) d'information sur les "
 "messages vous souhaitez afficher."
 
-#: ../C/evolution.xml:2503(para)
+#: ../C/evolution.xml:2679(para)
 msgid "Select the search criteria from the list."
 msgstr "Sélectionnez le critère de recherche dans la liste."
 
-#: ../C/evolution.xml:2504(para)
+#: ../C/evolution.xml:2680(para)
 msgid "You can view the messages in the desired order in the message list."
 msgstr ""
 "Vous pouvez afficher les messages dans l'ordre souhaité dans la liste des "
 "messages."
 
-#: ../C/evolution.xml:2510(title)
+#: ../C/evolution.xml:2686(title)
 msgid "Using the Follow up Feature"
 msgstr "Fonctionnalité de suivi"
 
-#: ../C/evolution.xml:2511(para)
+#: ../C/evolution.xml:2687(para)
 msgid ""
 "To make sure you don't forget about a message, you can use the Follow up "
 "feature."
@@ -6363,47 +6722,47 @@ msgstr ""
 "Pour être certain de ne pas oublier de traiter un message, vous pouvez "
 "utiliser la fonctionnalité de suivi."
 
-#: ../C/evolution.xml:2514(para)
+#: ../C/evolution.xml:2690(para)
 msgid "Select one or more messages."
 msgstr "Sélectionnez un ou plusieurs messages."
 
-#: ../C/evolution.xml:2517(para)
+#: ../C/evolution.xml:2693(para)
 msgid "Right-click one of the messages."
 msgstr "Faites un clic droit sur l'un des messages."
 
-#: ../C/evolution.xml:2520(para)
+#: ../C/evolution.xml:2696(para)
 msgid "Click Mark for Follow Up."
 msgstr "Choisissez « Marquer pour donner suite »."
 
-#: ../C/evolution.xml:2523(para)
+#: ../C/evolution.xml:2699(para)
 msgid "You can also open the Flag to Follow Up window by"
 msgstr ""
 "Vous pouvez également ouvrir la fenêtre « Marquer pour donner suite » en"
 
-#: ../C/evolution.xml:2526(para)
+#: ../C/evolution.xml:2702(para)
 msgid "Select the messages."
 msgstr "Sélectionnez les messages."
 
-#: ../C/evolution.xml:2529(para)
+#: ../C/evolution.xml:2705(para)
 msgid "Select Message menu."
 msgstr "Ouvrez le menu Message."
 
-#: ../C/evolution.xml:2532(para)
+#: ../C/evolution.xml:2708(para)
 msgid "Click Mark as."
 msgstr "Choisissez « Marquer comme »."
 
-#: ../C/evolution.xml:2535(para)
+#: ../C/evolution.xml:2711(para)
 msgid "Select Follow Up or press Shift+Ctrl+G."
 msgstr "Choisissez « Donner suite » ou appuyez sur Maj+Ctrl+G."
 
-#: ../C/evolution.xml:2536(para)
+#: ../C/evolution.xml:2712(para)
 msgid ""
 "A dialog box opens to allow you to set the type of flag and the due date."
 msgstr ""
 "Une boîte de dialogue s'ouvre, vous permettant de saisir le type de "
 "marqueur, ainsi que la date d'échéance."
 
-#: ../C/evolution.xml:2540(para)
+#: ../C/evolution.xml:2716(para)
 msgid ""
 "The flag itself is the action you want to remind yourself about. Several are "
 "provided for you, such as Call, Forward, and Reply, but you can enter your "
@@ -6413,7 +6772,7 @@ msgstr ""
 "a plusieurs à votre disposition, tels que Appel, Faire suivre ou Répondre, "
 "mais vous pouvez saisir votre propre note ou action si vous le souhaitez."
 
-#: ../C/evolution.xml:2541(para)
+#: ../C/evolution.xml:2717(para)
 msgid ""
 "After you have added a flag, you can mark it as complete or remove it "
 "entirely by right-clicking the message, then click either Flag Completed or "
@@ -6423,7 +6782,7 @@ msgstr ""
 "entièrement en faisant un clic droit sur le message et en choisissant Marqué "
 "Achevé ou Effacer les marqueurs."
 
-#: ../C/evolution.xml:2542(para)
+#: ../C/evolution.xml:2718(para)
 msgid ""
 "When you read a flagged message, its flag status is displayed at the top, "
 "before the message headers. An overdue message might tell you "
@@ -6433,7 +6792,7 @@ msgstr ""
 "sommet, avant les en-têtes. Une marque de suivi en retard vous est signalé "
 "avec un message du style « Retard : Appel le 7 avril 2003, 17:00 »."
 
-#: ../C/evolution.xml:2543(para)
+#: ../C/evolution.xml:2719(para)
 msgid ""
 "Flags can help you organize your work in a number of ways. For example, you "
 "might add a Flag Status column to your message list and sort that way. "
@@ -6449,11 +6808,11 @@ msgstr ""
 "votre dossier de recherche ne contiendra plus que les messages qui "
 "contiennent encore une échéance."
 
-#: ../C/evolution.xml:2545(title)
+#: ../C/evolution.xml:2721(title)
 msgid "Mark as Important Feature:"
 msgstr "Fonctionnalité Marquer comme important :"
 
-#: ../C/evolution.xml:2546(para)
+#: ../C/evolution.xml:2722(para)
 msgid ""
 "If you prefer a simpler way to remind yourself about messages, you can mark "
 "them as important by right-clicking the message, then click Mark as "
@@ -6465,7 +6824,7 @@ msgstr ""
 "en choississant le menu « Message &gt; Marquer comme important » dans la "
 "barre de menus."
 
-#: ../C/evolution.xml:2553(para)
+#: ../C/evolution.xml:2729(para)
 msgid ""
 "Evolution, like most other mail systems, stores mail in folders. You start "
 "out with a few mail folders, such as Inbox, Outbox, and Drafts, but you can "
@@ -6479,7 +6838,7 @@ msgstr ""
 "choisissant Dossier &gt; Nouveau, ou en faisant un clic droit sur la liste "
 "des dossiers et en choisissant Nouveau dossier."
 
-#: ../C/evolution.xml:2554(para)
+#: ../C/evolution.xml:2730(para)
 msgid ""
 "When you click OK, your new folder appears in the folder view. You can then "
 "move the messages to it by dragging and dropping them, or right click on the "
@@ -6490,7 +6849,7 @@ msgstr ""
 "déposer, ou en choisissant « Déplacer vers le dossier » dans le menu "
 "contextuel des messages, ou encore en appuyant sur Maj+Ctrl+V."
 
-#: ../C/evolution.xml:2555(para)
+#: ../C/evolution.xml:2731(para)
 msgid ""
 "You can also drop the messages to a particular folder by selecting Message "
 "&gt; Move to folder. This will open the Select folder window, where you can "
@@ -6501,7 +6860,7 @@ msgstr ""
 "un dossier » apparaît et vous permet de choisir le dossier de destination du "
 "ou des messages."
 
-#: ../C/evolution.xml:2557(para)
+#: ../C/evolution.xml:2733(para)
 msgid ""
 "If you want to create a new folder click New at the bottom left of the "
 "window. Specify the location and enter the label of the folder at the entry "
@@ -6514,7 +6873,7 @@ msgstr ""
 "messages d'un dossier vers un autre en sélectionnant le message et en "
 "cliquant sur Déplacer en bas à droite."
 
-#: ../C/evolution.xml:2558(para)
+#: ../C/evolution.xml:2734(para)
 msgid ""
 "If you create a filter with the filter assistant, you can have mail filed "
 "automatically. Select Edit &gt; Message Filters to bring up the Message "
@@ -6524,7 +6883,7 @@ msgstr ""
 "automatiquement les messages. Choisissez Édition &gt; Filtres de message "
 "afin de faire apparaître la fenêtre des Filtres de message."
 
-#: ../C/evolution.xml:2560(para)
+#: ../C/evolution.xml:2736(para)
 msgid ""
 "Click on the Add button to bring up the Add Rule window from where you can "
 "set different criteria for filtering messages. For additional information on "
@@ -6537,7 +6896,7 @@ msgstr ""
 "\"usage-mail-org-filters-new\">Création de nouvelles règles de filtrage</"
 "link>."
 
-#: ../C/evolution.xml:2562(para)
+#: ../C/evolution.xml:2738(para)
 msgid ""
 "The Inbox folder on most IMAP servers cannot contain both subfolders and "
 "messages. When you create additional folders on your IMAP mail server, "
@@ -6555,7 +6914,7 @@ msgstr ""
 "trouvent dans la boîte de réception, tant que vous ne déplacez pas ces "
 "dossiers à un autre endroit."
 
-#: ../C/evolution.xml:2568(para)
+#: ../C/evolution.xml:2744(para)
 msgid ""
 "Most email clients can search the message for you, but Evolution does it "
 "differently and efficiently giving you faster search result with Quick "
@@ -6566,13 +6925,13 @@ msgstr ""
 "de recherche plus rapidement avec la Recherche rapide, la Recherche "
 "personnalisée et la Recherche avancée."
 
-#: ../C/evolution.xml:2570(title) ../C/evolution.xml:3315(title)
-#: ../C/evolution.xml:4197(title) ../C/evolution.xml:4505(title)
-#: ../C/evolution.xml:4749(title)
+#: ../C/evolution.xml:2746(title) ../C/evolution.xml:3548(title)
+#: ../C/evolution.xml:4430(title) ../C/evolution.xml:4738(title)
+#: ../C/evolution.xml:4982(title)
 msgid "Quick Search:"
 msgstr "Recherche rapide :"
 
-#: ../C/evolution.xml:2571(para)
+#: ../C/evolution.xml:2747(para)
 msgid ""
 "Quick Search displays all the messages that match the in-built criteria you "
 "selected from the drop-down list at the top left side, just above the "
@@ -6582,14 +6941,14 @@ msgstr ""
 "prédéfinis que vous sélectionnez dans le menu déroulant en haut à gauche, "
 "juste au-dessus de la liste des messages."
 
-#: ../C/evolution.xml:2573(para)
+#: ../C/evolution.xml:2749(para)
 msgid "To perform a quick search, perform the following procedure:"
 msgstr "Pour effectuer une recherche rapide, suivez la procédure suivante :"
 
-#: ../C/evolution.xml:2576(para) ../C/evolution.xml:2655(para)
-#: ../C/evolution.xml:3278(para) ../C/evolution.xml:3321(para)
-#: ../C/evolution.xml:4149(para) ../C/evolution.xml:4465(para)
-#: ../C/evolution.xml:4701(para)
+#: ../C/evolution.xml:2752(para) ../C/evolution.xml:2831(para)
+#: ../C/evolution.xml:3511(para) ../C/evolution.xml:3554(para)
+#: ../C/evolution.xml:4382(para) ../C/evolution.xml:4698(para)
+#: ../C/evolution.xml:4934(para)
 msgid ""
 "Click the search icon <inlinegraphic format=\"PNG\" fileref=\"figures/"
 "stock_search.png\"/> to expand the drop-down list."
@@ -6597,72 +6956,72 @@ msgstr ""
 "Cliquez sur l'icône de recherche <inlinegraphic format=\"PNG\" fileref="
 "\"figures/stock_search.png\"/> pour ouvrir la liste déroulante."
 
-#: ../C/evolution.xml:2579(para) ../C/evolution.xml:3324(para)
-#: ../C/evolution.xml:4205(para) ../C/evolution.xml:4547(para)
-#: ../C/evolution.xml:4757(para)
+#: ../C/evolution.xml:2755(para) ../C/evolution.xml:3557(para)
+#: ../C/evolution.xml:4438(para) ../C/evolution.xml:4780(para)
+#: ../C/evolution.xml:4990(para)
 msgid "Select the search criteria from the list:"
 msgstr "Sélectionnez un critère de recherche dans la liste :"
 
-#: ../C/evolution.xml:2582(para)
+#: ../C/evolution.xml:2758(para)
 msgid "All Messages"
 msgstr "Tous les messages"
 
-#: ../C/evolution.xml:2585(para)
+#: ../C/evolution.xml:2761(para)
 msgid "Unread Messages"
 msgstr "Messages non lus"
 
-#: ../C/evolution.xml:2588(para)
+#: ../C/evolution.xml:2764(para)
 msgid "No Label"
 msgstr "Aucune étiquette"
 
-#: ../C/evolution.xml:2591(para) ../C/evolution.xml:2633(para)
+#: ../C/evolution.xml:2767(para) ../C/evolution.xml:2809(para)
 msgid "Important"
 msgstr "Important"
 
-#: ../C/evolution.xml:2594(para) ../C/evolution.xml:2636(para)
+#: ../C/evolution.xml:2770(para) ../C/evolution.xml:2812(para)
 msgid "Work"
 msgstr "Bureau"
 
-#: ../C/evolution.xml:2597(para) ../C/evolution.xml:2639(para)
-#: ../C/evolution.xml:3369(para) ../C/evolution.xml:4259(para)
-#: ../C/evolution.xml:4610(para) ../C/evolution.xml:4805(para)
-#: ../C/evolution.xml:5375(para)
+#: ../C/evolution.xml:2773(para) ../C/evolution.xml:2815(para)
+#: ../C/evolution.xml:3602(para) ../C/evolution.xml:4492(para)
+#: ../C/evolution.xml:4843(para) ../C/evolution.xml:5038(para)
+#: ../C/evolution.xml:5608(para)
 msgid "Personal"
 msgstr "Personnel"
 
-#: ../C/evolution.xml:2600(para) ../C/evolution.xml:2642(para)
+#: ../C/evolution.xml:2776(para) ../C/evolution.xml:2818(para)
 msgid "To do"
 msgstr "À faire"
 
-#: ../C/evolution.xml:2603(para) ../C/evolution.xml:2645(para)
+#: ../C/evolution.xml:2779(para) ../C/evolution.xml:2821(para)
 msgid "Later"
 msgstr "Plus tard"
 
-#: ../C/evolution.xml:2606(para)
+#: ../C/evolution.xml:2782(para)
 msgid "Read Messages"
 msgstr "Messages lus"
 
-#: ../C/evolution.xml:2609(para)
+#: ../C/evolution.xml:2785(para)
 msgid "Recent Messages"
 msgstr "Message récents"
 
-#: ../C/evolution.xml:2612(para)
+#: ../C/evolution.xml:2788(para)
 msgid "Last 5 Days' Messages"
 msgstr "Messages des 5 derniers jours"
 
-#: ../C/evolution.xml:2615(para)
+#: ../C/evolution.xml:2791(para)
 msgid "Messages with Attachments"
 msgstr "Messages avec une pièce jointe"
 
-#: ../C/evolution.xml:2618(para)
+#: ../C/evolution.xml:2794(para)
 msgid "Important Messages"
 msgstr "Messages importants"
 
-#: ../C/evolution.xml:2621(para)
+#: ../C/evolution.xml:2797(para)
 msgid "Messages Not Junk"
 msgstr "Messages non pourriels"
 
-#: ../C/evolution.xml:2626(para)
+#: ../C/evolution.xml:2802(para)
 msgid ""
 "Evolution displays the messages matching the criteria present in the shown "
 "message list"
@@ -6670,7 +7029,7 @@ msgstr ""
 "Evolution affiche dans la liste des messages les messages correspondant au "
 "critère choisi."
 
-#: ../C/evolution.xml:2630(para)
+#: ../C/evolution.xml:2806(para)
 msgid ""
 "The following labels need not necessarily be the same as the default names "
 "listed here. You can change the name of these labels by selecting Edit &gt; "
@@ -6680,13 +7039,13 @@ msgstr ""
 "énumérés ici. Vous pouvez modifier les noms de ces étiquettes en choisissant "
 "Édition &gt; Préférences &gt; Préférences de courriel &gt; Couleurs."
 
-#: ../C/evolution.xml:2650(title) ../C/evolution.xml:3273(title)
-#: ../C/evolution.xml:4144(title) ../C/evolution.xml:4460(title)
-#: ../C/evolution.xml:4696(title)
+#: ../C/evolution.xml:2826(title) ../C/evolution.xml:3506(title)
+#: ../C/evolution.xml:4377(title) ../C/evolution.xml:4693(title)
+#: ../C/evolution.xml:4929(title)
 msgid "Customized Search:"
 msgstr "Recherche personnalisée :"
 
-#: ../C/evolution.xml:2651(para)
+#: ../C/evolution.xml:2827(para)
 msgid ""
 "Evolution allows you to perform customized search. To search for a message "
 "use the following procedure:"
@@ -6694,11 +7053,11 @@ msgstr ""
 "Evolution vous permet d'effectuer des recherches personnalisées. Pour "
 "rechercher un message, suivez la procédure suivante :"
 
-#: ../C/evolution.xml:2657(title)
+#: ../C/evolution.xml:2833(title)
 msgid "Subject or Sender Contain:"
 msgstr "Le sujet ou l'expéditeur contiennent :"
 
-#: ../C/evolution.xml:2658(para)
+#: ../C/evolution.xml:2834(para)
 msgid ""
 "Finds messages that contain the search text in the subject or sender. It "
 "does not search in the message body."
@@ -6706,80 +7065,80 @@ msgstr ""
 "Recherche les messages contenant le texte à rechercher dans le sujet ou "
 "l'expéditeur. Il ne recherche pas dans le corps du message."
 
-#: ../C/evolution.xml:2661(title)
+#: ../C/evolution.xml:2837(title)
 msgid "Recipients Contain:"
 msgstr "Les destinataires contiennent :"
 
-#: ../C/evolution.xml:2662(para)
+#: ../C/evolution.xml:2838(para)
 msgid "Finds messages with the search text in the To: and Cc: headers."
 msgstr ""
 "Recherche les messages contenant le texte recherché dans les en-têtes À: et "
 "Cc:."
 
-#: ../C/evolution.xml:2665(title)
+#: ../C/evolution.xml:2841(title)
 msgid "Message Contains:"
 msgstr "Le message contient :"
 
-#: ../C/evolution.xml:2666(para)
+#: ../C/evolution.xml:2842(para)
 msgid "Searches the message body and all headers for the specified text."
 msgstr ""
 "Recherche le texte spécifié dans le corps du message et tous les en-têtes."
 
-#: ../C/evolution.xml:2669(title)
+#: ../C/evolution.xml:2845(title)
 msgid "Subject Contain:"
 msgstr "Le sujet contient :"
 
-#: ../C/evolution.xml:2670(para)
+#: ../C/evolution.xml:2846(para)
 msgid "Shows messages where the search text is in the subject line."
 msgstr ""
 "Recherche les messages où le texte recherché apparaît dans la ligne du sujet."
 
-#: ../C/evolution.xml:2673(title)
+#: ../C/evolution.xml:2849(title)
 msgid "Sender Contain:"
 msgstr "L'expéditeur contient :"
 
-#: ../C/evolution.xml:2674(para)
+#: ../C/evolution.xml:2850(para)
 msgid ""
 "Finds messages whose From: header contains a match for your search text."
 msgstr "Recherche les messages où l'en-tête De: contient le texte recherché."
 
-#: ../C/evolution.xml:2677(title)
+#: ../C/evolution.xml:2853(title)
 msgid "Body Contains:"
 msgstr "Le corps contient :"
 
-#: ../C/evolution.xml:2678(para)
+#: ../C/evolution.xml:2854(para)
 msgid "Searches only in message text, not any other header."
 msgstr ""
 "Recherche uniquement dans le corps du message, et pas dans les en-têtes."
 
-#: ../C/evolution.xml:2682(para)
+#: ../C/evolution.xml:2858(para)
 msgid "Click the drop-down list to select the scope"
 msgstr ""
 "Cliquez sur le menu déroulant « dans » pour définir l'étendue de la recherche."
 
-#: ../C/evolution.xml:2685(para)
+#: ../C/evolution.xml:2861(para)
 msgid "Current Folder"
 msgstr "Dossier actuel"
 
-#: ../C/evolution.xml:2688(para)
+#: ../C/evolution.xml:2864(para)
 msgid "Current Account"
 msgstr "Compte actuel"
 
-#: ../C/evolution.xml:2691(para)
+#: ../C/evolution.xml:2867(para)
 msgid "All Accounts"
 msgstr "Tous les comptes"
 
-#: ../C/evolution.xml:2694(para)
+#: ../C/evolution.xml:2870(para)
 msgid "Current Message"
 msgstr "Message actuel"
 
-#: ../C/evolution.xml:2699(para)
+#: ../C/evolution.xml:2875(para)
 msgid "Type the search string in the search entry and press Enter."
 msgstr ""
 "Saisissez le texte à rechercher dans la zone de recherche et appuyez sur "
 "« Entrée »."
 
-#: ../C/evolution.xml:2701(para)
+#: ../C/evolution.xml:2877(para)
 msgid ""
 "The folder list will be disabled while you perform search on All Accounts or "
 "Current Account."
@@ -6787,7 +7146,7 @@ msgstr ""
 "La liste des dossiers est désactivée lorsque vous effectuez une recherche "
 "dans Tous les comptes ou dans le Compte actuel."
 
-#: ../C/evolution.xml:2705(para)
+#: ../C/evolution.xml:2881(para)
 msgid ""
 "Evolution shows your search results in the message list. You might want to "
 "create a search folder instead; see <link linkend=\"usage-mail-organize-"
@@ -6798,7 +7157,7 @@ msgstr ""
 "linkend=\"usage-mail-organize-vfolders\">Utilisation des dossiers de "
 "recherche</link> pour plus de détails."
 
-#: ../C/evolution.xml:2707(para) ../C/evolution.xml:3313(para)
+#: ../C/evolution.xml:2883(para) ../C/evolution.xml:3546(para)
 msgid ""
 "To clear your search you can click the Clear icon in the search string "
 "field, or choose Search &gt; Clear from the menubar, or enter a blank "
@@ -6809,7 +7168,7 @@ msgstr ""
 "effectuez une recherche vide. Vous pouvez aussi appuyer sur Ctrl+Maj+Q pour "
 "effacer la recherche."
 
-#: ../C/evolution.xml:2710(para)
+#: ../C/evolution.xml:2886(para)
 msgid ""
 "You can even perform a quick search on a customized search results as it "
 "just filters and displays the messages in the message list."
@@ -6818,34 +7177,34 @@ msgstr ""
 "recherche personnalisée, car la recherche rapide ne fait que filtrer "
 "l'affichage des messages dans la liste des messages."
 
-#: ../C/evolution.xml:2713(title) ../C/evolution.xml:4170(title)
-#: ../C/evolution.xml:4486(title) ../C/evolution.xml:4722(title)
+#: ../C/evolution.xml:2889(title) ../C/evolution.xml:4403(title)
+#: ../C/evolution.xml:4719(title) ../C/evolution.xml:4955(title)
 msgid "Advanced Search:"
 msgstr "Recherche avancée :"
 
-#: ../C/evolution.xml:2714(para) ../C/evolution.xml:4171(para)
-#: ../C/evolution.xml:4487(para) ../C/evolution.xml:4723(para)
+#: ../C/evolution.xml:2890(para) ../C/evolution.xml:4404(para)
+#: ../C/evolution.xml:4720(para) ../C/evolution.xml:4956(para)
 msgid "You can perform an advanced search based on any of the search types."
 msgstr ""
 "Vous pouvez effectuer une recherche avancée sur la base de n'importe quel "
 "type de recherche."
 
-#: ../C/evolution.xml:2718(para) ../C/evolution.xml:4175(para)
-#: ../C/evolution.xml:4491(para)
+#: ../C/evolution.xml:2894(para) ../C/evolution.xml:4408(para)
+#: ../C/evolution.xml:4724(para)
 msgid "Select the Search menu."
 msgstr "Ouvrez le menu Recherche."
 
-#: ../C/evolution.xml:2721(para)
+#: ../C/evolution.xml:2897(para)
 msgid "Click Advanced Search to open Advanced Search dialog box."
 msgstr ""
 "Choisissez « Recherche avancée » afin d'ouvrir la boîte de dialogue Recherche "
 "avancée."
 
-#: ../C/evolution.xml:2726(para)
+#: ../C/evolution.xml:2902(para)
 msgid "Enter the Search name."
 msgstr "Saisissez un nom pour la recherche."
 
-#: ../C/evolution.xml:2729(para)
+#: ../C/evolution.xml:2905(para)
 msgid ""
 "Click Add to add rules. For more information on rules, refer <link linkend="
 "\"bsazsjd\">Step 4</link> under <link linkend=\"vfolder-create\">Creating A "
@@ -6856,15 +7215,15 @@ msgstr ""
 "\">étape 4</link> de la <link linkend=\"vfolder-create\">Création d'un "
 "dossier de recherche</link>."
 
-#: ../C/evolution.xml:2735(para)
+#: ../C/evolution.xml:2911(para)
 msgid "Press Save to save your search results."
 msgstr "Cliquez sur Enregistrer pour conserver les résultats de la recherche."
 
-#: ../C/evolution.xml:2739(title)
+#: ../C/evolution.xml:2915(title)
 msgid "Save Search:"
 msgstr "Enregistrer la recherche :"
 
-#: ../C/evolution.xml:2740(para)
+#: ../C/evolution.xml:2916(para)
 msgid ""
 "To save your search results other than from advanced search, select Search "
 "&gt; Save Search. You can view the label of your search results listed under "
@@ -6874,31 +7233,31 @@ msgstr ""
 "avancée, sélectionnez Recherche &gt; Enregistrer la recherche. Vous voyez "
 "apparaître le nom de vos résultats de recherche dans le menu Recherche."
 
-#: ../C/evolution.xml:2743(title)
+#: ../C/evolution.xml:2919(title)
 msgid "Edit Saved Searches:"
 msgstr "Édition de recherches enregistrées :"
 
-#: ../C/evolution.xml:2744(para)
+#: ../C/evolution.xml:2920(para)
 msgid "To edit your saved searches,"
 msgstr "Pour modifier les recherches enregistrées :"
 
-#: ../C/evolution.xml:2748(para)
+#: ../C/evolution.xml:2924(para)
 msgid "Select Search from the menu bar."
 msgstr "Dans la barre de menus, ouvrez le menu Recherche."
 
-#: ../C/evolution.xml:2751(para)
+#: ../C/evolution.xml:2927(para)
 msgid "Click Edit Saved Searches to open the Searches dialog box."
 msgstr ""
 "Choisissez « Modifier les recherches enregistrées » pour ouvrir la boîte de "
 "dialogue des recherches."
 
-#: ../C/evolution.xml:2756(para)
+#: ../C/evolution.xml:2932(para)
 msgid "Click the Edit button to open the Edit Rule dialog box."
 msgstr ""
 "Cliquez sur le bouton Édition pour ouvrir la boîte de dialogue Éditer la "
 "règle."
 
-#: ../C/evolution.xml:2757(para)
+#: ../C/evolution.xml:2933(para)
 msgid ""
 "You can also add or remove Searches from the list by using the respective "
 "buttons available at the right."
@@ -6906,12 +7265,12 @@ msgstr ""
 "Vous pouvez aussi ajouter ou enlever des Recherches dans la liste en "
 "utilisant les boutons correspondants affichés sur la droite."
 
-#: ../C/evolution.xml:2762(para)
+#: ../C/evolution.xml:2938(para)
 msgid "Edit the title or search criteria from the dialog box."
 msgstr ""
 "Modifiez le titre ou les critères de la recherche dans la boîte de dialogue."
 
-#: ../C/evolution.xml:2772(para)
+#: ../C/evolution.xml:2948(para)
 msgid ""
 "Filters work very much like the mail room in a large company. Their purpose "
 "is to bundle, sort, and distribute mail to the various folders. In addition, "
@@ -6928,29 +7287,29 @@ msgstr ""
 "message dans plusieurs dossiers, ou conserver une copie et en envoyer une à "
 "une autre personne."
 
-#: ../C/evolution.xml:2775(title)
+#: ../C/evolution.xml:2951(title)
 msgid "Creating New Filter Rules"
 msgstr "Création de règles de filtrage"
 
-#: ../C/evolution.xml:2778(para) ../C/evolution.xml:2982(para)
-#: ../C/evolution.xml:2997(para)
+#: ../C/evolution.xml:2954(para) ../C/evolution.xml:3158(para)
+#: ../C/evolution.xml:3173(para)
 msgid "Click Edit &gt; Message Filters."
 msgstr "Choisissez Éditer &gt; Filtres de message."
 
-#: ../C/evolution.xml:2781(para) ../C/evolution.xml:3032(para)
-#: ../C/evolution.xml:5038(para) ../C/evolution.xml:5619(para)
+#: ../C/evolution.xml:2957(para) ../C/evolution.xml:3208(para)
+#: ../C/evolution.xml:5271(para) ../C/evolution.xml:5852(para)
 msgid "Click Add."
 msgstr "Cliquez sur Ajouter."
 
-#: ../C/evolution.xml:2784(para)
+#: ../C/evolution.xml:2960(para)
 msgid "Type a name for the filter in the Rule name field."
 msgstr "Saisissez un nom pour le filtre dans le champ « Nom de la règle »."
 
-#: ../C/evolution.xml:2789(para)
+#: ../C/evolution.xml:2965(para)
 msgid "Define the criteria for the filter in the first section."
 msgstr "Définissez les critères du filtre dans la première section."
 
-#: ../C/evolution.xml:2790(para)
+#: ../C/evolution.xml:2966(para)
 msgid ""
 "For each of the filter criteria, you must first select which parts of the "
 "message you want to filter:"
@@ -6958,39 +7317,39 @@ msgstr ""
 "Pour chaque critère de filtre, vous devez d'abord sélectionner quelle partie "
 "du message vous souhaitez filtrer :"
 
-#: ../C/evolution.xml:2792(title) ../C/evolution.xml:3042(title)
+#: ../C/evolution.xml:2968(title) ../C/evolution.xml:3218(title)
 msgid "Sender:"
 msgstr "Expéditeur :"
 
-#: ../C/evolution.xml:2793(para)
+#: ../C/evolution.xml:2969(para)
 msgid "The sender's email address or the name of the sender."
 msgstr "L'adresse électronique de l'expéditeur ou son nom."
 
-#: ../C/evolution.xml:2796(title)
+#: ../C/evolution.xml:2972(title)
 msgid "Recipient:"
 msgstr "Destinataires :"
 
-#: ../C/evolution.xml:2797(para) ../C/evolution.xml:3047(para)
+#: ../C/evolution.xml:2973(para) ../C/evolution.xml:3223(para)
 msgid "The recipients of the message."
 msgstr "Les destinataires du message."
 
-#: ../C/evolution.xml:2800(title) ../C/evolution.xml:3050(title)
+#: ../C/evolution.xml:2976(title) ../C/evolution.xml:3226(title)
 msgid "Subject:"
 msgstr "Sujet :"
 
-#: ../C/evolution.xml:2801(para) ../C/evolution.xml:3051(para)
+#: ../C/evolution.xml:2977(para) ../C/evolution.xml:3227(para)
 msgid "The subject line of the message."
 msgstr "La ligne sujet du message."
 
-#: ../C/evolution.xml:2804(title)
+#: ../C/evolution.xml:2980(title)
 msgid "Specific Header:"
 msgstr "En-tête spécifique :"
 
-#: ../C/evolution.xml:2805(para)
+#: ../C/evolution.xml:2981(para)
 msgid "Any header including custom ones."
 msgstr "N'importe quel en-tête, y compris les en-têtes personnalisés."
 
-#: ../C/evolution.xml:2807(para)
+#: ../C/evolution.xml:2983(para)
 msgid ""
 "If a message uses a header more than once, Evolution pays attention only to "
 "the first instance, even if the message defines the header differently the "
@@ -7008,19 +7367,19 @@ msgstr ""
 "deuxième déclaration n'existait pas. Pour filtrer sur les en-têtes "
 "redondants des messages, utilisez une expression regulière."
 
-#: ../C/evolution.xml:2809(title) ../C/evolution.xml:3054(title)
+#: ../C/evolution.xml:2985(title) ../C/evolution.xml:3230(title)
 msgid "Message Body:"
 msgstr "Corps du message :"
 
-#: ../C/evolution.xml:2810(para) ../C/evolution.xml:3055(para)
+#: ../C/evolution.xml:2986(para) ../C/evolution.xml:3231(para)
 msgid "Searches in the actual text of the message."
 msgstr "Recherche dans le texte effectif du message."
 
-#: ../C/evolution.xml:2813(title)
+#: ../C/evolution.xml:2989(title)
 msgid "Expression:"
 msgstr "Expression :"
 
-#: ../C/evolution.xml:2814(para)
+#: ../C/evolution.xml:2990(para)
 msgid ""
 "(For programmers only) Match a message according to an expression you write "
 "in the Scheme language used to define filters in Evolution."
@@ -7029,11 +7388,11 @@ msgstr ""
 "expression écrite en langage Scheme, utilisé pour définir les filtres dans "
 "Evolution."
 
-#: ../C/evolution.xml:2817(title) ../C/evolution.xml:3062(title)
+#: ../C/evolution.xml:2993(title) ../C/evolution.xml:3238(title)
 msgid "Date Sent:"
 msgstr "Date d'envoi :"
 
-#: ../C/evolution.xml:2818(para) ../C/evolution.xml:3063(para)
+#: ../C/evolution.xml:2994(para) ../C/evolution.xml:3239(para)
 msgid ""
 "Filters messages according to the date on which they were sent. First, "
 "choose the conditions you want a message to meet, such as before a given "
@@ -7051,11 +7410,11 @@ msgstr ""
 "demander de vérifier qu'un message soit dans un intrervalle de temps relatif "
 "au filtre, comme par exemple entre deux et quatre jours."
 
-#: ../C/evolution.xml:2821(title) ../C/evolution.xml:3066(title)
+#: ../C/evolution.xml:2997(title) ../C/evolution.xml:3242(title)
 msgid "Date Received:"
 msgstr "Date de réception :"
 
-#: ../C/evolution.xml:2822(para) ../C/evolution.xml:3067(para)
+#: ../C/evolution.xml:2998(para) ../C/evolution.xml:3243(para)
 msgid ""
 "This works the same way as the Date Sent option, except that it compares the "
 "time you received the message with the dates you specify."
@@ -7063,11 +7422,11 @@ msgstr ""
 "Cela fonctionne de la même manière qu'avec l'option Date d'envoi, sauf qu'il "
 "compare avec la date à laquelle vous avez reçu le message."
 
-#: ../C/evolution.xml:2825(title) ../C/evolution.xml:3070(title)
+#: ../C/evolution.xml:3001(title) ../C/evolution.xml:3246(title)
 msgid "Label:"
 msgstr "Étiquette :"
 
-#: ../C/evolution.xml:2826(para) ../C/evolution.xml:3071(para)
+#: ../C/evolution.xml:3002(para) ../C/evolution.xml:3247(para)
 msgid ""
 "Messages can have labels of Important, Work, Personal, To Do, or Later. You "
 "can set labels with other filters or manually."
@@ -7076,11 +7435,11 @@ msgstr ""
 "faire ou Plus tard. Vous pouvez placer ces étiquettes avec d'autres filtres "
 "ou à la main."
 
-#: ../C/evolution.xml:2829(title) ../C/evolution.xml:3074(title)
+#: ../C/evolution.xml:3005(title) ../C/evolution.xml:3250(title)
 msgid "Score:"
 msgstr "Score :"
 
-#: ../C/evolution.xml:2830(para) ../C/evolution.xml:3075(para)
+#: ../C/evolution.xml:3006(para) ../C/evolution.xml:3251(para)
 msgid ""
 "Sets the message score to any whole number greater than 0. You can have one "
 "filter set or change a message score, and then set up another filter to move "
@@ -7095,19 +7454,19 @@ msgstr ""
 "nombre que vous pouvez attribuer aux messages afin que d'autres filtres les "
 "traitent."
 
-#: ../C/evolution.xml:2833(title) ../C/evolution.xml:3078(title)
+#: ../C/evolution.xml:3009(title) ../C/evolution.xml:3254(title)
 msgid "Size:"
 msgstr "Taille :"
 
-#: ../C/evolution.xml:2834(para) ../C/evolution.xml:3079(para)
+#: ../C/evolution.xml:3010(para) ../C/evolution.xml:3255(para)
 msgid "Sorts based on the size of the message in kilobytes."
 msgstr "Trie selon la taille du message en kilooctets."
 
-#: ../C/evolution.xml:2837(title) ../C/evolution.xml:3082(title)
+#: ../C/evolution.xml:3013(title) ../C/evolution.xml:3258(title)
 msgid "Status:"
 msgstr "État :"
 
-#: ../C/evolution.xml:2838(para) ../C/evolution.xml:3083(para)
+#: ../C/evolution.xml:3014(para) ../C/evolution.xml:3259(para)
 msgid ""
 "Filters according to the status of a message. The status can be Replied To, "
 "Draft, Important, Read, or Junk."
@@ -7115,27 +7474,27 @@ msgstr ""
 "Filtre selon l'état d'un message. L'état peut être Répondre à, Brouillon, "
 "Important, Lu ou Pourriel."
 
-#: ../C/evolution.xml:2841(title)
+#: ../C/evolution.xml:3017(title)
 msgid "Flagged:"
 msgstr "Donner suite :"
 
-#: ../C/evolution.xml:2842(para) ../C/evolution.xml:3087(para)
+#: ../C/evolution.xml:3018(para) ../C/evolution.xml:3263(para)
 msgid "Checks whether the message is flagged for follow-up."
 msgstr "Vérifie si le message est marqué pour effectuer un suivi."
 
-#: ../C/evolution.xml:2845(title) ../C/evolution.xml:3090(title)
+#: ../C/evolution.xml:3021(title) ../C/evolution.xml:3266(title)
 msgid "Attachments:"
 msgstr "Pièces jointes :"
 
-#: ../C/evolution.xml:2846(para) ../C/evolution.xml:3091(para)
+#: ../C/evolution.xml:3022(para) ../C/evolution.xml:3267(para)
 msgid "Creates a filter based on whether there is an attachment for the email."
 msgstr "Crée un filtre basé sur la présence d'une pièce jointe au courriel."
 
-#: ../C/evolution.xml:2849(title)
+#: ../C/evolution.xml:3025(title)
 msgid "Mailing List"
 msgstr "Liste de diffusion"
 
-#: ../C/evolution.xml:2850(para) ../C/evolution.xml:3095(para)
+#: ../C/evolution.xml:3026(para) ../C/evolution.xml:3271(para)
 msgid ""
 "Filters based on the mailing list the message came from. This filter might "
 "miss messages from some list servers, because it checks for the X-BeenThere "
@@ -7150,11 +7509,11 @@ msgstr ""
 "listes qui ne définissent pas correctement X-BeenThere ne seront pas "
 "interceptés par ces filtres."
 
-#: ../C/evolution.xml:2853(title)
+#: ../C/evolution.xml:3029(title)
 msgid "Regex Match:"
 msgstr "Correspondance Regex :"
 
-#: ../C/evolution.xml:2854(para)
+#: ../C/evolution.xml:3030(para)
 msgid ""
 "If you know your way around a <link linkend=\"regular-expression\">regex</"
 "link>, or regular expression, this option allows you to search for complex "
@@ -7171,11 +7530,11 @@ msgstr ""
 "particulier. Pour des informations sur l'utilisation des expressions "
 "régulières, consultez la page de manuel de la commande « grep »."
 
-#: ../C/evolution.xml:2857(title)
+#: ../C/evolution.xml:3033(title)
 msgid "Source Account:"
 msgstr "Compte source :"
 
-#: ../C/evolution.xml:2858(para)
+#: ../C/evolution.xml:3034(para)
 msgid ""
 "Filters messages according the server you got them from. This is most useful "
 "if you use multiple POP mail accounts."
@@ -7183,11 +7542,11 @@ msgstr ""
 "Filtre les messages selon le serveur de provenance. Ce critère est utile si "
 "vous disposez de plusieurs comptes POP."
 
-#: ../C/evolution.xml:2861(title) ../C/evolution.xml:2945(title)
+#: ../C/evolution.xml:3037(title) ../C/evolution.xml:3121(title)
 msgid "Pipe to Program:"
 msgstr "Canal d'accès au programme :"
 
-#: ../C/evolution.xml:2862(para)
+#: ../C/evolution.xml:3038(para)
 msgid ""
 "Evolution can use an external command to process a message, then process it "
 "based on the return value. Commands used in this way must return an integer. "
@@ -7198,50 +7557,50 @@ msgstr ""
 "cet effet doivent retourner un nombre entier. L'usage le plus courant "
 "consiste à ajouter un filtre de pourriels externe."
 
-#: ../C/evolution.xml:2865(title)
+#: ../C/evolution.xml:3041(title)
 msgid "Junk Test:"
 msgstr "Test pourriel :"
 
-#: ../C/evolution.xml:2866(para)
+#: ../C/evolution.xml:3042(para)
 msgid "Filters based on the results of the junk mail test."
 msgstr "Filtre selon les résultats d'un test de pourriel."
 
-#: ../C/evolution.xml:2869(title)
+#: ../C/evolution.xml:3045(title)
 msgid "Select the Criteria for the Condition:"
 msgstr "Sélectionnez le critère correspondant à la condition :"
 
-#: ../C/evolution.xml:2870(para)
+#: ../C/evolution.xml:3046(para)
 msgid ""
 "If you want multiple criteria for this filter, click Add and repeat step 4."
 msgstr ""
 "Si vous souhaitez plusieurs critères pour ce filtre, cliquez sur Ajouter et "
 "répétez l'étape 4."
 
-#: ../C/evolution.xml:2873(title)
+#: ../C/evolution.xml:3049(title)
 msgid "Select the Actions for the Filter in the Then Section:"
 msgstr "Sélectionnez les actions du filtre dans la section « Alors » :"
 
-#: ../C/evolution.xml:2874(para)
+#: ../C/evolution.xml:3050(para)
 msgid "Select any of the following options."
 msgstr "Sélectionnez l'une des options suivantes."
 
-#: ../C/evolution.xml:2879(title)
+#: ../C/evolution.xml:3055(title)
 msgid "Move to Folder:"
 msgstr "Déplacer vers le dossier :"
 
-#: ../C/evolution.xml:2880(para)
+#: ../C/evolution.xml:3056(para)
 msgid "Moves the message into a folder you specify."
 msgstr "Déplace le message dans un dossier de votre choix."
 
-#: ../C/evolution.xml:2885(title)
+#: ../C/evolution.xml:3061(title)
 msgid "Copy to Folder:"
 msgstr "Copier vers le dossier :"
 
-#: ../C/evolution.xml:2886(para)
+#: ../C/evolution.xml:3062(para)
 msgid "Puts a copy of the message into a folder you specify."
 msgstr "Place une copie du message dans un dossier à définir."
 
-#: ../C/evolution.xml:2892(para)
+#: ../C/evolution.xml:3068(para)
 msgid ""
 "Marks the message for deletion. The message can be undeleted until you "
 "expunge or empty the trash."
@@ -7249,11 +7608,11 @@ msgstr ""
 "Marque le message pour la suppression. Le message peut être récupéré tant "
 "que vous ne nettoyez pas les dossiers ou que vous ne videz pas la corbeille."
 
-#: ../C/evolution.xml:2897(title)
+#: ../C/evolution.xml:3073(title)
 msgid "Stop Processing:"
 msgstr "Arrêter le traitement :"
 
-#: ../C/evolution.xml:2898(para)
+#: ../C/evolution.xml:3074(para)
 msgid ""
 "Select this if you want to all other filters ignore this message. Note that "
 "only filters listed after this particular rule will be ignored."
@@ -7262,35 +7621,35 @@ msgstr ""
 "message. Notez que seuls les filtres apparaissant après cette règle seront "
 "ignorés."
 
-#: ../C/evolution.xml:2903(title)
+#: ../C/evolution.xml:3079(title)
 msgid "Assign Color:"
 msgstr "Assigner une couleur :"
 
-#: ../C/evolution.xml:2904(para)
+#: ../C/evolution.xml:3080(para)
 msgid "Marks the message with a color of your choice."
 msgstr "Marque le message avec une couleur de votre choix."
 
-#: ../C/evolution.xml:2909(title)
+#: ../C/evolution.xml:3085(title)
 msgid "Assign Score:"
 msgstr "Assigner un score :"
 
-#: ../C/evolution.xml:2910(para)
+#: ../C/evolution.xml:3086(para)
 msgid "Assigns the message a numeric score."
 msgstr "Attribue un score numérique au message."
 
-#: ../C/evolution.xml:2915(title)
+#: ../C/evolution.xml:3091(title)
 msgid "Adjust Score:"
 msgstr "Ajuster le score :"
 
-#: ../C/evolution.xml:2916(para)
+#: ../C/evolution.xml:3092(para)
 msgid "Changes the numeric score by the amount you set."
 msgstr "Modifie le score numérique selon la quantité indiquée."
 
-#: ../C/evolution.xml:2921(title)
+#: ../C/evolution.xml:3097(title)
 msgid "Set Status:"
 msgstr "Définir l'état :"
 
-#: ../C/evolution.xml:2922(para)
+#: ../C/evolution.xml:3098(para)
 msgid ""
 "Sets the status of the message. The status can be Replied To, Draft, "
 "Important, Read, or Junk."
@@ -7298,11 +7657,11 @@ msgstr ""
 "Définit l'état du message. L'état peut être Répondu à, Brouillon, Important, "
 "Lu ou Pourriel."
 
-#: ../C/evolution.xml:2927(title)
+#: ../C/evolution.xml:3103(title)
 msgid "Unset Status:"
 msgstr "État non défini :"
 
-#: ../C/evolution.xml:2928(para)
+#: ../C/evolution.xml:3104(para)
 msgid ""
 "If the message has a status value, unsets it. If a status value is not set, "
 "it does nothing."
@@ -7310,23 +7669,19 @@ msgstr ""
 "Si le message possède une valeur d'état, celle-ci est supprimée. S'il n'en "
 "avait pas, l'action est neutre."
 
-#: ../C/evolution.xml:2933(title)
-msgid "Beep:"
-msgstr "Bip :"
-
-#: ../C/evolution.xml:2934(para)
+#: ../C/evolution.xml:3110(para)
 msgid "Makes the system beep."
 msgstr "Effectue un bip système."
 
-#: ../C/evolution.xml:2939(title)
+#: ../C/evolution.xml:3115(title)
 msgid "Play Sound:"
 msgstr "Jouer le son :"
 
-#: ../C/evolution.xml:2940(para)
+#: ../C/evolution.xml:3116(para)
 msgid "Select a sound file for Evolution to play."
 msgstr "Sélectionne un fichier son joué par Evolution."
 
-#: ../C/evolution.xml:2946(para)
+#: ../C/evolution.xml:3122(para)
 msgid ""
 "Sends the message to a program of your choice. No return value is expected. "
 "This feature can be used to create automatic Web postings from email "
@@ -7339,37 +7694,37 @@ msgstr ""
 "effectuer des traitements supplémentaires de message non pris en charge par "
 "Evolution."
 
-#: ../C/evolution.xml:2951(title)
+#: ../C/evolution.xml:3127(title)
 msgid "Run Program:"
 msgstr "Lancer le programme :"
 
-#: ../C/evolution.xml:2952(para)
+#: ../C/evolution.xml:3128(para)
 msgid "Evolution runs an application."
 msgstr "Evolution lance une application."
 
-#: ../C/evolution.xml:2958(para)
+#: ../C/evolution.xml:3134(para)
 msgid "Click Add if you need multiple actions and click OK."
 msgstr ""
 "Cliquez sur Ajouter si vous souhaitez effectuer plusieurs actions, puis "
 "cliquez sur Valider."
 
-#: ../C/evolution.xml:2964(para)
+#: ../C/evolution.xml:3140(para)
 msgid "There is an easy shortcut for fast filter or search folder creation:"
 msgstr ""
 "Il existe un raccourci simple pour la création rapide de filtres ou de "
 "dossiers de recherche :"
 
-#: ../C/evolution.xml:2967(para)
+#: ../C/evolution.xml:3143(para)
 msgid "Right-click the message in the message list."
 msgstr "Faites un clic droit sur le message dans la liste des courriels."
 
-#: ../C/evolution.xml:2970(para)
+#: ../C/evolution.xml:3146(para)
 msgid "Select one of the items under the Create Rule From Message submenu."
 msgstr ""
 "Choisissez l'un des éléments du sous-menu « Créer une règle à partir du "
 "message »."
 
-#: ../C/evolution.xml:2971(para)
+#: ../C/evolution.xml:3147(para)
 msgid ""
 "Creating a rule based on a message opens the filter creation tool with some "
 "of the information about the message already filled in for your convenience."
@@ -7377,7 +7732,7 @@ msgstr ""
 "La création d'une règle basée sur un message ouvre l'outil de création de "
 "filtre avec une partie des informations du message pré-remplies pour vous."
 
-#: ../C/evolution.xml:2974(para)
+#: ../C/evolution.xml:3150(para)
 msgid ""
 "If you have several filters that match a single message, they are all "
 "applied to the message in order, unless one of the filters has the Stop "
@@ -7389,7 +7744,7 @@ msgstr ""
 "le traitement ». Si vous utilisez cette action dans un filtre, les messages "
 "qu'il traite ne sont plus affectés par les autres filtres."
 
-#: ../C/evolution.xml:2975(para)
+#: ../C/evolution.xml:3151(para)
 msgid ""
 "When you first open the Filters dialog box, you are shown the list of "
 "filters sorted in the order in which they will be applied. You can move them "
@@ -7400,28 +7755,28 @@ msgstr ""
 "priorité en les faisant monter ou descendre dans la liste à l'aide des "
 "boutons Haut et Bas."
 
-#: ../C/evolution.xml:2979(title)
+#: ../C/evolution.xml:3155(title)
 msgid "Editing Filters"
 msgstr "Édition des filtres"
 
-#: ../C/evolution.xml:2985(para)
+#: ../C/evolution.xml:3161(para)
 msgid "Select the filter to edit, then click Edit."
 msgstr "Sélectionnez le filtre à éditer, puis cliquez sur Édition."
 
-#: ../C/evolution.xml:2988(para)
+#: ../C/evolution.xml:3164(para)
 msgid "Make the desired corrections, then click OK twice."
 msgstr ""
 "Effectuez les corrections souhaitées, puis cliquez deux fois sur Valider."
 
-#: ../C/evolution.xml:2994(title)
+#: ../C/evolution.xml:3170(title)
 msgid "Deleting Filters"
 msgstr "Suppression de filtres"
 
-#: ../C/evolution.xml:3000(para)
+#: ../C/evolution.xml:3176(para)
 msgid "Select the filter to remove, then click Remove."
 msgstr "Sélectionnez le filtre à supprimer, puis cliquez sur Enlever."
 
-#: ../C/evolution.xml:3011(para)
+#: ../C/evolution.xml:3187(para)
 msgid ""
 "If filters aren't flexible enough, or you find yourself performing the same "
 "search again and again, consider a search folder. Search folders are an "
@@ -7437,7 +7792,7 @@ msgstr ""
 "dossiers de recherche peuvent vous aider à conserver de l'ordre dans vos "
 "affaires."
 
-#: ../C/evolution.xml:3012(para)
+#: ../C/evolution.xml:3188(para)
 msgid ""
 "A search folder is really a hybrid of all the other organizational tools: it "
 "looks like a folder, it acts like a search, and you set it up like a filter. "
@@ -7454,7 +7809,7 @@ msgstr ""
 "Les messages qu'il contient sont définis à la volée par un ensemble de "
 "critères choisis à l'avance."
 
-#: ../C/evolution.xml:3013(para)
+#: ../C/evolution.xml:3189(para)
 msgid ""
 "As messages that meet the search folder criteria arrive or are deleted, "
 "Evolution automatically adjusts the search folder contents. When you delete "
@@ -7467,7 +7822,7 @@ msgstr ""
 "dossier auquel il appartient, ainsi que de tout dossier de recherche dans "
 "lequel il apparaissait."
 
-#: ../C/evolution.xml:3014(para)
+#: ../C/evolution.xml:3190(para)
 msgid ""
 "The Unmatched Search Folder is the opposite of other search folders: it "
 "displays all messages that do not appear in other search folders."
@@ -7476,7 +7831,7 @@ msgstr ""
 "recherche. Il affiche tous les messages qui n'apparaissent dans aucun autre "
 "dossier de recherche."
 
-#: ../C/evolution.xml:3015(para)
+#: ../C/evolution.xml:3191(para)
 msgid ""
 "If you use remote email storage like IMAP or Microsoft Exchange, and have "
 "created search folders to search through them, the Unmatched Search Folder "
@@ -7491,7 +7846,7 @@ msgstr ""
 "de stockage distants, le dossier de recherche Autres courriels ne les "
 "recherche pas non plus."
 
-#: ../C/evolution.xml:3016(para)
+#: ../C/evolution.xml:3192(para)
 msgid ""
 "As an example of using folders, searches, and search folders, consider the "
 "following: To organize his mailbox, Jim sets up a search folder for email "
@@ -7517,11 +7872,11 @@ msgstr ""
 "recherche « Anna » et dans le dossier de recherche « Discussions internes sur "
 "Evolution »."
 
-#: ../C/evolution.xml:3019(title)
+#: ../C/evolution.xml:3195(title)
 msgid "Creating A Search Folder"
 msgstr "Création d'un dossier de recherche"
 
-#: ../C/evolution.xml:3022(para)
+#: ../C/evolution.xml:3198(para)
 msgid ""
 "Click Message &gt; Create Rule, then select a search folder based on "
 "Subject, Sender, Recipient, or Mailing List."
@@ -7530,13 +7885,13 @@ msgstr ""
 "recherche basé sur le sujet, l'expéditeur, les destinataires ou la liste de "
 "diffusion."
 
-#: ../C/evolution.xml:3024(para)
+#: ../C/evolution.xml:3200(para)
 msgid "Select Search menu &gt; Create Search Folder From Search."
 msgstr ""
 "Dans le menu Recherche, choisissez Créer un dossier de recherche à partir "
 "d'une recherche."
 
-#: ../C/evolution.xml:3026(para)
+#: ../C/evolution.xml:3202(para)
 msgid ""
 "Perform this operation from the search results. Create a search folder from "
 "search is enabled only when you already have performed a search."
@@ -7545,16 +7900,16 @@ msgstr ""
 "création d'un dossier de recherche à partir d'une recherche n'est activée "
 "que si vous avez déjà effectué une recherche."
 
-#: ../C/evolution.xml:3029(para)
+#: ../C/evolution.xml:3205(para)
 msgid "Select Edit &gt; Search Folder"
 msgstr "Choisissez Édition &gt; Dossier de recherche"
 
-#: ../C/evolution.xml:3037(para)
+#: ../C/evolution.xml:3213(para)
 msgid "Type the name of the search folder in the Search name field."
 msgstr ""
 "Saisissez le nom du dossier de recherche dans le champ Nom de la recherche."
 
-#: ../C/evolution.xml:3040(para)
+#: ../C/evolution.xml:3216(para)
 msgid ""
 "Select your search criteria. For each criterion, you must first select which "
 "of the following parts of the message you want the search to examine. The "
@@ -7564,19 +7919,19 @@ msgstr ""
 "d'abord sélectionner quelle partie du message la recherche doit examiner. "
 "Les critères sont quasiment identiques à ceux des filtres."
 
-#: ../C/evolution.xml:3043(para)
+#: ../C/evolution.xml:3219(para)
 msgid "Sender's address."
 msgstr "Adresse de l'expéditeur."
 
-#: ../C/evolution.xml:3046(title)
+#: ../C/evolution.xml:3222(title)
 msgid "Recipients:"
 msgstr "Destinataires :"
 
-#: ../C/evolution.xml:3058(title)
+#: ../C/evolution.xml:3234(title)
 msgid "Expression (For programmers only):"
 msgstr "Expression (uniquement pour les programmeurs) :"
 
-#: ../C/evolution.xml:3059(para)
+#: ../C/evolution.xml:3235(para)
 msgid ""
 "Match a message according to an expression you write in the Scheme language "
 "used to define filters in Evolution."
@@ -7584,34 +7939,34 @@ msgstr ""
 "Recherche les messages selon une expression écrite en langage Scheme, "
 "utilisé pour définir les filtres dans Evolution."
 
-#: ../C/evolution.xml:3086(title)
+#: ../C/evolution.xml:3262(title)
 msgid "Follow Up:"
 msgstr "Donner suite :"
 
-#: ../C/evolution.xml:3094(title)
+#: ../C/evolution.xml:3270(title)
 msgid "Mailing List:"
 msgstr "Liste de diffusion :"
 
-#: ../C/evolution.xml:3098(title)
+#: ../C/evolution.xml:3274(title)
 msgid "Match all:"
 msgstr "Vérifie tout :"
 
-#: ../C/evolution.xml:3099(para)
+#: ../C/evolution.xml:3275(para)
 msgid "Checks whether the message matchs all the criteria listed."
 msgstr "Vérifie si le message correspond à tous les critères de la liste."
 
-#: ../C/evolution.xml:3103(para)
+#: ../C/evolution.xml:3279(para)
 msgid ""
 "Select which folders will be used for the search folder. Your options are:"
 msgstr ""
 "Sélectionnez les dossiers dans lesquels ce dossier de recherche va "
 "rechercher. Les options sont :"
 
-#: ../C/evolution.xml:3105(title)
+#: ../C/evolution.xml:3281(title)
 msgid "All local folders:"
 msgstr "Tous les dossiers locaux :"
 
-#: ../C/evolution.xml:3106(para)
+#: ../C/evolution.xml:3282(para)
 msgid ""
 "Uses all local folders for the search folder source in addition to "
 "individual folders that are selected."
@@ -7619,11 +7974,11 @@ msgstr ""
 "Utilise tous les dossiers locaux comme source pour le dossier de recherche, "
 "en plus des dossiers individuels sélectionnés."
 
-#: ../C/evolution.xml:3109(title)
+#: ../C/evolution.xml:3285(title)
 msgid "All active remote folders:"
 msgstr "Tous les dossiers distants actifs :"
 
-#: ../C/evolution.xml:3110(para)
+#: ../C/evolution.xml:3286(para)
 msgid ""
 "Remote folders are considered active if you are connected to the server; you "
 "must be connected to your mail server for the search folder to include any "
@@ -7635,11 +7990,11 @@ msgstr ""
 "dossier de recherche inclue tout message de cette source, en plus des "
 "dossiers individuels sélectionnés."
 
-#: ../C/evolution.xml:3113(title)
+#: ../C/evolution.xml:3289(title)
 msgid "All local and active remote folders:"
 msgstr "Tous les dossiers locaux et distants actifs :"
 
-#: ../C/evolution.xml:3114(para)
+#: ../C/evolution.xml:3290(para)
 msgid ""
 "Uses all local and active remote folders for the search folder source in "
 "addition to individual folders that are selected."
@@ -7647,28 +8002,28 @@ msgstr ""
 "Utilise tous les dossiers locaux et distants actifs comme source du dossier "
 "de recherche, en plus des dossiers individuels sélectionnés."
 
-#: ../C/evolution.xml:3117(title)
+#: ../C/evolution.xml:3293(title)
 msgid "Specific folders only:"
 msgstr "Uniquement les dossiers spécifiques :"
 
-#: ../C/evolution.xml:3118(para)
+#: ../C/evolution.xml:3294(para)
 msgid "Uses individual folders for the search folder source."
 msgstr "Utilise des dossiers individuels comme source du dossier de recherche."
 
-#: ../C/evolution.xml:3120(para)
+#: ../C/evolution.xml:3296(para)
 msgid "If you select Specific folders only,"
 msgstr "Si vous sélectionnez «Uniquement les dossiers spécifiques »,"
 
-#: ../C/evolution.xml:3123(para)
+#: ../C/evolution.xml:3299(para)
 msgid "click Add button to open the Select folder window."
 msgstr ""
 "cliquez sur le bouton Ajouter pour ouvrir la fenêtre de sélection de dossier."
 
-#: ../C/evolution.xml:3130(para)
+#: ../C/evolution.xml:3306(para)
 msgid "Select the folder and press Add button."
 msgstr "Sélectionnez le dossier et cliquez sur le bouton Ajouter."
 
-#: ../C/evolution.xml:3133(para)
+#: ../C/evolution.xml:3309(para)
 msgid ""
 "You can view the folder added to the list in the entry box at the bottom of "
 "the New Search Folder window."
@@ -7676,7 +8031,7 @@ msgstr ""
 "Vous pouvez voir le dossier ajouté à la liste de la zone de saisie au bas de "
 "la fenêtre « Nouveau dossier de recherche »."
 
-#: ../C/evolution.xml:3144(para)
+#: ../C/evolution.xml:3320(para)
 msgid ""
 "Evolution can check for junk mail for you. Evolution uses SpamAssassin and/"
 "or Bogofilter with trainable Bayesian filters to perform the spam check. "
@@ -7690,7 +8045,7 @@ msgstr ""
 "marque et le masque. Les message marqués comme pourriel apparaissent "
 "uniquement dans le dossier Pourriels."
 
-#: ../C/evolution.xml:3145(para)
+#: ../C/evolution.xml:3321(para)
 msgid ""
 "The junk mail filter can learn which kinds of mail are legitimate and which "
 "are not if you train it. When you first start using junk mail blocking, "
@@ -7713,7 +8068,7 @@ msgstr ""
 "reconnaître les messages semblables à l'avenir, et devenir de plus en plus "
 "performant avec le temps."
 
-#: ../C/evolution.xml:3146(para)
+#: ../C/evolution.xml:3322(para)
 msgid ""
 "Every filter needs to learn at the least 100 spam and 100 ham to start "
 "working. For that, you must mark each message manually by clicking the "
@@ -7727,7 +8082,7 @@ msgstr ""
 "légitimes. Le bouton <emphasis>Pourriel</emphasis> signifie au filtre que le "
 "message est un pourriel."
 
-#: ../C/evolution.xml:3147(para)
+#: ../C/evolution.xml:3323(para)
 msgid ""
 "To change your junk mail filtering preferences, click Edit &gt; Preferences, "
 "then click Mail Preferences."
@@ -7735,7 +8090,7 @@ msgstr ""
 "Pour modifier les préférences de filtrage du pourriel, choisissez Édition "
 "&gt; Préférences, puis cliquez sur Préférences du courriel."
 
-#: ../C/evolution.xml:3148(para) ../C/evolution.xml:5672(para)
+#: ../C/evolution.xml:3324(para) ../C/evolution.xml:5905(para)
 msgid ""
 "For additional information on junk content, see <link linkend=\"mail-prefs-"
 "junk\">Junk Mail Preferences</link>."
@@ -7743,7 +8098,7 @@ msgstr ""
 "Pour plus d'informations sur le contenu indésirable, consultez les <link "
 "linkend=\"mail-prefs-junk\">Préférences du pourriel</link>."
 
-#: ../C/evolution.xml:3149(para)
+#: ../C/evolution.xml:3325(para)
 msgid ""
 "For additional junk mail settings, see <link linkend=\"more-mail-options"
 "\">Receiving Mail Options</link>."
@@ -7752,7 +8107,7 @@ msgstr ""
 "consultez <link linkend=\"more-mail-options\">Options de réception du "
 "courriel</link>."
 
-#: ../C/evolution.xml:3151(para)
+#: ../C/evolution.xml:3327(para)
 msgid ""
 "SpamAssassin is an application that scan through the mail box to find junk "
 "mail. Evolution uses SpamAssassin as the default spam-filtering application. "
@@ -7765,7 +8120,7 @@ msgstr ""
 "site du <ulink url=\"http://spamassassin.apache.org/\">projet Apache "
 "SpamAssassin</ulink>."
 
-#: ../C/evolution.xml:3152(para)
+#: ../C/evolution.xml:3328(para)
 msgid ""
 "Bogofilter is a mail filter that classifies mail as spam or ham (non-spam) "
 "by a statistical analysis of the message's header and content (body). It is "
@@ -7779,7 +8134,7 @@ msgstr ""
 "utilisateurs. Pour plus d'informations sur Bogofilter, consultez le <ulink "
 "url=\"http://bogofilter.sourceforge.net/\">site de Bogofilter</ulink>."
 
-#: ../C/evolution.xml:3159(para)
+#: ../C/evolution.xml:3335(para)
 msgid ""
 "This section shows you how to use the <trademark>Evolution</trademark> "
 "contacts tool to organize any amount of contact information, share addresses "
@@ -7790,27 +8145,27 @@ msgstr ""
 "contact, partager des adresses sur un réseau et gagner du temps dans vos "
 "tâches quotidiennes."
 
-#: ../C/evolution.xml:3162(link) ../C/evolution.xml:3179(title)
+#: ../C/evolution.xml:3338(link) ../C/evolution.xml:3355(title)
 msgid "Contacts and Cards"
 msgstr "Contacts et cartes"
 
-#: ../C/evolution.xml:3165(link) ../C/evolution.xml:3271(title)
+#: ../C/evolution.xml:3341(link) ../C/evolution.xml:3504(title)
 msgid "Searching for Contacts"
 msgstr "Recherche de contacts"
 
-#: ../C/evolution.xml:3168(link) ../C/evolution.xml:3422(title)
+#: ../C/evolution.xml:3344(link) ../C/evolution.xml:3655(title)
 msgid "Organizing your Contacts"
 msgstr "Organisation des contacts"
 
-#: ../C/evolution.xml:3171(link) ../C/evolution.xml:3538(title)
+#: ../C/evolution.xml:3347(link) ../C/evolution.xml:3771(title)
 msgid "LDAP: Shared Address Books on a Network"
 msgstr "LDAP : Carnets d'adresses partagés sur un réseau"
 
-#: ../C/evolution.xml:3174(link) ../C/evolution.xml:3561(title)
+#: ../C/evolution.xml:3350(link) ../C/evolution.xml:3794(title)
 msgid "Send Me a Card: Adding New Cards Quickly"
 msgstr "Envoie-moi une carte : l'ajout rapide de nouvelles cartes"
 
-#: ../C/evolution.xml:3180(para)
+#: ../C/evolution.xml:3356(para)
 msgid ""
 "Contacts are the individuals you have chosen to add to your address book so "
 "you can keep track of information about them and send email to them. In "
@@ -7827,11 +8182,11 @@ msgstr ""
 "des contacts</link>. Pour apprendre comment configurer l'outil « Contacts », "
 "consultez <link linkend=\"config-prefs-contact\">Gestion des contacts</link>."
 
-#: ../C/evolution.xml:3183(title)
+#: ../C/evolution.xml:3359(title)
 msgid "The Contact Editor"
 msgstr "L'éditeur de contact"
 
-#: ../C/evolution.xml:3184(para)
+#: ../C/evolution.xml:3360(para)
 msgid ""
 "If you want to add or change cards, use the contact editor. You can edit "
 "email address, telephone numbers, mailer addresses and all other contact "
@@ -7842,23 +8197,23 @@ msgstr ""
 "téléphone, les adresses postales et toutes les autres informations de "
 "contact saisies pour un contact particulier."
 
-#: ../C/evolution.xml:3185(para)
+#: ../C/evolution.xml:3361(para)
 msgid "The contact editor window has three tabs:"
 msgstr "La fenêtre de l'éditeur de contact présente trois onglets :"
 
-#: ../C/evolution.xml:3187(title)
+#: ../C/evolution.xml:3363(title)
 msgid "Contact:"
 msgstr "Contact :"
 
-#: ../C/evolution.xml:3188(para)
+#: ../C/evolution.xml:3364(para)
 msgid "Contains basic contact information."
 msgstr "Contient les informations de base du contact."
 
-#: ../C/evolution.xml:3191(title)
+#: ../C/evolution.xml:3367(title)
 msgid "Personal Information:"
 msgstr "Informations personnelles :"
 
-#: ../C/evolution.xml:3192(para)
+#: ../C/evolution.xml:3368(para)
 msgid ""
 "Contains a more specific description of the person, including URLs for "
 "calendar and free/busy information."
@@ -7866,26 +8221,26 @@ msgstr ""
 "Contient une description plus spécifique de la personne, y compris des URL "
 "pour les informations de calendrier et de disponibilité."
 
-#: ../C/evolution.xml:3195(title)
+#: ../C/evolution.xml:3371(title)
 msgid "Mailing Address:"
 msgstr "Adresse postale :"
 
-#: ../C/evolution.xml:3196(para)
+#: ../C/evolution.xml:3372(para)
 msgid "Contains the individual's mailing address."
 msgstr "Contient l'adresse postale de la personne."
 
-#: ../C/evolution.xml:3198(para)
+#: ../C/evolution.xml:3374(para)
 msgid ""
-"You can also use Action Menu to find Forward Contact, which opens a new "
-"message with the card already attached, and Send Message to Contact, which "
-"opens a new message to the contact's email address."
+"You can also the Forward Contact menu item in the Action menu, which opens a "
+"new message with the card already attached, and Send Message to Contact, "
+"which opens a new message to the contact's email address."
 msgstr ""
 "Vous pouvez aussi utiliser le menu Actions pour y trouver « Faire suivre le "
 "contact », ce qui crée un nouveau message contenant la carte en pièce "
 "jointe, et « Envoyer un message au contact », ce qui crée un nouveau message "
 "à destination de l'adresse électronique du contact."
 
-#: ../C/evolution.xml:3199(para)
+#: ../C/evolution.xml:3375(para)
 msgid ""
 "You can add a card from within an email message or calendar appointment. In "
 "an open email, right-click any email address or message, and click Add to "
@@ -7896,7 +8251,7 @@ msgstr ""
 "électronique et choisissez « Ajouter dans le carnet d'adresses » ou "
 "choisissez « Ajouter l'expéditeur au carnet d'adresses » dans le menu Message."
 
-#: ../C/evolution.xml:3200(para)
+#: ../C/evolution.xml:3376(para)
 msgid ""
 "Most of the items in the contact editor simply display the information you "
 "enter, but some of them have additional features:"
@@ -7905,11 +8260,11 @@ msgstr ""
 "informations que vous avez saisies, mais certains d'entre eux offrent des "
 "fonctionnalités supplémentaires :"
 
-#: ../C/evolution.xml:3202(title)
+#: ../C/evolution.xml:3378(title)
 msgid "Full Name:"
 msgstr "Nom complet :"
 
-#: ../C/evolution.xml:3203(para)
+#: ../C/evolution.xml:3379(para)
 msgid ""
 "Specify the name of your contact here. You can type a name into the Full "
 "Name field, but you can also click the Full Name button to bring up a small "
@@ -7940,11 +8295,11 @@ msgstr ""
 "Miguel, « de Icaza », comporte deux mots. Pour qu'il soit trié correctement, "
 "vous devez choisir « de Icaza, Miguel » dans le champ Classer sous."
 
-#: ../C/evolution.xml:3206(title)
+#: ../C/evolution.xml:3382(title)
 msgid "Where:"
 msgstr "Où :"
 
-#: ../C/evolution.xml:3207(para)
+#: ../C/evolution.xml:3383(para)
 msgid ""
 "Select one of your address books as the location for this contact. You might "
 "not be able to write to all available address books, especially those on a "
@@ -7954,11 +8309,11 @@ msgstr ""
 "contact. Il est possible que vous ne puissiez pas modifier certains carnets "
 "d'adresses, particulièrement ceux qui se trouvent sur un réseau."
 
-#: ../C/evolution.xml:3210(title)
+#: ../C/evolution.xml:3386(title)
 msgid "Categories:"
 msgstr "Catégories :"
 
-#: ../C/evolution.xml:3211(para)
+#: ../C/evolution.xml:3387(para)
 msgid ""
 "Click the Categories button to select categories for this card. If you "
 "assign contact categories, you can then search for contacts using those "
@@ -7971,11 +8326,11 @@ msgstr ""
 "sur les catégories de contacts, consultez <link linkend=\"usage-contact-"
 "organize\">Organisation des contacts</link>."
 
-#: ../C/evolution.xml:3214(title)
+#: ../C/evolution.xml:3390(title)
 msgid "Free/Busy and Calendar URLs:"
 msgstr "URL de calendrier et de disponibilité :"
 
-#: ../C/evolution.xml:3215(para)
+#: ../C/evolution.xml:3391(para)
 msgid ""
 "Click the Personal Information tab to enter Web addresses for the contact. "
 "If the contact publishes Free/Busy or calendar data online, using a server "
@@ -7990,29 +8345,29 @@ msgstr ""
 "Après cela, vous pouvez vérifier leurs agendas lorsque vous créez des rendez-"
 "vous dans un calendrier."
 
-#: ../C/evolution.xml:3220(title)
+#: ../C/evolution.xml:3396(title)
 msgid "Creating and Editing Contacts"
 msgstr "Création et édition de contacts"
 
-#: ../C/evolution.xml:3221(para)
+#: ../C/evolution.xml:3397(para)
 msgid "Follow the steps given below to create a new card."
 msgstr "Suivez les étapes ci-dessous pour créer une nouvelle carte."
 
-#: ../C/evolution.xml:3224(para)
+#: ../C/evolution.xml:3400(para)
 msgid "Click File &gt; New &gt; Contact."
 msgstr "Choisissez Fichier &gt; Nouveau &gt; Contact."
 
-#: ../C/evolution.xml:3227(para)
+#: ../C/evolution.xml:3403(para)
 msgid "Enter the contact information to the entry boxes provided."
 msgstr ""
 "Saisissez les informations du contact dans les zones de saisies à "
 "disposition."
 
-#: ../C/evolution.xml:3233(para)
+#: ../C/evolution.xml:3409(para)
 msgid "If you want to change a card that already exists,"
 msgstr "Si vous souhaitez modifier une carte existante, "
 
-#: ../C/evolution.xml:3236(para)
+#: ../C/evolution.xml:3412(para)
 msgid ""
 "Go to the Contacts window by selecting View &gt; Window &gt; Contacts from "
 "the menubar."
@@ -8020,31 +8375,31 @@ msgstr ""
 "Affichez la fenêtre des contacts en choisissant Affichage &gt; Fenêtre &gt; "
 "Contacts dans la barre de menus."
 
-#: ../C/evolution.xml:3239(para)
+#: ../C/evolution.xml:3415(para)
 msgid "Double click on the card you want to edit."
 msgstr "Double-cliquez sur la carte que vous souhaitez modifier."
 
-#: ../C/evolution.xml:3242(para) ../C/evolution.xml:3262(para)
+#: ../C/evolution.xml:3418(para) ../C/evolution.xml:3438(para)
 msgid "Edit the information in the Contact Editor window."
 msgstr "Effectuez vos modifications dans la fenêtre de l'éditeur de contact."
 
-#: ../C/evolution.xml:3248(para)
+#: ../C/evolution.xml:3424(para)
 msgid "You can also edit the contact information from the preview pane."
 msgstr ""
 "Vous pouvez aussi modifier les informations d'un contact à partir du panneau "
 "d'aperçu."
 
-#: ../C/evolution.xml:3251(para)
+#: ../C/evolution.xml:3427(para)
 msgid "Right click on the address from Message Header."
 msgstr "Faites un clic droit sur l'adresse dans les en-têtes du message."
 
-#: ../C/evolution.xml:3254(para)
+#: ../C/evolution.xml:3430(para)
 msgid "Select Add to Address Book to bring up the Contact Quick-Add window."
 msgstr ""
 "Choisissez « Ajouter dans le carnet d'adresses » pour faire apparaître la "
 "fenêtre « Ajout express de contact »."
 
-#: ../C/evolution.xml:3259(para)
+#: ../C/evolution.xml:3435(para)
 msgid ""
 "Press the Edit Full button at the bottom left to bring up the Contact Editor "
 "window."
@@ -8052,7 +8407,98 @@ msgstr ""
 "Cliquez sur le bouton « Éditer entièrement » en bas à gauche pour faire "
 "apparaître la fenêtre d'édition de contact."
 
-#: ../C/evolution.xml:3274(para)
+#: ../C/evolution.xml:3446(title)
+msgid "Google Contacts"
+msgstr "Contacts Google"
+
+#: ../C/evolution.xml:3447(para)
+msgid ""
+"Evolution allows you to access your Google Address Book. You can view the "
+"Google contacts offline and create, modify and delete the contacts online."
+msgstr ""
+"Evolution permet d'accéder à votre carnet d'adresses Google. Il est alors possible de "
+"consulter les contacts Google hors ligne, et de créer, modifier ou "
+"supprimer des contacts en ligne."
+
+#: ../C/evolution.xml:3448(para)
+msgid "To configure your Google Address Book in Evolution contacts:"
+msgstr "Pour configurer votre carnet d'adresses Google dans les contacts d'Evolution :"
+
+#: ../C/evolution.xml:3451(para)
+msgid ""
+"Select File &gt; New &gt; Address book to open the New Address Book window."
+msgstr ""
+"Choisissez Fichier &gt; Nouveau &gt; Carnet d'adresses pour ouvrir la fenêtre "
+"de création de carnet d'adresses."
+
+#: ../C/evolution.xml:3456(para) ../C/evolution.xml:3953(para)
+msgid "Select Google from the Type drop-down list."
+msgstr "Choisissez Google dans le menu déroulant Type."
+
+#: ../C/evolution.xml:3459(para)
+msgid "Specify a name for the address book."
+msgstr "Indiquez un nom pour le carnet d'adresses."
+
+#: ../C/evolution.xml:3462(para)
+msgid ""
+"Select or deselect the following options and provide the username for the "
+"Google account:"
+msgstr ""
+"Cochez ou décochez les options suivantes et indiquez le nom d'utilisateur "
+"de votre compte Google :"
+
+#: ../C/evolution.xml:3466(title)
+msgid "Mark as default address book:"
+msgstr "Marquer comme carnet d'adresses par défaut"
+
+#: ../C/evolution.xml:3467(para)
+msgid ""
+"Select this option to make the Google address book as your default address "
+"book."
+msgstr ""
+"Cochez cette option pour faire du carnet d'adresses Google votre carnet "
+"d'adresses par défaut."
+
+#: ../C/evolution.xml:3472(title)
+msgid "Copy book content locally for offline operations:"
+msgstr "Copier localement le contenu du carnet pour les opérations hors ligne"
+
+#: ../C/evolution.xml:3473(para)
+msgid ""
+"Select this option to copy the address book to your machine so you can "
+"access the contacts even when you are not connected to the network."
+msgstr ""
+"Cochez cette option pour copier le carnet d'adresses sur votre ordinateur "
+"afin de pouvoir accéder aux contacts même lorsque vous n'êtes pas connecté."
+
+#: ../C/evolution.xml:3478(title) ../C/evolution.xml:3968(title)
+msgid "Username:"
+msgstr "Nom d'utilisateur :"
+
+#: ../C/evolution.xml:3479(para)
+msgid "Specify the username of your Google account."
+msgstr "Indiquez le nom d'utilisateur de votre compte Google."
+
+#: ../C/evolution.xml:3484(title)
+msgid "Use SSL:"
+msgstr "Utiliser SSL :"
+
+#: ../C/evolution.xml:3485(para)
+msgid ""
+"Select Use SSL to enable a secure connection between Evolution and the server"
+msgstr ""
+"Cochez « Utiliser SSL » pour activer la communication sécurisée entre "
+"Evolution et le serveur."
+
+#: ../C/evolution.xml:3490(title)
+msgid "Refresh:"
+msgstr "Actualiser :"
+
+#: ../C/evolution.xml:3491(para)
+msgid "Set the time to automatically refresh the Google address book."
+msgstr "Définissez la fréquence d'actualisation automatique du carnet d'adresses Google."
+
+#: ../C/evolution.xml:3507(para)
 msgid ""
 "Evolution enables you to find the contact address quickly by using "
 "Customized Search. To find the contact address you are looking for, use the "
@@ -8062,28 +8508,28 @@ msgstr ""
 "utilisant la recherche personnalisée. Pour trouver l'adresse du contact que "
 "vous cherchez, utilisez la procédure suivante :"
 
-#: ../C/evolution.xml:3281(para) ../C/evolution.xml:4152(para)
-#: ../C/evolution.xml:4468(para) ../C/evolution.xml:4704(para)
+#: ../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 "Indiquez le critère de recherche parmi ceux qui vous sont proposés :"
 
-#: ../C/evolution.xml:3284(para)
+#: ../C/evolution.xml:3517(para)
 msgid "Name begins with"
 msgstr "Le nom commence par"
 
-#: ../C/evolution.xml:3287(para)
+#: ../C/evolution.xml:3520(para)
 msgid "Email begins with"
 msgstr "L'adresse commence par"
 
-#: ../C/evolution.xml:3290(para)
+#: ../C/evolution.xml:3523(para)
 msgid "Any field contains"
 msgstr "N'importe quel champ contient"
 
-#: ../C/evolution.xml:3295(para)
+#: ../C/evolution.xml:3528(para)
 msgid "Press Enter to begin the search"
 msgstr "Appuyez sur Entrée pour commencer la recherche"
 
-#: ../C/evolution.xml:3298(para)
+#: ../C/evolution.xml:3531(para)
 msgid ""
 "For a more complex search, select Search Advanced and select criteria that "
 "describe your desired contact:"
@@ -8091,19 +8537,19 @@ msgstr ""
 "Pour une recherche plus complexe, choisissez « Recherche avancée » et "
 "sélectionnez les critères qui décrivent le contact recherché :"
 
-#: ../C/evolution.xml:3301(para)
+#: ../C/evolution.xml:3534(para)
 msgid "Name the rule in the Rule Name field."
 msgstr "Nommez la règle dans le champ Nom de la recherche."
 
-#: ../C/evolution.xml:3304(para)
+#: ../C/evolution.xml:3537(para)
 msgid "Set up your criteria in the Find items field."
 msgstr "Définissez vos critères dans les champs de recherche."
 
-#: ../C/evolution.xml:3307(para)
+#: ../C/evolution.xml:3540(para)
 msgid "Select Add to add additional criteria."
 msgstr "Cliquez sur Ajouter pour ajouter des critères supplémentaires."
 
-#: ../C/evolution.xml:3316(para)
+#: ../C/evolution.xml:3549(para)
 msgid ""
 "Displays all the contacts that match the built-in criteria you have selected "
 "from the drop-down list at the top left side, just above the Display pane."
@@ -8112,139 +8558,139 @@ msgstr ""
 "avez sélectionnés dans le menu déroulant Afficher, en haut à gauche, juste "
 "au-dessus de la zone d'affichage."
 
-#: ../C/evolution.xml:3318(para)
+#: ../C/evolution.xml:3551(para)
 msgid "To perform quick search, use the following procedure:"
 msgstr "Pour effectuer une recherche rapide, utilisez la procédure suivante :"
 
-#: ../C/evolution.xml:3327(para) ../C/evolution.xml:4220(para)
-#: ../C/evolution.xml:4571(para) ../C/evolution.xml:4766(para)
+#: ../C/evolution.xml:3560(para) ../C/evolution.xml:4453(para)
+#: ../C/evolution.xml:4804(para) ../C/evolution.xml:4999(para)
 msgid "Anniversary"
 msgstr "Anniversaire"
 
-#: ../C/evolution.xml:3330(para) ../C/evolution.xml:4223(para)
-#: ../C/evolution.xml:4574(para) ../C/evolution.xml:4769(para)
+#: ../C/evolution.xml:3563(para) ../C/evolution.xml:4456(para)
+#: ../C/evolution.xml:4807(para) ../C/evolution.xml:5002(para)
 msgid "Birthday"
 msgstr "Date de naissance"
 
-#: ../C/evolution.xml:3333(para) ../C/evolution.xml:4226(para)
-#: ../C/evolution.xml:4577(para) ../C/evolution.xml:4772(para)
+#: ../C/evolution.xml:3566(para) ../C/evolution.xml:4459(para)
+#: ../C/evolution.xml:4810(para) ../C/evolution.xml:5005(para)
 msgid "Business"
 msgstr "Travail"
 
-#: ../C/evolution.xml:3336(para) ../C/evolution.xml:4229(para)
-#: ../C/evolution.xml:4580(para) ../C/evolution.xml:4775(para)
+#: ../C/evolution.xml:3569(para) ../C/evolution.xml:4462(para)
+#: ../C/evolution.xml:4813(para) ../C/evolution.xml:5008(para)
 msgid "Competition"
 msgstr "Compétition"
 
-#: ../C/evolution.xml:3339(para) ../C/evolution.xml:4778(para)
+#: ../C/evolution.xml:3572(para) ../C/evolution.xml:5011(para)
 msgid "Favorites"
 msgstr "Favoris"
 
-#: ../C/evolution.xml:3342(para) ../C/evolution.xml:4235(para)
-#: ../C/evolution.xml:4586(para) ../C/evolution.xml:4781(para)
+#: ../C/evolution.xml:3575(para) ../C/evolution.xml:4468(para)
+#: ../C/evolution.xml:4819(para) ../C/evolution.xml:5014(para)
 msgid "Gifts"
 msgstr "Cadeaux"
 
-#: ../C/evolution.xml:3345(para) ../C/evolution.xml:4238(para)
-#: ../C/evolution.xml:4589(para) ../C/evolution.xml:4784(para)
+#: ../C/evolution.xml:3578(para) ../C/evolution.xml:4471(para)
+#: ../C/evolution.xml:4822(para) ../C/evolution.xml:5017(para)
 msgid "Goals/Objectives"
 msgstr "Buts/Objectifs"
 
-#: ../C/evolution.xml:3348(para) ../C/evolution.xml:4241(para)
+#: ../C/evolution.xml:3581(para) ../C/evolution.xml:4474(para)
 msgid "Holiday"
 msgstr "Vacances"
 
-#: ../C/evolution.xml:3351(para) ../C/evolution.xml:4244(para)
-#: ../C/evolution.xml:4595(para) ../C/evolution.xml:4790(para)
+#: ../C/evolution.xml:3584(para) ../C/evolution.xml:4477(para)
+#: ../C/evolution.xml:4828(para) ../C/evolution.xml:5023(para)
 msgid "Holiday Cards"
 msgstr "Cartes postales"
 
-#: ../C/evolution.xml:3354(para)
+#: ../C/evolution.xml:3587(para)
 msgid "Hot Contacts"
 msgstr "Contacts fréquents"
 
-#: ../C/evolution.xml:3357(para) ../C/evolution.xml:4247(para)
-#: ../C/evolution.xml:4598(para) ../C/evolution.xml:4793(para)
+#: ../C/evolution.xml:3590(para) ../C/evolution.xml:4480(para)
+#: ../C/evolution.xml:4831(para) ../C/evolution.xml:5026(para)
 msgid "Ideas"
 msgstr "Idées"
 
-#: ../C/evolution.xml:3360(para) ../C/evolution.xml:4250(para)
-#: ../C/evolution.xml:4601(para) ../C/evolution.xml:4796(para)
+#: ../C/evolution.xml:3593(para) ../C/evolution.xml:4483(para)
+#: ../C/evolution.xml:4834(para) ../C/evolution.xml:5029(para)
 msgid "International"
 msgstr "International"
 
-#: ../C/evolution.xml:3363(para) ../C/evolution.xml:4253(para)
+#: ../C/evolution.xml:3596(para) ../C/evolution.xml:4486(para)
 msgid "Key Customer"
 msgstr "Client clé"
 
-#: ../C/evolution.xml:3366(para) ../C/evolution.xml:4256(para)
-#: ../C/evolution.xml:4607(para) ../C/evolution.xml:4802(para)
+#: ../C/evolution.xml:3599(para) ../C/evolution.xml:4489(para)
+#: ../C/evolution.xml:4840(para) ../C/evolution.xml:5035(para)
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: ../C/evolution.xml:3372(para) ../C/evolution.xml:4262(para)
-#: ../C/evolution.xml:4613(para) ../C/evolution.xml:4808(para)
+#: ../C/evolution.xml:3605(para) ../C/evolution.xml:4495(para)
+#: ../C/evolution.xml:4846(para) ../C/evolution.xml:5041(para)
 msgid "Phone Calls"
 msgstr "Appels téléphoniques"
 
-#: ../C/evolution.xml:3378(para) ../C/evolution.xml:4268(para)
-#: ../C/evolution.xml:4619(para) ../C/evolution.xml:4814(para)
+#: ../C/evolution.xml:3611(para) ../C/evolution.xml:4501(para)
+#: ../C/evolution.xml:4852(para) ../C/evolution.xml:5047(para)
 msgid "Strategies"
 msgstr "Stratégies"
 
-#: ../C/evolution.xml:3381(para) ../C/evolution.xml:4271(para)
-#: ../C/evolution.xml:4622(para) ../C/evolution.xml:4817(para)
+#: ../C/evolution.xml:3614(para) ../C/evolution.xml:4504(para)
+#: ../C/evolution.xml:4855(para) ../C/evolution.xml:5050(para)
 msgid "Suppliers"
 msgstr "Fournisseurs"
 
-#: ../C/evolution.xml:3384(para) ../C/evolution.xml:4274(para)
-#: ../C/evolution.xml:4625(para) ../C/evolution.xml:4820(para)
+#: ../C/evolution.xml:3617(para) ../C/evolution.xml:4507(para)
+#: ../C/evolution.xml:4858(para) ../C/evolution.xml:5053(para)
 msgid "Time &amp; Expenses"
 msgstr "Temps &amp; dépenses"
 
-#: ../C/evolution.xml:3387(para) ../C/evolution.xml:4277(para)
-#: ../C/evolution.xml:4628(para) ../C/evolution.xml:4823(para)
+#: ../C/evolution.xml:3620(para) ../C/evolution.xml:4510(para)
+#: ../C/evolution.xml:4861(para) ../C/evolution.xml:5056(para)
 msgid "VIP"
 msgstr "VIP"
 
-#: ../C/evolution.xml:3390(para) ../C/evolution.xml:4280(para)
-#: ../C/evolution.xml:4631(para) ../C/evolution.xml:4826(para)
+#: ../C/evolution.xml:3623(para) ../C/evolution.xml:4513(para)
+#: ../C/evolution.xml:4864(para) ../C/evolution.xml:5059(para)
 msgid "Waiting"
 msgstr "En attente"
 
-#: ../C/evolution.xml:3393(para)
+#: ../C/evolution.xml:3626(para)
 msgid "Weather: Cloudy"
 msgstr "Météo : nuageux"
 
-#: ../C/evolution.xml:3396(para)
+#: ../C/evolution.xml:3629(para)
 msgid "Weather: Fog"
 msgstr "Météo : brouillard"
 
-#: ../C/evolution.xml:3399(para)
+#: ../C/evolution.xml:3632(para)
 msgid "Weather: Partly Cloudy"
 msgstr "Météo : partiellement nuageux"
 
-#: ../C/evolution.xml:3402(para)
+#: ../C/evolution.xml:3635(para)
 msgid "Weather: Rain"
 msgstr "Météo : pluie"
 
-#: ../C/evolution.xml:3405(para)
+#: ../C/evolution.xml:3638(para)
 msgid "Weather: Snow"
 msgstr "Météo : neige"
 
-#: ../C/evolution.xml:3408(para)
+#: ../C/evolution.xml:3641(para)
 msgid "Weather: Sunny"
 msgstr "Météo : ensoleillé"
 
-#: ../C/evolution.xml:3411(para)
+#: ../C/evolution.xml:3644(para)
 msgid "Weather: Thunderstorms"
 msgstr "Météo : orages"
 
-#: ../C/evolution.xml:3416(para)
+#: ../C/evolution.xml:3649(para)
 msgid "Evolution displays the desired contacts."
 msgstr "Evolution affiche les contacts désirés."
 
-#: ../C/evolution.xml:3423(para)
+#: ../C/evolution.xml:3656(para)
 msgid ""
 "Evolution allows you to organize your contacts. You can create several "
 "individual address books, or contact lists. Within a given address book, you "
@@ -8254,23 +8700,23 @@ msgstr ""
 "carnets d'adresses différents ou des listes de contacts. Dans un carnet "
 "d'adresses donné, vous pouvez avoir plusieurs catégories de contacts."
 
-#: ../C/evolution.xml:3426(link) ../C/evolution.xml:3440(title)
+#: ../C/evolution.xml:3659(link) ../C/evolution.xml:3673(title)
 msgid "Contacts Groups"
 msgstr "Groupes de contacts"
 
-#: ../C/evolution.xml:3429(link) ../C/evolution.xml:3462(title)
+#: ../C/evolution.xml:3662(link) ../C/evolution.xml:3695(title)
 msgid "Creating a List of Contacts"
 msgstr "Création d'une liste de contacts"
 
-#: ../C/evolution.xml:3432(link) ../C/evolution.xml:3494(title)
+#: ../C/evolution.xml:3665(link) ../C/evolution.xml:3727(title)
 msgid "Grouping with Categories"
 msgstr "Groupements par catégorie"
 
-#: ../C/evolution.xml:3435(link) ../C/evolution.xml:3555(title)
+#: ../C/evolution.xml:3668(link) ../C/evolution.xml:3788(title)
 msgid "Configuring Evolution to use LDAP"
 msgstr "Configuration de LDAP dans Evolution"
 
-#: ../C/evolution.xml:3441(para)
+#: ../C/evolution.xml:3674(para)
 msgid ""
 "Contacts Groups are nothing but Address Books. The simplest way to organize "
 "contacts is to create additional address books. You can create a new one by "
@@ -8287,7 +8733,7 @@ msgstr ""
 "réseau, vous devez fournir plus d'informations sur le serveur de contacts "
 "que vous souhaitez atteindre."
 
-#: ../C/evolution.xml:3442(para)
+#: ../C/evolution.xml:3675(para)
 msgid ""
 "To move a card from one group to another, just drag it from the main display "
 "of contacts and drop it to a different group. You cannot change the contents "
@@ -8297,7 +8743,7 @@ msgstr ""
 "glisser à partir de l'affichage principal des contacts vers un autre groupe. "
 "La plupart des groupes de contacts sur le réseau ne sont pas modifiables."
 
-#: ../C/evolution.xml:3444(para)
+#: ../C/evolution.xml:3677(para)
 msgid ""
 "Contacts groups are not the same as contact lists. A contact group is like a "
 "folder or address book full of contacts. A contact list is a single contact "
@@ -8310,11 +8756,11 @@ msgstr ""
 "qui contient d'autres contacts, et sert le plus souvent à envoyer un "
 "courriel à plusieurs personnes à la fois."
 
-#: ../C/evolution.xml:3449(title)
+#: ../C/evolution.xml:3682(title)
 msgid "Importing Contacts"
 msgstr "Importation de contacts"
 
-#: ../C/evolution.xml:3450(para)
+#: ../C/evolution.xml:3683(para)
 msgid ""
 "You can import contacts from other contact management tools with the Import "
 "tool."
@@ -8322,11 +8768,11 @@ msgstr ""
 "Vous pouvez importer des contacts depuis d'autres outils de gestion de "
 "contacts à l'aide de l'outil d'importation."
 
-#: ../C/evolution.xml:3455(para)
+#: ../C/evolution.xml:3688(para)
 msgid "Mail yourself a contact as vCard attachment."
 msgstr "Envoyez-vous un contact sous forme de pièce jointe vCard."
 
-#: ../C/evolution.xml:3456(para)
+#: ../C/evolution.xml:3689(para)
 msgid ""
 "Currently VCF and LDIF are supported. CSV and TAB format files are supported "
 "from Microsoft Outlook, Thunderbird, Mozilla, and Evolution."
@@ -8335,7 +8781,7 @@ msgstr ""
 "fichier CSV et TAB sont pris en charge par MS Outlook, Thunderbird, Mozilla "
 "et Evolution."
 
-#: ../C/evolution.xml:3463(para)
+#: ../C/evolution.xml:3696(para)
 msgid ""
 "A contact list is a set of contacts with a single nickname that you create. "
 "When you send email to the nickname, it is sent to every member of the list. "
@@ -8351,7 +8797,7 @@ msgstr ""
 "adresse électronique réelle gérée par une application de listes de diffusion "
 "sur un serveur."
 
-#: ../C/evolution.xml:3464(para)
+#: ../C/evolution.xml:3697(para)
 msgid ""
 "For example, you could create one card for each family member, then add "
 "those cards to a contact list called <quote>Family.</quote> Then, instead of "
@@ -8364,33 +8810,33 @@ msgstr ""
 "électroniques de votre famille, vous pouvez envoyer un message à « Famille » "
 "et le message sera distribué à chacun d'eux."
 
-#: ../C/evolution.xml:3465(para)
+#: ../C/evolution.xml:3698(para)
 msgid "To create a list of contacts:"
 msgstr "Pour créer une liste de contacts :"
 
-#: ../C/evolution.xml:3468(para)
+#: ../C/evolution.xml:3701(para)
 msgid "Open the list creation dialog box by clicking the New List button."
 msgstr ""
 "Ouvrez la boîte de dialogue de création de liste en cliquant sur le bouton "
 "Nouvelle liste."
 
-#: ../C/evolution.xml:3470(para)
+#: ../C/evolution.xml:3703(para)
 msgid "Click File &gt; New &gt; Contact List."
 msgstr "Choisissez Fichier &gt; Nouveau &gt; Liste de contacts."
 
-#: ../C/evolution.xml:3473(para)
+#: ../C/evolution.xml:3706(para)
 msgid "Specify a name for the list."
 msgstr "Indiquez un nom pour la liste."
 
-#: ../C/evolution.xml:3476(para)
+#: ../C/evolution.xml:3709(para)
 msgid "Specify the names or email addresses of contacts."
 msgstr "Indiquez les noms ou les adresses électroniques des contacts."
 
-#: ../C/evolution.xml:3478(para)
+#: ../C/evolution.xml:3711(para)
 msgid "Drag contacts from the main window into the list."
 msgstr "Faites glisser les contacts de la fenêtre principale dans la liste."
 
-#: ../C/evolution.xml:3481(para)
+#: ../C/evolution.xml:3714(para)
 msgid ""
 "Choose whether you want to hide the email addresses when you send a message "
 "to the list."
@@ -8398,7 +8844,7 @@ msgstr ""
 "Décidez si vous voulez masquer les adresses électroniques lorsque vous "
 "envoyez un message à la liste."
 
-#: ../C/evolution.xml:3482(para)
+#: ../C/evolution.xml:3715(para)
 msgid ""
 "Unless it is a very small list, it is recommended that you leave the "
 "addresses hidden. This is the same thing as using the <quote>Bcc:</quote> "
@@ -8410,11 +8856,11 @@ msgstr ""
 "Cci discutée dans <link linkend=\"usage-mail-getnsend-send-to-types\">Ajout "
 "de destinataires supplémentaires</link>."
 
-#: ../C/evolution.xml:3485(para)
+#: ../C/evolution.xml:3718(para)
 msgid "When you are finished, click OK."
 msgstr "Lorsque vous avez terminé, cliquez sur Valider."
 
-#: ../C/evolution.xml:3488(para)
+#: ../C/evolution.xml:3721(para)
 msgid ""
 "The list appears as a contact card, which you can use as you would any other "
 "card, including mailing the list to another person and sending email to the "
@@ -8424,7 +8870,7 @@ msgstr ""
 "même manière que toute autre carte, y compris l'envoi de la liste à une "
 "autre personne et l'envoi de messages à la liste."
 
-#: ../C/evolution.xml:3489(para)
+#: ../C/evolution.xml:3722(para)
 msgid ""
 "To mail the list, open a new email and type the name you chose for the list. "
 "Evolution addresses the message to the entire list when you send the "
@@ -8437,13 +8883,13 @@ msgstr ""
 "avec le bouton droit sur la carte de la liste dans l'outil Contacts et "
 "choisir « Envoyer un message à la liste »."
 
-#: ../C/evolution.xml:3490(para)
+#: ../C/evolution.xml:3723(para)
 msgid "Evolution cannot store contact lists on Microsoft Exchange servers."
 msgstr ""
 "Evolution ne peut pas stocker des listes de contacts sur des serveurs "
 "Microsoft Exchange."
 
-#: ../C/evolution.xml:3495(para)
+#: ../C/evolution.xml:3728(para)
 msgid ""
 "Another way to group cards is to mark them as belonging to different "
 "categories. You can mark a card as being in several categories or no "
@@ -8457,27 +8903,27 @@ msgstr ""
 "catégorie <guilabel>Travail</guilabel> parce qu'il travaille avec vous et "
 "dans la catégorie <guilabel>Amis</guilabel> car c'est un ami."
 
-#: ../C/evolution.xml:3496(para)
+#: ../C/evolution.xml:3729(para)
 msgid "To mark a card as belonging to a category,"
 msgstr "Pour signaler qu'une carte appartient à une catégorie, "
 
-#: ../C/evolution.xml:3499(para)
+#: ../C/evolution.xml:3732(para)
 msgid "Double click the card to appear the Contact Editor window"
 msgstr ""
 "Double-cliquez sur la carte pour faire apparaître la fenêtre de l'éditeur de "
 "contact"
 
-#: ../C/evolution.xml:3502(para)
+#: ../C/evolution.xml:3735(para)
 msgid "Click the Categories button at the left."
 msgstr "Cliquez sur le bouton Catégories sur la gauche."
 
-#: ../C/evolution.xml:3503(para)
+#: ../C/evolution.xml:3736(para)
 msgid "You can view the Categories dialog box as given below."
 msgstr ""
 "La boîte de dialogue Catégories apparaît, comme le montre la figure ci-"
 "dessous."
 
-#: ../C/evolution.xml:3515(para)
+#: ../C/evolution.xml:3748(para)
 msgid ""
 "Select the category from the list. You can select as many or as few "
 "categories as you like."
@@ -8485,7 +8931,7 @@ msgstr ""
 "Sélectionnez une catégorie dans la liste. Vous pouvez sélectionner autant de "
 "catégories que vous le souhaitez."
 
-#: ../C/evolution.xml:3518(para)
+#: ../C/evolution.xml:3751(para)
 msgid ""
 "If the master list of categories doesn't suit you, you can add your own "
 "categories. To add a new category,"
@@ -8493,13 +8939,13 @@ msgstr ""
 "Si la liste principale des catégories ne vous convient pas, vous pouvez "
 "ajouter vos propres catégories. Pour ajouter une catégorie, "
 
-#: ../C/evolution.xml:3521(para)
+#: ../C/evolution.xml:3754(para)
 msgid "Enter the new category in the entry box at the top."
 msgstr ""
 "Saisissez le nom de la nouvelle catégorie dans la zone de saisie tout en "
 "haut."
 
-#: ../C/evolution.xml:3525(para)
+#: ../C/evolution.xml:3758(para)
 msgid ""
 "You can view the category name appeared in the field next to Categories "
 "button in the Contact Editor."
@@ -8507,7 +8953,7 @@ msgstr ""
 "Le nom de la catégorie apparaît en regard du bouton Catégories dans "
 "l'éditeur de contact."
 
-#: ../C/evolution.xml:3532(para)
+#: ../C/evolution.xml:3765(para)
 msgid ""
 "You can edit or set the color and icon for each categories available under "
 "categories list. To achieve that click Edit button at the bottom of the "
@@ -8518,7 +8964,7 @@ msgstr ""
 "Édition au bas de la fenêtre des catégories. Cliquez sur le bouton Supprimer "
 "pour supprimer des catégories de la liste."
 
-#: ../C/evolution.xml:3539(para)
+#: ../C/evolution.xml:3772(para)
 msgid ""
 "The <link linkend=\"ldap\">LDAP</link> protocol was created to let users "
 "share contact information over a network by sharing access to a central "
@@ -8533,7 +8979,7 @@ msgstr ""
 "Beaucoup d'organisations conservent un carnet d'adresses LDAP commun pour "
 "tous leurs employés ou pour les contacts clients."
 
-#: ../C/evolution.xml:3540(para)
+#: ../C/evolution.xml:3773(para)
 msgid ""
 "To learn how to add a remote LDAP directory to your available address books, "
 "see <link linkend=\"config-prefs-contact\">Contact Management</link>. Remote "
@@ -8547,7 +8993,7 @@ msgstr ""
 "rubrique « Sur les serveurs LDAP » dans le sélecteur. Ils se comportent comme "
 "un dossier local de cartes de contact, à l'exception des éléments suivants :"
 
-#: ../C/evolution.xml:3543(para)
+#: ../C/evolution.xml:3776(para)
 msgid ""
 "Network folders are only available when you are connected to the network. If "
 "you use a laptop or have a modem connection, you might want to copy or cache "
@@ -8560,7 +9006,7 @@ msgstr ""
 "mémoire tampon une partie du répertoire réseau. Vous pouvez le faire en "
 "faisant glisser les contacts concernés dans les carnets d'adresses locaux."
 
-#: ../C/evolution.xml:3544(para)
+#: ../C/evolution.xml:3777(para)
 msgid ""
 "You can also mark the network folder for offline usage. To mark the folder, "
 "right-click the folder, then click Properties. Select Copy Folder Content "
@@ -8571,7 +9017,7 @@ msgstr ""
 "Cochez « Copier localement le contenu du carnet pour les opérations hors-"
 "ligne »."
 
-#: ../C/evolution.xml:3547(para)
+#: ../C/evolution.xml:3780(para)
 msgid ""
 "To prevent excess network traffic, Evolution does not normally load data "
 "from the LDAP server upon opening."
@@ -8579,7 +9025,7 @@ msgstr ""
 "Pour éviter un trafic réseau trop important, Evolution ne charge en principe "
 "pas les données du serveur LDAP au moment de son ouverture."
 
-#: ../C/evolution.xml:3550(para)
+#: ../C/evolution.xml:3783(para)
 msgid ""
 "Depending on your server settings, you might not be able to edit all the "
 "fields in a contact stored on an LDAP server. Some servers prohibit some or "
@@ -8592,7 +9038,7 @@ msgstr ""
 "de champs plus restreint que ceux d'Evolution. Contactez votre "
 "administrateur système si vous avez besoin de réglages différents."
 
-#: ../C/evolution.xml:3556(para)
+#: ../C/evolution.xml:3789(para)
 msgid ""
 "For information about setting up Evolution to use LDAP, refer to <link "
 "linkend=\"config-prefs-contact\">Contact Management</link>."
@@ -8601,7 +9047,7 @@ msgstr ""
 "LDAP, référez-vous à la <link linkend=\"config-prefs-contact\">Gestion des "
 "contacts</link>."
 
-#: ../C/evolution.xml:3562(para)
+#: ../C/evolution.xml:3795(para)
 msgid ""
 "When you get information about a person in the mail or in a calendar entry, "
 "you can add it to an address card. To do so, right-click any email address "
@@ -8621,7 +9067,7 @@ msgstr ""
 "détails, consultez <link linkend=\"config-sync\">Synchronisation avec un "
 "PAD</link>."
 
-#: ../C/evolution.xml:3568(para)
+#: ../C/evolution.xml:3801(para)
 msgid ""
 "This section shows you how to use the <trademark>Evolution</trademark> "
 "Calendar to manage your schedule alone or in conjunction with peers. To "
@@ -8635,47 +9081,47 @@ msgstr ""
 "\">Importation de fichiers uniques</link>, qui traite de l'outil "
 "d'importation."
 
-#: ../C/evolution.xml:3571(link) ../C/evolution.xml:3603(title)
+#: ../C/evolution.xml:3804(link) ../C/evolution.xml:3836(title)
 msgid "Ways of Looking at your Calendar"
 msgstr "Différentes vues du calendrier"
 
-#: ../C/evolution.xml:3574(link) ../C/evolution.xml:3761(title)
+#: ../C/evolution.xml:3807(link) ../C/evolution.xml:3994(title)
 msgid "Scheduling With the Evolution Calendar"
 msgstr "Planification dans le calendrier Evolution"
 
-#: ../C/evolution.xml:3577(link) ../C/evolution.xml:4141(title)
+#: ../C/evolution.xml:3810(link) ../C/evolution.xml:4374(title)
 msgid "Searching for Calendar Items"
 msgstr "Recherche d'éléments de calendrier"
 
-#: ../C/evolution.xml:3580(link) ../C/evolution.xml:4289(title)
+#: ../C/evolution.xml:3813(link) ../C/evolution.xml:4522(title)
 msgid "Printing Displayed Items"
 msgstr "Impression d'éléments affichés"
 
-#: ../C/evolution.xml:3583(link) ../C/evolution.xml:4294(title)
+#: ../C/evolution.xml:3816(link) ../C/evolution.xml:4527(title)
 msgid "Deleting Old Appointments and Meetings"
 msgstr "Suppression d'anciens rendez-vous"
 
-#: ../C/evolution.xml:3586(link) ../C/evolution.xml:4299(title)
+#: ../C/evolution.xml:3819(link) ../C/evolution.xml:4532(title)
 msgid "Delegating Meetings"
 msgstr "Délégation de rendez-vous"
 
-#: ../C/evolution.xml:3589(link) ../C/evolution.xml:4319(title)
+#: ../C/evolution.xml:3822(link) ../C/evolution.xml:4552(title)
 msgid "Multiple Calendars, Web Calendars, and CalDAV"
 msgstr "Calendriers multiples, calendriers Web et CalDAV"
 
-#: ../C/evolution.xml:3592(link) ../C/evolution.xml:4326(title)
+#: ../C/evolution.xml:3825(link) ../C/evolution.xml:4559(title)
 msgid "The Task List"
 msgstr "La liste des tâches"
 
-#: ../C/evolution.xml:3595(link) ../C/evolution.xml:4641(title)
+#: ../C/evolution.xml:3828(link) ../C/evolution.xml:4874(title)
 msgid "Memos"
 msgstr "Mémos"
 
-#: ../C/evolution.xml:3598(link) ../C/evolution.xml:4836(title)
+#: ../C/evolution.xml:3831(link) ../C/evolution.xml:5069(title)
 msgid "Configuring Time Zones"
 msgstr "Configuration des fuseaux horaire"
 
-#: ../C/evolution.xml:3604(para)
+#: ../C/evolution.xml:3837(para)
 msgid ""
 "In Evolution, you can keep multiple calendars and overlay them one over the "
 "next. For example, you might have a schedule of events for work, one for "
@@ -8694,13 +9140,13 @@ msgstr ""
 "ensembles de rendez-vous, vous pouvez être certain d'éviter des conflits "
 "tout en conservant un encombrement minimal à l'affichage."
 
-#: ../C/evolution.xml:3605(para)
+#: ../C/evolution.xml:3838(para)
 msgid "Appointments for each calendar appear as a different color."
 msgstr ""
 "Les rendez-vous de chaque calendrier apparaissent dans des couleurs "
 "différentes."
 
-#: ../C/evolution.xml:3606(para)
+#: ../C/evolution.xml:3839(para)
 msgid ""
 "The toolbar offers you five different buttons that can show you different "
 "views of your calendar."
@@ -8708,55 +9154,55 @@ msgstr ""
 "La barre d'outils présente cinq boutons qui vous permettent d'afficher votre "
 "calendrier de différentes manières."
 
-#: ../C/evolution.xml:3614(para)
+#: ../C/evolution.xml:3847(para)
 msgid "Calendar View"
 msgstr "Vue du calendrier"
 
-#: ../C/evolution.xml:3617(para)
+#: ../C/evolution.xml:3850(para)
 msgid "Shortcut Keys"
 msgstr "Raccourcis clavier"
 
-#: ../C/evolution.xml:3624(para)
+#: ../C/evolution.xml:3857(para)
 msgid "Day"
 msgstr "Jour"
 
-#: ../C/evolution.xml:3627(para)
+#: ../C/evolution.xml:3860(para)
 msgid "control+y"
 msgstr "Ctrl+Y"
 
-#: ../C/evolution.xml:3632(para)
+#: ../C/evolution.xml:3865(para)
 msgid "Work Week"
 msgstr "Semaine de travail"
 
-#: ../C/evolution.xml:3635(para)
+#: ../C/evolution.xml:3868(para)
 msgid "control+j"
 msgstr "Ctrl+J"
 
-#: ../C/evolution.xml:3640(para)
+#: ../C/evolution.xml:3873(para)
 msgid "Week"
 msgstr "Semaine"
 
-#: ../C/evolution.xml:3643(para)
+#: ../C/evolution.xml:3876(para)
 msgid "control+k"
 msgstr "Ctrl+K"
 
-#: ../C/evolution.xml:3648(para)
+#: ../C/evolution.xml:3881(para)
 msgid "Month"
 msgstr "Mois"
 
-#: ../C/evolution.xml:3651(para)
+#: ../C/evolution.xml:3884(para)
 msgid "control+m"
 msgstr "Ctrl+M"
 
-#: ../C/evolution.xml:3656(para)
+#: ../C/evolution.xml:3889(para)
 msgid "List"
 msgstr "Liste"
 
-#: ../C/evolution.xml:3659(para)
+#: ../C/evolution.xml:3892(para)
 msgid "control+l"
 msgstr "Ctrl+L"
 
-#: ../C/evolution.xml:3665(para)
+#: ../C/evolution.xml:3898(para)
 msgid ""
 "You can also select an arbitrary range of days in the small calendar in the "
 "side bar. To do this, select the days that you want to view in your calendar."
@@ -8765,7 +9211,7 @@ msgstr ""
 "petit calendrier dans la barre latérale. Pour cela, sélectionnez les jours "
 "que vous souhaitez voir apparaître dans le calendrier."
 
-#: ../C/evolution.xml:3667(para)
+#: ../C/evolution.xml:3900(para)
 msgid ""
 "The Previous and Next buttons move you forward and back in your calendar "
 "pages. If you are using a week or month view, you can move by week or month. "
@@ -8776,7 +9222,7 @@ msgstr ""
 "vous déplacer par semaine ou par mois. Pour revenir à l'affichage "
 "d'aujourd'hui, cliquez sur le bouton Aujourd'hui dans la barre d'outils."
 
-#: ../C/evolution.xml:3668(para)
+#: ../C/evolution.xml:3901(para)
 msgid ""
 "To visit calendar entries for a specific date, click Go To and select the "
 "date in the dialog box that appears."
@@ -8784,11 +9230,11 @@ msgstr ""
 "Pour consulter le calendrier à une date spécifique, cliquez sur Aller à et "
 "sélectionnez la date dans la boîte de dialogue qui apparaît."
 
-#: ../C/evolution.xml:3671(title)
+#: ../C/evolution.xml:3904(title)
 msgid "Calendar Properties"
 msgstr "Propriétés du calendrier"
 
-#: ../C/evolution.xml:3672(para)
+#: ../C/evolution.xml:3905(para)
 msgid ""
 "Evolution allows you to edit the label of your calendar, assign color, and "
 "copy content for offline use. To set your calendar properties"
@@ -8797,34 +9243,34 @@ msgstr ""
 "couleurs et de copier le contenu pour un usage hors ligne. Pour définir les "
 "propriétés de calendrier, "
 
-#: ../C/evolution.xml:3675(para)
+#: ../C/evolution.xml:3908(para)
 msgid "Select the calendar from the side bar at the left."
 msgstr "Sélectionnez le calendrier dans la barre latérale sur la gauche."
 
-#: ../C/evolution.xml:3678(para)
-msgid "Right click on the calendar."
+#: ../C/evolution.xml:3911(para)
+msgid "Right-click on the calendar."
 msgstr "Faites un clic droit sur le calendrier."
 
-#: ../C/evolution.xml:3681(para)
+#: ../C/evolution.xml:3914(para)
 msgid "Select Properties to open Calendar Properties dialog box."
 msgstr ""
 "Choisissez Propriétés pour ouvrir la boîte de dialogue des propriétés du "
 "calendrier."
 
-#: ../C/evolution.xml:3693(para)
+#: ../C/evolution.xml:3926(para)
 msgid "Edit the label from Name field."
 msgstr "Modifiez le nom du calendrier."
 
-#: ../C/evolution.xml:3696(para)
+#: ../C/evolution.xml:3929(para)
 msgid "To assign a color for the calendar, click the Color button."
 msgstr ""
 "Pour définir une couleur pour le calendrier, cliquez sur le bouton Couleur."
 
-#: ../C/evolution.xml:3699(para)
+#: ../C/evolution.xml:3932(para)
 msgid "Select the color and click OK."
 msgstr "Sélectionnez la couleur et cliquez sur Valider."
 
-#: ../C/evolution.xml:3702(para)
+#: ../C/evolution.xml:3935(para)
 msgid ""
 "To mark your calendar content for offline use, click Copy calendar contents "
 "locally for offline operations."
@@ -8832,9 +9278,9 @@ msgstr ""
 "Pour rendre disponible votre calendrier hors connexion, cochez « Copier "
 "localement le contenu du calendrier pour les opérations hors-ligne »."
 
-#: ../C/evolution.xml:3704(para)
+#: ../C/evolution.xml:3937(para)
 msgid ""
-"Right click on the calendar at the left and select Mark Calendar for offline "
+"Right-click on the calendar at the left and select Mark Calendar for offline "
 "use. For more information on working offline refer <link linkend=\"usage-"
 "mail-getnsend-offline\">Working Offline</link>."
 msgstr ""
@@ -8843,7 +9289,7 @@ msgstr ""
 "travail hors connexion, consultez <link linkend=\"usage-mail-getnsend-offline"
 "\">Travail hors ligne</link>."
 
-#: ../C/evolution.xml:3706(para)
+#: ../C/evolution.xml:3939(para)
 msgid ""
 "To export or share or to store a calendar locally in iCal format, right "
 "click on the calendar in the calendar view at the left and select Save to "
@@ -8853,7 +9299,7 @@ msgstr ""
 "faites un clic droit sur le calendrier dans la liste sur la gauche et "
 "choisissez « Enregistrer sur disque »."
 
-#: ../C/evolution.xml:3708(para)
+#: ../C/evolution.xml:3941(para)
 msgid ""
 "Click Mark as default folder if you want to mark this folder as your default "
 "calendar folder."
@@ -8861,11 +9307,11 @@ msgstr ""
 "Cochez « Marquer comme dossier par défaut » si vous voulez que ce dossier "
 "apparaisse comme le dossier de calendrier par défaut."
 
-#: ../C/evolution.xml:3712(title)
+#: ../C/evolution.xml:3945(title)
 msgid "Google Calendar"
 msgstr "Calendrier Google"
 
-#: ../C/evolution.xml:3713(para)
+#: ../C/evolution.xml:3946(para)
 msgid ""
 "Evolution allows you to access your Google calendar. You can view the Google "
 "calendar offline or create, modify, and delete the calendar items online."
@@ -8874,53 +9320,45 @@ msgstr ""
 "consulter le calendrier Google hors ligne, ou de créer, modifier ou "
 "supprimer des éléments du calendrier en ligne."
 
-#: ../C/evolution.xml:3714(para)
+#: ../C/evolution.xml:3947(para)
 msgid "To integrate the Google calendar to Evolution:"
 msgstr "Pour intégrer un calendrier Google à Evolution :"
 
-#: ../C/evolution.xml:3717(para)
+#: ../C/evolution.xml:3950(para)
 msgid "Click New, then select Calendar to open the New Calendar dialog."
 msgstr ""
 "Cliquez sur Nouveau, puis Calendrier pour ouvrir la boîte de dialogue de "
 "nouveau calendrier."
 
-#: ../C/evolution.xml:3720(para)
-msgid "Select Google from the Type drop-down list."
-msgstr "Choisissez Google dans le menu déroulant Type."
-
-#: ../C/evolution.xml:3725(para)
+#: ../C/evolution.xml:3958(para)
 msgid "Specify the following:"
 msgstr "Complétez les informations suivantes :"
 
-#: ../C/evolution.xml:3729(title)
+#: ../C/evolution.xml:3962(title)
 msgid "Name:"
 msgstr "Nom :"
 
-#: ../C/evolution.xml:3730(para)
+#: ../C/evolution.xml:3963(para)
 msgid "Specify a name for the Google calendar"
 msgstr "Indiquez un nom pour le calendrier Google."
 
-#: ../C/evolution.xml:3735(title)
-msgid "Username:"
-msgstr "Nom d'utilisateur :"
-
-#: ../C/evolution.xml:3736(para)
+#: ../C/evolution.xml:3969(para)
 msgid "Specify your username for your Google account"
 msgstr "Indiquez le nom d'utilisateur de votre compte Google."
 
-#: ../C/evolution.xml:3742(para)
+#: ../C/evolution.xml:3975(para)
 msgid "Set the time to automatically refresh the calendar."
 msgstr "Définissez la fréquence d'actualisation automatique du calendrier."
 
-#: ../C/evolution.xml:3745(para)
+#: ../C/evolution.xml:3978(para)
 msgid ""
-"Select Use SSL to enable SSL for communication between Evolution and the "
+"Select Use SSL to enable a secure connection between Evolution and the "
 "Google server."
 msgstr ""
 "Cochez « Utiliser SSL » pour activer la communication sécurisée entre "
 "Evolution et le serveur Google."
 
-#: ../C/evolution.xml:3748(para)
+#: ../C/evolution.xml:3981(para)
 msgid ""
 "If you want to set a color label for the calendar, click the Color tab, "
 "select the desired color, then click OK."
@@ -8929,7 +9367,7 @@ msgstr ""
 "cliquez sur l'onglet Couleur, choisissez la couleur souhaitée et cliquez sur "
 "Valider."
 
-#: ../C/evolution.xml:3751(para)
+#: ../C/evolution.xml:3984(para)
 msgid ""
 "If you want to view the calendar items offline, select Copy calendar content "
 "locally for offline operation check box."
@@ -8937,14 +9375,14 @@ msgstr ""
 "Si vous souhaitez pouvoir consulter le calendrier hors connexion, cochez "
 "« Copier localement le contenu du calendrier pour les opérations hors-ligne »."
 
-#: ../C/evolution.xml:3752(para)
+#: ../C/evolution.xml:3985(para)
 msgid ""
 "If you select this option, you cannot modify or create the calendar items."
 msgstr ""
 "Si vous cochez cette option, vous ne pourrez pas modifier ou créer des "
 "éléments dans le calendrier."
 
-#: ../C/evolution.xml:3762(para)
+#: ../C/evolution.xml:3995(para)
 msgid ""
 "There are two types of events you can schedule with Evolution: appointments "
 "and meetings. An appointment is an event you schedule for yourself only, and "
@@ -8959,72 +9397,72 @@ msgstr ""
 "effectuer une recherche de disponibilité pour les réunions afin de "
 "déterminer si les invités sont libres."
 
-#: ../C/evolution.xml:3765(link) ../C/evolution.xml:3788(title)
+#: ../C/evolution.xml:3998(link) ../C/evolution.xml:4021(title)
 msgid "Appointments"
 msgstr "Rendez-vous"
 
-#: ../C/evolution.xml:3768(link) ../C/evolution.xml:3960(title)
+#: ../C/evolution.xml:4001(link) ../C/evolution.xml:4193(title)
 msgid "Sending a Meeting Invitation"
 msgstr "Envoi d'une invitation de réunion"
 
-#: ../C/evolution.xml:3771(link) ../C/evolution.xml:4049(title)
+#: ../C/evolution.xml:4004(link) ../C/evolution.xml:4282(title)
 msgid "Accepting and Replying to a Meeting Request"
 msgstr "Acceptation et réponse à une requête de réunion"
 
-#: ../C/evolution.xml:3774(link) ../C/evolution.xml:4067(title)
+#: ../C/evolution.xml:4007(link) ../C/evolution.xml:4300(title)
 msgid "Reading Responses to Meeting Requests"
 msgstr "Lecture des réponses aux demandes de réunion"
 
-#: ../C/evolution.xml:3777(link) ../C/evolution.xml:4072(title)
+#: ../C/evolution.xml:4010(link) ../C/evolution.xml:4305(title)
 msgid "Using the Free/Busy View"
 msgstr "Utilisation de l'affichage libre/occupé"
 
-#: ../C/evolution.xml:3780(link) ../C/evolution.xml:4101(title)
+#: ../C/evolution.xml:4013(link) ../C/evolution.xml:4334(title)
 msgid ""
 "Publishing Calendar and Free/Busy Information Without a Groupware Server"
 msgstr ""
 "Publication des informations de calendrier et de disponibilité sans serveur "
 "collaboratif"
 
-#: ../C/evolution.xml:3783(link) ../C/evolution.xml:4134(title)
+#: ../C/evolution.xml:4016(link) ../C/evolution.xml:4367(title)
 msgid "Accessing Free/Busy Data Without a Groupware Server"
 msgstr "Accès aux données de disponibilité sans serveur collaboratif"
 
-#: ../C/evolution.xml:3789(para)
+#: ../C/evolution.xml:4022(para)
 msgid "In Evolution, an appointment is an event you schedule for yourself."
 msgstr ""
 "Dans Evolution, un rendez-vous est un événement que vous planifiez pour vous-"
 "même."
 
-#: ../C/evolution.xml:3792(link) ../C/evolution.xml:3806(title)
+#: ../C/evolution.xml:4025(link) ../C/evolution.xml:4039(title)
 msgid "Creating Appointments"
 msgstr "Création de rendez-vous"
 
-#: ../C/evolution.xml:3795(link) ../C/evolution.xml:3894(title)
-#: ../C/evolution.xml:5324(title)
+#: ../C/evolution.xml:4028(link) ../C/evolution.xml:4127(title)
+#: ../C/evolution.xml:5557(title)
 msgid "Reminders"
 msgstr "Rappels"
 
-#: ../C/evolution.xml:3798(link) ../C/evolution.xml:3930(title)
+#: ../C/evolution.xml:4031(link) ../C/evolution.xml:4163(title)
 msgid "Classifications"
 msgstr "Classifications"
 
-#: ../C/evolution.xml:3801(link) ../C/evolution.xml:3953(title)
+#: ../C/evolution.xml:4034(link) ../C/evolution.xml:4186(title)
 msgid "Recurrence"
 msgstr "Récurrence"
 
-#: ../C/evolution.xml:3809(para)
+#: ../C/evolution.xml:4042(para)
 msgid "Click File &gt; New &gt; Appointment."
 msgstr "Choisissez Fichier &gt; Nouveau &gt; Rendez-vous."
 
-#: ../C/evolution.xml:3811(para)
+#: ../C/evolution.xml:4044(para)
 msgid ""
 "Click Calendars on the Switcher, then click File &gt; New &gt; Appointment."
 msgstr ""
 "Cliquez sur Calendriers dans le sélecteur, puis cliquez sur Nouveau &gt; "
 "Rendez-vous."
 
-#: ../C/evolution.xml:3813(para)
+#: ../C/evolution.xml:4046(para)
 msgid ""
 "Double-click in a blank space on the calendar view to open an Appointment "
 "dialog box. The particular time on the calendar view against which you have "
@@ -9034,31 +9472,31 @@ msgstr ""
 "de dialogue Rendez-vous. L'heure de l'endroit sur lequel vous avez cliqué "
 "dans le calendrier est suggérée comme heure du nouveau rendez-vous."
 
-#: ../C/evolution.xml:3815(para)
+#: ../C/evolution.xml:4048(para)
 msgid ""
 "Select the required duration on the calender view and enter the summary."
 msgstr "Sélectionnez la durée souhaitée de l'événement et saisissez un résumé."
 
-#: ../C/evolution.xml:3818(para) ../C/evolution.xml:3973(para)
+#: ../C/evolution.xml:4051(para) ../C/evolution.xml:4206(para)
 msgid "Select a calendar in the Calendar drop-down list."
 msgstr "Sélectionnez un calendrier dans la liste déroulante Calendrier."
 
-#: ../C/evolution.xml:3819(para) ../C/evolution.xml:3830(para)
-#: ../C/evolution.xml:3988(para) ../C/evolution.xml:4371(para)
-#: ../C/evolution.xml:4425(para) ../C/evolution.xml:4657(para)
-#: ../C/evolution.xml:5723(para)
+#: ../C/evolution.xml:4052(para) ../C/evolution.xml:4063(para)
+#: ../C/evolution.xml:4221(para) ../C/evolution.xml:4604(para)
+#: ../C/evolution.xml:4658(para) ../C/evolution.xml:4890(para)
+#: ../C/evolution.xml:5956(para)
 msgid "Enter a brief summary in the Summary field."
 msgstr "Saisissez un bref résumé dans le champ Résumé."
 
-#: ../C/evolution.xml:3824(para) ../C/evolution.xml:3991(para)
+#: ../C/evolution.xml:4057(para) ../C/evolution.xml:4224(para)
 msgid "(Optional) Type a location in the Location field."
 msgstr "(facultatif) Saisissez un emplacement dans le champ Emplacement."
 
-#: ../C/evolution.xml:3827(para)
+#: ../C/evolution.xml:4060(para)
 msgid "Select the date and time."
 msgstr "Choisissez la date et l'heure."
 
-#: ../C/evolution.xml:3833(para) ../C/evolution.xml:3994(para)
+#: ../C/evolution.xml:4066(para) ../C/evolution.xml:4227(para)
 msgid ""
 "To select this appointment as an all day event, click Options &gt; All Day "
 "Event."
@@ -9066,18 +9504,18 @@ msgstr ""
 "Pour définir ce rendez-vous comme événement sur une journée entière, "
 "choisissez Options &gt; Toute la journée."
 
-#: ../C/evolution.xml:3835(para) ../C/evolution.xml:3996(para)
+#: ../C/evolution.xml:4068(para) ../C/evolution.xml:4229(para)
 msgid "Click the All Day Event button on the toolbar."
 msgstr "Cliquez sur le bouton « Toute la journée » dans la barre d'outils."
 
-#: ../C/evolution.xml:3838(para) ../C/evolution.xml:3999(para)
+#: ../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."
 msgstr ""
 "Si c'est un événement d'une journée entière, indiquez une date de début et "
 "une date de fin."
 
-#: ../C/evolution.xml:3841(para) ../C/evolution.xml:4002(para)
+#: ../C/evolution.xml:4074(para) ../C/evolution.xml:4235(para)
 msgid ""
 "If the event is not an all day event, specify a starting time and an ending "
 "time."
@@ -9085,58 +9523,58 @@ msgstr ""
 "Si ce n'est pas un événement d'une journée entière, indiquez une heure de "
 "début et une heure de fin."
 
-#: ../C/evolution.xml:3844(para) ../C/evolution.xml:4005(para)
+#: ../C/evolution.xml:4077(para) ../C/evolution.xml:4238(para)
 msgid "Select For to specify the duration."
 msgstr "Choisissez « pour » pour indiquer une durée."
 
-#: ../C/evolution.xml:3846(para) ../C/evolution.xml:4007(para)
+#: ../C/evolution.xml:4079(para) ../C/evolution.xml:4240(para)
 msgid "Select Until to specify the ending time of the event."
 msgstr "Choisissez « jusqu'à » pour indiquer l'heure de fin de l'événement."
 
-#: ../C/evolution.xml:3849(para) ../C/evolution.xml:4010(para)
-#: ../C/evolution.xml:4380(para) ../C/evolution.xml:4431(para)
+#: ../C/evolution.xml:4082(para) ../C/evolution.xml:4243(para)
+#: ../C/evolution.xml:4613(para) ../C/evolution.xml:4664(para)
 msgid "Type the time zone information in the Time Zone field."
 msgstr "Saisssez le fuseau horaire dans le champ correspondant."
 
-#: ../C/evolution.xml:3851(para) ../C/evolution.xml:4012(para)
-#: ../C/evolution.xml:4382(para) ../C/evolution.xml:4433(para)
+#: ../C/evolution.xml:4084(para) ../C/evolution.xml:4245(para)
+#: ../C/evolution.xml:4615(para) ../C/evolution.xml:4666(para)
 msgid "Click the globe to customize the time zone."
 msgstr "Cliquez sur le globe pour personnaliser le fuseau horaire."
 
-#: ../C/evolution.xml:3852(para) ../C/evolution.xml:4013(para)
-#: ../C/evolution.xml:4383(para) ../C/evolution.xml:4434(para)
+#: ../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 ""
 "Pour masquer ou afficher le champ du fuseau horaire, choisissez Affichage "
 "&gt; Fuseau horaire."
 
-#: ../C/evolution.xml:3855(para)
+#: ../C/evolution.xml:4088(para)
 msgid "To show the time as busy, click Options &gt; Show Time as Busy."
 msgstr ""
 "Pour que la période s'affiche comme occupée, choisissez Options &gt; "
 "Afficher la période comme occupé."
 
-#: ../C/evolution.xml:3858(para) ../C/evolution.xml:3936(para)
-#: ../C/evolution.xml:4386(para) ../C/evolution.xml:4437(para)
-#: ../C/evolution.xml:4653(para)
+#: ../C/evolution.xml:4091(para) ../C/evolution.xml:4169(para)
+#: ../C/evolution.xml:4619(para) ../C/evolution.xml:4670(para)
+#: ../C/evolution.xml:4886(para)
 msgid "(Optional) Type a category in the Categories field."
 msgstr "(facultatif) Saisissez une catégorie dans le champ Catégories."
 
-#: ../C/evolution.xml:3859(para) ../C/evolution.xml:3942(para)
-#: ../C/evolution.xml:4387(para) ../C/evolution.xml:4438(para)
+#: ../C/evolution.xml:4092(para) ../C/evolution.xml:4175(para)
+#: ../C/evolution.xml:4620(para) ../C/evolution.xml:4671(para)
 msgid "To show or hide the Categories field, click View &gt; Categories."
 msgstr ""
 "Pour afficher ou masquer le champ Catégories, choisissez Affichage &gt; "
 "Catégories."
 
-#: ../C/evolution.xml:3862(para) ../C/evolution.xml:4390(para)
-#: ../C/evolution.xml:4441(para) ../C/evolution.xml:4663(para)
-#: ../C/evolution.xml:5732(para)
+#: ../C/evolution.xml:4095(para) ../C/evolution.xml:4623(para)
+#: ../C/evolution.xml:4674(para) ../C/evolution.xml:4896(para)
+#: ../C/evolution.xml:5965(para)
 msgid "(Optional) Enter a description in the Description field."
 msgstr "(facultatif) Saisissez une description dans le champ Description."
 
-#: ../C/evolution.xml:3865(para) ../C/evolution.xml:3920(para)
-#: ../C/evolution.xml:4016(para)
+#: ../C/evolution.xml:4098(para) ../C/evolution.xml:4153(para)
+#: ../C/evolution.xml:4249(para)
 msgid ""
 "To create an alarm for this appointment, click Alarms on the toolbar, or "
 "click Options &gt; Alarms."
@@ -9144,14 +9582,14 @@ msgstr ""
 "Pour créer une alarme pour ce rendez-vous, cliquez sur Alarmes dans la barre "
 "d'outils ou choisissez Options &gt; Alarmes."
 
-#: ../C/evolution.xml:3866(para) ../C/evolution.xml:3923(para)
-#: ../C/evolution.xml:4017(para)
+#: ../C/evolution.xml:4099(para) ../C/evolution.xml:4156(para)
+#: ../C/evolution.xml:4250(para)
 msgid "Select Customize to add or remove customized alarms for the event."
 msgstr ""
 "Sélectionnez Personnaliser pour ajouter ou enlever des alarmes "
 "personnalisées pour l'événement."
 
-#: ../C/evolution.xml:3867(para) ../C/evolution.xml:4018(para)
+#: ../C/evolution.xml:4100(para) ../C/evolution.xml:4251(para)
 msgid ""
 "For more information on reminders, see <link linkend=\"bshly4v\">Reminders</"
 "link>."
@@ -9159,9 +9597,9 @@ msgstr ""
 "Pour plus d'informations sur les rappels, consultez <link linkend=\"bshly4v"
 "\">Rappels</link>."
 
-#: ../C/evolution.xml:3870(para) ../C/evolution.xml:4021(para)
-#: ../C/evolution.xml:4399(para) ../C/evolution.xml:4444(para)
-#: ../C/evolution.xml:4666(para)
+#: ../C/evolution.xml:4103(para) ../C/evolution.xml:4254(para)
+#: ../C/evolution.xml:4632(para) ../C/evolution.xml:4677(para)
+#: ../C/evolution.xml:4899(para)
 msgid ""
 "(Optional) To add an attachment, drag and drop the attachment into the "
 "attachment bar."
@@ -9169,9 +9607,9 @@ msgstr ""
 "(facultatif) Pour ajouter une pièce jointe, faites glisser un fichier dans "
 "la barre des pièces jointes."
 
-#: ../C/evolution.xml:3872(para) ../C/evolution.xml:4023(para)
-#: ../C/evolution.xml:4401(para) ../C/evolution.xml:4446(para)
-#: ../C/evolution.xml:4668(para)
+#: ../C/evolution.xml:4105(para) ../C/evolution.xml:4256(para)
+#: ../C/evolution.xml:4634(para) ../C/evolution.xml:4679(para)
+#: ../C/evolution.xml:4901(para)
 msgid ""
 "Click the Attach button on the toolbar, or click Insert &gt; Attachment and "
 "then browse to the attachment."
@@ -9179,7 +9617,7 @@ msgstr ""
 "Cliquez sur le bouton Joindre dans la barre d'outils ou choisissez Insérer "
 "&gt; Pièce jointe, puis sélectionnez le fichier à joindre."
 
-#: ../C/evolution.xml:3875(para) ../C/evolution.xml:4026(para)
+#: ../C/evolution.xml:4108(para) ../C/evolution.xml:4259(para)
 msgid ""
 "(Optional) Select a classification (Public, Private, or Confidential) by "
 "clicking &gt; Options &gt; Classifications."
@@ -9187,11 +9625,11 @@ msgstr ""
 "(facultatif) Sélectionnez une classification (public, privé, confidentiel) "
 "en choisissant Options &gt; Classifications."
 
-#: ../C/evolution.xml:3878(para) ../C/evolution.xml:4029(para)
+#: ../C/evolution.xml:4111(para) ../C/evolution.xml:4262(para)
 msgid "(Optional) Click the Recurrence button on the toolbar."
 msgstr "(facultatif) Cliquez sur le bouton Récurrence dans la barre d'outils."
 
-#: ../C/evolution.xml:3880(para) ../C/evolution.xml:4031(para)
+#: ../C/evolution.xml:4113(para) ../C/evolution.xml:4264(para)
 msgid ""
 "Click Options &gt; Recurrence, and specify whether you want the appointment "
 "to recur and how often."
@@ -9199,11 +9637,11 @@ msgstr ""
 "Choisissez Options &gt; Récurrence, et indiquez la fréquence et le type de "
 "répétition de l'événement."
 
-#: ../C/evolution.xml:3885(title)
+#: ../C/evolution.xml:4118(title)
 msgid "All Day Event"
 msgstr "Événement sur une journée entière"
 
-#: ../C/evolution.xml:3886(para)
+#: ../C/evolution.xml:4119(para)
 msgid ""
 "An All Day event appears at the top of a day's appointment list, in the "
 "header under the date, rather than inside. That makes it easy to have "
@@ -9222,7 +9660,7 @@ msgstr ""
 "peuvent également se superposer. Lorsque c'est le cas, ils apparaissent sous "
 "forme de colonnes dans la vue journalière du calendrier."
 
-#: ../C/evolution.xml:3887(para)
+#: ../C/evolution.xml:4120(para)
 msgid ""
 "If you create calendar appointments that overlap, Evolution displays them "
 "side by side in your calendar."
@@ -9230,7 +9668,7 @@ msgstr ""
 "Si vous créez des rendez-vous qui se superposent dans le calendrier, "
 "Evolution les affiche côte à côte."
 
-#: ../C/evolution.xml:3895(para)
+#: ../C/evolution.xml:4128(para)
 msgid ""
 "You can have several Reminders for individual appointments, any time prior "
 "to the appointment you schedule. You can have one reminder of each of the "
@@ -9240,29 +9678,29 @@ msgstr ""
 "précédant le rendez-vous planifié. Vous pouvez définir un rappel pour chacun "
 "des types suivants :"
 
-#: ../C/evolution.xml:3899(title)
+#: ../C/evolution.xml:4132(title)
 msgid "Display:"
 msgstr "Affichage :"
 
-#: ../C/evolution.xml:3900(para)
+#: ../C/evolution.xml:4133(para)
 msgid ""
 "A notification pops up on your screen to remind you of your appointment."
 msgstr ""
 "Une notification surgit à l'écran pour vous rappeler votre rendez-vous."
 
-#: ../C/evolution.xml:3905(title)
+#: ../C/evolution.xml:4138(title)
 msgid "Audio:"
 msgstr "Audio :"
 
-#: ../C/evolution.xml:3906(para)
+#: ../C/evolution.xml:4139(para)
 msgid "Your computer delivers a sound alarm."
 msgstr "L'ordinateur génère une alarme sonore."
 
-#: ../C/evolution.xml:3911(title)
+#: ../C/evolution.xml:4144(title)
 msgid "Program:"
 msgstr "Programme :"
 
-#: ../C/evolution.xml:3912(para)
+#: ../C/evolution.xml:4145(para)
 msgid ""
 "You can run a program as a reminder. You can enter its name in the text "
 "field, or find it with the Browse button."
@@ -9270,7 +9708,7 @@ msgstr ""
 "Vous pouvez lancer un programme comme rappel. Vous pouvez saisir son nom "
 "dans la zone de texte ou le trouver avec le bouton Parcourir."
 
-#: ../C/evolution.xml:3916(para)
+#: ../C/evolution.xml:4149(para)
 msgid ""
 "Apart from the above notifications, the Evolution alarm icon blinks in the "
 "notification area. To pause the alarm or view the event, click the "
@@ -9280,11 +9718,11 @@ msgstr ""
 "dans la zone de notification. Pour stopper l'alarme ou voir l'événement, "
 "cliquez sur l'icône de notification."
 
-#: ../C/evolution.xml:3917(para)
+#: ../C/evolution.xml:4150(para)
 msgid "To create a reminder:"
 msgstr "Pour créer un rappel :"
 
-#: ../C/evolution.xml:3926(para)
+#: ../C/evolution.xml:4159(para)
 msgid ""
 "If you have stored reminders in a local calendar, they work from the moment "
 "you log in. However, for reminders stored on any remote server like "
@@ -9300,7 +9738,7 @@ msgstr ""
 "continuent de vous avertir des prochains rendez-vous même si vous quittez "
 "Evolution."
 
-#: ../C/evolution.xml:3931(para)
+#: ../C/evolution.xml:4164(para)
 msgid ""
 "If you are using a calendar on a Novell <trademark class=\"registered"
 "\">GroupWise</trademark> or Microsoft Exchange server, select a "
@@ -9320,7 +9758,7 @@ msgstr ""
 "Les différents niveaux varient selon les paramètres du serveur ; adressez-"
 "vous à votre administrateur système ou ajustez vos paramètres de délégation."
 
-#: ../C/evolution.xml:3932(para)
+#: ../C/evolution.xml:4165(para)
 msgid ""
 "If you are using a Novell GroupWise or Microsoft Exchange server, other "
 "people on the server can check your schedule to see if you are available at "
@@ -9335,13 +9773,13 @@ msgstr ""
 "d'occupée, cochez la case « Libre » dans la section « Afficher la période "
 "comme ». Normalement, les rendez-vous sont signalés occupés."
 
-#: ../C/evolution.xml:3933(para)
+#: ../C/evolution.xml:4166(para)
 msgid ""
 "You can categorize appointments in the same way you can categorize contacts."
 msgstr ""
 "Vous pouvez attribuer des catégories aux rendez-vous comme pour les contacts."
 
-#: ../C/evolution.xml:3939(para)
+#: ../C/evolution.xml:4172(para)
 msgid ""
 "Select the check box next to each category that matches the appointment you "
 "are creating."
@@ -9349,7 +9787,7 @@ msgstr ""
 "Cochez la case en regard de chaque catégorie qui correspond au rendez-vous "
 "en cours d'édition."
 
-#: ../C/evolution.xml:3946(para)
+#: ../C/evolution.xml:4179(para)
 msgid ""
 "You can add a new category to your category list by clicking Edit Master "
 "Category List, then click Click Here To Add A Category."
@@ -9358,7 +9796,7 @@ msgstr ""
 "« Éditer la liste maître des catégories », puis cliquez sur « Cliquez ici pour "
 "ajouter une catégorie »."
 
-#: ../C/evolution.xml:3948(para)
+#: ../C/evolution.xml:4181(para)
 msgid ""
 "After you have selected your categories, click OK to assign these categories "
 "to the appointment. The categories you selected are now listed in the text "
@@ -9368,7 +9806,7 @@ msgstr ""
 "ces catégories au rendez-vous. Les catégories sélectionnées apparaissent "
 "dorénavant dans la zone de texte à droite du bouton Catégories."
 
-#: ../C/evolution.xml:3949(para)
+#: ../C/evolution.xml:4182(para)
 msgid ""
 "Appointments with categories appear with icons in the calendar display, and "
 "you can also search for appointments by category. To display only the "
@@ -9381,7 +9819,7 @@ msgstr ""
 "particulière, sélectionnez la catégorie correspondante dans la barre de "
 "recherche au sommet du calendrier."
 
-#: ../C/evolution.xml:3954(para)
+#: ../C/evolution.xml:4187(para)
 msgid ""
 "The Recurrence tool button lets you describe repetition in appointments "
 "ranging from once every day up to once every 100 years. You can then choose "
@@ -9399,7 +9837,7 @@ msgstr ""
 "les deux semaines le lundi et le vendredi jusqu'au 3 janvier 2008 » ou « Tous "
 "les mois, le premier vendredi durant 12 fois »."
 
-#: ../C/evolution.xml:3955(para)
+#: ../C/evolution.xml:4188(para)
 msgid ""
 "After you have finished settings, click the Save button in the toolbar to "
 "save and close the appointment editor window. If you want, you can alter an "
@@ -9414,7 +9852,7 @@ msgstr ""
 "pouvez modifier les autres paramètres en faisant un clic droit sur le rendez-"
 "vous et en choisissant Ouvrir, ou en double-cliquant sur le rendez-vous."
 
-#: ../C/evolution.xml:3961(para)
+#: ../C/evolution.xml:4194(para)
 msgid ""
 "A meeting is an event you schedule for multiple people. Evolution can be "
 "used to schedule group meetings and help you manage responses to meeting "
@@ -9424,11 +9862,11 @@ msgstr ""
 "Evolution peut être utilisé pour planifier des réunions de groupe et pour "
 "vous aider à gérer les réponses aux requêtes de réunion."
 
-#: ../C/evolution.xml:3962(para)
+#: ../C/evolution.xml:4195(para)
 msgid ""
 "When you create a meeting or group appointment, you can specify the "
 "attendees in several categories, such as <quote>chair</quote> or "
-"<quote>required.</quote> When you save the meeting listing, each attendee is "
+"<quote>required</quote>. When you save the meeting listing, each attendee is "
 "sent an email with the meeting information, which also gives them the option "
 "to respond."
 msgstr ""
@@ -9438,7 +9876,7 @@ msgstr ""
 "reçoit un courriel avec les informations de la réunion, leur donnant "
 "également la possibilité de répondre."
 
-#: ../C/evolution.xml:3963(para)
+#: ../C/evolution.xml:4196(para)
 msgid ""
 "If you don't need to collect attendance information when you're scheduling "
 "an event, and would rather just announce the event, right-click the meeting "
@@ -9456,15 +9894,15 @@ msgstr ""
 "enverra pas automatiquement un courriel pour vous signaler s'ils "
 "participeront ou pas."
 
-#: ../C/evolution.xml:3964(para)
+#: ../C/evolution.xml:4197(para)
 msgid "To schedule a meeting:"
 msgstr "Pour planifier une réunion :"
 
-#: ../C/evolution.xml:3967(para) ../C/evolution.xml:4077(para)
+#: ../C/evolution.xml:4200(para) ../C/evolution.xml:4310(para)
 msgid "Click File &gt; New &gt; Meeting."
 msgstr "Cliquez sur Fichier &gt; Nouveau &gt; Réunion."
 
-#: ../C/evolution.xml:3970(para) ../C/evolution.xml:4416(para)
+#: ../C/evolution.xml:4203(para) ../C/evolution.xml:4649(para)
 msgid ""
 "If you have multiple email accounts, select the one to use by selecting an "
 "item in the Organizer field."
@@ -9472,24 +9910,24 @@ msgstr ""
 "Si vous avez plusieurs comptes de messagerie, sélectionnez celui que vous "
 "voulez utiliser en sélectionnant un élément dans le champ Organisateur."
 
-#: ../C/evolution.xml:3976(para) ../C/evolution.xml:4080(para)
+#: ../C/evolution.xml:4209(para) ../C/evolution.xml:4313(para)
 msgid "Click Add to add the email addresses of people you want to invite."
 msgstr ""
 "Cliquez sur Ajouter pour ajouter les adresses électroniques des personnes "
 "que vous souhaitez inviter."
 
-#: ../C/evolution.xml:3979(para)
+#: ../C/evolution.xml:4212(para)
 msgid ""
 "To remove an attendee from the list, select an attendee and press Remove."
 msgstr ""
 "Pour enlever un participant dans la liste, sélectionnez-le et cliquez sur "
 "Enlever."
 
-#: ../C/evolution.xml:3982(para)
+#: ../C/evolution.xml:4215(para)
 msgid "To edit a field, select the field and click Edit."
 msgstr "Pour éditer un champ, sélectionnez-le et cliquez sur Édition."
 
-#: ../C/evolution.xml:3985(para)
+#: ../C/evolution.xml:4218(para)
 msgid ""
 "Click View on the menu bar to show or hide the Type, Role, Status, and RSVP "
 "fields."
@@ -9497,7 +9935,7 @@ msgstr ""
 "Choisissez Affichage dans la barre de menus pour afficher ou masquer les "
 "champs Type, Rôle, État et RSVP."
 
-#: ../C/evolution.xml:4034(para)
+#: ../C/evolution.xml:4267(para)
 msgid ""
 "To query free/busy information for the attendees, click the Free/Busy button "
 "on the toolbar."
@@ -9505,21 +9943,21 @@ msgstr ""
 "Pour interroger les informations de disponibilité des participants, cliquez "
 "sur le bouton Libre/Occupé dans la barre d'outils."
 
-#: ../C/evolution.xml:4036(para)
+#: ../C/evolution.xml:4269(para)
 msgid "Click Options &gt; Free/Busy."
 msgstr "Choisissez Options &gt; Libre/Occupé."
 
-#: ../C/evolution.xml:4039(para)
+#: ../C/evolution.xml:4272(para)
 msgid "Click Save to save the meeting."
 msgstr "Cliquez sur Enregistrer pour enregistrer la réunion."
 
-#: ../C/evolution.xml:4042(para)
+#: ../C/evolution.xml:4275(para)
 msgid ""
 "An email is sent out to all the recipients, inviting them to your event."
 msgstr ""
 "Un courriel est envoyé à tous les participants, les invitant à l'événement."
 
-#: ../C/evolution.xml:4044(para)
+#: ../C/evolution.xml:4277(para)
 msgid ""
 "In Evolution, a meeting can have only one organizer, and only the organizer "
 "can add participants to that meeting. Though it is possible to change the "
@@ -9537,7 +9975,7 @@ msgstr ""
 "n'en êtes pas l'organisateur, la meilleure solution est de faire suivre le "
 "message d'invitationoriginel de l'organisateur à ces personnes."
 
-#: ../C/evolution.xml:4050(para)
+#: ../C/evolution.xml:4283(para)
 msgid ""
 "Meeting requests are sent as iCal attachments. To view or respond to one, "
 "click the attachment icon and view it inline in the mail window. All the "
@@ -9550,19 +9988,19 @@ msgstr ""
 "apparaissent, y compris l'heure et la date. Vous pouvez alors choisir "
 "comment répondre à l'invitation. Les choix sont :"
 
-#: ../C/evolution.xml:4053(para)
+#: ../C/evolution.xml:4286(para)
 msgid "Accept"
 msgstr "Accepter"
 
-#: ../C/evolution.xml:4056(para)
+#: ../C/evolution.xml:4289(para)
 msgid "Tentatively Accept"
 msgstr "Accepter provisoirement"
 
-#: ../C/evolution.xml:4059(para)
+#: ../C/evolution.xml:4292(para)
 msgid "Decline"
 msgstr "Refuser"
 
-#: ../C/evolution.xml:4062(para)
+#: ../C/evolution.xml:4295(para)
 msgid ""
 "Click OK to send an email to the organizer with your answer. The event is "
 "also added to your calendar if you accept."
@@ -9570,7 +10008,7 @@ msgstr ""
 "Cliquez sur Valider pour envoyer un courriel à l'organisateur avec votre "
 "réponse. L'événement est aussi ajouté à votre calendrier si vous l'acceptez."
 
-#: ../C/evolution.xml:4063(para)
+#: ../C/evolution.xml:4296(para)
 msgid ""
 "After you add the meeting to your calendar, you can make changes to the "
 "information, but if the original organizer sends out another update, your "
@@ -9580,7 +10018,7 @@ msgstr ""
 "informations, mais si l'organisateur original envoie une mise à jour, il se "
 "peut que vos modifications soient écrasées."
 
-#: ../C/evolution.xml:4068(para)
+#: ../C/evolution.xml:4301(para)
 msgid ""
 "When you get a reply to a meeting invitation you sent, you can view it "
 "inline by clicking the attachment and selecting View Inline."
@@ -9589,7 +10027,7 @@ msgstr ""
 "envoyée, vous pouvez la voir dans le message en cliquant sur la pièce jointe "
 "et en choisissant « Afficher dans le corps »."
 
-#: ../C/evolution.xml:4073(para)
+#: ../C/evolution.xml:4306(para)
 msgid ""
 "In addition to the standard meeting scheduling tools, you can use the Free/"
 "Busy view to check whether people are available in advance. The Free/Busy "
@@ -9611,18 +10049,18 @@ msgstr ""
 "tout de même utiliser les invitations à des événements avec iCal pour "
 "coordonner la planification d'événements avec d'autres personnes."
 
-#: ../C/evolution.xml:4074(para)
+#: ../C/evolution.xml:4307(para)
 msgid "To access the free/busy view:"
 msgstr "Pour accéder à l'affichage Libre/Occupé :"
 
-#: ../C/evolution.xml:4083(para)
+#: ../C/evolution.xml:4316(para)
 msgid ""
 "Click the Free/Busy button on the toolbar, or click Options &gt; Free/Busy."
 msgstr ""
 "Cliquez sur le bouton Libre/Occupé dans la barre d'outils ou choisissez "
 "Options &gt; Libre/Occupé."
 
-#: ../C/evolution.xml:4088(para)
+#: ../C/evolution.xml:4321(para)
 msgid ""
 "Adjust the meeting time, either by dragging the meeting borders or by using "
 "the Autopick buttons to choose a time automatically, then click Save and "
@@ -9636,20 +10074,20 @@ msgstr ""
 "participants invités ; dans les autres cas, un courriel de notification de "
 "mise à jour est envoyé aux particpants."
 
-#: ../C/evolution.xml:4092(title)
+#: ../C/evolution.xml:4325(title)
 msgid "Attendee List:"
 msgstr "Liste des participants :"
 
-#: ../C/evolution.xml:4093(para)
+#: ../C/evolution.xml:4326(para)
 msgid ""
 "The Attendee List shows the people who have been invited to the appointment."
 msgstr "La liste des participants montre les personnes invitées à la réunion."
 
-#: ../C/evolution.xml:4096(title)
+#: ../C/evolution.xml:4329(title)
 msgid "Schedule Grid:"
 msgstr "Grille horaire :"
 
-#: ../C/evolution.xml:4097(para)
+#: ../C/evolution.xml:4330(para)
 msgid ""
 "The Schedule Grid shows the published Free/Busy information for the people "
 "you have invited. This is where you compare schedules to find free time to "
@@ -9668,7 +10106,7 @@ msgstr ""
 "publiées à un URL accessible et que vous l'avez saisi dans leur carte de "
 "contact avec l'éditeur de contact."
 
-#: ../C/evolution.xml:4102(para)
+#: ../C/evolution.xml:4335(para)
 msgid ""
 "You can publish Calendar and Free/Busy information to a WebDAV, FTP server, "
 "or remote machine through secure shell or other Web server with HTTP PUT "
@@ -9681,16 +10119,16 @@ msgstr ""
 "administrateur système si vous n'êtes pas certain de disposer de cette "
 "fonctionnalité."
 
-#: ../C/evolution.xml:4103(para)
+#: ../C/evolution.xml:4336(para)
 msgid "To set up Calendar or Free/Busy publishing:"
 msgstr "Pour configurer la publication de calendrier ou de disponibilité :"
 
-#: ../C/evolution.xml:4106(para) ../C/evolution.xml:4840(para)
+#: ../C/evolution.xml:4339(para) ../C/evolution.xml:5073(para)
 msgid "Click Edit &gt; Preferences, then click Calendar and Tasks."
 msgstr ""
 "Choisissez Édition &gt; Préférences, puis cliquez sur Calendrier et tâches."
 
-#: ../C/evolution.xml:4109(para)
+#: ../C/evolution.xml:4342(para)
 msgid ""
 "Click the Calendar Publishing tab, click Add, then select the information "
 "you want to publish."
@@ -9698,23 +10136,23 @@ msgstr ""
 "Cliquez sur l'onglet Publication de calendrier, cliquez sur Ajouter, puis "
 "sélectionnez l'information que vous souhaitez publier."
 
-#: ../C/evolution.xml:4112(para)
+#: ../C/evolution.xml:4345(para)
 msgid "Select the frequency with which you want to upload data."
 msgstr "Choisissez la fréquence de publication des données."
 
-#: ../C/evolution.xml:4115(para)
+#: ../C/evolution.xml:4348(para)
 msgid "Select the calendars you want to display data for."
 msgstr "Sélectionnez les calendriers dont vous voulez publier les données."
 
-#: ../C/evolution.xml:4118(para)
+#: ../C/evolution.xml:4351(para)
 msgid "Specify the publishing location for the upload server."
 msgstr "Indiquez l'emplacement de publication du serveur distant."
 
-#: ../C/evolution.xml:4121(para)
+#: ../C/evolution.xml:4354(para)
 msgid "Type your username and password."
 msgstr "Saisissez votre nom d'utilisateur et votre mot de passe."
 
-#: ../C/evolution.xml:4127(para)
+#: ../C/evolution.xml:4360(para)
 msgid ""
 "To immediately publish calendar information, go to the Calendar tool and "
 "click Actions &gt; Publish Calendar Information."
@@ -9723,13 +10161,13 @@ msgstr ""
 "l'outil Calendriers et choisissez Actions &gt; Publier l'information "
 "iCalendar."
 
-#: ../C/evolution.xml:4129(para) ../C/evolution.xml:6706(para)
+#: ../C/evolution.xml:4362(para) ../C/evolution.xml:6915(para)
 msgid "You can specify a template to use when posting to the Free/Busy server."
 msgstr ""
 "Vous pouvez indiquer un modèle à utiliser lors de la publication vers un "
 "serveur de disponibilité."
 
-#: ../C/evolution.xml:4135(para)
+#: ../C/evolution.xml:4368(para)
 msgid ""
 "If individuals give you a URL for Free/Busy data or for their Web calendar, "
 "you can enter it as part of the contact information in the Contacts tool. "
@@ -9742,7 +10180,7 @@ msgstr ""
 "eux, Evolution consulte leur agenda et l'affiche dans les informations de "
 "disponibilité."
 
-#: ../C/evolution.xml:4142(para)
+#: ../C/evolution.xml:4375(para)
 msgid ""
 "You can use a customized search, an advanced search, or a quick search to "
 "search for Calendar items."
@@ -9750,7 +10188,7 @@ msgstr ""
 "Vous pouvez utiliser une recherche personnalisée, une recherche avancée ou "
 "une recherche rapide pour rechercher des éléments de calendrier."
 
-#: ../C/evolution.xml:4145(para)
+#: ../C/evolution.xml:4378(para)
 msgid ""
 "Evolution enables you to find the Calendar items by using a Customized "
 "Search."
@@ -9758,55 +10196,55 @@ msgstr ""
 "Evolution vous permet de chercher des éléments de calendrier en utilisant "
 "une recherche personnalisée."
 
-#: ../C/evolution.xml:4155(para) ../C/evolution.xml:4471(para)
-#: ../C/evolution.xml:4707(para)
+#: ../C/evolution.xml:4388(para) ../C/evolution.xml:4704(para)
+#: ../C/evolution.xml:4940(para)
 msgid "Summary contains"
 msgstr "Le résumé contient"
 
-#: ../C/evolution.xml:4158(para) ../C/evolution.xml:4474(para)
-#: ../C/evolution.xml:4710(para)
+#: ../C/evolution.xml:4391(para) ../C/evolution.xml:4707(para)
+#: ../C/evolution.xml:4943(para)
 msgid "Description contains"
 msgstr "La description contient"
 
-#: ../C/evolution.xml:4161(para) ../C/evolution.xml:4477(para)
-#: ../C/evolution.xml:4713(para)
+#: ../C/evolution.xml:4394(para) ../C/evolution.xml:4710(para)
+#: ../C/evolution.xml:4946(para)
 msgid "Any field Contains"
 msgstr "N'importe quel champ contient"
 
-#: ../C/evolution.xml:4166(para) ../C/evolution.xml:4718(para)
+#: ../C/evolution.xml:4399(para) ../C/evolution.xml:4951(para)
 msgid "Evolution displays the desired Calendar items."
 msgstr "Evolution affiche les éléments de calendrier souhaités."
 
-#: ../C/evolution.xml:4178(para) ../C/evolution.xml:4492(para)
-#: ../C/evolution.xml:4730(para)
+#: ../C/evolution.xml:4411(para) ../C/evolution.xml:4725(para)
+#: ../C/evolution.xml:4963(para)
 msgid "Select Advanced Search to open Advanced Search dialog box."
 msgstr ""
 "Choisissez Recherche avancée afin d'ouvrir la boîte de dialogue Recherche "
 "avancée."
 
-#: ../C/evolution.xml:4179(para) ../C/evolution.xml:4493(para)
-#: ../C/evolution.xml:4731(para)
+#: ../C/evolution.xml:4412(para) ../C/evolution.xml:4726(para)
+#: ../C/evolution.xml:4964(para)
 msgid "Search name field displays the search type you have selected."
 msgstr ""
 "Le champ Nom de recherche affiche le type de recherche que vous avez choisi."
 
-#: ../C/evolution.xml:4184(para) ../C/evolution.xml:4498(para)
-#: ../C/evolution.xml:4736(para)
+#: ../C/evolution.xml:4417(para) ../C/evolution.xml:4731(para)
+#: ../C/evolution.xml:4969(para)
 msgid "Click Add to add rules."
 msgstr "Cliquez sur Ajouter pour ajouter des règles."
 
-#: ../C/evolution.xml:4187(para) ../C/evolution.xml:4501(para)
-#: ../C/evolution.xml:4739(para)
+#: ../C/evolution.xml:4420(para) ../C/evolution.xml:4734(para)
+#: ../C/evolution.xml:4972(para)
 msgid "Select the criteria, and then type a search entry in the given field."
 msgstr ""
 "Sélectionnez un critère puis saisissez un terme de recherche dans le champ "
 "correspondant."
 
-#: ../C/evolution.xml:4193(para) ../C/evolution.xml:4745(para)
+#: ../C/evolution.xml:4426(para) ../C/evolution.xml:4978(para)
 msgid "Click Save to save your search results."
 msgstr "Cliquez sur Enregistrer pour conserver les résultats de la recherche."
 
-#: ../C/evolution.xml:4198(para)
+#: ../C/evolution.xml:4431(para)
 msgid ""
 "Displays all the Calendar items that match the criteria that you have "
 "selected from the drop-down list in the Search bar."
@@ -9814,44 +10252,44 @@ msgstr ""
 "Affiche tous les éléments de calendrier correspondant aux critères que vous "
 "avez sélectionnés dans la liste déroulante de la barre de recherche."
 
-#: ../C/evolution.xml:4202(para) ../C/evolution.xml:4754(para)
+#: ../C/evolution.xml:4435(para) ../C/evolution.xml:4987(para)
 msgid "Click the Show drop-down list."
 msgstr "Cliquez sur la liste déroulante Afficher."
 
-#: ../C/evolution.xml:4208(para) ../C/evolution.xml:4550(para)
-#: ../C/evolution.xml:4760(para)
+#: ../C/evolution.xml:4441(para) ../C/evolution.xml:4783(para)
+#: ../C/evolution.xml:4993(para)
 msgid "Any Category"
 msgstr "Toute catégorie"
 
-#: ../C/evolution.xml:4211(para) ../C/evolution.xml:4553(para)
-#: ../C/evolution.xml:4763(para)
+#: ../C/evolution.xml:4444(para) ../C/evolution.xml:4786(para)
+#: ../C/evolution.xml:4996(para)
 msgid "Unmatched"
 msgstr "Différent"
 
-#: ../C/evolution.xml:4214(para)
+#: ../C/evolution.xml:4447(para)
 msgid "Active Appointments"
 msgstr "Rendez-vous actuels"
 
-#: ../C/evolution.xml:4217(para)
+#: ../C/evolution.xml:4450(para)
 msgid "Next 7 Days' Appointments"
 msgstr "Rendez-vous des 7 prochains jours"
 
-#: ../C/evolution.xml:4232(para) ../C/evolution.xml:4583(para)
+#: ../C/evolution.xml:4465(para) ../C/evolution.xml:4816(para)
 msgid "Favourites"
 msgstr "Favoris"
 
-#: ../C/evolution.xml:4285(para)
+#: ../C/evolution.xml:4518(para)
 msgid "You can view the desired items listed in the Calendar view."
 msgstr ""
 "Vous voyez apparaître les éléments souhaités dans l'affichage du calendrier."
 
-#: ../C/evolution.xml:4290(para)
+#: ../C/evolution.xml:4523(para)
 msgid "To print the displayed calendar items, click File &gt; Print."
 msgstr ""
 "Pour imprimer les éléments de calendrier affichés, choisissez Fichier &gt; "
 "Imprimer."
 
-#: ../C/evolution.xml:4295(para)
+#: ../C/evolution.xml:4528(para)
 msgid ""
 "Keeping a list of everything you did in the past eventually slows down your "
 "calendar. To delete old events, click Actions &gt; Purge, then enter the "
@@ -9863,29 +10301,29 @@ msgstr ""
 "lesquels vous souhaitez conserver les éléments passés. Cliquez sur Valider "
 "pour effacer les éléments plus anciens."
 
-#: ../C/evolution.xml:4300(para)
+#: ../C/evolution.xml:4533(para)
 msgid "Only attendees of a meeting can delegate a meeting."
 msgstr "Seuls les particpants à une réunion peuvent déléguer une réunion."
 
-#: ../C/evolution.xml:4303(para)
+#: ../C/evolution.xml:4536(para)
 msgid "In the Calendar, right-click the meeting you want to delegate."
 msgstr ""
 "Dans le calendrier, faites un clic droit sur la réunion que vous souhaitez "
 "déléguer."
 
-#: ../C/evolution.xml:4306(para)
+#: ../C/evolution.xml:4539(para)
 msgid "Click Delegate Meeting."
 msgstr "Cliquez sur Déléguer une réunion."
 
-#: ../C/evolution.xml:4309(para)
+#: ../C/evolution.xml:4542(para)
 msgid "Select the contacts you want to delegate the meeting to."
 msgstr "Sélectionnez les contacts auxquels vous souhaitez déléguer la réunion."
 
-#: ../C/evolution.xml:4315(para)
+#: ../C/evolution.xml:4548(para)
 msgid "Each contact receives a copy of the meeting invitation."
 msgstr "Chaque contact reçoit une copie de l'invitation à la réunion."
 
-#: ../C/evolution.xml:4320(para)
+#: ../C/evolution.xml:4553(para)
 msgid ""
 "To create a new calendar, click File &gt; New &gt; Calendar. If the calendar "
 "is one you plan to store locally, you need only provide a name and color. If "
@@ -9908,7 +10346,7 @@ msgstr ""
 "si vous utilisez le calendrier pour afficher l'agenda d'une équipe sportive, "
 "il semble suffisant de le rafraîchir une fois par semaine."
 
-#: ../C/evolution.xml:4321(para)
+#: ../C/evolution.xml:4554(para)
 msgid ""
 "The <ulink url=\"http://icalshare.com\">icalshare.com Web site</ulink> has "
 "an extensive list of shared online calendars, including national and "
@@ -9920,25 +10358,21 @@ msgstr ""
 "nationaux et religieux, des phases lunaires, des événements sportifs et des "
 "événements locaux et régionaux."
 
-#: ../C/evolution.xml:4322(para)
+#: ../C/evolution.xml:4555(para)
 msgid ""
-"Evolution lets you view and manage calendars on remote CalDAV servers such "
-"as <trademark class=\"registered\">Hula</trademark>. For more information "
-"about Hula, see the <ulink url=\"http://www.hula-project.org\">Hula Project "
-"Web site</ulink>. The procedure to create a CalDAV calendar source is "
-"similar to that of a remote Web calendar source. You can view and create "
-"calendar events on CalDav accounts just like other calendars on Evolution."
+"Evolution lets you view and manage calendars on remote CalDAV servers. The "
+"procedure to create a CalDAV calendar source is similar to that of a remote "
+"Web calendar source. You can view and create calendar events on CalDav "
+"accounts just like other calendars on Evolution."
 msgstr ""
 "Evolution vous permet de visualiser et de gérer des calendriers sur des "
-"serveurs CalDAV distants tels que <trademark class=\"registered\">Hula</"
-"trademark>. Pour plus d'informations sur Hula, consultez le <ulink url="
-"\"http://www.hula-project.org\">site Web du projet Hula</ulink>. La "
+"serveurs CalDAV distants. La "
 "procédure pour créer une source de calendrier CalDAV est identique à celle "
 "utilisée pour une source de calendrier Web distante. Vous pouvez afficher et "
 "créer des événements de calendrier sur des comptes CalDAV tout comme sur "
 "d'autres calendriers Evolution."
 
-#: ../C/evolution.xml:4327(para)
+#: ../C/evolution.xml:4560(para)
 msgid ""
 "The Task List, located in the upper-right corner of the calendar, lets you "
 "keep a list of tasks separate from your calendar appointments."
@@ -9947,7 +10381,7 @@ msgstr ""
 "permet de conserver une liste de tâches indépendamment des rendez-vous du "
 "calendrier."
 
-#: ../C/evolution.xml:4328(para)
+#: ../C/evolution.xml:4561(para)
 msgid ""
 "You can use the list in a larger window by clicking the Tasks button in the "
 "side bar."
@@ -9955,7 +10389,7 @@ msgstr ""
 "Vous pouvez afficher cette liste dans une fenêtre plus grande en cliquant "
 "sur le bouton Tâches dans la barre latérale."
 
-#: ../C/evolution.xml:4329(para)
+#: ../C/evolution.xml:4562(para)
 msgid ""
 "Task Lists are more easily organized in the dedicated Tasks tool. Each task "
 "list is assigned a color, and you can use the Tasks tool switcher to hide "
@@ -9969,34 +10403,34 @@ msgstr ""
 "de l'affichage du calendrier, les tâches de toutes les listes de tâches "
 "visibles apparaissent, avec leur couleur respective."
 
-#: ../C/evolution.xml:4332(link) ../C/evolution.xml:4343(title)
+#: ../C/evolution.xml:4565(link) ../C/evolution.xml:4576(title)
 msgid "Creating a New Task List"
 msgstr "Création d'une nouvelle liste de tâches"
 
-#: ../C/evolution.xml:4335(link) ../C/evolution.xml:4362(title)
+#: ../C/evolution.xml:4568(link) ../C/evolution.xml:4595(title)
 msgid "Creating a New Task"
 msgstr "Création d'une nouvelle tâche"
 
-#: ../C/evolution.xml:4338(link) ../C/evolution.xml:4407(title)
+#: ../C/evolution.xml:4571(link) ../C/evolution.xml:4640(title)
 msgid "Assigned Tasks"
 msgstr "Tâches attribuées"
 
-#: ../C/evolution.xml:4346(para)
+#: ../C/evolution.xml:4579(para)
 msgid "Click File &gt; New &gt; Task List."
 msgstr "Choisissez Fichier &gt; Nouveau &gt; Liste de tâches"
 
-#: ../C/evolution.xml:4349(para)
+#: ../C/evolution.xml:4582(para)
 msgid "Specify the name and color for the task list."
 msgstr "Indiquez le nom et la couleur de la liste de tâches."
 
-#: ../C/evolution.xml:4352(para)
+#: ../C/evolution.xml:4585(para)
 msgid ""
 "(Optional) If the task is an online list, specify the URL of the task list."
 msgstr ""
 "(facultatif) Si la liste est publiée en ligne, indiquez l'URL de la liste de "
 "tâches."
 
-#: ../C/evolution.xml:4358(para)
+#: ../C/evolution.xml:4591(para)
 msgid ""
 "After you have added a task to your to-do list, its summary appears in the "
 "Summary section of the task list. To view or edit a detailed description of "
@@ -10016,26 +10450,26 @@ msgstr ""
 "modifier l'ordre et le type de tri, ou utilisez le clic droit pour ajouter "
 "ou enlever des colonnes de l'affichage."
 
-#: ../C/evolution.xml:4365(para)
+#: ../C/evolution.xml:4598(para)
 msgid "Click File &gt; New &gt; Task."
 msgstr "Choisissez Fichier &gt; Nouveau &gt; Tâche."
 
-#: ../C/evolution.xml:4368(para) ../C/evolution.xml:4419(para)
+#: ../C/evolution.xml:4601(para) ../C/evolution.xml:4652(para)
 msgid "Select a group for the task."
 msgstr "Sélectionnez un groupe pour la tâche."
 
-#: ../C/evolution.xml:4374(para)
+#: ../C/evolution.xml:4607(para)
 msgid "(Optional) Specify a starting date and ending date for the task."
 msgstr ""
 "(facultatif) Indiquez une date de début et une date de fin pour la tâche."
 
-#: ../C/evolution.xml:4377(para)
+#: ../C/evolution.xml:4610(para)
 msgid "(Optional) Specify a starting time and ending time for the task."
 msgstr ""
 "(facultatif) Indiquez une heure de début et une heure de fin pour la tâche."
 
-#: ../C/evolution.xml:4393(para) ../C/evolution.xml:4449(para)
-#: ../C/evolution.xml:4671(para)
+#: ../C/evolution.xml:4626(para) ../C/evolution.xml:4682(para)
+#: ../C/evolution.xml:4904(para)
 msgid ""
 "(Optional) Click Options &gt; Classifications, then select a classification "
 "(as Public, Private or Confidential)."
@@ -10043,7 +10477,7 @@ msgstr ""
 "(facultatif) Choisissez Options &gt; Classifications, puis sélectionnez une "
 "classification (Public, Privé ou Confidentiel)."
 
-#: ../C/evolution.xml:4396(para) ../C/evolution.xml:4452(para)
+#: ../C/evolution.xml:4629(para) ../C/evolution.xml:4685(para)
 msgid ""
 "(Optional) To specify a status for the task, click Options &gt; Status "
 "Details."
@@ -10051,11 +10485,11 @@ msgstr ""
 "(facultatif) Pour indiquer l'état d'une tâche, choisissez Options &gt; "
 "Détails de l'état."
 
-#: ../C/evolution.xml:4408(para)
+#: ../C/evolution.xml:4641(para)
 msgid "Evolution can be used to assign a task to multiple people."
 msgstr "Evolution permet d'attribuer des tâches à plusieurs personnes."
 
-#: ../C/evolution.xml:4409(para)
+#: ../C/evolution.xml:4642(para)
 msgid ""
 "When you assign a task, you can specify the attendees in several categories, "
 "such as <quote>chair</quote> or <quote>required.</quote> When you save the "
@@ -10067,21 +10501,21 @@ msgstr ""
 "enregistrez la tâche, chaque participant reçoit un courriel avec les "
 "informations de la tâche, et leur donne également la possibilité de répondre."
 
-#: ../C/evolution.xml:4410(para)
+#: ../C/evolution.xml:4643(para)
 msgid "To assign a new task:"
 msgstr "Pour attribuer une nouvelle tâche :"
 
-#: ../C/evolution.xml:4413(para)
+#: ../C/evolution.xml:4646(para)
 msgid "Click File &gt; New &gt; Assigned Task."
 msgstr "Choisissez Fichier &gt; Nouveau &gt; Tâche attribuée."
 
-#: ../C/evolution.xml:4422(para)
+#: ../C/evolution.xml:4655(para)
 msgid ""
 "Click Add, or press Insert key, or right click and then press Add to add the "
-"email addresses of people you want to assign the task.To remove an attendee "
-"from the list, select an attendee, then press Remove.To edit a field, select "
-"the field, then click Edit.Click View on the menu bar to show or hide the "
-"Type, Role, Status, and RSVP fields."
+"email addresses of people you want to assign the task. To remove an attendee "
+"from the list, select an attendee, then press Remove. To edit a field, "
+"select the field, then click Edit. Click View on the menu bar to show or "
+"hide the Type, Role, Status, and RSVP fields."
 msgstr ""
 "Cliquez sur Ajouter ou appuyez sur la touche Inser, ou faites un clic droit "
 "et choisissez Ajouter pour ajouter l'adresse électronique des personnes "
@@ -10090,7 +10524,7 @@ msgstr ""
 "sélectionnez-le et cliquez sur Édition. Ouvrez le menu Affichage pour "
 "afficher ou masquer les champs Type, Rôle, État ou RSVP."
 
-#: ../C/evolution.xml:4428(para)
+#: ../C/evolution.xml:4661(para)
 msgid ""
 "(Optional) Specify a starting date and time, and a due date and time for the "
 "task."
@@ -10098,22 +10532,22 @@ msgstr ""
 "(facultatif) Indiquez une date et une heure de début, ainsi qu'une date et "
 "une heure d'échéance pour la tâche."
 
-#: ../C/evolution.xml:4458(title)
+#: ../C/evolution.xml:4691(title)
 msgid "Searching for Task Items"
 msgstr "Recherche de tâches"
 
-#: ../C/evolution.xml:4461(para)
+#: ../C/evolution.xml:4694(para)
 msgid ""
 "Evolution enables you to find the task items by using Customized Search."
 msgstr ""
 "Evolution vous permet de chercher des tâches en utilisant la recherche "
 "personnalisée."
 
-#: ../C/evolution.xml:4482(para)
+#: ../C/evolution.xml:4715(para)
 msgid "Evolution displays the desired Task items."
 msgstr "Evolution affiche les tâches correspondantes."
 
-#: ../C/evolution.xml:4506(para)
+#: ../C/evolution.xml:4739(para)
 msgid ""
 "Displays all the task items that match the criteria that you have selected "
 "from the drop-down list at the top left side, just above the display pane."
@@ -10122,7 +10556,7 @@ msgstr ""
 "sélectionnés dans la liste déroulante en haut à gauche, juste au-dessus de "
 "la zone d'affichage."
 
-#: ../C/evolution.xml:4508(para)
+#: ../C/evolution.xml:4741(para)
 msgid ""
 "This feature provides the following best quick search options. This allows "
 "you to quickly see when tasks are due, as it can become unwieldy for "
@@ -10133,19 +10567,19 @@ msgstr ""
 "planification peut se révéler assez vite problématique si vous avez un grand "
 "nombre de tâches."
 
-#: ../C/evolution.xml:4510(title)
+#: ../C/evolution.xml:4743(title)
 msgid "Any Category:"
 msgstr "Toute catégorie :"
 
-#: ../C/evolution.xml:4511(para)
+#: ../C/evolution.xml:4744(para)
 msgid "Displays all the tasks that fall under any category."
 msgstr "Affiche toutes les tâches ayant une catégorie."
 
-#: ../C/evolution.xml:4514(title)
+#: ../C/evolution.xml:4747(title)
 msgid "Unmatched:"
 msgstr "Différent :"
 
-#: ../C/evolution.xml:4515(para)
+#: ../C/evolution.xml:4748(para)
 msgid ""
 "Displays all the tasks that do not fall under any of the categories listed "
 "here."
@@ -10153,21 +10587,21 @@ msgstr ""
 "Affiche toutes les tâches n'appartenant à aucune des catégories énumérées "
 "ici."
 
-#: ../C/evolution.xml:4518(title)
+#: ../C/evolution.xml:4751(title)
 msgid "Next 7 Days' Tasks:"
 msgstr "Tâches des 7 prochains jours :"
 
-#: ../C/evolution.xml:4519(para)
+#: ../C/evolution.xml:4752(para)
 msgid "Displays all the active tasks that are due within the next seven days."
 msgstr ""
 "Affiche toutes les tâches actives arrivant à échéance dans les 7 prochains "
 "jours."
 
-#: ../C/evolution.xml:4522(title)
+#: ../C/evolution.xml:4755(title)
 msgid "Active Tasks:"
 msgstr "Tâches actuelles :"
 
-#: ../C/evolution.xml:4523(para)
+#: ../C/evolution.xml:4756(para)
 msgid ""
 "Displays all the tasks whose due date is yet to come. This allows you to see "
 "the date due for tasks due in the future."
@@ -10176,35 +10610,35 @@ msgstr ""
 "Cela vous permet de voir les dates d'échéances de toutes les tâches dont la "
 "date d'échéance n'est pas encore passée."
 
-#: ../C/evolution.xml:4526(title)
+#: ../C/evolution.xml:4759(title)
 msgid "Over Due Tasks:"
 msgstr "Tâches en retard :"
 
-#: ../C/evolution.xml:4527(para)
+#: ../C/evolution.xml:4760(para)
 msgid "Displays all the tasks whose end date has already passed."
 msgstr "Affiche toutes les tâches dont la date d'échéance est passée."
 
-#: ../C/evolution.xml:4530(title)
+#: ../C/evolution.xml:4763(title)
 msgid "Completed Tasks:"
 msgstr "Tâches terminées :"
 
-#: ../C/evolution.xml:4531(para)
+#: ../C/evolution.xml:4764(para)
 msgid "Displays the tasks whose status is 100% completed."
 msgstr "Affiche toutes les tâches dont l'état est terminé à 100 %."
 
-#: ../C/evolution.xml:4534(title)
+#: ../C/evolution.xml:4767(title)
 msgid "Tasks With Attachment:"
 msgstr "Tâches avec une pièce jointe :"
 
-#: ../C/evolution.xml:4535(para)
+#: ../C/evolution.xml:4768(para)
 msgid "Displays all the tasks with attachments."
 msgstr "Affiche toutes les tâches possédant au moins une pièce jointe."
 
-#: ../C/evolution.xml:4538(title)
+#: ../C/evolution.xml:4771(title)
 msgid "&lt;List of Categories&gt;:"
 msgstr "&lt;Liste de catégories&gt; :"
 
-#: ../C/evolution.xml:4539(para)
+#: ../C/evolution.xml:4772(para)
 msgid ""
 "Lists all the tasks that belong to a particular category such as "
 "Anniversary, Holidays, Gifts, etc."
@@ -10212,48 +10646,48 @@ msgstr ""
 "Affiche la liste de toutes les tâches appartenant à une catégorie précise, "
 "telle que Anniversaire, Vacances, Cadeaux, etc."
 
-#: ../C/evolution.xml:4541(para)
+#: ../C/evolution.xml:4774(para)
 msgid "To perform quick search,"
 msgstr "Pour effectuer une recherche rapide,"
 
-#: ../C/evolution.xml:4544(para)
+#: ../C/evolution.xml:4777(para)
 msgid "Click the Show drop-down list from the Search bar."
 msgstr "Cliquez sur la liste déroulante Afficher dans la barre de recherche."
 
-#: ../C/evolution.xml:4556(para)
+#: ../C/evolution.xml:4789(para)
 msgid "Next 7 Days Tasks"
 msgstr "Tâches des 7 prochains jours"
 
-#: ../C/evolution.xml:4559(para)
+#: ../C/evolution.xml:4792(para)
 msgid "Active Tasks"
 msgstr "Tâches actuelles"
 
-#: ../C/evolution.xml:4562(para)
+#: ../C/evolution.xml:4795(para)
 msgid "Over Due Tasks"
 msgstr "Tâches en retard"
 
-#: ../C/evolution.xml:4565(para)
+#: ../C/evolution.xml:4798(para)
 msgid "Completed Tasks"
 msgstr "Tâches terminées"
 
-#: ../C/evolution.xml:4568(para)
+#: ../C/evolution.xml:4801(para)
 msgid "Tasks With Attachments"
 msgstr "Tâches avec une pièce jointe"
 
-#: ../C/evolution.xml:4592(para) ../C/evolution.xml:4787(para)
+#: ../C/evolution.xml:4825(para) ../C/evolution.xml:5020(para)
 msgid "Holidays"
 msgstr "Vacances"
 
-#: ../C/evolution.xml:4604(para) ../C/evolution.xml:4799(para)
+#: ../C/evolution.xml:4837(para) ../C/evolution.xml:5032(para)
 msgid "Key Customers"
 msgstr "Clients clés"
 
-#: ../C/evolution.xml:4636(para)
+#: ../C/evolution.xml:4869(para)
 msgid "You can view the desired items listed in the Task view."
 msgstr ""
 "Vous voyez apparaître les éléments souhaités dans l'affichage des tâches."
 
-#: ../C/evolution.xml:4642(para)
+#: ../C/evolution.xml:4875(para)
 msgid ""
 "In Evolution, the Memos component lets you create, edit, and store journal "
 "entries without dates, using the filesystem as a backend."
@@ -10262,25 +10696,25 @@ msgstr ""
 "stocker des notes journalisées sans date, stockées sur le système de "
 "fichiers."
 
-#: ../C/evolution.xml:4644(para)
+#: ../C/evolution.xml:4877(para)
 msgid "To create a new memo entry:"
 msgstr "Pour créer une nouvelle note mémo :"
 
-#: ../C/evolution.xml:4647(para)
+#: ../C/evolution.xml:4880(para)
 msgid "Click File &gt; New &gt; Memo."
 msgstr "Choisissez Fichier &gt; Nouveau &gt; Mémo."
 
-#: ../C/evolution.xml:4650(para) ../C/evolution.xml:5720(para)
+#: ../C/evolution.xml:4883(para) ../C/evolution.xml:5953(para)
 msgid "Select the Group in which you would like to create the entry."
 msgstr "Sélectionnez le groupe dans lequel vous souhaitez créer l'élément."
 
-#: ../C/evolution.xml:4654(para)
+#: ../C/evolution.xml:4887(para)
 msgid "To show or hide Categories field, click View &gt; Categories."
 msgstr ""
 "Pour afficher ou masquer le champ Catégories, choisissez Affichage &gt; "
 "Catégories."
 
-#: ../C/evolution.xml:4660(para) ../C/evolution.xml:5726(para)
+#: ../C/evolution.xml:4893(para) ../C/evolution.xml:5959(para)
 msgid ""
 "In the Start Date field, type the date this reminder note should appear in "
 "the recipients' Calendars."
@@ -10288,11 +10722,11 @@ msgstr ""
 "Dans le champ « Date de début », saisissez la date à laquelle cette note de "
 "rappel doit apparaître dans le calendrier des destinataires."
 
-#: ../C/evolution.xml:4676(title)
+#: ../C/evolution.xml:4909(title)
 msgid "The Memo List"
 msgstr "La liste des mémos"
 
-#: ../C/evolution.xml:4677(para)
+#: ../C/evolution.xml:4910(para)
 msgid ""
 "As with calendars and tasks, you can create multiple memo lists. Each memo "
 "list is assigned a color, and you can use the side bar to hide and show memo "
@@ -10302,23 +10736,23 @@ msgstr ""
 "de mémos. Une couleur est attribuée à chaque liste, et il est possible de "
 "masquer et d'afficher les différentes listes à l'aide de la barre latérale."
 
-#: ../C/evolution.xml:4678(para)
+#: ../C/evolution.xml:4911(para)
 msgid "To create a new memo list:"
 msgstr "Pour créer une nouvelle liste de mémos :"
 
-#: ../C/evolution.xml:4681(para)
+#: ../C/evolution.xml:4914(para)
 msgid "Click File &gt; New &gt; Memo List."
 msgstr "Choisissez Fichier &gt; Nouveau &gt; Liste de mémos."
 
-#: ../C/evolution.xml:4684(para)
+#: ../C/evolution.xml:4917(para)
 msgid "Enter the type, name and color for the memo list."
 msgstr "Saisissez le type, le nom et la couleur de la liste de mémos."
 
-#: ../C/evolution.xml:4693(title)
+#: ../C/evolution.xml:4926(title)
 msgid "Searching for Memo Items"
 msgstr "Recherche de mémos"
 
-#: ../C/evolution.xml:4694(para)
+#: ../C/evolution.xml:4927(para)
 msgid ""
 "You can use a customized search, an advanced search, or a quick search to "
 "search for Memo Items."
@@ -10326,18 +10760,18 @@ msgstr ""
 "Vous pouvez utiliser une recherche personnalisée, une recherche avancée ou "
 "une recherche rapide pour chercher des mémos."
 
-#: ../C/evolution.xml:4697(para)
+#: ../C/evolution.xml:4930(para)
 msgid ""
 "Evolution enables you to find the Memo items by using a Customized Search."
 msgstr ""
 "Evolution vous permet de chercher des mémos en utilisant la recherche "
 "personnalisée."
 
-#: ../C/evolution.xml:4727(para)
+#: ../C/evolution.xml:4960(para)
 msgid "Select the desired search type from the drop-down list."
 msgstr "Choisissez le type de recherche souhaité dans la liste déroulante."
 
-#: ../C/evolution.xml:4750(para)
+#: ../C/evolution.xml:4983(para)
 msgid ""
 "Displays all the Memo items that match the criteria that you have selected "
 "from the Show drop-down list in the Search bar."
@@ -10345,12 +10779,12 @@ msgstr ""
 "Affiche tous les mémos correspondant aux critères que vous avez sélectionnés "
 "dans la liste déroulante Afficher dans la barre de recherche."
 
-#: ../C/evolution.xml:4829(para)
+#: ../C/evolution.xml:5062(para)
 msgid "You can view the desired items listed in the Memo view."
 msgstr ""
 "Vous voyez apparaître les éléments souhaités dans l'affichage des mémos."
 
-#: ../C/evolution.xml:4837(para)
+#: ../C/evolution.xml:5070(para)
 msgid ""
 "Evolution supports the use of time zones. If you share calendar files with "
 "friends or co-workers, you might need to configure your time zone."
@@ -10359,21 +10793,21 @@ msgstr ""
 "avec des amis ou des collègues de travail, il se peut que vous deviez "
 "configurer votre fuseau horaire."
 
-#: ../C/evolution.xml:4843(para)
+#: ../C/evolution.xml:5076(para)
 msgid "Click the icon next to the Time Zone field, then select your location."
 msgstr ""
 "Cliquez sur l'icône à côté du champ Fuseau horaire, puis choisissez votre "
 "emplacement."
 
-#: ../C/evolution.xml:4844(para)
+#: ../C/evolution.xml:5077(para)
 msgid "Each red dot represents a major city."
 msgstr "Chaque point rouge représente une ville importante."
 
-#: ../C/evolution.xml:4847(para)
+#: ../C/evolution.xml:5080(para)
 msgid "Select a city, then click OK."
 msgstr "Sélectionnez une ville, puis cliquez sur Valider."
 
-#: ../C/evolution.xml:4850(para)
+#: ../C/evolution.xml:5083(para)
 msgid ""
 "You can also configure time zone information specific to each appointment. "
 "To do that, simply create a new appointment and click the globe to customize "
@@ -10390,11 +10824,11 @@ msgstr ""
 "assurer de bien coordonner vos horaires. La définition de fuseaux horaires "
 "spécifiques par rendez-vous aide à éviter les confusions possibles."
 
-#: ../C/evolution.xml:4854(title)
+#: ../C/evolution.xml:5087(title)
 msgid "Marcus Bains Line"
 msgstr "Ligne de l'heure courante"
 
-#: ../C/evolution.xml:4855(para)
+#: ../C/evolution.xml:5088(para)
 msgid ""
 "The Marcus Bains Line is a marker to show the current date and time. This "
 "feature is available in the Evolution calendar."
@@ -10402,7 +10836,7 @@ msgstr ""
 "La ligne de l'heure courante est une marque pour afficher la date et l'heure "
 "actuelle. Cette fonctionnalité est disponible dans le calendrier d'Evolution."
 
-#: ../C/evolution.xml:4861(para)
+#: ../C/evolution.xml:5094(para)
 msgid ""
 "<trademark>Evolution</trademark> Exchange for Microsoft Exchange allows "
 "Evolution clients to access accounts on Microsoft Exchange 2000 and 2003 "
@@ -10413,28 +10847,28 @@ msgstr ""
 "2000 et 2003. Comme Evolution, c'estégalement du logiciel libre et placé "
 "sous licence GPL."
 
-#: ../C/evolution.xml:4864(link) ../C/evolution.xml:4884(title)
+#: ../C/evolution.xml:5097(link) ../C/evolution.xml:5117(title)
 msgid "Evolution Exchange Features"
 msgstr "Fonctionnalités de Evolution Exchange"
 
-#: ../C/evolution.xml:4867(link) ../C/evolution.xml:4986(title)
+#: ../C/evolution.xml:5100(link) ../C/evolution.xml:5219(title)
 msgid "Adding Your Exchange Account to Evolution"
 msgstr "Ajout d'un compte Exchange à Evolution"
 
-#: ../C/evolution.xml:4870(link) ../C/evolution.xml:5104(title)
+#: ../C/evolution.xml:5103(link) ../C/evolution.xml:5337(title)
 msgid "Accessing the Exchange Server"
 msgstr "Accès au serveur Exchange"
 
-#: ../C/evolution.xml:4873(link) ../C/evolution.xml:5112(title)
+#: ../C/evolution.xml:5106(link) ../C/evolution.xml:5345(title)
 msgid "Settings Exclusive to Evolution Exchange"
 msgstr "Paramètres propres à Evolution Exchange"
 
-#: ../C/evolution.xml:4876(link) ../C/evolution.xml:5135(link)
-#: ../C/evolution.xml:5357(title)
+#: ../C/evolution.xml:5109(link) ../C/evolution.xml:5368(link)
+#: ../C/evolution.xml:5590(title)
 msgid "Scheduling Meetings with Free/Busy"
 msgstr "Planification de réunions avec Libre/Occupé"
 
-#: ../C/evolution.xml:4880(para)
+#: ../C/evolution.xml:5113(para)
 msgid ""
 "Evolution Exchange works only with Exchange 2000 and later, and requires "
 "that Outlook Web Access be enabled. Each user needs a valid Microsoft "
@@ -10444,24 +10878,24 @@ msgstr ""
 "et requiert que Outlook Web Access soit activé. Chaque utilisateur doit "
 "avoir un compte serveur Exchange valide, et une licence."
 
-#: ../C/evolution.xml:4885(para)
+#: ../C/evolution.xml:5118(para)
 msgid ""
 "Evolution Exchange supports the following basic Microsoft Exchange features:"
 msgstr ""
 "Evolution Exchange prend en charge les fonctionnalités basiques de Microsoft "
 "Exchange suivantes :"
 
-#: ../C/evolution.xml:4888(para) ../C/evolution.xml:6562(link)
-#: ../C/evolution.xml:6573(title) ../C/evolution.xml:6621(link)
-#: ../C/evolution.xml:6635(title)
+#: ../C/evolution.xml:5121(para) ../C/evolution.xml:6771(link)
+#: ../C/evolution.xml:6782(title) ../C/evolution.xml:6830(link)
+#: ../C/evolution.xml:6844(title)
 msgid "General"
 msgstr "Général"
 
-#: ../C/evolution.xml:4892(title)
+#: ../C/evolution.xml:5125(title)
 msgid "Remote Exchange Information Store:"
 msgstr "Stockage d'informations Exchange distant :"
 
-#: ../C/evolution.xml:4893(para)
+#: ../C/evolution.xml:5126(para)
 msgid ""
 "Allows you to access mail, address book (including the Global Address List "
 "folder), calendars, and task folders on an Exchange server from Evolution."
@@ -10470,19 +10904,19 @@ msgstr ""
 "dossier Liste d'adresses globale), calendriers et dossiers de tâches sur un "
 "serveur Exchange à partir d'Evolution."
 
-#: ../C/evolution.xml:4898(title)
+#: ../C/evolution.xml:5131(title)
 msgid "Palm Synchronization:"
 msgstr "Synchronisation du Palm :"
 
-#: ../C/evolution.xml:4899(para)
+#: ../C/evolution.xml:5132(para)
 msgid "Supported for Contacts and Calendars on Exchange."
 msgstr "Prise en charge pour les contacts et calendriers sur Exchange."
 
-#: ../C/evolution.xml:4904(title)
+#: ../C/evolution.xml:5137(title)
 msgid "Password Management:"
 msgstr "Gestion du mot de passe :"
 
-#: ../C/evolution.xml:4905(para)
+#: ../C/evolution.xml:5138(para)
 msgid ""
 "Allows you to reset your password. If your password has expired, Evolution "
 "asks you to change your password at startup."
@@ -10490,15 +10924,15 @@ msgstr ""
 "Vous permet de réinitialiser votre mot de passe. Si celui-ci a expiré,"
 "Evolution demande de le changer au démarrage."
 
-#: ../C/evolution.xml:4911(para) ../C/evolution.xml:5446(para)
+#: ../C/evolution.xml:5144(para) ../C/evolution.xml:5679(para)
 msgid "Mail"
 msgstr "Messagerie"
 
-#: ../C/evolution.xml:4915(title)
+#: ../C/evolution.xml:5148(title)
 msgid "Viewing Mail in Exchange Folders:"
 msgstr "Affichage des courriels dans les dossiers Exchange :"
 
-#: ../C/evolution.xml:4916(para)
+#: ../C/evolution.xml:5149(para)
 msgid ""
 "Mail stored on the Exchange server is visible in the Mail component in "
 "Evolution."
@@ -10506,11 +10940,11 @@ msgstr ""
 "Les courriels stockés sur un serveur Exchange sont visibles dans le "
 "composant Courriel d'Evolution."
 
-#: ../C/evolution.xml:4921(title)
+#: ../C/evolution.xml:5154(title)
 msgid "Sending Email via Exchange Protocols:"
 msgstr "Envoi de courriels via les protocoles Exchange :"
 
-#: ../C/evolution.xml:4922(para)
+#: ../C/evolution.xml:5155(para)
 msgid ""
 "If you use the Microsoft Exchange mail transport protocol to send email, "
 "make sure that the address you have entered as your email address is exactly "
@@ -10523,11 +10957,11 @@ msgstr ""
 "correspond exactement à celle du serveur Exchange. Cela pourrait être "
 "« votrenom@exchange-serveur.exemple.com » plutôt que « votrenom@exemple.com »."
 
-#: ../C/evolution.xml:4927(title)
+#: ../C/evolution.xml:5160(title)
 msgid "Out of Office Message:"
 msgstr "Message d'absence du bureau :"
 
-#: ../C/evolution.xml:4928(para)
+#: ../C/evolution.xml:5161(para)
 msgid ""
 "You can set <quote>out of Office</quote> message that will automatically be "
 "sent to people who send mail to you while you are away from office."
@@ -10536,11 +10970,11 @@ msgstr ""
 "tous les gens qui vous envoient des messages lorsque vous n'êtes pas au "
 "bureau."
 
-#: ../C/evolution.xml:4933(title)
+#: ../C/evolution.xml:5166(title)
 msgid "Send Options:"
 msgstr "Options d'envoi :"
 
-#: ../C/evolution.xml:4934(para)
+#: ../C/evolution.xml:5167(para)
 msgid ""
 "You can set the priority and sensitivity of the sent message so that the "
 "recipients will know how important the message is.The priority can have one "
@@ -10556,16 +10990,16 @@ msgstr ""
 "Confidentiel). Vous pouvez aussi activer l'accusé de réception et l'accusé "
 "de lecture pour les messages envoyés."
 
-#: ../C/evolution.xml:4940(para) ../C/evolution.xml:5469(para)
-#: ../C/evolution.xml:7017(link) ../C/evolution.xml:7087(title)
+#: ../C/evolution.xml:5173(para) ../C/evolution.xml:5702(para)
+#: ../C/evolution.xml:7350(link) ../C/evolution.xml:7420(title)
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: ../C/evolution.xml:4944(title)
+#: ../C/evolution.xml:5177(title)
 msgid "Meeting Requests/Proposal:"
 msgstr "Demande/proposition de réunion :"
 
-#: ../C/evolution.xml:4945(para)
+#: ../C/evolution.xml:5178(para)
 msgid ""
 "Allows Evolution users to schedule meetings. You can check when other users "
 "are busy according to their calendars and send the meeting requests "
@@ -10575,11 +11009,11 @@ msgstr ""
 "vérifier les disponibilités des autres utilisateurs et envoyer les demandes "
 "de réunion possibles."
 
-#: ../C/evolution.xml:4950(title)
+#: ../C/evolution.xml:5183(title)
 msgid "Adding iCalendar Meeting Requests to the Calendar:"
 msgstr "Ajout de demandes de réunion iCalendar au calendrier :"
 
-#: ../C/evolution.xml:4951(para)
+#: ../C/evolution.xml:5184(para)
 msgid ""
 "Allows you to add the iCalendar meeting requests you receive to your "
 "Exchange calendar. Note that you need to specify the calendar from the list, "
@@ -10589,24 +11023,24 @@ msgstr ""
 "votre calendrier Exchange. Remarquez que vous devez indiquer le calendrier "
 "auquel vous  voulez ajouter les réunions planifiées à partir de la liste."
 
-#: ../C/evolution.xml:4957(para) ../C/evolution.xml:5381(para)
-#: ../C/evolution.xml:5480(para)
+#: ../C/evolution.xml:5190(para) ../C/evolution.xml:5614(para)
+#: ../C/evolution.xml:5713(para)
 msgid "Contacts"
 msgstr "Contacts"
 
-#: ../C/evolution.xml:4961(title)
+#: ../C/evolution.xml:5194(title)
 msgid "Address Completion:"
 msgstr "Saisie automatique d'adresse :"
 
-#: ../C/evolution.xml:4962(para)
+#: ../C/evolution.xml:5195(para)
 msgid "Supported for your Exchange Contacts folder."
 msgstr "Pris en charge pour votre dossier de contacts Exchange."
 
-#: ../C/evolution.xml:4967(title)
+#: ../C/evolution.xml:5200(title)
 msgid "Adding vCards to the Address Book:"
 msgstr "Ajout de cartes de visite vCards au carnet d'adresses :"
 
-#: ../C/evolution.xml:4968(para)
+#: ../C/evolution.xml:5201(para)
 msgid ""
 "Allows you to save the vCards you receive in attachment to your Exchange "
 "address book.New Address Book entries can also be created on Exchange from "
@@ -10616,11 +11050,11 @@ msgstr ""
 "jointes au carnet d'adresses Evolution. De nouvelles adresses peuvent aussi "
 "être créées dans Exchange à partir des courriels reçus par un simple clic."
 
-#: ../C/evolution.xml:4974(para)
+#: ../C/evolution.xml:5207(para)
 msgid "Work Offline (disconnected mode)"
 msgstr "Travail hors ligne (mode déconnecté)"
 
-#: ../C/evolution.xml:4975(para)
+#: ../C/evolution.xml:5208(para)
 msgid ""
 "To mark a folder for offline usage, right-click the folder, then click "
 "Properties. Click Copy Folder Content Locally for Offline Operation. For "
@@ -10633,11 +11067,11 @@ msgstr ""
 "d'informations, voir <link linkend=\"usage-mail-getnsend-offline\">Travail "
 "hors ligne</link>."
 
-#: ../C/evolution.xml:4980(para)
+#: ../C/evolution.xml:5213(para)
 msgid "Recall Message function is not available."
 msgstr "La fonction de rappel de message n'est pas disponible."
 
-#: ../C/evolution.xml:4987(para)
+#: ../C/evolution.xml:5220(para)
 msgid ""
 "After you have installed Evolution Exchange, you need to set up access for "
 "your Exchange account on both the Exchange server and within Evolution."
@@ -10645,35 +11079,35 @@ msgstr ""
 "Après l'installation de Evolution Exchange, vous devez configurer l'accès à "
 "votre compte Exchange aussi bien sur le serveur Exchange que dans Evolution."
 
-#: ../C/evolution.xml:4990(link) ../C/evolution.xml:5007(title)
+#: ../C/evolution.xml:5223(link) ../C/evolution.xml:5240(title)
 msgid "Exchange Server Settings"
 msgstr "Paramètres du serveur Exchange"
 
-#: ../C/evolution.xml:4993(link) ../C/evolution.xml:5021(title)
+#: ../C/evolution.xml:5226(link) ../C/evolution.xml:5254(title)
 msgid "Standard Configuration Tool for Evolution Exchange"
 msgstr "Outil de configuration standard pour Evolution Exchange"
 
-#: ../C/evolution.xml:4996(link) ../C/evolution.xml:5025(title)
+#: ../C/evolution.xml:5229(link) ../C/evolution.xml:5258(title)
 msgid "Simple Configuration Tool for Evolution Exchange"
 msgstr "Outil de configuration simplifié pour Evolution Exchange"
 
-#: ../C/evolution.xml:4999(link) ../C/evolution.xml:5032(title)
+#: ../C/evolution.xml:5232(link) ../C/evolution.xml:5265(title)
 msgid "Creating a New Exchange Account"
 msgstr "Création d'un compte Exchange"
 
-#: ../C/evolution.xml:5002(link) ../C/evolution.xml:5056(title)
+#: ../C/evolution.xml:5235(link) ../C/evolution.xml:5289(title)
 msgid "Configuring an Existing Account for Evolution Exchange Account"
 msgstr "Configuration d'un compte existant pour l'utiliser avec Exchange"
 
-#: ../C/evolution.xml:5008(para)
+#: ../C/evolution.xml:5241(para)
 msgid "Check with your system administrator to ensure that:"
 msgstr "Contactez votre administrateur système pour vérifier que :"
 
-#: ../C/evolution.xml:5011(para)
+#: ../C/evolution.xml:5244(para)
 msgid "You have a valid account on the Exchange server."
 msgstr "Vous disposez d'un compte valide sur le serveur Exchange."
 
-#: ../C/evolution.xml:5014(para)
+#: ../C/evolution.xml:5247(para)
 msgid ""
 "You are permitted to access the account with WebDAV. This is the default "
 "setting for the Exchange server, so unless your system administrator has "
@@ -10683,7 +11117,7 @@ msgstr ""
 "par défaut du serveur Exchange. Si votre administrateur système ne l'a pas "
 "désactivé, aucun changement n'est nécessaire."
 
-#: ../C/evolution.xml:5017(para)
+#: ../C/evolution.xml:5250(para)
 msgid ""
 "The <ulink url=\"http://support.novell.com\"><trademark class=\"registered"
 "\">Novell</trademark> Web site Knowledgebase</ulink> has additional "
@@ -10695,7 +11129,7 @@ msgstr ""
 "informations supplémentaires pour vérifier que votre serveur Exchange "
 "accepte les connexions provenant d'Evolution."
 
-#: ../C/evolution.xml:5022(para)
+#: ../C/evolution.xml:5255(para)
 msgid ""
 "When you know that your server is ready for you to connect, you are ready to "
 "add your Exchange account to Evolution Exchange."
@@ -10703,7 +11137,7 @@ msgstr ""
 "Lorsque vous savez que le serveur est prêt à accepter les connexions, vous "
 "pouvez ajouter votre compte Exchange à Evolution Exchange."
 
-#: ../C/evolution.xml:5026(para)
+#: ../C/evolution.xml:5259(para)
 msgid ""
 "Evolution Exchange comes with a simple account creation tool for Exchange "
 "accounts."
@@ -10711,7 +11145,7 @@ msgstr ""
 "Evolution Exchange fournit un outil simplifié de création de compte pour "
 "Exchange."
 
-#: ../C/evolution.xml:5027(para)
+#: ../C/evolution.xml:5260(para)
 msgid ""
 "If you have no accounts configured, the simple account configuration "
 "assistant starts when you start Evolution. It asks only for the Outlook Web "
@@ -10723,7 +11157,7 @@ msgstr ""
 "d'Outlook Web Access, votre nom d'utilisateur et votre mot de passe. "
 "Evolution Exchange détermine les informations restantes pour vous."
 
-#: ../C/evolution.xml:5028(para)
+#: ../C/evolution.xml:5261(para)
 msgid ""
 "If the simple account configuration tool does not run automatically, you "
 "need to create an account manually. For more information on how to do this, "
@@ -10735,7 +11169,7 @@ msgstr ""
 "<link linkend=\"config-exchange-new-account\">Création d'un compte Exchange</"
 "link>."
 
-#: ../C/evolution.xml:5043(para)
+#: ../C/evolution.xml:5276(para)
 msgid ""
 "Create the account following the procedure in <link linkend=\"usage-"
 "mainwindow-starting\">Starting Evolution for the First Time</link>. Remember "
@@ -10746,13 +11180,13 @@ msgstr ""
 "Pensez  à sélectionner Microsoft Exchange comme type de serveur dans la "
 "section Réception de messages."
 
-#: ../C/evolution.xml:5049(para)
+#: ../C/evolution.xml:5282(para)
 msgid "Only one Microsoft Exchange account can be configured in Evolution."
 msgstr ""
 "Vous ne pouvez configurer qu'un seul compte Microsoft Exchange dans "
 "Evolution."
 
-#: ../C/evolution.xml:5057(para)
+#: ../C/evolution.xml:5290(para)
 msgid ""
 "Use the following procedure to configure your existing account for Evolution "
 "Exchange:"
@@ -10760,7 +11194,7 @@ msgstr ""
 "Suivez la procédure ci-après pour configurer un compte déjà existant afin de "
 "l'utiliser avec Evolution Exchange."
 
-#: ../C/evolution.xml:5063(para)
+#: ../C/evolution.xml:5296(para)
 msgid ""
 "Select the account you want to convert, then click Edit to appear the "
 "Account Editor."
@@ -10768,15 +11202,15 @@ msgstr ""
 "Sélectionnez le compte à convertir, puis cliquez sur Édition pour afficher "
 "l'éditeur de compte."
 
-#: ../C/evolution.xml:5064(para)
+#: ../C/evolution.xml:5297(para)
 msgid "You can view Identity tab enabled."
 msgstr "Vous pouvez voir l'onglet Identité."
 
-#: ../C/evolution.xml:5069(para) ../C/evolution.xml:5643(para)
+#: ../C/evolution.xml:5302(para) ../C/evolution.xml:5876(para)
 msgid "Change your email address as needed."
 msgstr "Changez votre adresse électronique si nécessaire."
 
-#: ../C/evolution.xml:5072(para)
+#: ../C/evolution.xml:5305(para)
 msgid ""
 "Click the Receiving Mail tab, then select Microsoft Exchange as your server "
 "type."
@@ -10784,7 +11218,7 @@ msgstr ""
 "Cliquez sur l'onglet de Réception des courriels, puis sélectionnez Microsoft "
 "Exchange comme type de serveur."
 
-#: ../C/evolution.xml:5077(para)
+#: ../C/evolution.xml:5310(para)
 msgid ""
 "Type your user name, and the Outlook Web Access (OWA) URL. Click "
 "Authenticate, then enter the password at the prompt. The Exchange server "
@@ -10794,11 +11228,11 @@ msgstr ""
 "Cliquez sur S'authentifier, puis saisissez le mot de passe lorsqu'on vous le "
 "demande. Le serveur Exchange authentifie votre compte."
 
-#: ../C/evolution.xml:5085(para) ../C/evolution.xml:5657(para)
+#: ../C/evolution.xml:5318(para) ../C/evolution.xml:5890(para)
 msgid "Click the Receiving Options tab."
 msgstr "Cliquez sur l'onglet des Options de réception."
 
-#: ../C/evolution.xml:5086(para)
+#: ../C/evolution.xml:5319(para)
 msgid ""
 "Specify how often to check for new mail, your Global Catalog server name and "
 "whether to apply filters to messages in your Inbox, check for junk, set a "
@@ -10810,7 +11244,7 @@ msgstr ""
 "d'expiration du mot de passe, et tout autre paramètre que vous souhaitez "
 "inclure."
 
-#: ../C/evolution.xml:5089(para)
+#: ../C/evolution.xml:5322(para)
 msgid ""
 "Use the Defaults tab to define folders, send cc: or bcc: messages to certain "
 "IDs, and set options for message receipts."
@@ -10819,15 +11253,15 @@ msgstr ""
 "copies cc: ou cci: à certaines personnes, et pour définir les options "
 "d'accusés de réception."
 
-#: ../C/evolution.xml:5092(para)
+#: ../C/evolution.xml:5325(para)
 msgid "Use the Security tab to set PGP and s/MIME options."
 msgstr "Utilisez l'onglet Sécurité pour définir les options PGP et s/MIME."
 
-#: ../C/evolution.xml:5095(para)
+#: ../C/evolution.xml:5328(para)
 msgid "Quit Evolution and restart it."
 msgstr "Quittez, puis redémarrez Evolution."
 
-#: ../C/evolution.xml:5096(para)
+#: ../C/evolution.xml:5329(para)
 msgid ""
 "Changes to Evolution Exchange accounts configuration are not active until "
 "you have restarted the application."
@@ -10835,7 +11269,7 @@ msgstr ""
 "Les modifications de la configuration du compte Exchange ne prendront effet "
 "qu'après un redémarrage de l'application."
 
-#: ../C/evolution.xml:5105(para)
+#: ../C/evolution.xml:5338(para)
 msgid ""
 "When you have installed Evolution Exchange, you can access public folders "
 "and perform certain Exchange actions like delegation and password "
@@ -10855,7 +11289,7 @@ msgstr ""
 "composant Contacts pour les contacts et le composant Calendrier pour "
 "planifier votre emploi du temps."
 
-#: ../C/evolution.xml:5106(para)
+#: ../C/evolution.xml:5339(para)
 msgid ""
 "If you are using both an Exchange account and a local mail account, you "
 "should be aware that whenever you save an email address or appointment from "
@@ -10873,7 +11307,7 @@ msgstr ""
 "sont synchronisés dans les dossiers Exchange, plutôt quand dans les dossiers "
 "locaux."
 
-#: ../C/evolution.xml:5107(para)
+#: ../C/evolution.xml:5340(para)
 msgid ""
 "To avoid unnecessary strain on the server, the Global Address List (GAL) "
 "appears empty until you search for something in it."
@@ -10881,7 +11315,7 @@ msgstr ""
 "Pour éviter de surcharger le serveur, la liste d'adresses globale est vide "
 "tant que vous n'y recherchez pas un élément."
 
-#: ../C/evolution.xml:5113(para)
+#: ../C/evolution.xml:5346(para)
 msgid ""
 "There are some settings in Evolution that are available only with Evolution "
 "Exchange, like delegation and permission handling, creating <quote>Out of "
@@ -10892,31 +11326,31 @@ msgstr ""
 "création des messages « Absent du bureau », la modification du mot de passe "
 "et l'affichage de la taille des dossiers."
 
-#: ../C/evolution.xml:5117(link) ../C/evolution.xml:5140(title)
+#: ../C/evolution.xml:5350(link) ../C/evolution.xml:5373(title)
 msgid "Send Options"
 msgstr "Options d'envoi"
 
-#: ../C/evolution.xml:5120(link) ../C/evolution.xml:5221(title)
+#: ../C/evolution.xml:5353(link) ../C/evolution.xml:5454(title)
 msgid "Access Delegation"
 msgstr "Délégation des accès"
 
-#: ../C/evolution.xml:5123(link) ../C/evolution.xml:5225(title)
+#: ../C/evolution.xml:5356(link) ../C/evolution.xml:5458(title)
 msgid "Delegating Access to Others"
 msgstr "Délégation des accès"
 
-#: ../C/evolution.xml:5126(link) ../C/evolution.xml:5275(title)
+#: ../C/evolution.xml:5359(link) ../C/evolution.xml:5508(title)
 msgid "Subscribe to Other Users' Folders"
 msgstr "Abonnement aux dossiers d'autres utilisateurs"
 
-#: ../C/evolution.xml:5129(link) ../C/evolution.xml:5299(title)
+#: ../C/evolution.xml:5362(link) ../C/evolution.xml:5532(title)
 msgid "Subscribe to Public Folders"
 msgstr "Abonnement à des dossiers publics"
 
-#: ../C/evolution.xml:5132(link) ../C/evolution.xml:5329(title)
+#: ../C/evolution.xml:5365(link) ../C/evolution.xml:5562(title)
 msgid "Setting an Out of Office Message"
 msgstr "Définition d'un message d'absence du bureau"
 
-#: ../C/evolution.xml:5141(para)
+#: ../C/evolution.xml:5374(para)
 msgid ""
 "You can set the priority and sensitivity of the sent message from an "
 "exchange account so that the recipients will know how important the message "
@@ -10932,11 +11366,11 @@ msgstr ""
 "(Normal, Personnel, Privé, Confidentiel). Vous pouvez aussi activer l'accusé "
 "de réception et l'accusé de lecture pour les messages envoyés."
 
-#: ../C/evolution.xml:5144(title)
+#: ../C/evolution.xml:5377(title)
 msgid "Tracking Options"
 msgstr "Options de suivi"
 
-#: ../C/evolution.xml:5145(para)
+#: ../C/evolution.xml:5378(para)
 msgid ""
 "Evolution lets you track the status of an item you have sent. You can enable "
 "the Delivery Receipt request as well as Read Receipt request so that you "
@@ -10947,25 +11381,25 @@ msgstr ""
 "lecture afin de savoir quand l'élément envoyé est arrivé chez les "
 "destinataires et quand il a été lu."
 
-#: ../C/evolution.xml:5146(para)
+#: ../C/evolution.xml:5379(para)
 msgid "To set the importance and sensitivity of the message:"
 msgstr "Pour définir l'importance et la sensibilité d'un message :"
 
-#: ../C/evolution.xml:5149(para)
+#: ../C/evolution.xml:5382(para)
 msgid "Open a Compose Message window."
 msgstr "Ouvrez la fenêtre d'édition d'un message."
 
-#: ../C/evolution.xml:5152(para)
+#: ../C/evolution.xml:5385(para)
 msgid "Select the exchange account from the From field."
 msgstr "Sélectionnez le compte Exchange à partir du champ De."
 
-#: ../C/evolution.xml:5155(para)
+#: ../C/evolution.xml:5388(para)
 msgid "Click Insert &gt; Send Options to open the Send Option dialog box"
 msgstr ""
 "Choisissez Insertion &gt; Options d'envoi pour ouvrir la boîte de dialogue "
 "des options d'envoi."
 
-#: ../C/evolution.xml:5160(para)
+#: ../C/evolution.xml:5393(para)
 msgid ""
 "Select the priority for your sent message from the given three options "
 "(Normal, High, Low)"
@@ -10973,7 +11407,7 @@ msgstr ""
 "Choisissez la priorité du message à envoyer parmi les trois options "
 "disponibles (Normale, Élevée, Faible)."
 
-#: ../C/evolution.xml:5163(para)
+#: ../C/evolution.xml:5396(para)
 msgid ""
 "Select the sensitivity for your sent message from the given four options "
 "(Normal, Personal, Private, Confidential)."
@@ -10981,11 +11415,11 @@ msgstr ""
 "Choisissez la sensibilité du message à envoyer parmi les quatre options "
 "disponibles (Normal, Personnel, Privé, Confidentiel)."
 
-#: ../C/evolution.xml:5167(title)
+#: ../C/evolution.xml:5400(title)
 msgid "Message Access Delegation:"
 msgstr "Délégation d'accès aux messages :"
 
-#: ../C/evolution.xml:5168(para)
+#: ../C/evolution.xml:5401(para)
 msgid ""
 "Click Send as Delegate to send the message to the recipient on behalf of "
 "someone else."
@@ -10993,7 +11427,7 @@ msgstr ""
 "Cliquez sur « Envoyer en tant que délégué » pour envoyer le message au "
 "destinataire au nom de quelqu'un d'autre."
 
-#: ../C/evolution.xml:5171(para)
+#: ../C/evolution.xml:5404(para)
 msgid ""
 "To send a calendar item as delegate, you should subscribe to the delegator's "
 "message and also you should have necessary rights assigned to you by the "
@@ -11003,13 +11437,13 @@ msgstr ""
 "abonner aux messages de la personne concernée, et celle-ci doit vous avoir "
 "donné les permissions nécessaires."
 
-#: ../C/evolution.xml:5175(para)
+#: ../C/evolution.xml:5408(para)
 msgid "Click User to open Show Contacts dialog box."
 msgstr ""
 "Cliquez sur Utilisateur pour ouvrir la boîte de dialogue Afficher les "
 "contacts."
 
-#: ../C/evolution.xml:5178(para)
+#: ../C/evolution.xml:5411(para)
 msgid ""
 "Select the contact from the desired Address book and click Add, then close "
 "the dialog box."
@@ -11017,7 +11451,7 @@ msgstr ""
 "Choisissez le contact à partir du carnet d'adresses souhaité, cliquez sur "
 "Ajouter, puis fermez la boîte de dialogue."
 
-#: ../C/evolution.xml:5180(para)
+#: ../C/evolution.xml:5413(para)
 msgid ""
 "You are not permitted to send a message on behalf of more than one person at "
 "a time."
@@ -11025,7 +11459,7 @@ msgstr ""
 "Vous n'avez pas le droit d'envoyer un message de la part de plus d'une "
 "personne à la fois."
 
-#: ../C/evolution.xml:5182(para)
+#: ../C/evolution.xml:5415(para)
 msgid ""
 "When the recipient opens the mail, he or she can also read a message that "
 "<guilabel>The message was sent by &lt;Delegator's name&gt; on behalf of &lt;"
@@ -11036,7 +11470,7 @@ msgstr ""
 "délégué&gt; de la part de &lt;Nom du délégué&gt; » sur la barre d'en-tête de "
 "la zone d'aperçu."
 
-#: ../C/evolution.xml:5187(para)
+#: ../C/evolution.xml:5420(para)
 msgid ""
 "Select the Request a delivery receipt for this message check box to get a "
 "delivery receipt from your recipient."
@@ -11044,7 +11478,7 @@ msgstr ""
 "Cochez « Demander un accusé de réception pour ce message » pour obtenir un "
 "accusé de réception de la part de vos destinataires."
 
-#: ../C/evolution.xml:5190(para)
+#: ../C/evolution.xml:5423(para)
 msgid ""
 "Select the Request a read receipt for this message to get a read receipt for "
 "the message you have sent."
@@ -11052,11 +11486,11 @@ msgstr ""
 "Cochez « Demander un accusé de lecture pour ce message » pour obtenir un "
 "accusé de lecture de messages envoyés."
 
-#: ../C/evolution.xml:5199(title)
+#: ../C/evolution.xml:5432(title)
 msgid "Delegating Calendar Items"
 msgstr "Délégation d'éléments de calendrier"
 
-#: ../C/evolution.xml:5200(para)
+#: ../C/evolution.xml:5433(para)
 msgid ""
 "You can send Meetings or Appointments on behalf of someone else if you have "
 "subscribed to his or her Calendar."
@@ -11064,23 +11498,23 @@ msgstr ""
 "Vous pouvez envoyez des réunions ou des rendez-vous de la part de quelqu'un "
 "d'autre si vous vous êtes abonné à son calendrier."
 
-#: ../C/evolution.xml:5203(para)
+#: ../C/evolution.xml:5436(para)
 msgid "Select the delegator's Calendar."
 msgstr "Sélectionnez le calendrier de la personne pour laquelle vous agissez."
 
-#: ../C/evolution.xml:5206(para)
+#: ../C/evolution.xml:5439(para)
 msgid "Open a new Meeting composer window."
 msgstr "Ouvrez la fenêtre d'édition d'une nouvelle réunion."
 
-#: ../C/evolution.xml:5209(para)
+#: ../C/evolution.xml:5442(para)
 msgid "Add the recipients."
 msgstr "Ajoutez les destinataires."
 
-#: ../C/evolution.xml:5212(para)
+#: ../C/evolution.xml:5445(para)
 msgid "Fill in the information."
 msgstr "Complétez les informations."
 
-#: ../C/evolution.xml:5214(para)
+#: ../C/evolution.xml:5447(para)
 msgid ""
 "When the recipient receives the calendar item, a message indicates that the "
 "item was created by someone on behalf of the Delegator."
@@ -11089,7 +11523,7 @@ msgstr ""
 "que l'élément a été créé par quelqu'un qui agit pour le compte d'une autre "
 "personne."
 
-#: ../C/evolution.xml:5222(para)
+#: ../C/evolution.xml:5455(para)
 msgid ""
 "You can allow other people in your organization's Global Address List to "
 "access your calendar, address book, and messages, and they can let you "
@@ -11103,27 +11537,27 @@ msgstr ""
 "telles que vérifier mutuellement leurs planifications ou gérer mutuellement "
 "et complètement leurs informations personnelles."
 
-#: ../C/evolution.xml:5226(para)
+#: ../C/evolution.xml:5459(para)
 msgid "To add someone to your list of delegates:"
 msgstr "Pour ajouter une personne à votre liste de délégués :"
 
-#: ../C/evolution.xml:5232(para)
+#: ../C/evolution.xml:5465(para)
 msgid "Click the Exchange Settings tab."
 msgstr "Cliquez sur l'onglet Paramètres Exchange."
 
-#: ../C/evolution.xml:5235(para)
+#: ../C/evolution.xml:5468(para)
 msgid "Click Delegation Assistant to open the Delegates dialog box."
 msgstr ""
 "Cliquez sur Assistant de délégation pour ouvrir la boîte de dialogue de "
 "délégation."
 
-#: ../C/evolution.xml:5240(para)
+#: ../C/evolution.xml:5473(para)
 msgid "Click Add, then search for a contact in the Global Address List."
 msgstr ""
 "Cliquez sur Ajouter, puis recherchez un contact dans la liste d'adresses "
 "globale."
 
-#: ../C/evolution.xml:5241(para)
+#: ../C/evolution.xml:5474(para)
 msgid ""
 "Remember that the Global Address List (GAL) appears empty until you have "
 "searched for something in it."
@@ -11131,7 +11565,7 @@ msgstr ""
 "Souvenez-vous que la liste d'adresses globale (GAL) paraît vide tant que "
 "vous n'avez pas effectué une première recherche."
 
-#: ../C/evolution.xml:5244(para)
+#: ../C/evolution.xml:5477(para)
 msgid ""
 "Select the delegate and click Edit to open the delegate permission dialog "
 "box."
@@ -11139,7 +11573,7 @@ msgstr ""
 "Sélectionnez le délégué et cliquez sur Édition pour ouvrir la boîte de "
 "dialogue de délégation de permissions."
 
-#: ../C/evolution.xml:5249(para)
+#: ../C/evolution.xml:5482(para)
 msgid ""
 "Select from the following access levels for each of the four types of "
 "folders:"
@@ -11147,15 +11581,15 @@ msgstr ""
 "Pour chacun des quatre types de dossiers, vous pouvez sélectionner l'un des "
 "niveaux d'accès suivants :"
 
-#: ../C/evolution.xml:5252(para)
+#: ../C/evolution.xml:5485(para)
 msgid "Do not allow this person to access any folders of this type."
 msgstr "ne permet pas à la personne d'accéder à ce type de dossier."
 
-#: ../C/evolution.xml:5255(title)
+#: ../C/evolution.xml:5488(title)
 msgid "Reviewer (read-only):"
 msgstr "Relecteur (lecture seule) :"
 
-#: ../C/evolution.xml:5256(para)
+#: ../C/evolution.xml:5489(para)
 msgid ""
 "Allows the delegate to see items in this type of folder, but not create new "
 "items or edit existing items."
@@ -11163,11 +11597,11 @@ msgstr ""
 "permet à la personne d'afficher les éléments de ce type de dossier, mais pas "
 "de créer des éléments, ni d'en modifier."
 
-#: ../C/evolution.xml:5259(title)
+#: ../C/evolution.xml:5492(title)
 msgid "Author (read, create):"
 msgstr "Auteur (lecture, création) :"
 
-#: ../C/evolution.xml:5260(para)
+#: ../C/evolution.xml:5493(para)
 msgid ""
 "The delegate can view items in your folders, and can create new items, but "
 "cannot change any existing items."
@@ -11175,17 +11609,17 @@ msgstr ""
 "le délégué peut afficher les éléments de vos dossiers et peut en créer, mais "
 "il ne peut pas modifier les éléments existants."
 
-#: ../C/evolution.xml:5263(title)
+#: ../C/evolution.xml:5496(title)
 msgid "Editor (read, create, edit):"
 msgstr "Éditeur (lecture, création, modification) :"
 
-#: ../C/evolution.xml:5264(para)
+#: ../C/evolution.xml:5497(para)
 msgid "The delegate can view, create, and change items in your folders."
 msgstr ""
 "le délégué peut afficher et modifier les éléments de vos dossiers et en "
 "créer."
 
-#: ../C/evolution.xml:5271(para)
+#: ../C/evolution.xml:5504(para)
 msgid ""
 "The delegate is notified through a separate mail that he or she is being "
 "added to your list of delegates. The mail summarizes all the rights that "
@@ -11194,15 +11628,15 @@ msgstr ""
 "Le délégué est averti par un courriel distinct qu'il a été ajouté à votre "
 "liste de délégués. Le message résume tous les droits qu'il a reçus."
 
-#: ../C/evolution.xml:5276(para)
+#: ../C/evolution.xml:5509(para)
 msgid "To access the folders delegated to you:"
 msgstr "Pour accéder aux dossiers qui vous sont délégués :"
 
-#: ../C/evolution.xml:5279(para)
+#: ../C/evolution.xml:5512(para)
 msgid "Click File &gt; Subscribe to Other User's Exchange Folder."
 msgstr "Choisissez Fichier &gt; S'abonner à un dossier d'un autre utilisateur."
 
-#: ../C/evolution.xml:5284(para)
+#: ../C/evolution.xml:5517(para)
 msgid ""
 "Specify the email address of the user who has delegated to you, or click "
 "User to select the user from your address book."
@@ -11211,11 +11645,11 @@ msgstr ""
 "ou cliquez sur Utilisateur pour sélectionner l'utilisateur dans votre carnet "
 "d'adresses."
 
-#: ../C/evolution.xml:5287(para)
+#: ../C/evolution.xml:5520(para)
 msgid "Select the folder you want to open."
 msgstr "Sélectionnez le dossier à ouvrir."
 
-#: ../C/evolution.xml:5293(para)
+#: ../C/evolution.xml:5526(para)
 msgid ""
 "Folders delegated to you appear in your folder list inside a folder labeled "
 "with the name of its owner. For example, if Martha Thompson delegates "
@@ -11228,7 +11662,7 @@ msgstr ""
 "dans l'arborescence des dossiers au même niveau que vos dossiers personnels "
 "et publics."
 
-#: ../C/evolution.xml:5294(para)
+#: ../C/evolution.xml:5527(para)
 msgid ""
 "If the folder fails to open properly, check with the folder owner to make "
 "sure that you have been granted the correct access permissions."
@@ -11237,32 +11671,32 @@ msgstr ""
 "dossier pour vérifier s'il vous a accordé les autorisations d'accès "
 "appropriées."
 
-#: ../C/evolution.xml:5300(para)
+#: ../C/evolution.xml:5533(para)
 msgid "You can subscribe to public folders available on the Exchange server."
 msgstr ""
 "Vous pouvez vous abonner aux dossiers publics disponibles sur le serveur "
 "Exchange."
 
-#: ../C/evolution.xml:5306(para)
+#: ../C/evolution.xml:5539(para)
 msgid "Select the Exchange account."
 msgstr "Sélectionnez le compte Exchange."
 
-#: ../C/evolution.xml:5309(para)
+#: ../C/evolution.xml:5542(para)
 msgid "Check the folders you want to subscribe to."
 msgstr "Cochez les dossiers auxquels vous souhaitez vous abonner."
 
-#: ../C/evolution.xml:5315(para)
+#: ../C/evolution.xml:5548(para)
 msgid ""
 "The folders you have subscribed to appear in the folder list at the left."
 msgstr ""
 "Les dossiers auxquels vous vous êtes abonnés apparaissent dans la liste des "
 "dossiers sur la gauche."
 
-#: ../C/evolution.xml:5318(para)
+#: ../C/evolution.xml:5551(para)
 msgid "To view contents of a folder, click it."
 msgstr "Pour afficher le contenu d'un dossier, cliquez sur celui-ci."
 
-#: ../C/evolution.xml:5325(para)
+#: ../C/evolution.xml:5558(para)
 msgid ""
 "Reminders for meetings in your Exchange calendar do not work until you have "
 "run Evolution at least once after logging in. This is different from locally "
@@ -11281,7 +11715,7 @@ msgstr ""
 "Exchange, cochez la case « Se souvenir du mot de passe ». Pour en savoir plus "
 "sur les rappels, consultez <link linkend=\"bshly4v\">Rappels</link>."
 
-#: ../C/evolution.xml:5330(para)
+#: ../C/evolution.xml:5563(para)
 msgid ""
 "An Out of Office message is an automatic reply that you can send as a reply "
 "to messages, explaining why you are not immediately responding to their "
@@ -11296,11 +11730,11 @@ msgstr ""
 "accéder à votre courrier, vous pouvez définir une réponse automatique pour "
 "indiquer aux personnes que vous ne les ignorez pas."
 
-#: ../C/evolution.xml:5336(para)
+#: ../C/evolution.xml:5569(para)
 msgid "Select the Exchange account, then click Edit."
 msgstr "Sélectionnez le compte Exchange, puis cliquez sur Édition."
 
-#: ../C/evolution.xml:5339(para)
+#: ../C/evolution.xml:5572(para)
 msgid ""
 "Select the Exchange Settings tab. The top option allows you to set an Out of "
 "Office message."
@@ -11308,15 +11742,15 @@ msgstr ""
 "Sélectionnez l'onglet Paramètres Exchange. La première option vous permet de "
 "définir un message d'absence du bureau."
 
-#: ../C/evolution.xml:5342(para)
+#: ../C/evolution.xml:5575(para)
 msgid "Click I Am Currently Out of the Office."
 msgstr "Cochez « Je suis actuellement absent du bureau »."
 
-#: ../C/evolution.xml:5345(para)
+#: ../C/evolution.xml:5578(para)
 msgid "Type a short message in the text field."
 msgstr "Saisissez un bref message dans le champ de texte."
 
-#: ../C/evolution.xml:5352(para)
+#: ../C/evolution.xml:5585(para)
 msgid ""
 "Your message is automatically sent to anyone who sends you mail until you "
 "return and select I Am in the office."
@@ -11325,7 +11759,7 @@ msgstr ""
 "écrivent jusqu'à ce que vous soyez de retour et cliquiez sur « Je suis "
 "actuellement au bureau »."
 
-#: ../C/evolution.xml:5358(para)
+#: ../C/evolution.xml:5591(para)
 msgid ""
 "Evolution helps you fix a convenient time for a meeting according to the "
 "availability of the attendees.It's Free/Busy feature allows you to perform a "
@@ -11339,11 +11773,11 @@ msgstr ""
 "sont disponibles d'après leur calendrier Exchange. En cas de non "
 "disponibilité, vous pouvez réagender la réunion."
 
-#: ../C/evolution.xml:5362(para)
+#: ../C/evolution.xml:5595(para)
 msgid "Create a new appointment in the calendar."
 msgstr "Ouvrez un nouveau rendez-vous dans le calendrier."
 
-#: ../C/evolution.xml:5365(para)
+#: ../C/evolution.xml:5598(para)
 msgid ""
 "Right-click the appointment, then select Schedule Meeting to appear "
 "Evolution Meeting editor."
@@ -11351,12 +11785,12 @@ msgstr ""
 "Faites un clic droit sur le rendez-vous, puis choisissez « Planifier une "
 "réunion » pour faire apparaître l'éditeur de réunion d'Evolution."
 
-#: ../C/evolution.xml:5368(para)
+#: ../C/evolution.xml:5601(para)
 msgid "Click the Add tab to enter the email addresses into the list."
 msgstr ""
 "Cliquez sur Ajouter pour ajouter des adresses électroniques dans la liste."
 
-#: ../C/evolution.xml:5371(para)
+#: ../C/evolution.xml:5604(para)
 msgid ""
 "Click the Attendees tab to select the participants from Global Address List "
 "(GAL)."
@@ -11364,18 +11798,18 @@ msgstr ""
 "Cliquez sur Participants pour sélectionner des participants à partir de la "
 "liste d'adresses globale (GAL)."
 
-#: ../C/evolution.xml:5372(para)
+#: ../C/evolution.xml:5605(para)
 msgid ""
 "You can directly select the participants from the following address lists."
 msgstr ""
 "Vous pouvez sélectionnez directement des participants dans les listes "
 "d'adresses suivantes."
 
-#: ../C/evolution.xml:5378(para)
+#: ../C/evolution.xml:5611(para)
 msgid "Global Address List"
 msgstr "Liste d'adresses globale"
 
-#: ../C/evolution.xml:5384(para)
+#: ../C/evolution.xml:5617(para)
 msgid ""
 "You can also specify the category as Anniversary, Birthday, Business etc. "
 "from the drop-down list for each address list given."
@@ -11383,31 +11817,31 @@ msgstr ""
 "Vous pouvez aussi indiquer une catégorie (Anniversaire, Bureau, etc.) dans "
 "la liste déroulante correspondante de chaque liste d'adresses."
 
-#: ../C/evolution.xml:5387(para)
+#: ../C/evolution.xml:5620(para)
 msgid "Add the participants to the following categories of attendees."
 msgstr "Ajoutez des participants dans les catégories suivantes."
 
-#: ../C/evolution.xml:5390(para)
+#: ../C/evolution.xml:5623(para)
 msgid "Chair Persons"
 msgstr "Présidents"
 
-#: ../C/evolution.xml:5393(para)
+#: ../C/evolution.xml:5626(para)
 msgid "Required Participants"
 msgstr "Participants attendus"
 
-#: ../C/evolution.xml:5396(para)
+#: ../C/evolution.xml:5629(para)
 msgid "Optional Participants"
 msgstr "Participants optionnels"
 
-#: ../C/evolution.xml:5399(para)
+#: ../C/evolution.xml:5632(para)
 msgid "Resources"
 msgstr "Ressources"
 
-#: ../C/evolution.xml:5404(para)
+#: ../C/evolution.xml:5637(para)
 msgid "Click Free/Busy tool at the top right corner."
 msgstr "Cliquez sur Libre/Occupé à droite de la barre d'outils."
 
-#: ../C/evolution.xml:5407(para)
+#: ../C/evolution.xml:5640(para)
 msgid ""
 "Click Options &gt; Update Free/Busy to check participant schedules and, if "
 "possible, update the meeting in all participants' calendars"
@@ -11416,7 +11850,7 @@ msgstr ""
 "planifications des participants et, si possible, mettre à jour la réunion "
 "dans les calendriers de tous les participants."
 
-#: ../C/evolution.xml:5410(para)
+#: ../C/evolution.xml:5643(para)
 msgid ""
 "If meeting attendees are not available during the times you have scheduled a "
 "meeting, you can <quote>nudge</quote> the meeting forward or backward to the "
@@ -11435,7 +11869,7 @@ msgstr ""
 "convient pas, vous pouvez faire glisser les bords de l'horaire de la réunion "
 "vers les heures que vous voulez sélectionner."
 
-#: ../C/evolution.xml:5416(para)
+#: ../C/evolution.xml:5649(para)
 msgid ""
 "<trademark>Evolution</trademark> can access accounts on <trademark class="
 "\"registered\">Novell</trademark><trademark class=\"registered\">GroupWise</"
@@ -11445,35 +11879,35 @@ msgstr ""
 "<trademark class=\"registered\">Novell</trademark><trademark class="
 "\"registered\">GroupWise</trademark> 7."
 
-#: ../C/evolution.xml:5419(link) ../C/evolution.xml:5442(title)
+#: ../C/evolution.xml:5652(link) ../C/evolution.xml:5675(title)
 msgid "GroupWise Features"
 msgstr "Fonctionnalités GroupWise"
 
-#: ../C/evolution.xml:5422(link) ../C/evolution.xml:5531(title)
+#: ../C/evolution.xml:5655(link) ../C/evolution.xml:5764(title)
 msgid "GroupWise Terminology vs. Evolution Terminology"
 msgstr "Terminologie GroupWise vs. terminologie Evolution"
 
-#: ../C/evolution.xml:5425(link) ../C/evolution.xml:5602(title)
+#: ../C/evolution.xml:5658(link) ../C/evolution.xml:5835(title)
 msgid "Adding your GroupWise Account to Evolution"
 msgstr "Ajout d'un compte GroupWise à Evolution"
 
-#: ../C/evolution.xml:5428(link) ../C/evolution.xml:5743(title)
+#: ../C/evolution.xml:5661(link) ../C/evolution.xml:5976(title)
 msgid "Scheduling Appointments with Free/Busy"
 msgstr "Planification de rendez-vous avec Libre/Occupé"
 
-#: ../C/evolution.xml:5431(link) ../C/evolution.xml:5765(title)
+#: ../C/evolution.xml:5664(link) ../C/evolution.xml:5998(title)
 msgid "Managing Sent Items"
 msgstr "Gestion des éléments envoyés"
 
-#: ../C/evolution.xml:5434(link) ../C/evolution.xml:5946(title)
+#: ../C/evolution.xml:5667(link) ../C/evolution.xml:6179(title)
 msgid "Giving Other People Access to Your Mailbox or Calendar"
 msgstr "Accès à la messagerie et au calendrier par d'autres personnes"
 
-#: ../C/evolution.xml:5437(link) ../C/evolution.xml:6117(title)
+#: ../C/evolution.xml:5670(link) ../C/evolution.xml:6350(title)
 msgid "Junk Mail Handling"
 msgstr "Gestion du pourriel"
 
-#: ../C/evolution.xml:5443(para)
+#: ../C/evolution.xml:5676(para)
 msgid ""
 "GroupWise connectivity in Evolution supports the following basic Novell "
 "GroupWise features:"
@@ -11481,24 +11915,24 @@ msgstr ""
 "La connectivité GroupWise dans Evolution gère les fonctionnalités GroupWise "
 "de base suivantes :"
 
-#: ../C/evolution.xml:5449(para)
+#: ../C/evolution.xml:5682(para)
 msgid "Viewing mail and folders stored on the GroupWise system."
 msgstr ""
 "Affichage des courriels et des dossiers stockés sur un système GroupWise."
 
-#: ../C/evolution.xml:5452(para)
+#: ../C/evolution.xml:5685(para)
 msgid "Sending mail from you GroupWise account."
 msgstr "Envoi de messages depuis votre compte GroupWise."
 
-#: ../C/evolution.xml:5455(para)
+#: ../C/evolution.xml:5688(para)
 msgid "Converting mail to a task or meeting."
 msgstr "Conversion de messages en tâches ou rendez-vous."
 
-#: ../C/evolution.xml:5458(para)
+#: ../C/evolution.xml:5691(para)
 msgid "Tracking the status of a message."
 msgstr "Suivi de l'état d'un message."
 
-#: ../C/evolution.xml:5461(para)
+#: ../C/evolution.xml:5694(para)
 msgid ""
 "Marking a message as junk mail adds the sender to your GroupWise junk mail "
 "list."
@@ -11506,11 +11940,11 @@ msgstr ""
 "Le signalement d'un message comme pourriel ajoute l'expéditeur à votre liste "
 "de pourriels GroupWise."
 
-#: ../C/evolution.xml:5464(para)
+#: ../C/evolution.xml:5697(para)
 msgid "Improved Status Tracking."
 msgstr "Suivi d'état amélioré."
 
-#: ../C/evolution.xml:5472(para)
+#: ../C/evolution.xml:5705(para)
 msgid ""
 "You can send and receive appointment and meeting requests. Allows Evolution "
 "users to schedule meetings and view attendee availability for other users on "
@@ -11520,7 +11954,7 @@ msgstr ""
 "Cela permet aux utilisateurs d'Evolution de planifier des réunions et de "
 "consulter la disponibilité d'autres utilisateurs de GroupWise."
 
-#: ../C/evolution.xml:5475(para)
+#: ../C/evolution.xml:5708(para)
 msgid ""
 "You can receive an iCalendar meeting request and add it to your GroupWise "
 "calendar."
@@ -11528,7 +11962,7 @@ msgstr ""
 "Vous pouvez recevoir une demande de réunion iCalendar et l'ajouter à votre "
 "calendrier GroupWise."
 
-#: ../C/evolution.xml:5483(para)
+#: ../C/evolution.xml:5716(para)
 msgid ""
 "Address Completion is supported for your GroupWise address books, including "
 "the System address book, the Frequent Contacts address book, and your "
@@ -11538,7 +11972,7 @@ msgstr ""
 "d'adresses GroupWise, y compris le carnet d'adresses système, le carnet "
 "d'adresses Contacts fréquents et le carnet d'adresses personnel."
 
-#: ../C/evolution.xml:5486(para)
+#: ../C/evolution.xml:5719(para)
 msgid ""
 "If you receive a card attachment and click Save in Address Book, it is saved "
 "to your Personal address book. New Address Book entries can also be added to "
@@ -11549,7 +11983,7 @@ msgstr ""
 "carnet d'adresses personnel. De nouvelles adresses peuvent également être "
 "ajoutées à votre carnet d'adresses personnel à partir de courriels reçus."
 
-#: ../C/evolution.xml:5489(para)
+#: ../C/evolution.xml:5722(para)
 msgid ""
 "To create your GroupWise Frequent contacts and Personal address books, you "
 "need to access your GroupWise account once through GroupWise Java client "
@@ -11563,11 +11997,11 @@ msgstr ""
 "carnet d'adresses système de GroupWise est par défaut marqué accessible hors "
 "ligne. Cela améliore les performances."
 
-#: ../C/evolution.xml:5494(para) ../C/evolution.xml:5566(para)
+#: ../C/evolution.xml:5727(para) ../C/evolution.xml:5799(para)
 msgid "Reminder Note"
 msgstr "Notes de rappel"
 
-#: ../C/evolution.xml:5497(para)
+#: ../C/evolution.xml:5730(para)
 msgid ""
 "GroupWise Reminder Note is integrated into Memo component. You can view the "
 "Reminder notes listed under Memos at the bottom right of the Calendar view "
@@ -11578,40 +12012,40 @@ msgstr ""
 "l'affichage du calendrier, pour autant que vous les ayez sélectionnées dans "
 "le composant Mémos."
 
-#: ../C/evolution.xml:5502(para)
+#: ../C/evolution.xml:5735(para)
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../C/evolution.xml:5505(para)
+#: ../C/evolution.xml:5738(para)
 msgid "You can assign Proxy access to other users."
 msgstr "Vous pouvez attribuer un accès Proxy à d'autres utilisateurs."
 
-#: ../C/evolution.xml:5508(para)
+#: ../C/evolution.xml:5741(para)
 msgid "You can view other users' accounts through Proxy access."
 msgstr ""
 "Vous pouvez voir les comptes d'autres utilisateurs au moyen de l'accès Proxy."
 
-#: ../C/evolution.xml:5513(para)
+#: ../C/evolution.xml:5746(para)
 msgid "There are, however, some features that are not available:"
 msgstr "Certaines fonctionnalités ne sont cependant pas disponibles :"
 
-#: ../C/evolution.xml:5516(para)
+#: ../C/evolution.xml:5749(para)
 msgid "Resending items"
 msgstr "Renvois d'éléments"
 
-#: ../C/evolution.xml:5519(para)
+#: ../C/evolution.xml:5752(para)
 msgid "Retracting items"
 msgstr "Retraits d'éléments"
 
-#: ../C/evolution.xml:5522(para)
+#: ../C/evolution.xml:5755(para)
 msgid "Accepting appointments or meetings in offline mode"
 msgstr "Acceptation de rendez-vous ou de réunions en mode hors ligne."
 
-#: ../C/evolution.xml:5525(para)
+#: ../C/evolution.xml:5758(para)
 msgid "Archive"
 msgstr "Archive"
 
-#: ../C/evolution.xml:5532(para)
+#: ../C/evolution.xml:5765(para)
 msgid ""
 "GroupWise and Evolution sometimes uses different terminology for different "
 "types of items. The following table compares GroupWise terminology to "
@@ -11621,55 +12055,55 @@ msgstr ""
 "certains types d'éléments. Le tableau ci-après compare la terminologie "
 "GroupWise avec la terminologie Evolution."
 
-#: ../C/evolution.xml:5540(para)
+#: ../C/evolution.xml:5773(para)
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../C/evolution.xml:5550(para) ../C/evolution.xml:5561(para)
+#: ../C/evolution.xml:5783(para) ../C/evolution.xml:5794(para)
 msgid "Appointment"
 msgstr "Rendez-vous"
 
-#: ../C/evolution.xml:5553(para)
+#: ../C/evolution.xml:5786(para)
 msgid "Meeting"
 msgstr "Réunion"
 
-#: ../C/evolution.xml:5558(para)
+#: ../C/evolution.xml:5791(para)
 msgid "Posted Appointment"
 msgstr "Rendez-vous posté"
 
-#: ../C/evolution.xml:5569(para) ../C/evolution.xml:5593(para)
+#: ../C/evolution.xml:5802(para) ../C/evolution.xml:5826(para)
 msgid "None; use a task"
 msgstr "Aucun ; utilisez les tâches"
 
-#: ../C/evolution.xml:5574(para)
+#: ../C/evolution.xml:5807(para)
 msgid "Discussion Note"
 msgstr "Note de discussion"
 
-#: ../C/evolution.xml:5577(para)
+#: ../C/evolution.xml:5810(para)
 msgid "None; use an assigned task"
 msgstr "Aucun ; utilisez les tâches attribuées"
 
-#: ../C/evolution.xml:5582(para)
+#: ../C/evolution.xml:5815(para)
 msgid "Phone Message"
 msgstr "Message téléphonique"
 
-#: ../C/evolution.xml:5585(para)
+#: ../C/evolution.xml:5818(para)
 msgid "None; use a message"
 msgstr "Aucun ; utilisez les messages"
 
-#: ../C/evolution.xml:5590(para)
+#: ../C/evolution.xml:5823(para)
 msgid "Checklist"
 msgstr "Liste de contrôle"
 
-#: ../C/evolution.xml:5605(link) ../C/evolution.xml:5613(title)
+#: ../C/evolution.xml:5838(link) ../C/evolution.xml:5846(title)
 msgid "Creating a New GroupWise Account"
 msgstr "Création d'un compte GroupWise"
 
-#: ../C/evolution.xml:5608(link) ../C/evolution.xml:5628(title)
+#: ../C/evolution.xml:5841(link) ../C/evolution.xml:5861(title)
 msgid "Changing an Existing Account to Work with GroupWise"
 msgstr "Modification d'un compte existant pour l'utiliser avec GroupWise"
 
-#: ../C/evolution.xml:5622(para)
+#: ../C/evolution.xml:5855(para)
 msgid ""
 "Create the account following the procedure in <link linkend=\"usage-"
 "mainwindow-starting\">Starting Evolution for the First Time</link>."
@@ -11677,7 +12111,7 @@ msgstr ""
 "Créez un compte selon la procédure indiquée dans <link linkend=\"usage-"
 "mainwindow-starting\">Démarrage d'Evolution pour la première fois</link>."
 
-#: ../C/evolution.xml:5629(para)
+#: ../C/evolution.xml:5862(para)
 msgid ""
 "If you have an existing email account, and want to convert it to use with "
 "GroupWise:"
@@ -11685,15 +12119,15 @@ msgstr ""
 "Si vous disposez d'un compte de messagerie et que vous voulez le convertir "
 "afin de l'utiliser avec GroupWise :"
 
-#: ../C/evolution.xml:5635(para)
+#: ../C/evolution.xml:5868(para)
 msgid "Select the account you want to convert, then click Edit."
 msgstr "Sélectionnez le compte à convertir, puis cliquez sur Édition."
 
-#: ../C/evolution.xml:5638(para)
+#: ../C/evolution.xml:5871(para)
 msgid "Click the Identity tab."
 msgstr "Cliquez sur l'onglet Identité."
 
-#: ../C/evolution.xml:5646(para)
+#: ../C/evolution.xml:5879(para)
 msgid ""
 "Click the Receiving Email tab, then select Novell GroupWise as your server "
 "type."
@@ -11701,7 +12135,7 @@ msgstr ""
 "Cliquez sur l'onglet Réception des courriels, puis sélectionnez Novell "
 "GroupWise comme type de serveur."
 
-#: ../C/evolution.xml:5651(para)
+#: ../C/evolution.xml:5884(para)
 msgid ""
 "Type the name of your mail server, your user name, and select whether to use "
 "SSL."
@@ -11709,15 +12143,15 @@ msgstr ""
 "Saisissez le nom de votre serveur de messagerie, votre nom d'utilisateur et "
 "choisissez s'il faut utiliser SSL."
 
-#: ../C/evolution.xml:5653(para)
+#: ../C/evolution.xml:5886(para)
 msgid ""
-"Select SSL for a highly secured connection between your client and server. "
-"Contact your administrator for further details."
+"Select Use SSL to enable a secure connection between Evolution and the "
+"server."
 msgstr ""
-"Choisissez SSL pour une connexion hautement sécurisée entre le client et le "
-"serveur. Contactez votre administrateur pour plus de détails."
+"Cochez « Utiliser SSL » pour activer la communication sécurisée entre "
+"Evolution et le serveur."
 
-#: ../C/evolution.xml:5678(para)
+#: ../C/evolution.xml:5911(para)
 msgid ""
 "Select if you want to automatically synchronize your remote calendar and "
 "contacts locally."
@@ -11725,7 +12159,7 @@ msgstr ""
 "Choisisssez si vous voulez synchroniser automatiquement les contacts et le "
 "calendrier avec votre système local."
 
-#: ../C/evolution.xml:5679(para)
+#: ../C/evolution.xml:5912(para)
 msgid ""
 "It fetches the remote calendar and contact information and stores it on your "
 "local drive."
@@ -11733,7 +12167,7 @@ msgstr ""
 "Evolution récupère les informations des contacts et du calendrier distants "
 "et les stocke sur votre disque local."
 
-#: ../C/evolution.xml:5681(para)
+#: ../C/evolution.xml:5914(para)
 msgid ""
 "Remote calendar and contacts are typically stored remotely on servers rather "
 "than on local hard disk."
@@ -11741,7 +12175,7 @@ msgstr ""
 "Les contacts et le calendrier distants sont généralement stockés à distance "
 "sur les serveurs plutôt que sur les disques durs locaux."
 
-#: ../C/evolution.xml:5685(para)
+#: ../C/evolution.xml:5918(para)
 msgid ""
 "Specify your Post Office Agent SOAP port in the Post Office Agent SOAP Port "
 "field."
@@ -11749,7 +12183,7 @@ msgstr ""
 "Indiquez le port SOAP de l'agent de bureau de poste dans le champ "
 "correspondant."
 
-#: ../C/evolution.xml:5689(para)
+#: ../C/evolution.xml:5922(para)
 msgid ""
 "(Optional) Click the Proxy tab, then click Add to add any Proxy users to "
 "your account."
@@ -11757,11 +12191,11 @@ msgstr ""
 "(facultatif) Cliquez sur l'onglet Proxy, puis sur Ajouter pour ajouter des "
 "utilisateurs Proxy à votre compte."
 
-#: ../C/evolution.xml:5700(title)
+#: ../C/evolution.xml:5933(title)
 msgid "Reminder Notes"
 msgstr "Notes de rappel"
 
-#: ../C/evolution.xml:5701(para)
+#: ../C/evolution.xml:5934(para)
 msgid ""
 "GroupWise Reminder notes are like mail messages except they are scheduled "
 "for a particular day and appear on the Calendar for that date. You can use "
@@ -11777,7 +12211,7 @@ msgstr ""
 "indiquée. Elles n'apparaissent pas dans votre boîte de messagerie ni dans "
 "celle d'autres utilisateurs."
 
-#: ../C/evolution.xml:5702(para)
+#: ../C/evolution.xml:5935(para)
 msgid ""
 "Evolution integrates this feature into its Memo component so that you can "
 "view the Reminder notes listed under Memo at the right bottom side of the "
@@ -11787,7 +12221,7 @@ msgstr ""
 "vous puissiez voir les notes de rappel dans la liste des mémos en bas à "
 "droite de la vue calendrier."
 
-#: ../C/evolution.xml:5704(para)
+#: ../C/evolution.xml:5937(para)
 msgid ""
 "Select the memo or the Reminder notes under the Memo component to display it "
 "on the Calendar view."
@@ -11795,7 +12229,7 @@ msgstr ""
 "Sélectionnez le mémo ou la note de rappel dans le composant Mémos afin de "
 "l'afficher dans la vue Calendrier."
 
-#: ../C/evolution.xml:5707(para)
+#: ../C/evolution.xml:5940(para)
 msgid ""
 "To create a new Reminder Note follow <link linkend=\"b1012vde\">Step 1</"
 "link> through <link linkend=\"b10fqh6r\">Step 8</link> under <link linkend="
@@ -11805,15 +12239,15 @@ msgstr ""
 "\"b1012vde\">1</link> à <link linkend=\"b10fqh6r\">8</link> dans la rubrique "
 "<link linkend=\"b1012vdd\">Mémos</link>."
 
-#: ../C/evolution.xml:5708(para)
+#: ../C/evolution.xml:5941(para)
 msgid "To send a Reminder Note,"
 msgstr "Pour envoyer une note de rappel :"
 
-#: ../C/evolution.xml:5711(para)
+#: ../C/evolution.xml:5944(para)
 msgid "Click File &gt; New &gt; Shared Memo."
 msgstr "Choisissez Fichier &gt; Nouveau &gt; Mémo partagé."
 
-#: ../C/evolution.xml:5714(para)
+#: ../C/evolution.xml:5947(para)
 msgid ""
 "Select the Organizer's account name from the drop-down list given next to "
 "the Organizer field."
@@ -11821,7 +12255,7 @@ msgstr ""
 "Sélectionnez le nom du compte de l'organisateur dans la liste déroulante "
 "« Organisateur »."
 
-#: ../C/evolution.xml:5717(para)
+#: ../C/evolution.xml:5950(para)
 msgid ""
 "In the To field, type a username, then press Enter. Repeat for additional "
 "users."
@@ -11829,15 +12263,15 @@ msgstr ""
 "Dans le champ À, saisissez un nom d'utilisateur, puis appuyez sur Entrée. "
 "Répétez l'opération pour ajouter d'autres utilisateurs."
 
-#: ../C/evolution.xml:5729(para)
+#: ../C/evolution.xml:5962(para)
 msgid "Specify the category that the Reminder note falls under."
 msgstr "Indiquez la catégorie sous laquelle doit apparaître la note de rappel."
 
-#: ../C/evolution.xml:5735(para)
+#: ../C/evolution.xml:5968(para)
 msgid "Click Save."
 msgstr "Cliquez sur « Enregistrer »."
 
-#: ../C/evolution.xml:5744(para)
+#: ../C/evolution.xml:5977(para)
 msgid ""
 "When you schedule a meeting with your calendar on GroupWise, you can check "
 "when other local GroupWise users are busy according to their GroupWise "
@@ -11847,7 +12281,7 @@ msgstr ""
 "pouvez consulter la disponibilité d'autres utilisateurs GroupWise locaux "
 "selon leurs agendas."
 
-#: ../C/evolution.xml:5746(para)
+#: ../C/evolution.xml:5979(para)
 msgid ""
 "Reminders for appointments in your GroupWise calendar do not work until you "
 "have run Evolution at least once after logging in. This is different from "
@@ -11860,15 +12294,15 @@ msgstr ""
 "fonctionnent dès que vous êtes connecté, que vous ayez exécuté ou non "
 "Evolution dans la session."
 
-#: ../C/evolution.xml:5749(para)
+#: ../C/evolution.xml:5982(para)
 msgid "Open a new appointment in the calendar."
 msgstr "Ouvrez un nouveau rendez-vous dans le calendrier."
 
-#: ../C/evolution.xml:5752(para)
+#: ../C/evolution.xml:5985(para)
 msgid "Click Actions &gt; Schedule Meeting."
 msgstr "Cliquez sur Actions &gt; Planifier une réunion."
 
-#: ../C/evolution.xml:5755(para)
+#: ../C/evolution.xml:5988(para)
 msgid ""
 "Add attendees, either by entering their email addresses into the list, or by "
 "clicking the Invite Others button."
@@ -11876,7 +12310,7 @@ msgstr ""
 "Ajoutez des participants, soit en saisissant des adresses électroniques dans "
 "la liste, soit en cliquant sur le bouton Participants."
 
-#: ../C/evolution.xml:5758(para)
+#: ../C/evolution.xml:5991(para)
 msgid ""
 "Click Options, then click Update Free/Busy to check participant schedules "
 "and, if possible, update the meeting in all participants' calendars."
@@ -11885,7 +12319,7 @@ msgstr ""
 "agendas des participants et, si possible, mettre à jour la réunion dans les "
 "calendriers de tous les participants."
 
-#: ../C/evolution.xml:5761(para)
+#: ../C/evolution.xml:5994(para)
 msgid ""
 "If meeting attendees are not available during the times you have scheduled a "
 "meeting, you can <quote>nudge</quote> the meeting forward or backward to the "
@@ -11904,24 +12338,24 @@ msgstr ""
 "convient pas, vous pouvez faire glisser les bords de l'horaire de la réunion "
 "vers les heures que vous voulez sélectionner."
 
-#: ../C/evolution.xml:5768(link) ../C/evolution.xml:5788(title)
+#: ../C/evolution.xml:6001(link) ../C/evolution.xml:6021(title)
 msgid "Confirming Delivery of Items You have Sent"
 msgstr "Confirmation de réception des éléments envoyés"
 
-#: ../C/evolution.xml:5771(link) ../C/evolution.xml:5894(title)
+#: ../C/evolution.xml:6004(link) ../C/evolution.xml:6127(title)
 msgid "Displaying Sent Items"
 msgstr "Affichage des éléments envoyés"
 
-#: ../C/evolution.xml:5774(link) ../C/evolution.xml:5833(title)
+#: ../C/evolution.xml:6007(link) ../C/evolution.xml:6066(title)
 msgid "Checking the Status of an Item You Have Sent"
 msgstr "Contrôle de l'état d'un élément envoyé"
 
-#: ../C/evolution.xml:5777(link) ../C/evolution.xml:5780(link)
-#: ../C/evolution.xml:5860(title)
+#: ../C/evolution.xml:6010(link) ../C/evolution.xml:6013(link)
+#: ../C/evolution.xml:6093(title)
 msgid "Requesting a Reply for Items You Send"
 msgstr "Demande de réponse pour des éléments envoyés"
 
-#: ../C/evolution.xml:5784(para)
+#: ../C/evolution.xml:6017(para)
 msgid ""
 "You can manage your sent items for GroupWise email only if the recipient is "
 "located on the same GroupWise system as you."
@@ -11929,7 +12363,7 @@ msgstr ""
 "Vous pouvez gérer les éléments envoyés de la messagerie GroupWise uniquement "
 "si le destinataire se trouve dans le même système GroupWise que vous."
 
-#: ../C/evolution.xml:5789(para)
+#: ../C/evolution.xml:6022(para)
 msgid ""
 "Evolution provides several ways for you to confirm that your item was "
 "delivered. You can easily track message status of any message you have sent. "
@@ -11941,11 +12375,11 @@ msgstr ""
 "exemple, vous pouvez voir quand un courriel a été reçu et que le "
 "destinataire a ouvert ou détruit le message."
 
-#: ../C/evolution.xml:5791(title)
+#: ../C/evolution.xml:6024(title)
 msgid "Track an Item You Sent:"
 msgstr "Suivi d'un élément envoyé :"
 
-#: ../C/evolution.xml:5792(para)
+#: ../C/evolution.xml:6025(para)
 msgid ""
 "You can check the status in the Message Status window of an email you have "
 "sent."
@@ -11953,12 +12387,12 @@ msgstr ""
 "Vous pouvez consulter l'état d'un courriel envoyé dans la fenêtre État du "
 "message."
 
-#: ../C/evolution.xml:5795(title)
+#: ../C/evolution.xml:6028(title)
 msgid "Receive Notification When the Item is Opened or Deleted:"
 msgstr ""
 "Réception d'une notification à l'ouverture ou à la suppression d'un élément :"
 
-#: ../C/evolution.xml:5796(para)
+#: ../C/evolution.xml:6029(para)
 msgid ""
 "You can receive notification when the recipient opens or deletes a message. "
 "For information, see <link linkend=\"Ak05sv1\">Requesting a Reply for Items "
@@ -11968,11 +12402,11 @@ msgstr ""
 "détruit un message. Pour en savoir plus, consultez <link linkend=\"Ak05sv1"
 "\">Demande de réponse pour des éléments envoyés</link>."
 
-#: ../C/evolution.xml:5799(title)
+#: ../C/evolution.xml:6032(title)
 msgid "Request a Reply:"
 msgstr "Demande de réponse :"
 
-#: ../C/evolution.xml:5800(para)
+#: ../C/evolution.xml:6033(para)
 msgid ""
 "You can inform the recipient that you need a reply to an email. Evolution "
 "adds a sentence to the item stating that a reply is requested and changes "
@@ -11985,28 +12419,28 @@ msgstr ""
 "destinataire en une double flèche. Pour en savoir plus, consultez <link "
 "linkend=\"Ak05sv1\">Demande de réponse pour des éléments envoyés</link>."
 
-#: ../C/evolution.xml:5804(title) ../C/evolution.xml:5918(title)
+#: ../C/evolution.xml:6037(title) ../C/evolution.xml:6151(title)
 msgid "Enabling Status Tracking"
 msgstr "Activation du suivi d'état"
 
-#: ../C/evolution.xml:5807(para) ../C/evolution.xml:5847(para)
-#: ../C/evolution.xml:5863(para)
+#: ../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 ""
 "Dans la fenêtre de rédaction d'un message, choisissez Insertion &gt; Options "
 "d'envoi."
 
-#: ../C/evolution.xml:5808(para)
+#: ../C/evolution.xml:6041(para)
 msgid "Select Status Tracking."
 msgstr "Sélectionnez Suivi de l'état"
 
-#: ../C/evolution.xml:5813(para) ../C/evolution.xml:5925(para)
+#: ../C/evolution.xml:6046(para) ../C/evolution.xml:6158(para)
 msgid "Select the check box next to Create a sent item to track information."
 msgstr ""
 "Cochez la case en regard de Créer un élément envoyé pour effectuer le suivi "
 "d'information."
 
-#: ../C/evolution.xml:5816(para) ../C/evolution.xml:5928(para)
+#: ../C/evolution.xml:6049(para) ../C/evolution.xml:6161(para)
 msgid ""
 "Select any of the options given (Delivered, Delivered and opened, All "
 "information)"
@@ -12014,7 +12448,7 @@ msgstr ""
 "Cochez les options souhaitées (Livré, Livré et ouvert, Toutes les "
 "informations)."
 
-#: ../C/evolution.xml:5817(para) ../C/evolution.xml:5929(para)
+#: ../C/evolution.xml:6050(para) ../C/evolution.xml:6162(para)
 msgid ""
 "Based on this selection, you can view the status of the send message in the "
 "Sent Items folder."
@@ -12022,7 +12456,7 @@ msgstr ""
 "Sur la base de vos choix, vous pouvez ensuite voir l'état d'un message "
 "envoyé dans le dossier des Éléments envoyés."
 
-#: ../C/evolution.xml:5818(para)
+#: ../C/evolution.xml:6051(para)
 msgid ""
 "For more information, see <link linkend=\"Aal54a9\">Checking the Status of "
 "an Item You Have Sent</link>."
@@ -12030,7 +12464,7 @@ msgstr ""
 "Pour plus d'informations, voyez <link linkend=\"Aal54a9\">Consultation de "
 "l'état d'un élément envoyé</link>."
 
-#: ../C/evolution.xml:5821(para) ../C/evolution.xml:5932(para)
+#: ../C/evolution.xml:6054(para) ../C/evolution.xml:6165(para)
 msgid ""
 "(Optional)Select the check box next to Auto-delete sent item to "
 "automatically delete the sent item from the Sent folder."
@@ -12038,20 +12472,20 @@ msgstr ""
 "(facultatif) Cochez l'option « Supprimer automatiquement l'élément envoyé » "
 "afin de supprimer automatiquement un élément envoyé dans le dossier Envoyés."
 
-#: ../C/evolution.xml:5824(para) ../C/evolution.xml:5935(para)
+#: ../C/evolution.xml:6057(para) ../C/evolution.xml:6168(para)
 msgid "Under Return Notification, specify the type of return receipt you want."
 msgstr ""
 "Sous « Renvoyer une notification », indiquez le type d'accusé de retour "
 "souhaité."
 
-#: ../C/evolution.xml:5836(para)
+#: ../C/evolution.xml:6069(para)
 msgid ""
 "Right-click an email in your Sent folder, then click Track Message Status."
 msgstr ""
 "Faites un clic droit sur un courriel dans votre dossier des éléments "
 "envoyés, puis choisissez « Surveiller l'état du message »."
 
-#: ../C/evolution.xml:5837(para)
+#: ../C/evolution.xml:6070(para)
 msgid ""
 "With Message Tracking, you know when the item reaches the recipients or is "
 "read by them. You also know exactly who received your message, who read your "
@@ -12062,16 +12496,16 @@ msgstr ""
 "savoir exactement qui a reçu votre message, par qui et quand il a été lu et "
 "supprimé."
 
-#: ../C/evolution.xml:5844(title)
+#: ../C/evolution.xml:6077(title)
 msgid "Changing the Priority of an Email"
 msgstr "Modification de la priorité d'un courriel"
 
-#: ../C/evolution.xml:5850(para)
+#: ../C/evolution.xml:6083(para)
 msgid "Select High Priority, Standard Priority, Low Priority, or Undefined."
 msgstr ""
 "Sélectionnez haute priorité, priorité standard, basse priorité ou indéfinie."
 
-#: ../C/evolution.xml:5851(para)
+#: ../C/evolution.xml:6084(para)
 msgid ""
 "The small icon next to an item in the Mailbox is red when the priority is "
 "high."
@@ -12079,13 +12513,13 @@ msgstr ""
 "La petite icône à côté d'un élément dans la boîte de messagerie apparaît en "
 "rouge lorsque la priorité est haute."
 
-#: ../C/evolution.xml:5867(para)
+#: ../C/evolution.xml:6100(para)
 msgid "Click Reply Requested, then specify when you want to receive the reply."
 msgstr ""
 "Cochez « Réponse requise », puis indiquez quand vous voulez recevoir la "
 "réponse."
 
-#: ../C/evolution.xml:5868(para)
+#: ../C/evolution.xml:6101(para)
 msgid ""
 "If you select When Convenient, then Reply Requested: When Convenient appears "
 "at the top of the message. If you select Within x Days, then Reply "
@@ -12098,7 +12532,7 @@ msgstr ""
 "<varname>jour mois jour numérique heure année</varname> » apparaît au sommet "
 "du message."
 
-#: ../C/evolution.xml:5871(para)
+#: ../C/evolution.xml:6104(para)
 msgid ""
 "Click Set Expiration Date, then specify the number of days for this message "
 "to remain in the recipient's Inbox."
@@ -12106,11 +12540,11 @@ msgstr ""
 "Cochez Définir la date d'expiration et définissez le nombre de jours que ce "
 "message doit rester dans la boîte de réception du destinataire."
 
-#: ../C/evolution.xml:5879(title)
+#: ../C/evolution.xml:6112(title)
 msgid "Setting Message Delivery Options"
 msgstr "Définition des options de livraison des messages"
 
-#: ../C/evolution.xml:5880(para)
+#: ../C/evolution.xml:6113(para)
 msgid ""
 "You can delay the delivery of an individual message by having it held in the "
 "Outbox for a specified time."
@@ -12118,11 +12552,11 @@ msgstr ""
 "Vous pouvez reporter la livraison d'un message spécifique en le conservant "
 "durant un certain temps dans la Boîte d'envoi."
 
-#: ../C/evolution.xml:5883(para)
+#: ../C/evolution.xml:6116(para)
 msgid "Click Delay message delivery."
 msgstr "Cochez Retarder la livraison du message."
 
-#: ../C/evolution.xml:5886(para)
+#: ../C/evolution.xml:6119(para)
 msgid ""
 "Use the Date and Time options to specify how long the message should remain "
 "in the Outbox before it is sent to the recipient."
@@ -12131,11 +12565,11 @@ msgstr ""
 "le message doit rester dans la Boîte d'envoi avant d'être envoyé à son "
 "destinataire."
 
-#: ../C/evolution.xml:5897(para)
+#: ../C/evolution.xml:6130(para)
 msgid "Click the Sent Items folder in the Folder List."
 msgstr "Cliquez sur le dossier Envoyé dans la liste des dossiers."
 
-#: ../C/evolution.xml:5900(para)
+#: ../C/evolution.xml:6133(para)
 msgid ""
 "All sent items reside in this folder unless you select a different folder "
 "for sent email in the account editor default settings. For more information, "
@@ -12149,18 +12583,18 @@ msgstr ""
 "les brouillons</link> dans <link linkend=\"b13uhy6r\">Paramètres par défaut</"
 "link>."
 
-#: ../C/evolution.xml:5903(title)
+#: ../C/evolution.xml:6136(title)
 msgid "Delegating an Item"
 msgstr "Délégation d'un élément"
 
-#: ../C/evolution.xml:5906(para)
+#: ../C/evolution.xml:6139(para)
 msgid ""
 "In the Calendar, right-click the meeting or appointment you want to delegate."
 msgstr ""
 "Dans le calendrier, faites un clic droit sur le rendez-vous ou la réunion à "
 "déléguer."
 
-#: ../C/evolution.xml:5909(para)
+#: ../C/evolution.xml:6142(para)
 msgid ""
 "Select Delegate Meeting, then select the contacts you want to delegate the "
 "meeting/appointment for."
@@ -12168,11 +12602,11 @@ msgstr ""
 "Choisissez Déléguer une réunion, puis sélectionnez les contacts auxquels "
 "vous souhaitez déléguer la réunion ou le rendez-vous."
 
-#: ../C/evolution.xml:5915(para)
+#: ../C/evolution.xml:6148(para)
 msgid "Each contact gets a copy of the appointment or meeting."
 msgstr "Chaque contact reçoit une copie du rendez-vous ou de la réunion."
 
-#: ../C/evolution.xml:5921(para)
+#: ../C/evolution.xml:6154(para)
 msgid ""
 "In the Compose Meeting window, click Insert &gt; Send Options &gt; Status "
 "Tracking"
@@ -12180,7 +12614,7 @@ msgstr ""
 "Dans la fenêtre d'édition d'une réunion, choisissez Insertion &gt; Options "
 "d'envoi &gt; Suivi d'état."
 
-#: ../C/evolution.xml:5947(para)
+#: ../C/evolution.xml:6180(para)
 msgid ""
 "Use Proxy to manage another user's Mailbox and Calendar. Proxy lets you "
 "perform various actions, such as reading, accepting, and declining items on "
@@ -12192,7 +12626,7 @@ msgstr ""
 "autre personne, dans la limite des restrictions définies par cette autre "
 "personne."
 
-#: ../C/evolution.xml:5949(para)
+#: ../C/evolution.xml:6182(para)
 msgid ""
 "You can proxy for a user in a different post office or domain, as long as "
 "that person is in the same GroupWise system. You cannot proxy for a user in "
@@ -12203,29 +12637,29 @@ msgstr ""
 "GroupWise. Vous ne pouvez pas être le proxy d'un utilisateur d'un système "
 "GroupWise différent."
 
-#: ../C/evolution.xml:5954(link) ../C/evolution.xml:5971(title)
+#: ../C/evolution.xml:6187(link) ../C/evolution.xml:6204(title)
 msgid "Receiving Proxy Rights"
 msgstr "Réception de droits de proxy"
 
-#: ../C/evolution.xml:5957(link) ../C/evolution.xml:5976(title)
+#: ../C/evolution.xml:6190(link) ../C/evolution.xml:6209(title)
 msgid "Assigning Proxy Rights to Another User"
 msgstr "Attribution de droits de proxy à un autre utilisateur"
 
-#: ../C/evolution.xml:5960(link) ../C/evolution.xml:6047(title)
+#: ../C/evolution.xml:6193(link) ../C/evolution.xml:6280(title)
 msgid "Adding and Removing Proxy Names and Rights in Your Proxy List"
 msgstr ""
 "Ajout et suppression de noms et de droits de proxy dans votre liste « Proxy »"
 
-#: ../C/evolution.xml:5963(link) ../C/evolution.xml:6078(title)
+#: ../C/evolution.xml:6196(link) ../C/evolution.xml:6311(title)
 msgid "Managing Someone Else's Mailbox or Calendar"
 msgstr ""
 "Gestion de la boîte de messagerie ou du calendrier d'une autre personne"
 
-#: ../C/evolution.xml:5966(link) ../C/evolution.xml:6102(title)
+#: ../C/evolution.xml:6199(link) ../C/evolution.xml:6335(title)
 msgid "Marking an Item Private"
 msgstr "Marquage d'un élément privé"
 
-#: ../C/evolution.xml:5972(para)
+#: ../C/evolution.xml:6205(para)
 msgid ""
 "Two steps must be completed before you can act as someone's proxy. First, "
 "the person for whom you plan to act as proxy must grant you rights in the "
@@ -12238,7 +12672,7 @@ msgstr ""
 "Proxy. Deuxièmement, vous devez devenir le proxy de cette personne afin de "
 "pouvoir accéder à sa boîte de messagerie ou à son calendrier."
 
-#: ../C/evolution.xml:5977(para)
+#: ../C/evolution.xml:6210(para)
 msgid ""
 "Use the Proxy List in the Preferences Account Editor to give other users "
 "rights to proxy for you. You can assign each user different rights to your "
@@ -12256,19 +12690,19 @@ msgstr ""
 "l'accès en lecture à vos rendez-vous. Le tableau suivant décrit les "
 "permissions que vous pouvez accorder aux utilisateurs :"
 
-#: ../C/evolution.xml:5985(para)
+#: ../C/evolution.xml:6218(para)
 msgid "This Right"
 msgstr "Cette permission"
 
-#: ../C/evolution.xml:5988(para)
+#: ../C/evolution.xml:6221(para)
 msgid "Lets your proxy do this"
 msgstr "permet ceci à votre proxy"
 
-#: ../C/evolution.xml:5995(para)
+#: ../C/evolution.xml:6228(para)
 msgid "Read"
 msgstr "Lire"
 
-#: ../C/evolution.xml:5998(para)
+#: ../C/evolution.xml:6231(para)
 msgid ""
 "Read items you receive. Proxies cannot see your Contacts folder with this or "
 "any other proxy right."
@@ -12276,11 +12710,11 @@ msgstr ""
 "Lire les éléments que vous recevez. Les personnes proxy ne peuvent afficher "
 "votre dossier Contacts avec aucune des permissions proxy."
 
-#: ../C/evolution.xml:6003(para)
+#: ../C/evolution.xml:6236(para)
 msgid "Write"
 msgstr "Écrire"
 
-#: ../C/evolution.xml:6006(para)
+#: ../C/evolution.xml:6239(para)
 msgid ""
 "Create and send items in your name, including applying your signature if you "
 "have one defined. Assign categories to items, and change the subject of "
@@ -12290,11 +12724,11 @@ msgstr ""
 "signature si vous en possédez une. Attribuer des catégories aux éléments et "
 "modifier le sujet des éléments."
 
-#: ../C/evolution.xml:6011(para)
+#: ../C/evolution.xml:6244(para)
 msgid "Subscribe to my alarms"
 msgstr "S'abonner à mes alarmes"
 
-#: ../C/evolution.xml:6014(para)
+#: ../C/evolution.xml:6247(para)
 msgid ""
 "Receive the same alarms you receive. Receiving alarms is supported only if "
 "the proxy is on the same post office you are."
@@ -12302,11 +12736,11 @@ msgstr ""
 "Recevoir les mêmes alarmes que vous. La réception d'alarmes n'est gérée que "
 "si le proxy se trouve dans le même office de poste que vous."
 
-#: ../C/evolution.xml:6019(para)
+#: ../C/evolution.xml:6252(para)
 msgid "Subscribe to my notifications"
 msgstr "S'abonner à mes notifications"
 
-#: ../C/evolution.xml:6022(para)
+#: ../C/evolution.xml:6255(para)
 msgid ""
 "Receive notification when you receive items. Receiving notifications is "
 "supported only if the proxy is on the same post office you are."
@@ -12315,11 +12749,11 @@ msgstr ""
 "de notifications n'est gérée que si le proxy se trouve dans le même office "
 "de poste que vous."
 
-#: ../C/evolution.xml:6027(para)
+#: ../C/evolution.xml:6260(para)
 msgid "Modify options/rules/folders"
 msgstr "Modifier options/règles/dossiers"
 
-#: ../C/evolution.xml:6030(para)
+#: ../C/evolution.xml:6263(para)
 msgid ""
 "Change the options in your Mailbox. The proxy can edit any of your Options "
 "settings, including the access given to other users. If the proxy also has "
@@ -12333,11 +12767,11 @@ msgstr ""
 "permet à un utilisateur proxy d'ajouter, de supprimer et de modifier des "
 "catégories."
 
-#: ../C/evolution.xml:6035(para)
+#: ../C/evolution.xml:6268(para)
 msgid "Read items marked Private"
 msgstr "Lire des éléments marqués privés"
 
-#: ../C/evolution.xml:6038(para)
+#: ../C/evolution.xml:6271(para)
 msgid ""
 "Read the items you marked Private. If you don't give a proxy Private rights, "
 "all items marked Private in your Mailbox are hidden from that proxy."
@@ -12346,15 +12780,15 @@ msgstr ""
 "permission à un utilisateur proxy, tous les éléments marqués privés dans "
 "votre boîte de messagerie lui seront invisibles."
 
-#: ../C/evolution.xml:6053(para)
+#: ../C/evolution.xml:6286(para)
 msgid "Select the GroupWise account to edit, then click Edit."
 msgstr "Sélectionnez le compte GroupWise à éditer, puis cliquez sur Édition."
 
-#: ../C/evolution.xml:6056(para)
+#: ../C/evolution.xml:6289(para)
 msgid "Click the Proxy tab, then click Add."
 msgstr "Cliquez sur l'onglet Proxy, puis sur Ajouter."
 
-#: ../C/evolution.xml:6059(para)
+#: ../C/evolution.xml:6292(para)
 msgid ""
 "To add a user to the list, type the name in the Name box or import the "
 "contact from Contact list."
@@ -12362,12 +12796,12 @@ msgstr ""
 "Pour ajouter un utilisateur dans la liste, saisissez son nom dans le champ "
 "Nom ou importez le contact à partir de la liste des contacts."
 
-#: ../C/evolution.xml:6062(para)
+#: ../C/evolution.xml:6295(para)
 msgid "Select the rights you want to give to the user."
 msgstr ""
 "Sélectionnez les permissions que vous souhaitez attribuer à l'utilisateur."
 
-#: ../C/evolution.xml:6067(para)
+#: ../C/evolution.xml:6300(para)
 msgid ""
 "Repeat <link linkend=\"Aai4sat\">Step 4</link> and <link linkend=\"Aai4sll"
 "\">Step 5</link> to assign rights to each user in the Proxy List."
@@ -12376,7 +12810,7 @@ msgstr ""
 "\"Aai4sll\">étape 5</link> pour attribuer des permissions à chaque "
 "utilisateur de la liste Proxy."
 
-#: ../C/evolution.xml:6074(para)
+#: ../C/evolution.xml:6307(para)
 msgid ""
 "To delete a user from the Proxy List, select the user, then click Remove "
 "User."
@@ -12384,7 +12818,7 @@ msgstr ""
 "Pour supprimer un utilisateur de la liste Proxy, sélectionnez-le, puis "
 "cliquez sur Supprimer l'utilisateur."
 
-#: ../C/evolution.xml:6079(para)
+#: ../C/evolution.xml:6312(para)
 msgid ""
 "Before you can act as a proxy for someone, that person must give you proxy "
 "rights in his or her Proxy List in Preferences. The amount of access you "
@@ -12395,16 +12829,16 @@ msgstr ""
 "préférences. L'étendue de vos droits dépend des permissions qui vous ont été "
 "attribuées."
 
-#: ../C/evolution.xml:6082(para)
+#: ../C/evolution.xml:6315(para)
 msgid "Right-click on the GroupWise account in the folder list."
 msgstr ""
 "Faites un clic droit sur le compte GroupWise dans la liste des dossiers."
 
-#: ../C/evolution.xml:6085(para)
+#: ../C/evolution.xml:6318(para)
 msgid "Click Proxy Login."
 msgstr "Choisissez Identification sur le proxy."
 
-#: ../C/evolution.xml:6090(para)
+#: ../C/evolution.xml:6323(para)
 msgid ""
 "Type the user name of the person who has given you Proxy access, or select "
 "from the list."
@@ -12412,12 +12846,12 @@ msgstr ""
 "Saisissez le nom d'utilisateur de la personne qui vous a donné l'accès proxy "
 "ou sélectionnez-la dans la liste."
 
-#: ../C/evolution.xml:6094(para)
+#: ../C/evolution.xml:6327(para)
 msgid "The user's data appears in the respective components."
 msgstr ""
 "Les données de la personne apparaissent dans les composants respectifs."
 
-#: ../C/evolution.xml:6096(para)
+#: ../C/evolution.xml:6329(para)
 msgid ""
 "You can set different colors to each user to distinguish between each users' "
 "appointments. You can also select whether to display the appointments of a "
@@ -12427,7 +12861,7 @@ msgstr ""
 "distinguer les rendez-vous de chacun. Vous pouvez aussi choisir d'afficher "
 "ou non les rendez-vous d'un utilisateur particulier."
 
-#: ../C/evolution.xml:6103(para)
+#: ../C/evolution.xml:6336(para)
 msgid ""
 "You can limit a proxy's access to individual items in your Mailbox or "
 "Calendar by marking items Private."
@@ -12435,7 +12869,7 @@ msgstr ""
 "Vous pouvez empêcher l'accès proxy à des éléments individuels de votre boîte "
 "de messagerie ou de votre calendrier en les marquant privés."
 
-#: ../C/evolution.xml:6104(para)
+#: ../C/evolution.xml:6337(para)
 msgid ""
 "When you mark an item Private, you prevent unauthorized proxies from opening "
 "it. Proxies cannot access items marked Private unless you give them those "
@@ -12446,7 +12880,7 @@ msgstr ""
 "éléments privés tant que vous ne leur attribuez pas la permission "
 "correspondante dans la liste d'accès."
 
-#: ../C/evolution.xml:6105(para)
+#: ../C/evolution.xml:6338(para)
 msgid ""
 "If you mark an item Private when you send it, neither your proxies nor the "
 "recipient's proxies can open the item without rights. If you mark an item "
@@ -12464,12 +12898,12 @@ msgstr ""
 "disponibilité selon l'état que vous avez sélectionné lorsque vous avez "
 "accepté le rendez-vous."
 
-#: ../C/evolution.xml:6108(para)
+#: ../C/evolution.xml:6341(para)
 msgid "In an open item, click Actions, then click Mark Private."
 msgstr ""
 "Avec un élément ouvert, choisissez Actions, puis cliquez sur Marquer privé."
 
-#: ../C/evolution.xml:6110(para)
+#: ../C/evolution.xml:6343(para)
 msgid ""
 "In your Calendar, click an item in the Appointments, Reminder Notes, or "
 "Tasks List, click Actions, then click Mark Private."
@@ -12477,7 +12911,7 @@ msgstr ""
 "Dans votre calendrier, cliquez sur un élément rendez-vous, note de rappel ou "
 "liste de tâches, choisissez Actions, puis cliquez sur Marquer privé."
 
-#: ../C/evolution.xml:6118(para)
+#: ../C/evolution.xml:6351(para)
 msgid ""
 "Junk mail handling for GroupWise accounts is a little different than other "
 "junk mail handling. When you mark an item as junk mail in GroupWise, the "
@@ -12492,34 +12926,34 @@ msgstr ""
 "trouvent dans le système GroupWise, votre liste de pourriels vous suit quel "
 "que soit l'ordinateur utilisé."
 
-#: ../C/evolution.xml:6121(link) ../C/evolution.xml:6138(title)
+#: ../C/evolution.xml:6354(link) ../C/evolution.xml:6371(title)
 msgid "Marking a Message As Junk Mail"
 msgstr "Marquage d'un message comme pourriel"
 
-#: ../C/evolution.xml:6124(link) ../C/evolution.xml:6148(title)
+#: ../C/evolution.xml:6357(link) ../C/evolution.xml:6381(title)
 msgid "Marking a Message As Not Junk Mail"
 msgstr "Marquage d'un message comme non pourriel"
 
-#: ../C/evolution.xml:6127(link) ../C/evolution.xml:6162(title)
+#: ../C/evolution.xml:6360(link) ../C/evolution.xml:6395(title)
 msgid "Enabling or Disabling Your Junk Mail List"
 msgstr "Activation ou désactivation de votre liste de pourriels"
 
-#: ../C/evolution.xml:6130(link) ../C/evolution.xml:6177(title)
+#: ../C/evolution.xml:6363(link) ../C/evolution.xml:6410(title)
 msgid "Adding an Email Address to Your Junk List"
 msgstr "Ajout d'une adresse électronique à votre liste de pourriels"
 
-#: ../C/evolution.xml:6133(link) ../C/evolution.xml:6192(title)
+#: ../C/evolution.xml:6366(link) ../C/evolution.xml:6425(title)
 msgid "Removing an Email Address from Your Junk List"
 msgstr "Suppression d'une adresse électronique à votre liste de pourriels"
 
-#: ../C/evolution.xml:6141(para)
+#: ../C/evolution.xml:6374(para)
 msgid ""
 "Select the message to mark as junk, then click the Junk icon or press Ctrl+J."
 msgstr ""
 "Sélectionnez le message à marquer comme pourriel, puis cliquez sur l'icône "
 "Pourriel ou appuyez sur Ctrl+J."
 
-#: ../C/evolution.xml:6142(para)
+#: ../C/evolution.xml:6375(para)
 msgid ""
 "The message is moved to your Junk Mail folder and the user is added to your "
 "junk list."
@@ -12527,23 +12961,23 @@ msgstr ""
 "Le message est déplacé dans le dossier des pourriels et l'expéditeur est "
 "ajouté à votre liste de pourriels."
 
-#: ../C/evolution.xml:6151(para)
+#: ../C/evolution.xml:6384(para)
 msgid "Select the message to mark as not junk in your Junk Mail folder."
 msgstr ""
 "Sélectionnez le message à marquer comme non pourriel dans votre dossier des "
 "pourriels."
 
-#: ../C/evolution.xml:6154(para)
+#: ../C/evolution.xml:6387(para)
 msgid "Right-click the message, then click Mark as Not Junk."
 msgstr ""
 "Faites un clic droit sur le message et choisissez « Marquer comme non "
 "pourriel »."
 
-#: ../C/evolution.xml:6155(para)
+#: ../C/evolution.xml:6388(para)
 msgid "Or select the message and press Shift+Ctrl+J"
 msgstr "Ou sélectionnez le message et appuyez sur Ctrl+Maj+J."
 
-#: ../C/evolution.xml:6156(para)
+#: ../C/evolution.xml:6389(para)
 msgid ""
 "The message is moved to your Mailbox folder and the name is removed from "
 "your junk list."
@@ -12551,69 +12985,34 @@ msgstr ""
 "Le message est déplacé dans votre dossier de boîte de messagerie et le nom "
 "est supprimé de la liste des pourriels."
 
-#: ../C/evolution.xml:6165(para) ../C/evolution.xml:6180(para)
-#: ../C/evolution.xml:6195(para)
+#: ../C/evolution.xml:6398(para) ../C/evolution.xml:6413(para)
+#: ../C/evolution.xml:6428(para)
 msgid "Right-click a message, then click Junk Mail Settings."
 msgstr ""
 "Faites un clic droit sur un message, puis choisissez « Paramètres de "
 "détection du pourriel »."
 
-#: ../C/evolution.xml:6168(para)
+#: ../C/evolution.xml:6401(para)
 msgid "Select if you want to enable or disable junk mail handling."
 msgstr ""
 "Choisissez si vous voulez activer ou désactiver la gestion des pourriels."
 
-#: ../C/evolution.xml:6183(para)
+#: ../C/evolution.xml:6416(para)
 msgid "Type the email address to block in the Email field."
 msgstr ""
 "Saisissez l'adresse électronique à bloquer dans le champ Adresse "
 "électronique."
 
-#: ../C/evolution.xml:6186(para)
+#: ../C/evolution.xml:6419(para)
 msgid "Click Add, then click OK."
 msgstr "Cliquez sur Ajouter, puis sur Valider."
 
-#: ../C/evolution.xml:6198(para)
+#: ../C/evolution.xml:6431(para)
 msgid "Select the email address to remove, then click Remove."
 msgstr ""
 "Sélectionnez l'adresse électronique à enlever, puis cliquez sur Enlever."
 
-#: ../C/evolution.xml:6210(para)
-msgid ""
-"<trademark>Evolution</trademark> supports mail connectivity to <trademark "
-"class=\"registered\">Hula</trademark> servers through IMAP and calendaring "
-"support through CalDAV."
-msgstr ""
-"<trademark>Evolution</trademark> gère la connectivité de messagerie aux "
-"serveurs <trademark class=\"registered\">Hula</trademark> au moyen d'IMAP et "
-"la connectivité du calendrier au moyen de CalDAV."
-
-#: ../C/evolution.xml:6211(para)
-msgid ""
-"To add your Hula account to Evolution, you must create a new Hula account by "
-"performing the following steps:"
-msgstr ""
-"Pour ajouter votre compte Hula à Evolution, vous devez créer un nouveau "
-"compte Hula en effectuant les opérations suivantes :"
-
-#: ../C/evolution.xml:6214(para)
-msgid "Click Edit, click Preferences, then click Mail Accounts."
-msgstr ""
-"Choisissez Édition &gt; Préférences, puis cliquez sur Comptes de messagerie."
-
-#: ../C/evolution.xml:6217(para)
-msgid "In the Preferences window, click Add."
-msgstr "Dans la fenêtre des préférences, cliquez sur Ajouter."
-
-#: ../C/evolution.xml:6220(para)
-msgid ""
-"Follow the procedure explained in <link linkend=\"usage-mainwindow-starting"
-"\">Starting Evolution for the First Time</link>."
-msgstr ""
-"Suivez la procédure décrite dans <link linkend=\"usage-mainwindow-starting"
-"\">Démarrage d'Evolution pour la première fois</link>."
-
-#: ../C/evolution.xml:6227(para)
+#: ../C/evolution.xml:6443(para)
 msgid ""
 "Perhaps your mail server has changed names. Or you have grown tired of a "
 "certain layout for your appointments. Whatever the reason, you can change "
@@ -12624,39 +13023,39 @@ msgstr ""
 "Quelle que soit la raison, vous pouvez changer les paramètres "
 "d'<trademark>Evolution</trademark>."
 
-#: ../C/evolution.xml:6230(link) ../C/evolution.xml:6284(title)
+#: ../C/evolution.xml:6446(link) ../C/evolution.xml:6500(title)
 msgid "Working with Mail Accounts"
 msgstr "Utilisation des comptes de messagerie"
 
-#: ../C/evolution.xml:6233(link) ../C/evolution.xml:6327(title)
+#: ../C/evolution.xml:6449(link) ../C/evolution.xml:6543(title)
 msgid "Autocompletion"
 msgstr "Complétion automatique"
 
-#: ../C/evolution.xml:6236(link) ../C/evolution.xml:6389(title)
+#: ../C/evolution.xml:6452(link) ../C/evolution.xml:6598(title)
 msgid "Mail Preferences"
 msgstr "Préférences du courriel"
 
-#: ../C/evolution.xml:6239(link) ../C/evolution.xml:6558(title)
+#: ../C/evolution.xml:6455(link) ../C/evolution.xml:6767(title)
 msgid "Composer Preferences"
 msgstr "Préférences de l'éditeur"
 
-#: ../C/evolution.xml:6242(link) ../C/evolution.xml:6617(title)
+#: ../C/evolution.xml:6458(link) ../C/evolution.xml:6826(title)
 msgid "Calendar and Tasks Settings"
 msgstr "Paramètres de calendrier et des tâches"
 
-#: ../C/evolution.xml:6245(link) ../C/evolution.xml:6736(title)
+#: ../C/evolution.xml:6461(link) ../C/evolution.xml:7069(title)
 msgid "Contact Management"
 msgstr "Gestion des contacts"
 
-#: ../C/evolution.xml:6248(link) ../C/evolution.xml:6719(title)
+#: ../C/evolution.xml:6464(link) ../C/evolution.xml:7052(title)
 msgid "Certificates"
 msgstr "Certificats"
 
-#: ../C/evolution.xml:6251(link) ../C/evolution.xml:6869(title)
+#: ../C/evolution.xml:6467(link) ../C/evolution.xml:7202(title)
 msgid "Debug Logs"
 msgstr "Journaux de débogage"
 
-#: ../C/evolution.xml:6254(para)
+#: ../C/evolution.xml:6470(para)
 msgid ""
 "You reach the Evolution settings window by clicking Edit &gt; Preferences. "
 "In the left part of the settings window is a column, similar to the "
@@ -12670,15 +13069,15 @@ msgstr ""
 "choisir la partie d'Evolution à personnaliser. La partie droite de la "
 "fenêtre permet d'effectuer les modifications."
 
-#: ../C/evolution.xml:6256(para)
+#: ../C/evolution.xml:6472(para)
 msgid "There are six items you can customize."
 msgstr "Vous pouvez personnaliser six éléments."
 
-#: ../C/evolution.xml:6258(title)
+#: ../C/evolution.xml:6474(title)
 msgid "Mail Accounts:"
 msgstr "Comptes de messagerie :"
 
-#: ../C/evolution.xml:6259(para)
+#: ../C/evolution.xml:6475(para)
 msgid ""
 "Add or change information about your email accounts, such as the servers you "
 "connect to, the way you download mail, and your password authentication "
@@ -12692,11 +13091,11 @@ msgstr ""
 "section <link linkend=\"config-prefs-mail-identity\">Utilisation des comptes "
 "de messagerie</link>."
 
-#: ../C/evolution.xml:6262(title)
+#: ../C/evolution.xml:6478(title)
 msgid "Autocompletion:"
 msgstr "Complétion automatique :"
 
-#: ../C/evolution.xml:6263(para)
+#: ../C/evolution.xml:6479(para)
 msgid ""
 "Set the address books to be used when completing email addresses in the "
 "message composer. For more information, see <link linkend=\"bshoq5l"
@@ -12706,11 +13105,11 @@ msgstr ""
 "adresses électroniques dans l'éditeur de messages. Pour plus d'informations, "
 "consultez <link linkend=\"bshoq5l\">Complétion automatique</link>."
 
-#: ../C/evolution.xml:6266(title)
+#: ../C/evolution.xml:6482(title)
 msgid "Mail Preferences:"
 msgstr "Préférences du courriel :"
 
-#: ../C/evolution.xml:6267(para)
+#: ../C/evolution.xml:6483(para)
 msgid ""
 "These are overall mail reading preferences, such as display settings, "
 "notification options, and security. Settings that vary per account are in "
@@ -12726,11 +13125,11 @@ msgstr ""
 "paramètres de courriel sont décrits dans <link linkend=\"config-prefs-mail"
 "\">Préférences du courriel</link>."
 
-#: ../C/evolution.xml:6270(title)
+#: ../C/evolution.xml:6486(title)
 msgid "Composer Preferences:"
 msgstr "Préférences de l'éditeur :"
 
-#: ../C/evolution.xml:6271(para)
+#: ../C/evolution.xml:6487(para)
 msgid ""
 "These are settings for the way that you use the mail composer, such as "
 "signatures, and spelling. This includes the ability to substitute graphical "
@@ -12745,11 +13144,11 @@ msgstr ""
 "est décrit dans la section <link linkend=\"config-prefs-mail-composer"
 "\">Préférences de l'éditeur</link>."
 
-#: ../C/evolution.xml:6274(title)
+#: ../C/evolution.xml:6490(title)
 msgid "Calendar and Tasks:"
 msgstr "Calendrier et tâches :"
 
-#: ../C/evolution.xml:6275(para)
+#: ../C/evolution.xml:6491(para)
 msgid ""
 "Use these settings to control how the calendar behaves, including your time "
 "zone and the length of your work week. For more information, see <link "
@@ -12760,11 +13159,11 @@ msgstr ""
 "travail. Pour plus d'informations, consultez <link linkend=\"config-prefs-cal"
 "\">Paramètres de calendrier et des tâches</link>."
 
-#: ../C/evolution.xml:6278(title)
+#: ../C/evolution.xml:6494(title)
 msgid "Certificates:"
 msgstr "Certificats :"
 
-#: ../C/evolution.xml:6279(para)
+#: ../C/evolution.xml:6495(para)
 msgid ""
 "Use these settings for certificate handling for S/MIME security systems. For "
 "more information, see <link linkend=\"bshoty0\">Certificates</link>."
@@ -12773,7 +13172,7 @@ msgstr ""
 "sécurité S/MIME. Pour plus d'informations, consultez <link linkend=\"bshoty0"
 "\">Certificats</link>."
 
-#: ../C/evolution.xml:6281(para)
+#: ../C/evolution.xml:6497(para)
 msgid ""
 "Previous versions of Evolution included directory servers, folder settings, "
 "and Exchange delegation in the settings tool. Directory servers can now be "
@@ -12789,7 +13188,7 @@ msgstr ""
 "bouton droit de la souris et la délégation Exchange est disponible dans le "
 "menu Message dans l'outil Exchange."
 
-#: ../C/evolution.xml:6285(para)
+#: ../C/evolution.xml:6501(para)
 msgid ""
 "Evolution allows you to maintain multiple accounts, or identities. When you "
 "are writing an email message, you can choose which account to use by "
@@ -12801,7 +13200,7 @@ msgstr ""
 "sélectionnant dans la liste déroulante en regard de la zone De dans "
 "l'éditeur de messages."
 
-#: ../C/evolution.xml:6286(para)
+#: ../C/evolution.xml:6502(para)
 msgid ""
 "Click Send/Receive to update all mail sources that are not disabled. If you "
 "don't want to check mail for a given account, select the account in Edit "
@@ -12812,7 +13211,7 @@ msgstr ""
 "courriel d'un compte, sélectionnez ce compte dans Édition &gt; Préférences "
 "&gt; Comptes de messagerie et cliquez sur le bouton Désactiver."
 
-#: ../C/evolution.xml:6287(para)
+#: ../C/evolution.xml:6503(para)
 msgid ""
 "To add a new account, click Add to open the Evolution configuration "
 "assistant. To alter an existing account, select it in the Preferences "
@@ -12823,15 +13222,15 @@ msgstr ""
 "le dans la fenêtre Préférences, puis cliquez sur Édition pour ouvrir la "
 "boîte de dialogue de l'éditeur de compte."
 
-#: ../C/evolution.xml:6288(para)
+#: ../C/evolution.xml:6504(para)
 msgid "The account editor dialog box has seven sections:"
 msgstr "Cette boîte de dialogue contient sept sections :"
 
-#: ../C/evolution.xml:6290(title)
+#: ../C/evolution.xml:6506(title)
 msgid "Identity:"
 msgstr "Identité :"
 
-#: ../C/evolution.xml:6291(para)
+#: ../C/evolution.xml:6507(para)
 msgid ""
 "Specify the name and email address for this account. You can also choose a "
 "default signature to insert into messages sent from this account."
@@ -12840,11 +13239,11 @@ msgstr ""
 "choisir une signature par défaut pour l'insérer dans les messages que vous "
 "envoyez depuis ce compte."
 
-#: ../C/evolution.xml:6294(title)
+#: ../C/evolution.xml:6510(title)
 msgid "Receiving Email:"
 msgstr "Réception des courriels :"
 
-#: ../C/evolution.xml:6295(para)
+#: ../C/evolution.xml:6511(para)
 msgid ""
 "Select the way you receive email. You can download email from a <link "
 "linkend=\"pop\">POP server</link>, read and keep it on the server (Microsoft "
@@ -12862,7 +13261,7 @@ msgstr ""
 "l'utilisation d'une connexion sécurisée, vous avez le choix entre trois "
 "options : Aucun chiffrement, Chiffrement TLS ou Chiffrement SSL."
 
-#: ../C/evolution.xml:6297(para)
+#: ../C/evolution.xml:6513(para)
 msgid ""
 "Your system administrator might ask you to connect to a specific port on a "
 "mail server. To specify which port you use, just type a colon and the port "
@@ -12875,7 +13274,7 @@ msgstr ""
 "serveur. Par exemple, pour vous connecter au port 143 sur le serveur smtp."
 "exemple.com, définissez smtp.exemple.com:143 comme nom de serveur."
 
-#: ../C/evolution.xml:6298(para)
+#: ../C/evolution.xml:6514(para)
 msgid ""
 "For additional information, see <link linkend=\"second-step\">Receiving "
 "Mail</link>."
@@ -12883,11 +13282,11 @@ msgstr ""
 "Pour plus d'informations, consultez <link linkend=\"second-step\">Réception "
 "des courriels</link>."
 
-#: ../C/evolution.xml:6300(title)
+#: ../C/evolution.xml:6516(title)
 msgid "Receiving Options:"
 msgstr "Options de réception :"
 
-#: ../C/evolution.xml:6301(para)
+#: ../C/evolution.xml:6517(para)
 msgid ""
 "Decide if you want to check for mail automatically and how often, as well as "
 "setting other message retrieval options."
@@ -12896,7 +13295,7 @@ msgstr ""
 "messages et définissez la fréquence de l'opération et d'autres options de "
 "réception des messages."
 
-#: ../C/evolution.xml:6303(para)
+#: ../C/evolution.xml:6519(para)
 msgid ""
 "For additional information, see <link linkend=\"more-mail-options"
 "\">Receiving Mail Options</link>."
@@ -12904,11 +13303,11 @@ msgstr ""
 "Pour plus d'informations, consultez <link linkend=\"more-mail-options"
 "\">Options de réception du courriel</link>."
 
-#: ../C/evolution.xml:6305(title)
+#: ../C/evolution.xml:6521(title)
 msgid "Sending Mail:"
 msgstr "Envoi de courriels :"
 
-#: ../C/evolution.xml:6306(para)
+#: ../C/evolution.xml:6522(para)
 msgid ""
 "Use this section to choose and configure a method for sending mail. You can "
 "choose <link linkend=\"smtp\">SMTP</link>, Microsoft Exchange (if you have "
@@ -12921,7 +13320,7 @@ msgstr ""
 "Exchange) ou <link linkend=\"sendmail\">Sendmail</link>, ou bien d'autres "
 "options."
 
-#: ../C/evolution.xml:6308(para)
+#: ../C/evolution.xml:6524(para)
 msgid ""
 "For additional information, see <link linkend=\"third-step\">Sending Mail</"
 "link>."
@@ -12929,11 +13328,11 @@ msgstr ""
 "Pour plus d'informations, consultez <link linkend=\"third-step\">Envoi de "
 "courriel</link>."
 
-#: ../C/evolution.xml:6310(title)
+#: ../C/evolution.xml:6526(title)
 msgid "Defaults:"
 msgstr "Valeurs par défaut :"
 
-#: ../C/evolution.xml:6311(para)
+#: ../C/evolution.xml:6527(para)
 msgid ""
 "Use this section to set where this account stores the messages that it has "
 "sent, and the messages that you save as drafts. If you want to revert to the "
@@ -12944,7 +13343,7 @@ msgstr ""
 "de brouillons. Si vous voulez restaurer les paramètres par défaut, cliquez "
 "sur Rétablir."
 
-#: ../C/evolution.xml:6313(para)
+#: ../C/evolution.xml:6529(para)
 msgid ""
 "If you want to send someone a copy of every message from this account, "
 "select either Always Carbon-Copy (Cc) To: or Always Blind Carbon-Copy (Bcc) "
@@ -12954,7 +13353,7 @@ msgstr ""
 "« Toujours envoyer une copie (Cc) à » ou « Toujours envoyer une copie cachée "
 "(Cci) à » et indiquez une ou plusieurs adresses."
 
-#: ../C/evolution.xml:6314(para)
+#: ../C/evolution.xml:6530(para)
 msgid ""
 "You can specify the way you want to receive message receipts. You can set "
 "Send message receipts to Never, Always or Ask for each message. For more "
@@ -12966,7 +13365,7 @@ msgstr ""
 "d'informations, consultez <link linkend=\"b13uhy6r\">Paramètres par défaut</"
 "link>."
 
-#: ../C/evolution.xml:6315(para)
+#: ../C/evolution.xml:6531(para)
 msgid ""
 "You can change the default settings of your sent items. Click Advanced Send "
 "Options to prioritize, classify your send messages. You can also set the "
@@ -12981,11 +13380,11 @@ msgstr ""
 "votre message en conséquence. Activez le suivi d'état et définissez les "
 "notifications de retour pour la messagerie, le calendrier et les tâches."
 
-#: ../C/evolution.xml:6317(title)
+#: ../C/evolution.xml:6533(title)
 msgid "Security:"
 msgstr "Sécurité :"
 
-#: ../C/evolution.xml:6318(para)
+#: ../C/evolution.xml:6534(para)
 msgid ""
 "Use this section to set the security options for this account. If you use "
 "encryption, enter your PGP key ID (see <link linkend=\"encryption"
@@ -12998,11 +13397,11 @@ msgstr ""
 "sélectionnez les quatre options de manière appropriée pour définir la "
 "gestion des clés et des signatures."
 
-#: ../C/evolution.xml:6321(title)
+#: ../C/evolution.xml:6537(title)
 msgid "Proxy:"
 msgstr "Proxy :"
 
-#: ../C/evolution.xml:6322(para)
+#: ../C/evolution.xml:6538(para)
 msgid ""
 "This only displays if you have a GroupWise account. Use this section to set "
 "proxy access for other users to access your mailbox or calendar."
@@ -13011,7 +13410,7 @@ msgstr ""
 "cette section pour définir l'accès proxy par d'autres utilisateurs à vos "
 "messages et à votre calendrier."
 
-#: ../C/evolution.xml:6328(para)
+#: ../C/evolution.xml:6544(para)
 msgid ""
 "The Autocompletion tool lets you choose address books to auto-complete names "
 "for you in the mail composer. This functionality requires accessibility to "
@@ -13025,11 +13424,11 @@ msgstr ""
 "page Complétion automatique, sélectionnez les carnets d'adresses avec "
 "lesquels vous voulez l'utiliser."
 
-#: ../C/evolution.xml:6332(title)
+#: ../C/evolution.xml:6548(title)
 msgid "IMAP Mail Headers"
 msgstr "En-têtes de messages IMAP"
 
-#: ../C/evolution.xml:6333(para)
+#: ../C/evolution.xml:6549(para)
 msgid ""
 "Evolution allows you to choose the headers that you want to download so that "
 "you can reduce the download time and filter or move your mail around the way "
@@ -13042,11 +13441,11 @@ msgstr ""
 "préférences des en-têtes de messages IMAP et à économiser ainsi du temps de "
 "téléchargement. Les options d'en-têtes de messages IMAP sont les suivantes :"
 
-#: ../C/evolution.xml:6335(title)
+#: ../C/evolution.xml:6551(title)
 msgid "All Headers:"
 msgstr "Tous les en-têtes :"
 
-#: ../C/evolution.xml:6336(para)
+#: ../C/evolution.xml:6552(para)
 msgid ""
 "This includes all the available IMAP Mail headers. By choosing this option, "
 "Evolution will download all the headers for all the messages."
@@ -13054,11 +13453,11 @@ msgstr ""
 "Cela comprend tous les en-têtes de messages IMAP disponibles. En choisissant "
 "cette option, Evolution télécharge tous les en-têtes de tous les messages."
 
-#: ../C/evolution.xml:6339(title)
+#: ../C/evolution.xml:6555(title)
 msgid "Basic Headers:"
 msgstr "En-têtes de base :"
 
-#: ../C/evolution.xml:6340(para)
+#: ../C/evolution.xml:6556(para)
 msgid ""
 "This will include Date, From, To, CC, Subject, Preferences, In-Reply-To, "
 "Message-ID, Mime-Version, and Content-Type. If you want to just fetch and "
@@ -13073,11 +13472,11 @@ msgstr ""
 "Cela permet d'accélérer Evolution. C'est l'option généralement recommandée "
 "pour la plupart des utilisateurs."
 
-#: ../C/evolution.xml:6343(title)
+#: ../C/evolution.xml:6559(title)
 msgid "Mailing List Headers:"
 msgstr "En-têtes de listes de diffusion :"
 
-#: ../C/evolution.xml:6344(para)
+#: ../C/evolution.xml:6560(para)
 msgid ""
 "Enable this option to have filters based on mailing list headers (like list "
 "ID) so that in addition to the basic headers, the headers that correspond to "
@@ -13093,7 +13492,7 @@ msgstr ""
 "la liste, etc. ce qui vous permet de créer des filtres en rapport avec les "
 "listes de diffusion."
 
-#: ../C/evolution.xml:6346(para)
+#: ../C/evolution.xml:6562(para)
 msgid ""
 "This is the default Header preference that comes with Evolution. When this "
 "option is chosen, Evolution will download a basic set of headers (as "
@@ -13108,60 +13507,31 @@ msgstr ""
 "Evolution, il est recommandé de choisir l'option « En-têtes de base "
 "uniquement »."
 
-#: ../C/evolution.xml:6348(title)
-msgid "Custom Headers:"
-msgstr "En-têtes personnalisés :"
-
-#: ../C/evolution.xml:6349(para)
-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 ""
-"Ce sont des en-têtes qui s'additionnent aux en-têtes standard ci-dessus. "
-"Vous pouvez ajouter des en-têtes personnalisés en plus des en-têtes "
-"standard. Si vous désirez créer des filtres basés sur certains en-têtes "
-"spécifiques personnalisés et que vous ne voulez pas saturer le réseau en "
-"téléchargeant tous les en-têtes des messages, Evolution vous offre une "
-"manière pratique de le faire au moyen de l'option des en-têtes "
-"personnalisés. À cet endroit, vous pouvez ajouter ou enlever des en-têtes "
-"individuels en fonction de vos besoins."
-
-#: ../C/evolution.xml:6352(para)
-msgid ""
-"This option may not be needed if you have chosen to download ALL Headers."
-msgstr ""
-"Cette option n'est pas utile si vous avez choisi de télécharger TOUS les en-"
-"têtes."
-
-#: ../C/evolution.xml:6354(para)
+#: ../C/evolution.xml:6563(para)
 msgid "To set the IMAP Mail headers:"
 msgstr "Pour définir les en-têtes de messages IMAP :"
 
-#: ../C/evolution.xml:6360(para)
+#: ../C/evolution.xml:6569(para)
 msgid "Select the IMAP account and click Edit to open the Account Editor."
 msgstr ""
 "Sélectionnez le compte IMAP et cliquez sur Édition pour ouvrir l'éditeur de "
 "compte."
 
-#: ../C/evolution.xml:6363(para)
+#: ../C/evolution.xml:6572(para)
 msgid ""
 "On the Account Editor, click IMAP Headers tab to open IMAP Headers to the "
 "Account Editor."
 msgstr ""
 "Dans l'éditeur de compte, cliquez sur l'onglet En-têtes IMAP pour l'ouvrir."
 
-#: ../C/evolution.xml:6368(para)
+#: ../C/evolution.xml:6577(para)
 msgid ""
 "Click Fetch All Headers to download all the available header information."
 msgstr ""
 "Cliquez sur « Télécharger tous les en-têtes » afin de télécharger toutes les "
 "informations d'en-têtes disponibles."
 
-#: ../C/evolution.xml:6370(para)
+#: ../C/evolution.xml:6579(para)
 msgid ""
 "The more headers you have, the more time it will consume to download. This "
 "option is not recommended."
@@ -13169,28 +13539,28 @@ msgstr ""
 "Plus vous avez d'en-têtes, plus le temps de téléchargement sera élevé. Cette "
 "option n'est pas recommandée."
 
-#: ../C/evolution.xml:6374(para)
+#: ../C/evolution.xml:6583(para)
 msgid "Click Basic Headers to download basic headers."
 msgstr ""
 "Cliquez sur « En-têtes de base » pour télécharger uniquement les en-têtes de "
 "base."
 
-#: ../C/evolution.xml:6377(para)
+#: ../C/evolution.xml:6586(para)
 msgid "Click Basic and Mailing Headers to download both."
 msgstr ""
 "Cliquez sur En-têtes de base et de listes de diffusion pour télécharger ces "
 "deux sortes d'en-têtes."
 
-#: ../C/evolution.xml:6380(para)
+#: ../C/evolution.xml:6589(para)
 msgid "Click Add to add any predefined custom headers."
 msgstr ""
 "Cliquez sur Ajouter pour ajouter des en-têtes personnalisés prédéfinis."
 
-#: ../C/evolution.xml:6383(para)
+#: ../C/evolution.xml:6592(para)
 msgid "Click Remove to remove the custom headers."
 msgstr "Cliquez sur Enlever pour enlever des en-têtes personnalisés."
 
-#: ../C/evolution.xml:6390(para)
+#: ../C/evolution.xml:6599(para)
 msgid ""
 "The Mail Preferences tool lets you choose how to display citations, how long "
 "to wait before marking a message as read, and other mail display settings."
@@ -13199,35 +13569,35 @@ msgstr ""
 "citations, le délai après lequel un message est marqué comme ayant été lu, "
 "ainsi que d'autres paramètres d'affichage des messages."
 
-#: ../C/evolution.xml:6393(link) ../C/evolution.xml:6417(title)
+#: ../C/evolution.xml:6602(link) ../C/evolution.xml:6626(title)
 msgid "General Mail Settings"
 msgstr "Paramètres généraux du courriel"
 
-#: ../C/evolution.xml:6396(link) ../C/evolution.xml:6439(title)
+#: ../C/evolution.xml:6605(link) ../C/evolution.xml:6648(title)
 msgid "HTML Mail Preferences"
 msgstr "Préférences du courriel HTML"
 
-#: ../C/evolution.xml:6399(link) ../C/evolution.xml:6457(title)
+#: ../C/evolution.xml:6608(link) ../C/evolution.xml:6666(title)
 msgid "Label Preferences"
 msgstr "Préférences des étiquettes"
 
-#: ../C/evolution.xml:6402(link) ../C/evolution.xml:6491(title)
+#: ../C/evolution.xml:6611(link) ../C/evolution.xml:6700(title)
 msgid "Mail Header Preferences"
 msgstr "Préférences des en-têtes de messages"
 
-#: ../C/evolution.xml:6405(link) ../C/evolution.xml:6503(title)
+#: ../C/evolution.xml:6614(link) ../C/evolution.xml:6712(title)
 msgid "Junk Mail Preferences"
 msgstr "Préférences du pourriel"
 
-#: ../C/evolution.xml:6408(link) ../C/evolution.xml:6546(title)
+#: ../C/evolution.xml:6617(link) ../C/evolution.xml:6755(title)
 msgid "Automatic Contacts Preferences"
 msgstr "Préférences des contacts automatiques"
 
-#: ../C/evolution.xml:6411(link) ../C/evolution.xml:6552(title)
+#: ../C/evolution.xml:6620(link) ../C/evolution.xml:6761(title)
 msgid "Calendar and Tasks Preferences"
 msgstr "Préférences du calendrier et des tâches"
 
-#: ../C/evolution.xml:6414(para)
+#: ../C/evolution.xml:6623(para)
 msgid ""
 "For information on individual email account settings, see <link linkend="
 "\"config-prefs-mail-identity\">Working with Mail Accounts</link>."
@@ -13236,15 +13606,15 @@ msgstr ""
 "<link linkend=\"config-prefs-mail-identity\">Utilisation des comptes de "
 "messagerie</link>."
 
-#: ../C/evolution.xml:6418(para) ../C/evolution.xml:6574(para)
+#: ../C/evolution.xml:6627(para) ../C/evolution.xml:6783(para)
 msgid "The General page has the following options:"
 msgstr "La page Général présente les options suivantes :"
 
-#: ../C/evolution.xml:6420(title)
+#: ../C/evolution.xml:6629(title)
 msgid "Message Fonts:"
 msgstr "Police des messages :"
 
-#: ../C/evolution.xml:6421(para)
+#: ../C/evolution.xml:6630(para)
 msgid ""
 "Normally, Evolution uses the same fonts as other GNOME applications. To "
 "choose different fonts, deselect Use the same fonts as other applications "
@@ -13256,11 +13626,11 @@ msgstr ""
 "pour les caractères standard et une police pour les caractères à espacement "
 "fixe."
 
-#: ../C/evolution.xml:6424(title)
+#: ../C/evolution.xml:6633(title)
 msgid "Message Display:"
 msgstr "Affichage des messages :"
 
-#: ../C/evolution.xml:6425(para)
+#: ../C/evolution.xml:6634(para)
 msgid ""
 "Choose how long you want to wait before marking a message read, how to "
 "highlight quotations, and the default encoding. Enable <guilabel>Fall back "
@@ -13286,7 +13656,7 @@ msgstr ""
 "utilisant une application externe. Il est aussi possible d'activer la barre "
 "d'espace magique et les dossiers de recherche."
 
-#: ../C/evolution.xml:6427(para)
+#: ../C/evolution.xml:6636(para)
 msgid ""
 "To group the messages as threads select View &gt; Group By threads or press "
 "Ctrl+T."
@@ -13294,11 +13664,11 @@ msgstr ""
 "Pour grouper les messages sous forme de fils de discussion, choisissez "
 "Affichage &gt; Grouper par fils de discussion ou appuyez sur Ctrl+T."
 
-#: ../C/evolution.xml:6429(title)
+#: ../C/evolution.xml:6638(title)
 msgid "Deleting Mail:"
 msgstr "Supprimer le courriel :"
 
-#: ../C/evolution.xml:6430(para)
+#: ../C/evolution.xml:6639(para)
 msgid ""
 "Choose whether to delete messages automatically when quitting Evolution and "
 "how frequently, and whether you want to explicitly confirm the final "
@@ -13314,11 +13684,11 @@ msgstr ""
 "disposez de quatre options pour définir la fréquence de suppression : À "
 "chaque fois, Une fois par jour, Une fois par semaine et Une fois par mois."
 
-#: ../C/evolution.xml:6433(title)
+#: ../C/evolution.xml:6642(title)
 msgid "New Mail Notifications:"
 msgstr "Notification des nouveaux courriels :"
 
-#: ../C/evolution.xml:6434(para)
+#: ../C/evolution.xml:6643(para)
 msgid ""
 "Evolution can alert you to the arrival of new mail with a beep or by playing "
 "a sound file. Choose your alert noise, or select none, as you prefer. You "
@@ -13329,27 +13699,27 @@ msgstr ""
 "sélectionnez pas. Vous pouvez choisir de ne pas recevoir de notification "
 "lors de l'arrivée d'un nouveau message."
 
-#: ../C/evolution.xml:6440(para)
+#: ../C/evolution.xml:6649(para)
 msgid "The HTML Mail page has the following options:"
 msgstr "La page Courriel HTML contient les options suivantes :"
 
-#: ../C/evolution.xml:6442(title)
+#: ../C/evolution.xml:6651(title)
 msgid "Show Image Animations:"
 msgstr "Afficher les animations :"
 
-#: ../C/evolution.xml:6443(para)
+#: ../C/evolution.xml:6652(para)
 msgid "Turns image animation (e.g. GIF files) on or off."
 msgstr ""
 "Permet d'activer ou de désactiver les animations d'images (par ex. fichiers "
 "GIF)."
 
-#: ../C/evolution.xml:6446(title)
+#: ../C/evolution.xml:6655(title)
 msgid "Prompt When Sending HTML Messages to Contacts That Don't Want Them:"
 msgstr ""
 "Demander l'autorisation lors de l'envoi de messages HTML à des contacts qui "
 "n'en veulent pas :"
 
-#: ../C/evolution.xml:6447(para)
+#: ../C/evolution.xml:6656(para)
 msgid ""
 "Some people do not like HTML mail, and you can set Evolution to warn you of "
 "this preference. This warning appears only when you send HTML mail to people "
@@ -13360,11 +13730,11 @@ msgstr ""
 "avertissement apparaît uniquement lorsque vous envoyez un message HTML à une "
 "personne de vos contacts définie comme n'utilisant pas HTML."
 
-#: ../C/evolution.xml:6450(title)
+#: ../C/evolution.xml:6659(title)
 msgid "Loading Images:"
 msgstr "Chargement des images :"
 
-#: ../C/evolution.xml:6451(para)
+#: ../C/evolution.xml:6660(para)
 msgid ""
 "You can embed a image in an email and have it load only when the message "
 "arrives. However, spammers can use image loading patterns to confirm "
@@ -13380,7 +13750,7 @@ msgstr ""
 "images que si les expéditeurs font partie de vos contacts ou de toujours "
 "charger les images."
 
-#: ../C/evolution.xml:6453(para)
+#: ../C/evolution.xml:6662(para)
 msgid ""
 "If you have chosen not to load images automatically, you can choose to see "
 "the images in one message at a time by selecting View &gt; Load Images or "
@@ -13390,7 +13760,7 @@ msgstr ""
 "choisir de voir les images de chaque message en choisissant Affichage &gt; "
 "Charger les images ou en appuyant sur Ctrl+I."
 
-#: ../C/evolution.xml:6458(para)
+#: ../C/evolution.xml:6667(para)
 msgid ""
 "The Label preferences option lets you add color labels for different kinds "
 "of messages. You can add, edit, or remove the labels. You can also assign "
@@ -13402,47 +13772,47 @@ msgstr ""
 "étiquette que vous créez. Vous ne pouvez pas supprimer les étiquettes par "
 "défaut."
 
-#: ../C/evolution.xml:6460(para)
+#: ../C/evolution.xml:6669(para)
 msgid "To create a label:"
 msgstr "Pour créer une étiquette :"
 
-#: ../C/evolution.xml:6463(para)
+#: ../C/evolution.xml:6672(para)
 msgid "Click Add and specify the name in the Label Name dialog box."
 msgstr ""
 "Cliquez sur Ajouter et saisissez un nom dans la boîte de dialogue du nom de "
 "l'étiquette."
 
-#: ../C/evolution.xml:6466(para)
+#: ../C/evolution.xml:6675(para)
 msgid "Click the color tab and select a color, then click OK."
 msgstr ""
 "Cliquez sur l'onglet Couleur, choisissez une couleur et cliquez sur Valider."
 
-#: ../C/evolution.xml:6469(para)
+#: ../C/evolution.xml:6678(para)
 msgid "To edit label properties:"
 msgstr "Pour modifier les propriétés d'une étiquette :"
 
-#: ../C/evolution.xml:6472(para)
+#: ../C/evolution.xml:6681(para)
 msgid "Select the label and click Edit."
 msgstr "Sélectionnez l'étiquette et cliquez sur Modifier."
 
-#: ../C/evolution.xml:6475(para)
+#: ../C/evolution.xml:6684(para)
 msgid "Edit name and color, then click OK."
 msgstr "Modifiez le nom et la couleur, puis cliquez sur Valider."
 
-#: ../C/evolution.xml:6478(para)
+#: ../C/evolution.xml:6687(para)
 msgid "To assign a label to a specific email message:"
 msgstr "Pour attribuer une étiquette à un message particulier :"
 
-#: ../C/evolution.xml:6481(para)
+#: ../C/evolution.xml:6690(para)
 msgid "Right-click the message from the message preview."
 msgstr "Faites un clic droit sur le message dans la liste des courriels."
 
-#: ../C/evolution.xml:6484(para)
+#: ../C/evolution.xml:6693(para)
 msgid "Click Label and select the desired label for the message."
 msgstr ""
 "Choisissez Étiquette et sélectionnez l'étiquette souhaitée pour le message."
 
-#: ../C/evolution.xml:6492(para)
+#: ../C/evolution.xml:6701(para)
 msgid ""
 "The headers on an incoming message are the information about the message "
 "that isn't the content of the message itself, such as the sender and the "
@@ -13457,11 +13827,11 @@ msgstr ""
 "vous lisez. Vous pouvez aussi ajouter de nouveaux en-têtes de messages dans "
 "la liste ou en enlever. Les en-têtes par défaut ne peuvent pas être enlevés."
 
-#: ../C/evolution.xml:6494(title)
+#: ../C/evolution.xml:6703(title)
 msgid "Sender Photograph:"
 msgstr "Photo de l'expéditeur :"
 
-#: ../C/evolution.xml:6495(para)
+#: ../C/evolution.xml:6704(para)
 msgid ""
 "This feature adds support for viewing the photograph of the sender at the "
 "right side of the preview pane."
@@ -13469,7 +13839,7 @@ msgstr ""
 "Cette fonctionnalité ajoute la possibilité de voir la photo de l'expéditeur "
 "du côté droit du panneau d'aperçu."
 
-#: ../C/evolution.xml:6497(para)
+#: ../C/evolution.xml:6706(para)
 msgid ""
 "To enable this feature, select Edit &gt; Preferences &gt; Mail Preferences "
 "&gt; Headers &gt; Show the photograph of sender in the email preview. "
@@ -13480,7 +13850,7 @@ msgstr ""
 "de l'expéditeur dans l'aperçu du courriel ». Décochez cette option pour "
 "désactiver la fonctionnalité."
 
-#: ../C/evolution.xml:6498(para)
+#: ../C/evolution.xml:6707(para)
 msgid ""
 "By default it searches only in the local addressbooks enabled for "
 "autocompletion. If you deselect the option <guilabel>Search for sender "
@@ -13501,7 +13871,7 @@ msgstr ""
 "premier contact trouvé, sans prendre en compte la présence d'une photo ou "
 "non dans les contacts trouvés."
 
-#: ../C/evolution.xml:6499(para)
+#: ../C/evolution.xml:6708(para)
 msgid ""
 "This feature is disabled by default as it causes delay in fetching the "
 "messages."
@@ -13509,7 +13879,7 @@ msgstr ""
 "Cette fonctionnalité est désactivée par défaut, car elle ralentit la "
 "récupération des messages."
 
-#: ../C/evolution.xml:6504(para)
+#: ../C/evolution.xml:6713(para)
 msgid ""
 "You can check your incoming messages for junk content by using Bogofilter "
 "and SpamAssassin* tools, which have trainable Bayesian filters. You need to "
@@ -13520,15 +13890,11 @@ msgstr ""
 "intelligents. Vous devez cependant activer les greffons de pourriel "
 "correspondants pour activer le filtrage des pourriels."
 
-#: ../C/evolution.xml:6505(para)
+#: ../C/evolution.xml:6714(para)
 msgid "To enable Junk plugins:"
 msgstr "Pour activer les greffons de pourriel :"
 
-#: ../C/evolution.xml:6508(para)
-msgid "Select Edit &gt; Plugins"
-msgstr "Choisissez Édition &gt; Greffons."
-
-#: ../C/evolution.xml:6511(para)
+#: ../C/evolution.xml:6720(para)
 msgid ""
 "Select the junk plugins you want. You can select either Bogofilter or "
 "SpamAssassin, or you can select both."
@@ -13536,11 +13902,11 @@ msgstr ""
 "Sélectionnez les greffons de pourriel que vous souhaitez activer. Vous "
 "pouvez activer Bogofilter ou SpamAssassin, ou les deux."
 
-#: ../C/evolution.xml:6515(title)
+#: ../C/evolution.xml:6724(title)
 msgid "General:"
 msgstr "Général :"
 
-#: ../C/evolution.xml:6516(para)
+#: ../C/evolution.xml:6725(para)
 msgid ""
 "You can check incoming email for junk contents and also decide how often you "
 "want to delete junk mail. You also have the option to choose either "
@@ -13550,19 +13916,19 @@ msgstr ""
 "aussi décider la fréquence de suppression des pourriels. Vous avez aussi la "
 "possibilité de choisir SpamAssassin, Bogofilter ou les deux."
 
-#: ../C/evolution.xml:6519(title)
+#: ../C/evolution.xml:6728(title)
 msgid "Checking Incoming Mail for Junk:"
 msgstr "Vérifier la présence de pourriels dans les messages entrants :"
 
-#: ../C/evolution.xml:6520(para)
+#: ../C/evolution.xml:6729(para)
 msgid "This option turns automatic junk mail filtering on or off."
 msgstr "Cette option active ou désactive le filtrage automatique de pourriels."
 
-#: ../C/evolution.xml:6523(title)
+#: ../C/evolution.xml:6732(title)
 msgid "Delete junk mail on exit:"
 msgstr "Supprimer le pourriel en quittant :"
 
-#: ../C/evolution.xml:6524(para)
+#: ../C/evolution.xml:6733(para)
 msgid ""
 "This option deletes junk messages when you exit. You can also specify when "
 "to delete the junk messages (every time, once per day, once per week, once "
@@ -13572,11 +13938,11 @@ msgstr ""
 "Vous pouvez également indiquer quand les pourriels doivent être détruits (À "
 "chaque fois, Une fois par jour, Une fois par semaine, Une fois par mois)."
 
-#: ../C/evolution.xml:6527(title)
+#: ../C/evolution.xml:6736(title)
 msgid "Default junk plugin:"
 msgstr "Greffon pourriel par défaut :"
 
-#: ../C/evolution.xml:6528(para)
+#: ../C/evolution.xml:6737(para)
 msgid ""
 "Select either SpamAssassin or Bogofilter, or both, as your junk filter. You "
 "can view them only if you have enabled the respective plugins. When you "
@@ -13588,11 +13954,11 @@ msgstr ""
 "Lorsque vous sélectionnez une option, vous êtes aussi informé de la présence "
 "ou non du programme binaire correspondant."
 
-#: ../C/evolution.xml:6532(title)
+#: ../C/evolution.xml:6741(title)
 msgid "SpamAssassin Options:"
 msgstr "Options de SpamAssassin :"
 
-#: ../C/evolution.xml:6533(para)
+#: ../C/evolution.xml:6742(para)
 msgid ""
 "Remote Test performs junk mail filtering on remote servers. It also includes "
 "online tests, like checking for blacklisted message senders and ISPs."
@@ -13602,7 +13968,7 @@ msgstr ""
 "vérification des expéditeurs de messages et les fournisseurs de service "
 "Internet fichés."
 
-#: ../C/evolution.xml:6535(para)
+#: ../C/evolution.xml:6744(para)
 msgid ""
 "This option uses tests that require a network connection, such as checking "
 "to see if a message is in a list of known junk messages, or if the sender or "
@@ -13619,11 +13985,11 @@ msgstr ""
 "détection. Si vous sélectionnez cette option, vous n'avez pas besoin "
 "d'effectuer d'autres réglages."
 
-#: ../C/evolution.xml:6537(title)
+#: ../C/evolution.xml:6746(title)
 msgid "Bogofilter Options:"
 msgstr "Options de Bogofilter :"
 
-#: ../C/evolution.xml:6538(para)
+#: ../C/evolution.xml:6747(para)
 msgid ""
 "Select Convert mail text to Unicode to enable Unicode* filtering. For more "
 "information on Bogofilter, see the <ulink url=\"http://bogofilter."
@@ -13633,7 +13999,7 @@ msgstr ""
 "Unicode*. Pour plus d'informations sur Bogofilter, consultez le <ulink url="
 "\"http://bogofilter.sourceforge.net/\">site de Bogofilter</ulink>."
 
-#: ../C/evolution.xml:6541(para)
+#: ../C/evolution.xml:6750(para)
 msgid ""
 "Check new messages for junk contents option under Edit &gt; Preferences &gt; "
 "Mail Accounts &gt; Edit &gt; Receiving options is enabled only for IMAP. "
@@ -13647,7 +14013,7 @@ msgstr ""
 "&gt; Préférences &gt; Préférences du courriel &gt; Pourriel ne s'applique "
 "qu'aux comptes POP et Distribution locale."
 
-#: ../C/evolution.xml:6547(para)
+#: ../C/evolution.xml:6756(para)
 msgid ""
 "There are two items in this section: Automatic Contacts automatically adds "
 "people that you respond to into your address book. You can select the "
@@ -13658,7 +14024,7 @@ msgstr ""
 "d'adresses. Vous pouvez sélectionner le carnet d'adresses par défaut dans la "
 "liste pour l'ajout automatique de contacts."
 
-#: ../C/evolution.xml:6548(para)
+#: ../C/evolution.xml:6757(para)
 msgid ""
 "Instant Messaging Contacts periodically synchronizes contact information and "
 "images with your instant messaging program. Currently this only works with "
@@ -13671,7 +14037,7 @@ msgstr ""
 "d'adresses ne doit pas être en lecture seule pour que ces deux fonctions "
 "soient opérationnelles."
 
-#: ../C/evolution.xml:6553(para)
+#: ../C/evolution.xml:6762(para)
 msgid ""
 "Allows you to delete messages after you have acted on an appointment. It "
 "also allows you to select calendars to search for meeting conflicts."
@@ -13680,7 +14046,7 @@ msgstr ""
 "vous. Il vous permet aussi de sélectionner des calendriers pour la recherche "
 "de conflits de réunions."
 
-#: ../C/evolution.xml:6559(para)
+#: ../C/evolution.xml:6768(para)
 msgid ""
 "There are three tabs for message composer settings where you can set the "
 "composer preferences. The General tab covers assorted behavior, the "
@@ -13692,19 +14058,19 @@ msgstr ""
 "l'onglet Signatures permet de gérer votre signature et l'onglet Correction "
 "orthographique contrôle la correction orthographique."
 
-#: ../C/evolution.xml:6565(link) ../C/evolution.xml:6605(title)
+#: ../C/evolution.xml:6774(link) ../C/evolution.xml:6814(title)
 msgid "Signature"
 msgstr "Signatures"
 
-#: ../C/evolution.xml:6568(link) ../C/evolution.xml:6610(title)
+#: ../C/evolution.xml:6777(link) ../C/evolution.xml:6819(title)
 msgid "Spell Checking"
 msgstr "Correction orthographique"
 
-#: ../C/evolution.xml:6576(title)
+#: ../C/evolution.xml:6785(title)
 msgid "Default Behavior:"
 msgstr "Comportement par défaut :"
 
-#: ../C/evolution.xml:6577(para)
+#: ../C/evolution.xml:6786(para)
 msgid ""
 "Choose how to normally forward and reply to messages, what character set "
 "they will use, whether they are in HTML, and whether that HTML can contain "
@@ -13715,7 +14081,7 @@ msgstr ""
 "voulez utiliser le format HTML et si les messages HTML peuvent contenir des "
 "émoticônes."
 
-#: ../C/evolution.xml:6579(para)
+#: ../C/evolution.xml:6788(para)
 msgid ""
 "You can forward messages either as an attachment or inline, or else as "
 "quoted. Choose reply style from the drop-down list: Quote original message, "
@@ -13726,11 +14092,11 @@ msgstr ""
 "liste déroulante : Citer le message d'origine, Ne pas citer le message "
 "d'origine ou Joindre le message d'origine."
 
-#: ../C/evolution.xml:6581(title)
+#: ../C/evolution.xml:6790(title)
 msgid "Top Posting Options:"
 msgstr "Option de réponse en tête de message :"
 
-#: ../C/evolution.xml:6582(para)
+#: ../C/evolution.xml:6791(para)
 msgid ""
 "When replying, you can choose where to place your signature in the message. "
 "You can place the signature either above the original message or at the end "
@@ -13744,31 +14110,31 @@ msgstr ""
 "recommandée, car le placement de la signature au fond des messages fait "
 "partie des standards de la messagerie."
 
-#: ../C/evolution.xml:6585(title) ../C/evolution.xml:6658(title)
+#: ../C/evolution.xml:6794(title) ../C/evolution.xml:6867(title)
 msgid "Alerts:"
 msgstr "Alertes :"
 
-#: ../C/evolution.xml:6586(para)
+#: ../C/evolution.xml:6795(para)
 msgid "There are two optional alerts you can select:"
 msgstr "Vous pouvez sélectionner deux types d'alertes :"
 
-#: ../C/evolution.xml:6591(title)
+#: ../C/evolution.xml:6800(title)
 msgid "Prompt When Sending Messages With an Empty Subject Line:"
 msgstr "Demander lors de l'envoi de messages dépourvus de sujet :"
 
-#: ../C/evolution.xml:6592(para)
+#: ../C/evolution.xml:6801(para)
 msgid "The composer warns you if you try to send a message without a subject."
 msgstr ""
 "L'éditeur vous avertit si vous essayez d'envoyer un message sans indiquer de "
 "sujet."
 
-#: ../C/evolution.xml:6597(title)
+#: ../C/evolution.xml:6806(title)
 msgid "Prompt When Sending Messages with Only Bcc Recipients Defined:"
 msgstr ""
 "Demander lors de l'envoi de messages où seuls des destinataires Cci sont "
 "définis :"
 
-#: ../C/evolution.xml:6598(para)
+#: ../C/evolution.xml:6807(para)
 msgid ""
 "The composer warns you if you try to send a message that has only Bcc "
 "recipients. This is important because some mail servers fail to transmit "
@@ -13780,7 +14146,7 @@ msgstr ""
 "messagerie n'envoient pas de copies cachées si les messages ne contiennent "
 "pas au moins un destinataire visible de tous les destinataires."
 
-#: ../C/evolution.xml:6606(para)
+#: ../C/evolution.xml:6815(para)
 msgid ""
 "The signature editor allows you to create several different signatures in "
 "plain text or in HTML, and to specify which of them will be added to email "
@@ -13793,7 +14159,7 @@ msgstr ""
 "utiliser une signature alternative ou n'en utiliser aucune, vous pouvez "
 "l'indiquer dans l'éditeur de messages."
 
-#: ../C/evolution.xml:6611(para)
+#: ../C/evolution.xml:6820(para)
 msgid ""
 "To choose a spell-checking language, select it here. You must install gnome-"
 "spell, aspell, and an aspell language package (like for example aspell-en "
@@ -13813,56 +14179,56 @@ msgstr ""
 "cochez « Vérifier l'orthographe pendant la frappe ». Vous pouvez définir la "
 "couleur des mots mal orthographiés."
 
-#: ../C/evolution.xml:6618(para)
+#: ../C/evolution.xml:6827(para)
 msgid "The calendar configuration tool has several pages:"
 msgstr "L'outil de configuration du calendrier contient plusieurs onglets :"
 
-#: ../C/evolution.xml:6624(link) ../C/evolution.xml:6664(title)
+#: ../C/evolution.xml:6833(link) ../C/evolution.xml:6873(title)
 msgid "Display"
 msgstr "Affichage"
 
-#: ../C/evolution.xml:6627(link) ../C/evolution.xml:6697(title)
+#: ../C/evolution.xml:6836(link) ../C/evolution.xml:6906(title)
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: ../C/evolution.xml:6630(link) ../C/evolution.xml:6710(title)
+#: ../C/evolution.xml:6839(link) ../C/evolution.xml:6919(title)
 msgid "Calendar Publishing"
 msgstr "Publication de calendrier"
 
-#: ../C/evolution.xml:6636(para)
+#: ../C/evolution.xml:6845(para)
 msgid "The General page lets you set the following options:"
 msgstr "L'onglet Général vous permet de définir les options suivantes :"
 
-#: ../C/evolution.xml:6638(title)
+#: ../C/evolution.xml:6847(title)
 msgid "Time Zone:"
 msgstr "Fuseau horaire :"
 
-#: ../C/evolution.xml:6639(para)
+#: ../C/evolution.xml:6848(para)
 msgid "The city you're located in, to specify your time zone."
 msgstr ""
 "La ville près de laquelle vous habitez, pour indiquer le fuseau horaire."
 
-#: ../C/evolution.xml:6642(title)
+#: ../C/evolution.xml:6851(title)
 msgid "Time Format:"
 msgstr "Format de date :"
 
-#: ../C/evolution.xml:6643(para)
+#: ../C/evolution.xml:6852(para)
 msgid "Choose between twelve-hour (AM/PM) and twenty-four-hour time formats."
 msgstr "Choisissez le format 12 heures (AM/PM) ou 24 heures."
 
-#: ../C/evolution.xml:6646(title)
+#: ../C/evolution.xml:6855(title)
 msgid "Week Starts:"
 msgstr "La semaine débute un :"
 
-#: ../C/evolution.xml:6647(para)
+#: ../C/evolution.xml:6856(para)
 msgid "Select the day to display as the first in each week."
 msgstr "Sélectionnez le premier jour de chaque semaine à afficher."
 
-#: ../C/evolution.xml:6650(title)
+#: ../C/evolution.xml:6859(title)
 msgid "Day Begins:"
 msgstr "La journée débute à :"
 
-#: ../C/evolution.xml:6651(para)
+#: ../C/evolution.xml:6860(para)
 msgid ""
 "For Evolution, a normal work day begins at 9 a.m. and ends at 5 p.m. You can "
 "select your preferred hours."
@@ -13870,15 +14236,15 @@ msgstr ""
 "Dans Evolution, une journée de travail normale commence à 9h00 et se termine "
 "à 17h00. Vous pouvez sélectionner les heures de travail qui vous conviennent."
 
-#: ../C/evolution.xml:6654(title)
+#: ../C/evolution.xml:6863(title)
 msgid "Day Ends:"
 msgstr "La journée se termine à :"
 
-#: ../C/evolution.xml:6655(para)
+#: ../C/evolution.xml:6864(para)
 msgid "Sets the end of a normal workday."
 msgstr "Définit la fin d'une journée de travail normale."
 
-#: ../C/evolution.xml:6659(para)
+#: ../C/evolution.xml:6868(para)
 msgid ""
 "If you want to be warned before you delete any appointment, or to have a "
 "reminder automatically appear for each event, select the options here."
@@ -13887,7 +14253,7 @@ msgstr ""
 "rendez-vous ou un rappel automatique pour chaque événement, sélectionnez les "
 "options correspondantes ici."
 
-#: ../C/evolution.xml:6665(para)
+#: ../C/evolution.xml:6874(para)
 msgid ""
 "The Display page lets you choose how your appointments and tasks appear in "
 "your calendar."
@@ -13895,11 +14261,11 @@ msgstr ""
 "L'onglet Affichage permet de définir la manière dont les rendez-vous et les "
 "tâches apparaissent dans le calendrier."
 
-#: ../C/evolution.xml:6667(title)
+#: ../C/evolution.xml:6876(title)
 msgid "Time Divisions:"
 msgstr "Divisions horaires :"
 
-#: ../C/evolution.xml:6668(para)
+#: ../C/evolution.xml:6877(para)
 msgid ""
 "Sets the time increments shown as fine lines on the daily view in the "
 "calendar."
@@ -13907,13 +14273,13 @@ msgstr ""
 "Définit les incréments horaires signalés par de fines lignes dans la vue "
 "journalière du calendrier."
 
-#: ../C/evolution.xml:6671(title)
+#: ../C/evolution.xml:6880(title)
 msgid "Show appointment end times in week and month views:"
 msgstr ""
 "Afficher les heures de fin de rendez-vous dans les vues mensuelles et "
 "hebdomadaires :"
 
-#: ../C/evolution.xml:6672(para)
+#: ../C/evolution.xml:6881(para)
 msgid ""
 "If there is space, Evolution shows the end times in the week and month views "
 "for each appointment."
@@ -13921,11 +14287,11 @@ msgstr ""
 "Si l'espace le permet, Evolution affiche l'heure de fin de chaque rendez-"
 "vous dans les vues hebdomadaires et mensuelles."
 
-#: ../C/evolution.xml:6675(title)
+#: ../C/evolution.xml:6884(title)
 msgid "Compress weekends in month view:"
 msgstr "Compresser les week-ends dans la vue mensuelle :"
 
-#: ../C/evolution.xml:6676(para)
+#: ../C/evolution.xml:6885(para)
 msgid ""
 "Select this option to display weekends in one box instead of two in the "
 "month view."
@@ -13933,35 +14299,35 @@ msgstr ""
 "Sélectionnez cette option pour afficher les week-ends dans une seule zone au "
 "lieu de deux dans la vue mensuelle."
 
-#: ../C/evolution.xml:6679(title)
+#: ../C/evolution.xml:6888(title)
 msgid "Show week numbers in date navigator:"
 msgstr "Afficher les numéros de semaine dans le navigateur de dates :"
 
-#: ../C/evolution.xml:6680(para)
+#: ../C/evolution.xml:6889(para)
 msgid "Shows the week numbers next to the respective weeks in the calendar."
 msgstr "Affiche le numéro de chaque semaine dans le calendrier."
 
-#: ../C/evolution.xml:6683(title)
+#: ../C/evolution.xml:6892(title)
 msgid "Tasks due today:"
 msgstr "Tâches d'aujourd'hui :"
 
-#: ../C/evolution.xml:6684(para)
+#: ../C/evolution.xml:6893(para)
 msgid "Select the color for tasks due today."
 msgstr "Sélectionnez la couleur des tâches du jour."
 
-#: ../C/evolution.xml:6687(title)
+#: ../C/evolution.xml:6896(title)
 msgid "Overdue tasks:"
 msgstr "Tâches en retard :"
 
-#: ../C/evolution.xml:6688(para)
+#: ../C/evolution.xml:6897(para)
 msgid "Select the color for overdue tasks."
 msgstr "Sélectionnez la couleur des tâches échues."
 
-#: ../C/evolution.xml:6691(title)
+#: ../C/evolution.xml:6900(title)
 msgid "Hide completed tasks after:"
 msgstr "Masquer les tâches effectuées après :"
 
-#: ../C/evolution.xml:6692(para)
+#: ../C/evolution.xml:6901(para)
 msgid ""
 "Select this option to have completed tasks hidden after a period of time "
 "measured in days, hours, or minutes. If you don't select this option, "
@@ -13972,11 +14338,11 @@ msgstr ""
 "terminées restent dans la liste des tâches et sont signalées comme étant "
 "terminées."
 
-#: ../C/evolution.xml:6699(title)
+#: ../C/evolution.xml:6908(title)
 msgid "Select the Calendars for Alarm Notification:"
 msgstr "Sélectionnez les calendriers pour les notifications d'alarme :"
 
-#: ../C/evolution.xml:6700(para)
+#: ../C/evolution.xml:6909(para)
 msgid ""
 "Select the calendars for which you want an alarm notification. If you don't "
 "select the calendar, you will not have an alarm notification for any event "
@@ -13986,15 +14352,15 @@ msgstr ""
 "d'alarme. Si un calendrier n'est pas sélectionné, vous ne recevrez aucune "
 "notification d'alarme pour les événements de ce calendrier."
 
-#: ../C/evolution.xml:6705(title)
+#: ../C/evolution.xml:6914(title)
 msgid "Free/Busy"
 msgstr "Libre/Occupé"
 
-#: ../C/evolution.xml:6712(title)
+#: ../C/evolution.xml:6921(title)
 msgid "Publishing:"
 msgstr "Publication :"
 
-#: ../C/evolution.xml:6713(para)
+#: ../C/evolution.xml:6922(para)
 msgid ""
 "Allows you to select a URL to post your calendar information to. When you "
 "add a URL, you can specify the publishing location, the frequency of "
@@ -14005,7 +14371,192 @@ msgstr ""
 "publication, la fréquence de publication, quel calendrier publier et sous "
 "quel utilisateur s'authentifier."
 
-#: ../C/evolution.xml:6720(para)
+#: ../C/evolution.xml:6928(title)
+msgid "Network Preferences"
+msgstr "Préférences réseau"
+
+#: ../C/evolution.xml:6929(para)
+msgid "This interface lets you configure your network proxy settings."
+msgstr ""
+"Cette interface vous permet de configurer les paramètres de serveur "
+"mandataire de votre réseau."
+
+#: ../C/evolution.xml:6931(para)
+msgid "Use the following four options to configure the proxy settings:"
+msgstr ""
+"Utilisez les quatre options suivantes pour configurer les paramètres de "
+"serveur mandataire :"
+
+#: ../C/evolution.xml:6933(title)
+msgid "Use system defaults:"
+msgstr "Utiliser les réglages par défaut du système"
+
+#: ../C/evolution.xml:6934(para)
+msgid ""
+"Select this option to use the system wide proxy settings configured through "
+"Control Center &gt; Network Proxies in GNOME. When this option is selected, "
+"Evolution uses the proxy settings in the /system/http_proxy and /system/"
+"proxy/gconf keys."
+msgstr ""
+"Cochez cette option pour utiliser les paramètres de serveur mandataire définis "
+"au niveau du système à l'aide des Préférences du serveur mandataire. Quand "
+"cette option est cochée, Evolution utilise les paramètres stockés dans les "
+"clés GConf /system/http_proxy et /system/proxy."
+
+#: ../C/evolution.xml:6937(para)
+msgid ""
+"If these keys do not reflect the settings configured through Control Center "
+"&gt; Network Proxies, Evolution does not work with the proxy and you must "
+"either update these gconf keys or choose Manual proxy configuration."
+msgstr ""
+"Si ces clés ne correspondent pas aux paramètres configurés dans les "
+"Préférences de serveur mandataire du système, Evolution n'utilise pas le "
+"serveur mandataire ; vous devez alors mettre à jour ces clés GConf ou définir "
+"une configuration manuelle du serveur mandataire."
+
+#: ../C/evolution.xml:6940(title)
+msgid "Direct connection to the Internet:"
+msgstr "Connexion directe à Internet"
+
+#: ../C/evolution.xml:6941(para)
+msgid "Select this option to connect directly to the internet."
+msgstr ""
+"Cochez cette option pour vous connecter directement à Internet."
+
+#: ../C/evolution.xml:6944(title)
+msgid "Manual proxy configuration:"
+msgstr "Configuration manuelle du serveur mandataire"
+
+#: ../C/evolution.xml:6945(para)
+msgid ""
+"This option helps you costomize proxy settings regardless of the desktop you "
+"use. Specify hosts and ports for HTTP and optionally for other protocols. In "
+"the No Proxy Domain field, specify that comma-separated domain names do not "
+"go through the configured proxy server. You can specify patterns like *."
+"example.com or .example.com in the No Proxy Domain list. Specify a username "
+"and password, and if the proxy server requires authentication, select Use "
+"Authentication to enable the username and password fields. The customized "
+"proxy settings are as follows:"
+msgstr ""
+"Cette option vous aide à personnaliser les paramètres de serveur mandataire "
+"quel que soit l'environnement de bureau utilisé. Indiquez les "
+"hôtes et les ports pour le protocole HTTP ou facultativement pour les autres protocoles. Dans "
+"le champ « Domaine sans serveur mandataire », indiquez les noms de domaine qui ne "
+"doivent pas passer par le serveur mandataire configuré, séparés par des virgules. "
+"Cette liste peut contenir des modèles comme *.exemple.com ou .example.com. "
+"Si le serveur nécessite une authentification, cochez « Utiliser l'authentification » puis indiquez un nom d'utilisateur et un "
+"mot de passe. Les paramètres de "
+"configuration du serveur mandataire sont les suivants :"
+
+#: ../C/evolution.xml:6954(para)
+msgid "Proxy Configuration Settings"
+msgstr "Paramètres de configuration du serveur mandataire"
+
+#: ../C/evolution.xml:6964(para)
+msgid "HTTP Proxy"
+msgstr "Serveur mandataire HTTP"
+
+#: ../C/evolution.xml:6967(para)
+msgid "The machine name to proxy HTTP through."
+msgstr "Le nom de la machine qui servira de serveur mandataire HTTP."
+
+#: ../C/evolution.xml:6972(para) ../C/evolution.xml:6988(para)
+#: ../C/evolution.xml:7004(para)
+msgid "Port"
+msgstr "Port"
+
+#: ../C/evolution.xml:6975(para)
+msgid ""
+"The port for the machine defined by the HTTP Proxy field that you proxy "
+"through."
+msgstr ""
+"Le port de la machine définie comme serveur mandataire HTTP dans le champ "
+"précédent."
+
+#: ../C/evolution.xml:6980(para)
+msgid "Secure HTTP Proxy"
+msgstr "Serveur mandataire HTTP sécurisé"
+
+#: ../C/evolution.xml:6983(para)
+msgid "The machine name to proxy secure HTTP through."
+msgstr "Le nom de la machine qui servira de serveur mandataire HTTP sécurisé."
+
+#: ../C/evolution.xml:6991(para)
+msgid "The port for the machine defined by the Secure HTTP Proxy port field."
+msgstr ""
+"Le port de la machine définie comme serveur mandataire HTTP sécurisé dans le champ "
+"précédent."
+
+#: ../C/evolution.xml:6996(para)
+msgid "SOCKS Host"
+msgstr "Hôte SOCKS"
+
+#: ../C/evolution.xml:6999(para)
+msgid "The machine name to proxy SOCKS through."
+msgstr "Le nom de la machine qui servira de serveur mandataire SOCKS."
+
+#: ../C/evolution.xml:7007(para)
+msgid "The port for the machine defined by the SOCKS host."
+msgstr "Le port de la machine qui servira de serveur mandataire SOCKS."
+
+#: ../C/evolution.xml:7012(para)
+msgid "No proxy domain"
+msgstr "Pas de serveur mandataire pour"
+
+#: ../C/evolution.xml:7015(para)
+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 "
+"(using an initial wildcard like *.example.com), IP host addresses (both IPv4 "
+"and IPv6) and network addresses with a netmask similar to 192.168.0.0/24."
+msgstr ""
+"Cette clé contient une liste d'hôtes qui sont accédés en direct, sans passer "
+"par le serveur mandataire (s'il est actif). Les valeurs peuvent être des noms "
+"d'hôtes, des domaines (utilisant un caractère de substitution initial comme *.exemple.com), des "
+"adresses d'hôtes IP (IPv4 et IPv6) et des adresses réseau avec masque, comme "
+"192.168.0.0/24."
+
+#: ../C/evolution.xml:7020(para)
+msgid "Use authentication"
+msgstr "Utiliser l'authentification"
+
+#: ../C/evolution.xml:7023(para)
+msgid ""
+"If this option is enabled, it uses authentication to connect via the proxy "
+"server."
+msgstr ""
+"Si cette option est cochée, la connexion au serveur mandataire utilise "
+"l'authentification."
+
+#: ../C/evolution.xml:7028(para)
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
+#: ../C/evolution.xml:7031(para)
+msgid "Username used to authenticate when performing an HTTP proxying."
+msgstr "Nom d'utilisateur servant à l'authentification pour accéder au serveur mandataire HTTP."
+
+#: ../C/evolution.xml:7036(para)
+msgid "Password"
+msgstr "Mot de passe"
+
+#: ../C/evolution.xml:7039(para)
+msgid "Password used to authenticate when performing an HTTP proxying."
+msgstr "Mot de passe servant à l'authentification pour accéder au serveur mandataire HTTP."
+
+#: ../C/evolution.xml:7046(title)
+msgid "Automatic proxy configuration URL:"
+msgstr "URL de configuration automatique du serveur mandataire"
+
+#: ../C/evolution.xml:7047(para)
+msgid ""
+"Specify the automatic proxy configuration URL for Evolution to use in the "
+"autoconfig script to configure the proxy."
+msgstr ""
+"Indique l'URL de configuration automatique du serveur mandataire utilisé par "
+"Evolution dans le script d'auto-configuration du serveur mandataire."
+
+#: ../C/evolution.xml:7053(para)
 msgid ""
 "Evolution allows you to add certificates for yourself as well as for "
 "contacts. This allows you to communicate with others securely over an "
@@ -14018,11 +14569,11 @@ msgstr ""
 "votre identité auprès d'un contact. Ces paramètres s'appliquent uniquement "
 "au chiffrement S/MIME."
 
-#: ../C/evolution.xml:6722(title)
+#: ../C/evolution.xml:7055(title)
 msgid "Your Certificates:"
 msgstr "Vos certificats :"
 
-#: ../C/evolution.xml:6723(para)
+#: ../C/evolution.xml:7056(para)
 msgid ""
 "Click the Your Certificates tab to display a list of certificates that you "
 "own. You can import, view and delete your certificates from this page."
@@ -14031,11 +14582,11 @@ msgstr ""
 "certificats. Vous pouvez importer, afficher et supprimer vos certificats "
 "dans cet onglet."
 
-#: ../C/evolution.xml:6726(title)
+#: ../C/evolution.xml:7059(title)
 msgid "Contact Certificates:"
 msgstr "Certificats des contacts :"
 
-#: ../C/evolution.xml:6727(para)
+#: ../C/evolution.xml:7060(para)
 msgid ""
 "Click the Contact Certificates tab to display a list of certificates that "
 "you have for contacts. These certificates allow you to decrypt messages as "
@@ -14048,11 +14599,11 @@ msgstr ""
 "Vous pouvez importer, afficher, modifier et supprimer les certificats des "
 "contacts dans cet onglet."
 
-#: ../C/evolution.xml:6730(title)
+#: ../C/evolution.xml:7063(title)
 msgid "Authorities:"
 msgstr "Autorités :"
 
-#: ../C/evolution.xml:6731(para)
+#: ../C/evolution.xml:7064(para)
 msgid ""
 "Click the Authorities tab to display a list of trusted certificate "
 "authorities who verify that the certificate you have is valid. You can "
@@ -14063,71 +14614,71 @@ msgstr ""
 "pouvez importer, afficher, modifier et supprimer les autorités de "
 "certification dans cet onglet."
 
-#: ../C/evolution.xml:6737(para)
+#: ../C/evolution.xml:7070(para)
 msgid "There are two main tasks for configuring contact information:"
 msgstr ""
 "Il existe deux tâches principales pour configurer les informations de "
 "contacts :"
 
-#: ../C/evolution.xml:6740(link) ../C/evolution.xml:6748(title)
+#: ../C/evolution.xml:7073(link) ../C/evolution.xml:7081(title)
 msgid "Creating a Contact"
 msgstr "Création d'un contact"
 
-#: ../C/evolution.xml:6743(link) ../C/evolution.xml:6770(title)
+#: ../C/evolution.xml:7076(link) ../C/evolution.xml:7103(title)
 msgid "Creating an Address Book"
 msgstr "Création d'un carnet d'adresses"
 
-#: ../C/evolution.xml:6749(para)
+#: ../C/evolution.xml:7082(para)
 msgid "To add a new contact list, either local or remote:"
 msgstr ""
 "Pour ajouter une nouvelle liste de contacts, qu'elle soit locale ou "
 "distante :"
 
-#: ../C/evolution.xml:6752(para)
+#: ../C/evolution.xml:7085(para)
 msgid "Click Contacts in the Switcher."
 msgstr "Cliquez sur Contacts dans le sélecteur."
 
-#: ../C/evolution.xml:6755(para)
+#: ../C/evolution.xml:7088(para)
 msgid "Click the down-arrow next to New."
 msgstr "Cliquez sur la flèche à droite du bouton Nouveau."
 
-#: ../C/evolution.xml:6758(para)
+#: ../C/evolution.xml:7091(para)
 msgid "Select Contact List."
 msgstr "Choisissez Liste de contacts."
 
-#: ../C/evolution.xml:6761(para)
+#: ../C/evolution.xml:7094(para)
 msgid "Type a name and location for the Address Book."
 msgstr "Saisissez un nom et un emplacement pour le carnet d'adresses."
 
-#: ../C/evolution.xml:6773(para)
+#: ../C/evolution.xml:7106(para)
 msgid "Click File &gt; New &gt; Address Book."
 msgstr "Choisissez Fichier &gt; Nouveau &gt; Carnet d'adresses."
 
-#: ../C/evolution.xml:6776(para)
+#: ../C/evolution.xml:7109(para)
 msgid "Select the type of Address Book."
 msgstr "Sélectionnez le type de carnet d'adresses."
 
-#: ../C/evolution.xml:6778(title)
+#: ../C/evolution.xml:7111(title)
 msgid "On This Computer:"
 msgstr "Sur cet ordinateur :"
 
-#: ../C/evolution.xml:6779(para)
+#: ../C/evolution.xml:7112(para)
 msgid "Creates a local address book on the computer."
 msgstr "Crée un carnet d'adresses local sur votre ordinateur."
 
-#: ../C/evolution.xml:6782(title)
+#: ../C/evolution.xml:7115(title)
 msgid "On LDAP Server:"
 msgstr "Sur un serveur LDAP :"
 
-#: ../C/evolution.xml:6783(para)
+#: ../C/evolution.xml:7116(para)
 msgid "Creates an address book on the LDAP server."
 msgstr "Crée un carnet d'adresses sur un serveur LDAP."
 
-#: ../C/evolution.xml:6786(title)
+#: ../C/evolution.xml:7119(title)
 msgid "Specific Account:"
 msgstr "Compte spécifique :"
 
-#: ../C/evolution.xml:6787(para)
+#: ../C/evolution.xml:7120(para)
 msgid ""
 "If you have an account that allows you to create an address book on that "
 "server, you can select that account."
@@ -14135,7 +14686,7 @@ msgstr ""
 "Si vous disposez d'un compte permettant la création d'un carnet d'adresses "
 "sur ce serveur, vous pouvez sélectionner ce compte."
 
-#: ../C/evolution.xml:6791(para)
+#: ../C/evolution.xml:7124(para)
 msgid ""
 "If you selected On This Computer, specify the name of the address book, and "
 "choose whether you want to the new address book as your default folder."
@@ -14144,7 +14695,7 @@ msgstr ""
 "d'adresses et indiquez si vous souhaitez que le nouveau carnet d'adresses "
 "soit votre dossier par défaut."
 
-#: ../C/evolution.xml:6793(para)
+#: ../C/evolution.xml:7126(para)
 msgid ""
 "If you are creating an address book on an <link linkend=\"ldap\">LDAP</link> "
 "server, enter the server information as requested by the assistant:"
@@ -14153,19 +14704,19 @@ msgstr ""
 "\">LDAP</link>, saisissez les informations du serveur selon ce qui est "
 "demandé par l'assistant :"
 
-#: ../C/evolution.xml:6795(title)
+#: ../C/evolution.xml:7128(title)
 msgid "Server Name:"
 msgstr "Nom du serveur :"
 
-#: ../C/evolution.xml:6796(para)
+#: ../C/evolution.xml:7129(para)
 msgid "The Internet address of the contact server you are using."
 msgstr "L'adresse Internet du serveur de contacts que vous utilisez."
 
-#: ../C/evolution.xml:6799(title)
+#: ../C/evolution.xml:7132(title)
 msgid "Login Method:"
 msgstr "Méthode d'identification :"
 
-#: ../C/evolution.xml:6800(para)
+#: ../C/evolution.xml:7133(para)
 msgid ""
 "Specify whether your login is anonymous, uses an email address, or uses a "
 "distinguished name. If the login is not anonymous, specify the email address "
@@ -14176,11 +14727,11 @@ msgstr ""
 "indiquez l'adresse électronique ou le nom distinctif (DN) requis par le "
 "serveur."
 
-#: ../C/evolution.xml:6803(title)
+#: ../C/evolution.xml:7136(title)
 msgid "Port:"
 msgstr "Port :"
 
-#: ../C/evolution.xml:6804(para)
+#: ../C/evolution.xml:7137(para)
 msgid ""
 "The Internet port Evolution connects to in order to access the LDAP "
 "database. This is normally 389."
@@ -14188,11 +14739,11 @@ msgstr ""
 "Le port Internet auquel Evolution doit se connecter pour pouvoir accéder à "
 "la base de données LDAP. Normalement, c'est le port 389."
 
-#: ../C/evolution.xml:6807(title)
+#: ../C/evolution.xml:7140(title)
 msgid "Use SSL/TLS:"
 msgstr "Utiliser une connexion sécurisée :"
 
-#: ../C/evolution.xml:6808(para)
+#: ../C/evolution.xml:7141(para)
 msgid ""
 "SSL and TLS are security mechanisms. If you select No Encryption, Evolution "
 "will send your password unencrypted. By using SSL or TLS, a secure "
@@ -14203,11 +14754,11 @@ msgstr ""
 "utilisant SSL ou TLS, une connexion sécurisée est établie et votre mot de "
 "passe sera envoyé de façon chiffrée."
 
-#: ../C/evolution.xml:6811(title)
+#: ../C/evolution.xml:7144(title)
 msgid "Details: Search Base:"
 msgstr "Détails : Base de recherche :"
 
-#: ../C/evolution.xml:6812(para)
+#: ../C/evolution.xml:7145(para)
 msgid ""
 "The <link linkend=\"search-base\">search base</link> is the starting point "
 "for a directory search. Contact your network administrator for information "
@@ -14217,11 +14768,11 @@ msgstr ""
 "point de départ d'une recherche d'annuaire. Pour plus d'informations sur les "
 "paramètres appropriés, contactez l'administrateur système."
 
-#: ../C/evolution.xml:6815(title)
+#: ../C/evolution.xml:7148(title)
 msgid "Search Scope:"
 msgstr "Domaine de recherche :"
 
-#: ../C/evolution.xml:6816(para)
+#: ../C/evolution.xml:7149(para)
 msgid ""
 "The <link linkend=\"search-scope\">search scope</link> is the breadth of a "
 "given search. The following options are available:"
@@ -14229,31 +14780,31 @@ msgstr ""
 "Le <link linkend=\"search-scope\">domaine de recherche</link> correspond à "
 "l'étendue d'une recherche. Vous disposez des options suivantes :"
 
-#: ../C/evolution.xml:6821(title)
+#: ../C/evolution.xml:7154(title)
 msgid "One:"
 msgstr "Un :"
 
-#: ../C/evolution.xml:6822(para)
+#: ../C/evolution.xml:7155(para)
 msgid "Searches the Search Base and one entry below it."
 msgstr ""
 "Effectue une recherche dans la base de recherche et dans un niveau "
 "hiérarchique au-dessous."
 
-#: ../C/evolution.xml:6827(title)
+#: ../C/evolution.xml:7160(title)
 msgid "Sub:"
 msgstr "Sous :"
 
-#: ../C/evolution.xml:6828(para)
+#: ../C/evolution.xml:7161(para)
 msgid "Searches the Search Base and all entries below it."
 msgstr ""
 "Effectue une recherche dans la base de recherche et dans tous les niveaux "
 "hiérarchiques."
 
-#: ../C/evolution.xml:6833(title)
+#: ../C/evolution.xml:7166(title)
 msgid "Timeout (minutes):"
 msgstr "Délai (minutes) :"
 
-#: ../C/evolution.xml:6834(para)
+#: ../C/evolution.xml:7167(para)
 msgid ""
 "The maximum time Evolution attempts to download data from the server before "
 "giving up."
@@ -14261,11 +14812,11 @@ msgstr ""
 "Délai maximum au cours duquel Evolution tente de télécharger les données du "
 "serveur avant d'abandonner le téléchargement."
 
-#: ../C/evolution.xml:6839(title)
+#: ../C/evolution.xml:7172(title)
 msgid "Download Limit:"
 msgstr "Limite de téléchargement :"
 
-#: ../C/evolution.xml:6840(para)
+#: ../C/evolution.xml:7173(para)
 msgid ""
 "The maximum number of results for a given search. Most servers refuse to "
 "send more than 500, but you can set the number lower if you want to shorten "
@@ -14276,28 +14827,28 @@ msgstr ""
 "une valeur inférieure pour raccourcir les téléchargements dans le cas de "
 "recherches très larges."
 
-#: ../C/evolution.xml:6845(title)
+#: ../C/evolution.xml:7178(title)
 msgid "Display Name:"
 msgstr "Nom d'affichage :"
 
-#: ../C/evolution.xml:6846(para)
+#: ../C/evolution.xml:7179(para)
 msgid ""
 "The name you want to use as a label for this folder. It can be any name you "
 "choose."
 msgstr "Nom à attribuer à ce dossier. Vous pouvez définir n'importe quel nom."
 
-#: ../C/evolution.xml:6851(title)
+#: ../C/evolution.xml:7184(title)
 msgid "Search Filter:"
 msgstr "Filtre de recherche :"
 
-#: ../C/evolution.xml:6852(para)
+#: ../C/evolution.xml:7185(para)
 msgid ""
 "The search filter can be set here for all the LDAP queries. For example:"
 msgstr ""
 "Le filtre de recherche peut être défini ici pour toutes les requêtes LDAP. "
 "Par exemple :"
 
-#: ../C/evolution.xml:6854(para)
+#: ../C/evolution.xml:7187(para)
 msgid ""
 "ObjectClass=*: Lists all the objects from the server.ObjectClass=User: Lists "
 "only the users. Filter (|(ObjectClass=User)(ObjectClass=groupOfNames)): "
@@ -14311,7 +14862,7 @@ msgstr ""
 "(&amp;(mail=*)(ObjectClass=*)): liste les objets associés avec ces adresses "
 "électroniques."
 
-#: ../C/evolution.xml:6856(para)
+#: ../C/evolution.xml:7189(para)
 msgid ""
 "If you change any LDAP address book configurations, Evolution and the "
 "Evolution Data Server need to be restarted in order to see the changes."
@@ -14320,7 +14871,7 @@ msgstr ""
 "Evolution Data Server doivent être redémarrés pour que les modifications "
 "s'appliquent."
 
-#: ../C/evolution.xml:6859(para)
+#: ../C/evolution.xml:7192(para)
 msgid ""
 "If you are creating the address book for a specific account, type the name "
 "of the address book if you want the address book stored locally when "
@@ -14330,7 +14881,7 @@ msgstr ""
 "nom du carnet d'adresses si vous voulez que celui-ci soit stocké localement "
 "en mode hors ligne et qu'il devienne votre carnet d'adresses par défaut."
 
-#: ../C/evolution.xml:6870(para)
+#: ../C/evolution.xml:7203(para)
 msgid ""
 "Evolution allows you to view the error logs and set the display duration for "
 "the error messages that appear in the statusbar. When an error occurs, "
@@ -14342,21 +14893,21 @@ msgstr ""
 "erreur se produit, le message de l'erreur apparaît dans la barre d'état "
 "pendant le temps défini, puis il est placé dans le journal de débogage."
 
-#: ../C/evolution.xml:6873(para)
+#: ../C/evolution.xml:7206(para)
 msgid "From the Help menu, select Debug Logs."
 msgstr "Dans le menu Aide, choisissez Journaux de débogage."
 
-#: ../C/evolution.xml:6877(para)
+#: ../C/evolution.xml:7210(para)
 msgid "Specify the display duration for the error messages."
 msgstr "Indiquez la durée d'affichage des messages d'erreur."
 
-#: ../C/evolution.xml:6878(para)
+#: ../C/evolution.xml:7211(para)
 msgid "The messages remain in the statusbar for this specified time."
 msgstr ""
 "Les messages restent affichés dans la barre d'état durant l'intervalle de "
 "temps indiqué."
 
-#: ../C/evolution.xml:6882(para)
+#: ../C/evolution.xml:7215(para)
 msgid ""
 "The <inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-warning.png\"/"
 "> icon indicates that the error message is a warning. The <inlinegraphic "
@@ -14368,7 +14919,7 @@ msgstr ""
 "L'icône <inlinegraphic format=\"PNG\" fileref=\"figures/evo_dialog-info.png"
 "\"/> indique que le message apparaît à titre informatif."
 
-#: ../C/evolution.xml:6889(para)
+#: ../C/evolution.xml:7222(para)
 msgid ""
 "Synchronization presents you with three issues you need to address. First, "
 "you need to enable synchronization. Second, your computer needs to recognize "
@@ -14383,19 +14934,19 @@ msgstr ""
 "périphériques Palm OS tels que PalmPilot* et Handspring Visor. Ensuite, vous "
 "devez définir le type de synchronisation à utiliser."
 
-#: ../C/evolution.xml:6892(link) ../C/evolution.xml:6903(title)
+#: ../C/evolution.xml:7225(link) ../C/evolution.xml:7236(title)
 msgid "Enabling Synchronization"
 msgstr "Activation de la synchronisation"
 
-#: ../C/evolution.xml:6895(link) ../C/evolution.xml:6908(title)
+#: ../C/evolution.xml:7228(link) ../C/evolution.xml:7241(title)
 msgid "Selecting Conduits"
 msgstr "Sélection des canaux"
 
-#: ../C/evolution.xml:6898(link) ../C/evolution.xml:6931(title)
+#: ../C/evolution.xml:7231(link) ../C/evolution.xml:7264(title)
 msgid "Synchronizing Information"
 msgstr "Informations de synchronisation"
 
-#: ../C/evolution.xml:6904(para)
+#: ../C/evolution.xml:7237(para)
 msgid ""
 "If you haven't used a handheld device with your computer before, you need to "
 "run the GNOME Control Center by clicking System &gt; Settings, and make sure "
@@ -14419,7 +14970,7 @@ msgstr ""
 "synchronisation par USB, deux noeuds sont créés, ttyUSB0 et ttyUSB1. Le "
 "second noeud est celui qui sera utilisé pour configurer le périphérique."
 
-#: ../C/evolution.xml:6909(para)
+#: ../C/evolution.xml:7242(para)
 msgid ""
 "After your computer and your Palm OS device are communicating, select the "
 "<link linkend=\"conduit\">conduits</link> you want under the Pilot Conduits "
@@ -14436,7 +14987,7 @@ msgstr ""
 "de votre carnet d'adresses, ECalendar pour votre calendrier et ETodo pour "
 "votre liste de tâches."
 
-#: ../C/evolution.xml:6910(para)
+#: ../C/evolution.xml:7243(para)
 msgid ""
 "Click Enable, then click Settings to change what the conduit does when "
 "activated. Your options can vary depending on the conduit, but typically "
@@ -14446,19 +14997,19 @@ msgstr ""
 "canal lorsqu'il est activé. Les options varient en fonction du canal, mais "
 "en règle générale, vous disposez des options suivantes :"
 
-#: ../C/evolution.xml:6912(title)
+#: ../C/evolution.xml:7245(title)
 msgid "Disabled:"
 msgstr "Désactivé :"
 
-#: ../C/evolution.xml:6913(para)
+#: ../C/evolution.xml:7246(para)
 msgid "Do nothing."
 msgstr "Aucune action."
 
-#: ../C/evolution.xml:6916(title)
+#: ../C/evolution.xml:7249(title)
 msgid "Synchronize:"
 msgstr "Synchroniser :"
 
-#: ../C/evolution.xml:6917(para)
+#: ../C/evolution.xml:7250(para)
 msgid ""
 "Copy new data from the computer to the handheld, and from the handheld to "
 "the computer. Remove items that were on both systems but have been deleted "
@@ -14468,27 +15019,27 @@ msgstr ""
 "versa. Supprime les éléments qui figuraient sur les deux systèmes et qui ont "
 "été supprimés de l'un des deux."
 
-#: ../C/evolution.xml:6920(title)
+#: ../C/evolution.xml:7253(title)
 msgid "Copy From Pilot:"
 msgstr "Copier depuis Pilot :"
 
-#: ../C/evolution.xml:6921(para)
+#: ../C/evolution.xml:7254(para)
 msgid ""
 "If there is any new data on the handheld device, copy it to the computer."
 msgstr ""
 "Si le périphérique portable contient de nouvelles données, cette option les "
 "copie vers l'ordinateur."
 
-#: ../C/evolution.xml:6924(title)
+#: ../C/evolution.xml:7257(title)
 msgid "Copy To Pilot:"
 msgstr "Copier vers Pilot :"
 
-#: ../C/evolution.xml:6925(para)
+#: ../C/evolution.xml:7258(para)
 msgid "Copy new data from the computer to the handheld."
 msgstr ""
 "Copie les nouvelles données de l'ordinateur vers le périphérique portable."
 
-#: ../C/evolution.xml:6927(para)
+#: ../C/evolution.xml:7260(para)
 msgid ""
 "Select the behavior you want for each conduit you choose to use. If you're "
 "not sure, use Synchronize."
@@ -14496,7 +15047,7 @@ msgstr ""
 "Sélectionnez le comportement de chacun des canaux à utiliser. Si vous ne "
 "savez pas, utilisez Synchroniser."
 
-#: ../C/evolution.xml:6932(para)
+#: ../C/evolution.xml:7265(para)
 msgid ""
 "Use the following procedure to synchronize the data on your Palm OS device "
 "with the data you store in Evolution."
@@ -14504,7 +15055,7 @@ msgstr ""
 "Procédez comme suit pour synchroniser les données sur le périphérique Palm "
 "OS et les données que vous stockez dans Evolution."
 
-#: ../C/evolution.xml:6933(para)
+#: ../C/evolution.xml:7266(para)
 msgid ""
 "If you want to back up your information before synchronizing, make a copy of "
 "the <command>.evolution</command> directory inside your home directory."
@@ -14513,13 +15064,13 @@ msgstr ""
 "une copie du répertoire <command>.evolution</command> dans votre dossier "
 "personnel."
 
-#: ../C/evolution.xml:6936(para)
+#: ../C/evolution.xml:7269(para)
 msgid "Put your handheld device in its cradle and press the HotSync button."
 msgstr ""
 "Placez le périphérique sur sa station d'accueil et appuyez sur le bouton "
 "HotSync."
 
-#: ../C/evolution.xml:6937(para)
+#: ../C/evolution.xml:7270(para)
 msgid ""
 "If you use Palm OS v. 4.0 and have password protection turned on for your "
 "handheld device, you might encounter trouble synchronizing. If this happens, "
@@ -14532,7 +15083,7 @@ msgstr ""
 "peuvent se produire. Dans ce cas, désactivez-la, synchronisez le "
 "périphérique et votre ordinateur, puis réactivez-la."
 
-#: ../C/evolution.xml:6940(para)
+#: ../C/evolution.xml:7273(para)
 msgid ""
 "If you have followed the setup instructions properly, your Palm OS device "
 "will synchronize data with Evolution."
@@ -14540,7 +15091,7 @@ msgstr ""
 "Si vous avez suivi les instructions de configuration, votre périphérique "
 "Palm OS et Evolution se synchronisent."
 
-#: ../C/evolution.xml:6946(para)
+#: ../C/evolution.xml:7279(para)
 msgid ""
 "If you are using Microsoft Outlook, but not Microsoft Exchange, this section "
 "helps you switch to <trademark>Evolution</trademark>."
@@ -14548,11 +15099,11 @@ msgstr ""
 "Si vous utilisez Microsoft Outlook, mais pas Microsoft Exchange, cette "
 "section vous explique comment migrer vers <trademark>Evolution</trademark>."
 
-#: ../C/evolution.xml:6949(title)
+#: ../C/evolution.xml:7282(title)
 msgid "Migrating Local Outlook Mail Folders"
 msgstr "Migration des dossiers locaux de la messagerie Outlook"
 
-#: ../C/evolution.xml:6950(para)
+#: ../C/evolution.xml:7283(para)
 msgid ""
 "Exchange and IMAP mail is stored on the server, so you do not need to "
 "migrate it to your Linux* partition. However, if you have stored mail on "
@@ -14563,11 +15114,11 @@ msgstr ""
 "messages sont stockés sur votre ordinateur, vous pouvez permettre à "
 "Evolution d'y accéder."
 
-#: ../C/evolution.xml:6951(para)
+#: ../C/evolution.xml:7284(para)
 msgid "First, while using Windows, prepare your messages for import:"
 msgstr "Tout d'abord, dans Windows, préparez l'importation des messages :"
 
-#: ../C/evolution.xml:6954(para)
+#: ../C/evolution.xml:7287(para)
 msgid ""
 "Clean up your mail. Delete messages and folders you do not need, and click "
 "File &gt; Folders &gt; Properties &gt; Advanced &gt; Compact to erase old, "
@@ -14577,7 +15128,7 @@ msgstr ""
 "choisissez Fichier &gt; Dossiers &gt; Propriétés &gt; Avancée &gt; "
 "Compresser pour effacer les anciens messages supprimés de votre fichier PST."
 
-#: ../C/evolution.xml:6957(para)
+#: ../C/evolution.xml:7290(para)
 msgid ""
 "If you nest your folders one inside another, you might want to rename "
 "subfolders so that you can tell which folder they belong to. You must re-"
@@ -14587,7 +15138,7 @@ msgstr ""
 "quel dossier ils appartiennent. Vous devez les imbriquer de nouveau après "
 "les avoir chargés sur Evolution."
 
-#: ../C/evolution.xml:6960(para)
+#: ../C/evolution.xml:7293(para)
 msgid ""
 "Import the files into Mozilla Mail (or another mailer, such as Netscape or "
 "Eudora, that uses the standard mbox format)."
@@ -14595,7 +15146,7 @@ msgstr ""
 "Importez les fichiers vers la messagerie Mozilla (ou un autre programme de "
 "messagerie tel que Netscape ou Eudora qui utilise le format mbox standard)."
 
-#: ../C/evolution.xml:6961(para)
+#: ../C/evolution.xml:7294(para)
 msgid ""
 "Linux mailers cannot do this task, because it requires a library available "
 "only under Windows. In Mozilla, import by selecting Window Mail &amp; "
@@ -14605,7 +15156,7 @@ msgstr ""
 "dernière nécessite une bibliothèque disponible uniquement dans Windows. Dans "
 "Mozilla, importez les données en choisissant le menu Outils &gt; Importer."
 
-#: ../C/evolution.xml:6964(para)
+#: ../C/evolution.xml:7297(para)
 msgid ""
 "Mozilla creates a set of files in the directory<command> Windows"
 "\\Application_Data\\Mozilla\\Profiles\\(UserName)\\(Random Letters)\\Mail"
@@ -14617,7 +15168,7 @@ msgstr ""
 "\\Mail\\Local Folders\\OutlookMail\\</command>. Les fichiers de données sont "
 "ceux qui ne portent pas d'extension."
 
-#: ../C/evolution.xml:6965(para)
+#: ../C/evolution.xml:7298(para)
 msgid ""
 "If you are using Windows Vista*, Windows XP* or Windows 2000*, your Windows "
 "hard drive is probably in the NTFS format, which some Linux systems cannot "
@@ -14629,7 +15180,7 @@ msgstr ""
 "peuvent pas lire sans un logiciel supplémentaire. Il peut être plus aisé de "
 "copier les dossiers de courrier vers un lecteur différent ou de graver un CD."
 
-#: ../C/evolution.xml:6966(para)
+#: ../C/evolution.xml:7299(para)
 msgid ""
 "When you have your mail in a format Evolution can understand, reboot to "
 "Linux. Then continue with the following procedure. To create new folders for "
@@ -14639,68 +15190,68 @@ msgstr ""
 "redémarrez Linux, puis utilisez la procédure suivante. Pour créer des "
 "dossiers pour les fichiers :"
 
-#: ../C/evolution.xml:6969(para)
+#: ../C/evolution.xml:7302(para)
 msgid "Mount your Windows drive or the disk where you saved the mail files."
 msgstr ""
 "Montez le lecteur ou le disque Windows sur lequel vous avez sauvegardé les "
 "fichiers de messages."
 
-#: ../C/evolution.xml:6972(para)
+#: ../C/evolution.xml:7305(para)
 msgid ""
 "Copy all the mail files into your home directory or another convenient place."
 msgstr ""
 "Copiez tous les fichiers de messages vers votre dossier personnel ou dans un "
 "autre emplacement de votre choix."
 
-#: ../C/evolution.xml:6975(para)
+#: ../C/evolution.xml:7308(para)
 msgid "Start Evolution."
 msgstr "Démarrez Evolution."
 
-#: ../C/evolution.xml:6978(para)
+#: ../C/evolution.xml:7311(para)
 msgid "Select File &gt; New &gt; Mail Folder to create the folders you want."
 msgstr ""
 "Choisissez Fichier &gt; Nouveau &gt; Dossier de courriel pour créer les "
 "dossiers de votre choix."
 
-#: ../C/evolution.xml:6981(para)
+#: ../C/evolution.xml:7314(para)
 msgid "To import the data files:"
 msgstr "Pour importer les fichiers de données :"
 
-#: ../C/evolution.xml:6984(para)
+#: ../C/evolution.xml:7317(para)
 msgid ""
 "In Evolution, open the File Import assistant by clicking File &gt; Import."
 msgstr ""
 "Dans Evolution, ouvrez l'assistant d'importation de fichiers en cliquant sur "
 "Fichier &gt; Importer."
 
-#: ../C/evolution.xml:6987(para)
+#: ../C/evolution.xml:7320(para)
 msgid "Click Next, then select Import a single file."
 msgstr "Cliquez sur Suivant, puis sélectionnez « Importer un seul fichier »."
 
-#: ../C/evolution.xml:6990(para)
+#: ../C/evolution.xml:7323(para)
 msgid "Click on the filechooser to select the data file."
 msgstr ""
 "Cliquez sur le sélecteur de fichier pour sélectionner le fichier de données."
 
-#: ../C/evolution.xml:6991(para)
+#: ../C/evolution.xml:7324(para)
 msgid "Remember, the data files are the files that have no file extension."
 msgstr ""
 "Souvenez-vous que les fichiers de données sont ceux qui ne portent pas "
 "d'extension."
 
-#: ../C/evolution.xml:6994(para)
+#: ../C/evolution.xml:7327(para)
 msgid "Select the folder where you want to put the imported data file."
 msgstr ""
 "Sélectionnez le dossier dans lequel vous voulez placer le fichier de données "
 "importé."
 
-#: ../C/evolution.xml:7000(para)
+#: ../C/evolution.xml:7333(para)
 msgid "Repeat the import steps until you have imported all your mail."
 msgstr ""
 "Effectuez de nouveau les étapes d'importation jusqu'à ce que vous ayez "
 "importé tout les messages."
 
-#: ../C/evolution.xml:7008(para)
+#: ../C/evolution.xml:7341(para)
 msgid ""
 "You can print this section to use it as a quick reference for most of the "
 "things you want to do with <trademark>Evolution</trademark>. You can also "
@@ -14712,23 +15263,23 @@ msgstr ""
 "dans l'application en choisissant Aide &gt; Référence rapide dans la barre "
 "de menus."
 
-#: ../C/evolution.xml:7011(link) ../C/evolution.xml:7025(title)
+#: ../C/evolution.xml:7344(link) ../C/evolution.xml:7358(title)
 msgid "Opening or Creating Items"
 msgstr "Ouverture ou création d'éléments"
 
-#: ../C/evolution.xml:7014(link) ../C/evolution.xml:7050(title)
+#: ../C/evolution.xml:7347(link) ../C/evolution.xml:7383(title)
 msgid "Mail Tasks"
 msgstr "Tâches de messagerie"
 
-#: ../C/evolution.xml:7020(link) ../C/evolution.xml:7100(title)
+#: ../C/evolution.xml:7353(link) ../C/evolution.xml:7433(title)
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: ../C/evolution.xml:7028(title)
+#: ../C/evolution.xml:7361(title)
 msgid "New Item:"
 msgstr "Nouvel élément :"
 
-#: ../C/evolution.xml:7029(para)
+#: ../C/evolution.xml:7362(para)
 msgid ""
 "Press Ctrl+N to open a new item for whatever part of Evolution you're "
 "working in. In mail, this means you create a new message. If you're looking "
@@ -14741,31 +15292,31 @@ msgstr ""
 "d'adresses, les touches Ctrl+N créent une carte de contact, et si vous vous "
 "trouvez dans le calendrier, cela crée un rendez-vous."
 
-#: ../C/evolution.xml:7032(title)
+#: ../C/evolution.xml:7365(title)
 msgid "Creating a New Email Message:"
 msgstr "Création d'un message :"
 
-#: ../C/evolution.xml:7033(para)
-msgid "Click File &gt; New &gt; Mail Message or Shift+Ctrl+M."
+#: ../C/evolution.xml:7366(para)
+msgid "Select File &gt; New &gt; Mail Message or Shift+Ctrl+M."
 msgstr ""
 "Choisissez Fichier &gt; Nouveau &gt; Message ou appuyez sur les touches Ctrl"
 "+Maj+M."
 
-#: ../C/evolution.xml:7036(title) ../C/evolution.xml:7089(title)
+#: ../C/evolution.xml:7369(title) ../C/evolution.xml:7422(title)
 msgid "Creating a New Appointment:"
 msgstr "Création d'un rendez-vous :"
 
-#: ../C/evolution.xml:7037(para) ../C/evolution.xml:7090(para)
+#: ../C/evolution.xml:7370(para) ../C/evolution.xml:7423(para)
 msgid "Click File &gt; New &gt; Appointment or Shift+Ctrl+A."
 msgstr ""
 "Choisissez Fichier &gt; Nouveau &gt; Rendez-vous ou appuyez sur les touches "
 "Ctrl+Maj+A."
 
-#: ../C/evolution.xml:7040(title)
+#: ../C/evolution.xml:7373(title)
 msgid "Entering a New Contact:"
 msgstr "Création d'un contact :"
 
-#: ../C/evolution.xml:7041(para)
+#: ../C/evolution.xml:7374(para)
 msgid ""
 "Double-click in any blank space in the contact manager to create a new "
 "address card. You can also click File &gt; New &gt; Contact or Shift+Ctrl+C."
@@ -14774,19 +15325,19 @@ msgstr ""
 "créer une carte de visite. Vous pouvez également choisir Fichier &gt; "
 "Nouveau &gt; Contact ou appuyer sur les touches Ctrl+Maj+C."
 
-#: ../C/evolution.xml:7044(title) ../C/evolution.xml:7094(title)
+#: ../C/evolution.xml:7377(title) ../C/evolution.xml:7427(title)
 msgid "Creating a New Task:"
 msgstr "Création d'une nouvelle tâche :"
 
-#: ../C/evolution.xml:7045(para) ../C/evolution.xml:7095(para)
+#: ../C/evolution.xml:7378(para) ../C/evolution.xml:7428(para)
 msgid "Click File &gt; New &gt; Task or Shift+Ctrl+T."
 msgstr "Choisissez Fichier &gt; Nouveau &gt; Tâche ou Ctrl+Maj+T."
 
-#: ../C/evolution.xml:7052(title)
+#: ../C/evolution.xml:7385(title)
 msgid "Send and Receive Mail:"
 msgstr "Envoi et réception de messages :"
 
-#: ../C/evolution.xml:7053(para)
+#: ../C/evolution.xml:7386(para)
 msgid ""
 "Press F9, click the Send/Receive button in the toolbar, or click File &gt; "
 "Send/Receive."
@@ -14794,11 +15345,11 @@ msgstr ""
 "Appuyez sur F9, cliquez sur le bouton Envoyer/Recevoir dans la barre "
 "d'outils ou choisissez Fichier &gt; Envoyer/Recevoir."
 
-#: ../C/evolution.xml:7056(title)
+#: ../C/evolution.xml:7389(title)
 msgid "Navigating the Message List with the Keyboard:"
 msgstr "Navigation dans la liste des messages avec le clavier :"
 
-#: ../C/evolution.xml:7057(para)
+#: ../C/evolution.xml:7390(para)
 msgid ""
 "Press (]) or (.) to jump to the next unread message. ([) or (,) goes to the "
 "previous unread message. Use the arrow keys to move up and down in the list "
@@ -14808,24 +15359,24 @@ msgstr ""
 "permet d'accéder au message non lu précédent. Utilisez les touches fléchées "
 "pour remonter ou redescendre dans la liste de tous les messages."
 
-#: ../C/evolution.xml:7060(title)
+#: ../C/evolution.xml:7393(title)
 msgid "Moving the Display Up and Down in the Preview Pane:"
 msgstr ""
 "Affichage de la page suivante ou de la page précédente dans le panneau "
 "d'aperçu :"
 
-#: ../C/evolution.xml:7061(para)
+#: ../C/evolution.xml:7394(para)
 msgid ""
 "Press the Spacebar to move down a page. Press Backspace to move up a page."
 msgstr ""
 "Appuyez sur la barre d'espace pour accéder à la page suivante. Appuyez sur "
 "la touche Retour arrière pour accéder à la page précédente."
 
-#: ../C/evolution.xml:7064(title)
+#: ../C/evolution.xml:7397(title)
 msgid "Replying To a Message:"
 msgstr "Répondre à un message :"
 
-#: ../C/evolution.xml:7065(para)
+#: ../C/evolution.xml:7398(para)
 msgid ""
 "To reply only to the sender of the message, click Reply in the toolbar, or "
 "press Ctrl+R."
@@ -14833,7 +15384,7 @@ msgstr ""
 "Pour répondre uniquement à l'expéditeur du message, cliquez sur Répondre "
 "dans la barre d'outils ou appuyez sur les touches Ctrl+R."
 
-#: ../C/evolution.xml:7067(para)
+#: ../C/evolution.xml:7400(para)
 msgid ""
 "To reply to the sender and all the other visible recipients of the message, "
 "click Reply to All or select the message and press Shift+Ctrl+R."
@@ -14842,11 +15393,11 @@ msgstr ""
 "message, cliquez sur Répondre à tous ou sélectionnez le message et appuyez "
 "sur les touches Maj+Ctrl+R."
 
-#: ../C/evolution.xml:7069(title)
+#: ../C/evolution.xml:7402(title)
 msgid "Forwarding a Message:"
 msgstr "Faire suivre un message :"
 
-#: ../C/evolution.xml:7070(para)
+#: ../C/evolution.xml:7403(para)
 msgid ""
 "Select the message or messages you want to forward, then click Forward in "
 "the toolbar, or press Ctrl+F."
@@ -14854,11 +15405,11 @@ msgstr ""
 "Sélectionnez le ou les message(s) à faire suivre, puis cliquez sur Faire "
 "suivre dans la barre d'outils ou appuyez sur les touches Ctrl+F."
 
-#: ../C/evolution.xml:7073(title)
+#: ../C/evolution.xml:7406(title)
 msgid "Opening a Message In a New Window:"
 msgstr "Ouverture d'un message dans une nouvelle fenêtre :"
 
-#: ../C/evolution.xml:7074(para)
+#: ../C/evolution.xml:7407(para)
 msgid ""
 "Double-click the message you want to view, or select it and press Enter or "
 "Ctrl+O."
@@ -14866,11 +15417,11 @@ msgstr ""
 "Double-cliquez sur le message à afficher ou sélectionnez-le et appuyez sur "
 "Entrée ou sur les touches Ctrl+O."
 
-#: ../C/evolution.xml:7077(title)
+#: ../C/evolution.xml:7410(title)
 msgid "Creating Filters and Search Folders:"
 msgstr "Création de filtres et de dossiers de recherche :"
 
-#: ../C/evolution.xml:7078(para)
+#: ../C/evolution.xml:7411(para)
 msgid ""
 "Right-click a message and select Create Rule From Message. You can also "
 "create filters and Search folders in the Edit menu."
@@ -14879,17 +15430,17 @@ msgstr ""
 "à partir du message ». Vous pouvez également créer des filtres et des "
 "dossiers de recherche dans le menu Édition."
 
-#: ../C/evolution.xml:7081(title)
+#: ../C/evolution.xml:7414(title)
 msgid "Adding a Sender to the Address Book:"
 msgstr "Ajout d'un expéditeur au carnet d'adresses :"
 
-#: ../C/evolution.xml:7082(para)
+#: ../C/evolution.xml:7415(para)
 msgid "Right-click on any email address to add it to your address book."
 msgstr ""
 "Cliquez avec le bouton droit sur n'importe quelle adresse électronique pour "
 "l'ajouter à votre carnet d'adresses."
 
-#: ../C/evolution.xml:7092(para)
+#: ../C/evolution.xml:7425(para)
 msgid ""
 "You can also click in any blank spot in the calendar and start typing to "
 "create a new appointment entry."
@@ -14897,21 +15448,21 @@ msgstr ""
 "Vous pouvez également cliquer sur un espace vierge dans le calendrier et "
 "saisir les informations pour créer un rendez-vous."
 
-#: ../C/evolution.xml:7102(title)
+#: ../C/evolution.xml:7435(title)
 msgid "Editing a Contact:"
 msgstr "Modification d'un contact :"
 
-#: ../C/evolution.xml:7103(para)
+#: ../C/evolution.xml:7436(para)
 msgid "Double-click the contact's address card to change details."
 msgstr ""
 "Double-cliquez sur la carte de visite du contact pour modifier les "
 "informations."
 
-#: ../C/evolution.xml:7106(title)
+#: ../C/evolution.xml:7439(title)
 msgid "Deleting a Contact:"
 msgstr "Suppression d'un contact :"
 
-#: ../C/evolution.xml:7107(para)
+#: ../C/evolution.xml:7440(para)
 msgid ""
 "Right-click a contact, then click Delete; or select a contact, then click "
 "Delete on the toolbar."
@@ -14919,21 +15470,21 @@ msgstr ""
 "Cliquez avec le bouton droit sur un contact, puis choisissez Supprimer, ou "
 "sélectionnez un contact, puis cliquez sur Supprimer dans la barre d'outils."
 
-#: ../C/evolution.xml:7110(title)
+#: ../C/evolution.xml:7443(title)
 msgid "Sending Emails to a Contact:"
 msgstr "Envoi d'un message à un contact :"
 
-#: ../C/evolution.xml:7111(para)
+#: ../C/evolution.xml:7444(para)
 msgid "Right-click a contact, then click Send Message to Contact."
 msgstr ""
 "Cliquez avec le bouton droit sur un contact, puis cliquez sur « Envoyer un "
 "message au contact »."
 
-#: ../C/evolution.xml:7114(title)
+#: ../C/evolution.xml:7447(title)
 msgid "Creating a New Contact:"
 msgstr "Création d'un contact :"
 
-#: ../C/evolution.xml:7115(para)
+#: ../C/evolution.xml:7448(para)
 msgid ""
 "Double-click in any blank space in the contact manager to create a new "
 "address card, or right-click anywhere in the address book and select New "
@@ -14945,7 +15496,7 @@ msgstr ""
 "cliquer sur Fichier &gt; Nouveau contact ou appuyer sur les touches Ctrl+Maj"
 "+C."
 
-#: ../C/evolution.xml:7122(para)
+#: ../C/evolution.xml:7455(para)
 msgid ""
 "<trademark>Evolution</trademark> bug tracking is done at the <ulink url="
 "\"http://bugzilla.gnome.org\">GNOME bug tracking System</ulink>. You can use "
@@ -14959,7 +15510,7 @@ msgstr ""
 "trouver des erreurs ou si vous souhaitez proposer de nouvelles "
 "fonctionnalités."
 
-#: ../C/evolution.xml:7123(para)
+#: ../C/evolution.xml:7456(para)
 msgid ""
 "A complete list of feature requests and other issues with Evolution is "
 "available online in the GNOME bug tracking system. You can learn more about "
@@ -14972,7 +15523,7 @@ msgstr ""
 "développement d'Evolution sur le <ulink url=\"http://gnome.org/projects/"
 "evolution/developer.shtml\">site des développeurs d'Evolution</ulink>."
 
-#: ../C/evolution.xml:7128(para)
+#: ../C/evolution.xml:7461(para)
 msgid ""
 "Evolution was written by the <trademark>Evolution</trademark> team and "
 "numerous other dedicated GNOME programmers. You can see their names by "
@@ -14982,7 +15533,7 @@ msgstr ""
 "nombreux autres programmeurs GNOME dévoués. Vous pouvez voir leur nom en "
 "choisissant Aide &gt; À propos dans la fenêtre principale d'Evolution."
 
-#: ../C/evolution.xml:7129(para)
+#: ../C/evolution.xml:7462(para)
 msgid ""
 "The Evolution code owes a great debt to the GNOME-pim and GNOME-Calendar "
 "applications, and to KHTMLW. The developers of Evolution acknowledge the "
@@ -14993,7 +15544,7 @@ msgstr ""
 "reconnaissent les efforts et les contributions de tous ceux qui ont "
 "travaillé sur ces projets."
 
-#: ../C/evolution.xml:7130(para)
+#: ../C/evolution.xml:7463(para)
 msgid ""
 "For more information please visit the Evolution <ulink url=\"http://www."
 "gnome.org/projects/evolution\">Web page</ulink>. Please send all comments, "
@@ -15010,51 +15561,51 @@ msgstr ""
 "rapports d'anomalie. Vous pouvez aussi utiliser à cet effet l'outil de "
 "rapport d'anomalies de GNOME, Bug Buddy."
 
-#: ../C/evolution.xml:7131(para)
+#: ../C/evolution.xml:7464(para)
 msgid "This manual was written by:"
 msgstr "Ce manuel a été écrit par :"
 
-#: ../C/evolution.xml:7134(para)
+#: ../C/evolution.xml:7467(para)
 msgid "Radhika PC (pradhika@novell.com)"
 msgstr "Radhika PC (pradhika@novell.com)"
 
-#: ../C/evolution.xml:7137(para)
+#: ../C/evolution.xml:7470(para)
 msgid "Srinivasa Ragavan (sragavan@novell.com)"
 msgstr "Srinivasa Ragavan (sragavan@novell.com)"
 
-#: ../C/evolution.xml:7140(para)
+#: ../C/evolution.xml:7473(para)
 msgid "Andre Klapper (ak-47@gmx.net)"
 msgstr "Andre Klapper (ak-47@gmx.net)"
 
-#: ../C/evolution.xml:7143(para)
+#: ../C/evolution.xml:7476(para)
 msgid "Francisco Javier F. Serrador (serrador@tecknolabs.com)"
 msgstr "Francisco Javier F. Serrador (serrador@tecknolabs.com)"
 
-#: ../C/evolution.xml:7146(para)
+#: ../C/evolution.xml:7479(para)
 msgid "Mark Moulder (mmoulder@novell.com)"
 msgstr "Mark Moulder (mmoulder@novell.com)"
 
-#: ../C/evolution.xml:7149(para)
+#: ../C/evolution.xml:7482(para)
 msgid "Jessica Prabhakar (jprabhakar@novell.com)"
 msgstr "Jessica Prabhakar (jprabhakar@novell.com)"
 
-#: ../C/evolution.xml:7152(para)
+#: ../C/evolution.xml:7485(para)
 msgid "Aaron Weber (aaron@ximian.com)"
 msgstr "Aaron·Weber·(aaron@ximian.com)"
 
-#: ../C/evolution.xml:7155(para)
+#: ../C/evolution.xml:7488(para)
 msgid "Kevin Breit (mrproper@ximian.com)"
 msgstr "Kevin Breit (mrproper@ximian.com)"
 
-#: ../C/evolution.xml:7158(para)
+#: ../C/evolution.xml:7491(para)
 msgid "Duncan Mak (duncan@ximian.com)"
 msgstr "Duncan Mak (duncan@ximian.com)"
 
-#: ../C/evolution.xml:7161(para)
+#: ../C/evolution.xml:7494(para)
 msgid "Ettore Perazzoli (ettore@ximian.com)"
 msgstr "Ettore Perazzoli (ettore@ximian.com)"
 
-#: ../C/evolution.xml:7164(para)
+#: ../C/evolution.xml:7497(para)
 msgid ""
 "With the help of the application programmers and the GNOME Documentation "
 "Project."
@@ -15062,7 +15613,7 @@ msgstr ""
 "Avec l'aide des programmeurs de l'application et du projet de documentation "
 "de GNOME."
 
-#: ../C/evolution.xml:7167(para)
+#: ../C/evolution.xml:7500(para)
 msgid ""
 "Please file comments and suggestions for this manual as bugs in the GNOME "
 "bug tracking system. If you contributed to this project but do not see your "
@@ -15075,7 +15626,7 @@ msgstr ""
 "ne figure pas ici, contactez Radhika PC (pradhika@novell.com) ou Srinivasa "
 "Ragavan (sragavan@novell.com) et ils feront le nécessaire."
 
-#: ../C/evolution.xml:7168(para)
+#: ../C/evolution.xml:7501(para)
 msgid ""
 "Partial list of Documentation Translators (application translated to "
 "numerous additional languages):"
@@ -15083,25 +15634,25 @@ msgstr ""
 "Liste partielle des traducteurs de cette documentation (l'application est "
 "traduite dans de nombreuses autres langues) :"
 
-#: ../C/evolution.xml:7171(para)
+#: ../C/evolution.xml:7504(para)
 msgid "Daniel Persson for Swedish (.se)"
 msgstr "Daniel Persson pour le suédois (.se)"
 
-#: ../C/evolution.xml:7174(para)
+#: ../C/evolution.xml:7507(para)
 msgid ""
 "Hector Garcia Alvarez and Francisco Javier F. Serrador for Spanish (.es)"
 msgstr ""
 "Hector Garcia Alvarez et Francisco Javier F. Serrador pour l'espagnol (.es)"
 
-#: ../C/evolution.xml:7177(para)
+#: ../C/evolution.xml:7510(para)
 msgid "Kjartan Maraas for Norwegian (.no)"
 msgstr "Kjartan Maraas pour le norvégien (.no)"
 
-#: ../C/evolution.xml:7180(para)
+#: ../C/evolution.xml:7513(para)
 msgid "Sergey V. Mironov for Russian (.ru)"
 msgstr "Sergey V. Mironov pour le russe (.ru)"
 
-#: ../C/evolution.xml:7187(para)
+#: ../C/evolution.xml:7520(para)
 msgid ""
 "This glossary contains terms that are frequently used in this guide as well "
 "as in <trademark>Evolution</trademark>."
@@ -15109,11 +15660,11 @@ msgstr ""
 "Ce glossaire contient des termes fréquemment utilisés dans ce guide comme "
 "dans <trademark>Evolution</trademark>."
 
-#: ../C/evolution.xml:7189(glossterm)
+#: ../C/evolution.xml:7522(glossterm)
 msgid "Assistant"
 msgstr "assistant"
 
-#: ../C/evolution.xml:7191(para)
+#: ../C/evolution.xml:7524(para)
 msgid ""
 "A tool that guides a user through a series of steps, usually to configure or "
 "set up a program. Equivalent to Wizard and Druid."
@@ -15121,11 +15672,11 @@ msgstr ""
 "Un outil qui guide un utilisateur étape par étape, normalement pour "
 "configurer un programme."
 
-#: ../C/evolution.xml:7195(glossterm)
+#: ../C/evolution.xml:7528(glossterm)
 msgid "attachment"
 msgstr "pièce jointe"
 
-#: ../C/evolution.xml:7197(para)
+#: ../C/evolution.xml:7530(para)
 msgid ""
 "Any file sent with an email. Attachments can be embedded in a message or "
 "appended to it."
@@ -15133,21 +15684,21 @@ msgstr ""
 "Tout fichier envoyé avec un courriel. Les pièces jointes peuvent être "
 "intégrées dans un message ou placées en fin de message."
 
-#: ../C/evolution.xml:7201(glossterm)
+#: ../C/evolution.xml:7534(glossterm)
 msgid "automatic indexing"
 msgstr "indexation automatique"
 
-#: ../C/evolution.xml:7203(para)
+#: ../C/evolution.xml:7536(para)
 msgid "A feature which allows Evolution to quickly find and sort data."
 msgstr ""
 "Une fonctionnalité permettant à Evolution de chercher et de trier rapidement "
 "des données."
 
-#: ../C/evolution.xml:7207(glossterm)
+#: ../C/evolution.xml:7540(glossterm)
 msgid "Bcc (Blind Carbon Copy)"
 msgstr "Cci (copie carbone invisible)"
 
-#: ../C/evolution.xml:7209(para)
+#: ../C/evolution.xml:7542(para)
 msgid ""
 "Blind copy recipients (Bcc) receive a copy of an item. Other recipients "
 "receive no information about blind copies. Only the sender and the blind "
@@ -15161,11 +15712,11 @@ msgstr ""
 "répond en choisissant Répondre à tous, les destinataires en copie invisible "
 "ne reçoivent pas la réponse."
 
-#: ../C/evolution.xml:7213(glossterm)
+#: ../C/evolution.xml:7546(glossterm)
 msgid "Cc (Carbon Copy)"
 msgstr "Cc (copie carbone)"
 
-#: ../C/evolution.xml:7215(para)
+#: ../C/evolution.xml:7548(para)
 msgid ""
 "Carbon copy recipients (CC) receive a copy of an item. CC recipients are "
 "users who would benefit from the information in an item, but are not "
@@ -15179,11 +15730,11 @@ msgstr ""
 "envoyée. Ils peuvent voir également les noms des destinataires en copie "
 "carbone."
 
-#: ../C/evolution.xml:7219(glossterm)
+#: ../C/evolution.xml:7552(glossterm)
 msgid "conduit"
 msgstr "conduite"
 
-#: ../C/evolution.xml:7221(para)
+#: ../C/evolution.xml:7554(para)
 msgid ""
 "A small application that controls the transfer of data between a handheld "
 "device and a desktop computer."
@@ -15191,15 +15742,15 @@ msgstr ""
 "Une petite application qui contrôle le transfert de données entre un "
 "appareil mobile et un ordinateur de bureau."
 
-#: ../C/evolution.xml:7227(para)
+#: ../C/evolution.xml:7560(para)
 msgid "The GNOME groupware application."
 msgstr "L'application GNOME de travail collaboratif."
 
-#: ../C/evolution.xml:7231(glossterm)
+#: ../C/evolution.xml:7564(glossterm)
 msgid "execute"
 msgstr "exécuter"
 
-#: ../C/evolution.xml:7233(para)
+#: ../C/evolution.xml:7566(para)
 msgid ""
 "To run a program. Any file that can be run is called an executable. "
 "Evolution can download executable attachments, but before they can be run, "
@@ -15217,11 +15768,11 @@ msgstr ""
 "permissions de fichiers, consultez la documentation du gestionnaire de "
 "fichiers ou de l'interpréteur de commandes."
 
-#: ../C/evolution.xml:7237(glossterm)
+#: ../C/evolution.xml:7570(glossterm)
 msgid "expunge"
 msgstr "nettoyer"
 
-#: ../C/evolution.xml:7239(para)
+#: ../C/evolution.xml:7572(para)
 msgid ""
 "When messages are marked for deletion, they remain until they are expunged. "
 "When a message is expunged, it is permanently deleted, as long as it was "
@@ -15231,11 +15782,11 @@ msgstr ""
 "jusqu'à ce qu'ils soient nettoyés. Lorsqu'un message est nettoyé, il est "
 "définitivement effacé, pour autant qu'il ait été marqué pour la suppression."
 
-#: ../C/evolution.xml:7243(glossterm)
+#: ../C/evolution.xml:7576(glossterm)
 msgid "file tree"
 msgstr "arborescence de fichiers"
 
-#: ../C/evolution.xml:7245(para)
+#: ../C/evolution.xml:7578(para)
 msgid ""
 "A way of describing a group of files on a computer. The top of the tree is "
 "called the root directory, and is denoted by <command>/</command>. The rest "
@@ -15250,11 +15801,11 @@ msgstr ""
 "compte administrateur (root) et le dossier personnel de l'administrateur, "
 "généralement <command>/root</command>."
 
-#: ../C/evolution.xml:7249(glossterm)
+#: ../C/evolution.xml:7582(glossterm)
 msgid "filter"
 msgstr "filtre"
 
-#: ../C/evolution.xml:7251(para)
+#: ../C/evolution.xml:7584(para)
 msgid ""
 "Within Evolution, a filter is a method of sorting mail automatically when it "
 "is downloaded. You can create filters to perform one or more actions on a "
@@ -15265,11 +15816,11 @@ msgstr ""
 "une ou plusieurs actions sur un message qui correspond à un ou à toute une "
 "série de critères."
 
-#: ../C/evolution.xml:7255(glossterm)
+#: ../C/evolution.xml:7588(glossterm)
 msgid "forward"
 msgstr "faire suivre"
 
-#: ../C/evolution.xml:7257(para)
+#: ../C/evolution.xml:7590(para)
 msgid ""
 "Forwards a copy of the message and any additional comments to a different "
 "email address."
@@ -15277,11 +15828,11 @@ msgstr ""
 "Fait suivre une copie d'un message avec d'éventuels commentaires "
 "supplémentaires à une adresse électronique différente."
 
-#: ../C/evolution.xml:7261(glossterm)
+#: ../C/evolution.xml:7594(glossterm)
 msgid "groupware"
 msgstr "travail collaboratif"
 
-#: ../C/evolution.xml:7263(para)
+#: ../C/evolution.xml:7596(para)
 msgid ""
 "A term describing an application that helps groups of people work together. "
 "Typically, a groupware application has several productivity features built "
@@ -15293,11 +15844,11 @@ msgstr ""
 "programme, comprenant la messagerie, le calendrier et des outils de carnet "
 "d'adresses."
 
-#: ../C/evolution.xml:7267(glossterm)
+#: ../C/evolution.xml:7600(glossterm)
 msgid "HTML"
 msgstr "HTML"
 
-#: ../C/evolution.xml:7269(para)
+#: ../C/evolution.xml:7602(para)
 msgid ""
 "Hypertext Markup Language (HTML) is a language for describing page layout in "
 "electronic documents such as Web pages, help files, and email messages. HTML "
@@ -15310,21 +15861,21 @@ msgstr ""
 "appliquer du formatage de texte dans des courriels ou des messages de "
 "nouvelles. "
 
-#: ../C/evolution.xml:7273(glossterm)
+#: ../C/evolution.xml:7606(glossterm)
 msgid "iCal"
 msgstr "iCal"
 
-#: ../C/evolution.xml:7275(para)
+#: ../C/evolution.xml:7608(para)
 msgid "iCal is a protocol that Evolution uses to manage the calendar section."
 msgstr ""
 "iCal est un protocole utilisé par Evolution pour gérer la section "
 "Calendriers."
 
-#: ../C/evolution.xml:7279(glossterm)
+#: ../C/evolution.xml:7612(glossterm)
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../C/evolution.xml:7281(para)
+#: ../C/evolution.xml:7614(para)
 msgid ""
 "Internet Mail Access Protocol. It allows access to email that is typically "
 "stored remotely on a server rather than on a local hard disk. Often "
@@ -15334,11 +15885,11 @@ msgstr ""
 "manière distante sur un serveur, et non pas sur le disque dur local. C'est "
 "un peu le contraire de POP."
 
-#: ../C/evolution.xml:7285(glossterm)
+#: ../C/evolution.xml:7618(glossterm)
 msgid "inline"
 msgstr "intégré"
 
-#: ../C/evolution.xml:7287(para)
+#: ../C/evolution.xml:7620(para)
 msgid ""
 "Displayed as part of a message or other document, rather than attached as a "
 "separate file. Contrast with <emphasis>attachment</emphasis>."
@@ -15347,11 +15898,11 @@ msgstr ""
 "sous forme d'un fichier séparé. L'inverse d'une <emphasis>pièce jointe</"
 "emphasis>."
 
-#: ../C/evolution.xml:7291(glossterm)
+#: ../C/evolution.xml:7624(glossterm)
 msgid "LDAP"
 msgstr "LDAP"
 
-#: ../C/evolution.xml:7293(para)
+#: ../C/evolution.xml:7626(para)
 msgid ""
 "Lightweight Directory Access Protocol. Allows a client to search through a "
 "large database of addresses, phone numbers, and people stored on a server."
@@ -15360,11 +15911,11 @@ msgstr ""
 "une grande base de données d'adresses, de numéros de téléphone et de "
 "personnes stockée sur un serveur."
 
-#: ../C/evolution.xml:7297(glossterm)
+#: ../C/evolution.xml:7630(glossterm)
 msgid "mail client"
 msgstr "client de messagerie"
 
-#: ../C/evolution.xml:7299(para)
+#: ../C/evolution.xml:7632(para)
 msgid ""
 "The application with which a person reads and sends email. Its counterparts "
 "are the various types of mail servers, which handle user authentication and "
@@ -15375,11 +15926,11 @@ msgstr ""
 "qui gèrent l'authentification des utilisateurs et dirigent les messages "
 "depuis l'expéditeur vers les destinataires."
 
-#: ../C/evolution.xml:7303(glossterm)
+#: ../C/evolution.xml:7636(glossterm)
 msgid "POP"
 msgstr "POP"
 
-#: ../C/evolution.xml:7305(para)
+#: ../C/evolution.xml:7638(para)
 msgid ""
 "Post Office Protocol. A mechanism for email transport. In contrast to IMAP, "
 "it is used only to get mail from a server and store it locally on your hard "
@@ -15389,11 +15940,11 @@ msgstr ""
 "à IMAP, il est uniquement utilisé pour relever les messages d'un serveur et "
 "les stocker localement sur le disque dur."
 
-#: ../C/evolution.xml:7309(glossterm)
+#: ../C/evolution.xml:7642(glossterm)
 msgid "protocol"
 msgstr "protocole"
 
-#: ../C/evolution.xml:7311(para)
+#: ../C/evolution.xml:7644(para)
 msgid ""
 "An agreed-upon method of communication, especially one for sending "
 "particular types of information between computer systems. Examples include "
@@ -15405,11 +15956,11 @@ msgstr ""
 "exemple, POP (Post Office Protocol) pour la messagerie et HTTP (HyperText "
 "Transfer Protocol) pour les pages Web."
 
-#: ../C/evolution.xml:7315(glossterm)
+#: ../C/evolution.xml:7648(glossterm)
 msgid "public key encryption"
 msgstr "chiffrement par clé publique"
 
-#: ../C/evolution.xml:7317(para)
+#: ../C/evolution.xml:7650(para)
 msgid ""
 "A strong encryption method that uses a set of two keys, one of which is made "
 "public, and one of which is kept private. Data encrypted using the public "
@@ -15421,11 +15972,11 @@ msgstr ""
 "ne peuvent être déchiffrées qu'avec la clé privée. Plus les clés sont "
 "longues, plus il est difficile de casser le chiffrement."
 
-#: ../C/evolution.xml:7321(glossterm)
+#: ../C/evolution.xml:7654(glossterm)
 msgid "regular expression"
 msgstr "expression régulière"
 
-#: ../C/evolution.xml:7323(para)
+#: ../C/evolution.xml:7656(para)
 msgid ""
 "A regular expression (regex) is a way of describing a string of text using "
 "metacharacters or wildcard symbols. For example, the statement fly.*so[au]p "
@@ -15443,11 +15994,11 @@ msgstr ""
 "dans la soute ». Pour plus d'informations, saisissez <command>man grep</"
 "command> dans une ligne de commande."
 
-#: ../C/evolution.xml:7327(glossterm)
+#: ../C/evolution.xml:7660(glossterm)
 msgid "script"
 msgstr "script"
 
-#: ../C/evolution.xml:7329(para)
+#: ../C/evolution.xml:7662(para)
 msgid ""
 "A program written in an interpreted (rather than compiled) language. Often "
 "used as a synonym for macro, to denote a series of prerecorded commands or "
@@ -15460,11 +16011,11 @@ msgstr ""
 "servent à accomplir des tâches répétitives et ennuyeuses, afin d'économiser "
 "du temps aux utilisateurs."
 
-#: ../C/evolution.xml:7333(glossterm)
+#: ../C/evolution.xml:7666(glossterm)
 msgid "search base"
 msgstr "base de recherche"
 
-#: ../C/evolution.xml:7335(para)
+#: ../C/evolution.xml:7668(para)
 msgid ""
 "LDAP can break contact lists into many groups. The search base tells LDAP "
 "the top group to use. How much of the Search Base to search is set by the "
@@ -15475,11 +16026,11 @@ msgstr ""
 "de la recherche » détermine ensuite jusqu'où s'étend la recherche à partir "
 "de la base de recherche."
 
-#: ../C/evolution.xml:7339(glossterm)
+#: ../C/evolution.xml:7672(glossterm)
 msgid "search folder"
 msgstr "dossier de recherche"
 
-#: ../C/evolution.xml:7341(para)
+#: ../C/evolution.xml:7674(para)
 msgid ""
 "An email organization tool. Search folders allow you to create a folder that "
 "contains the results of a complex search. Search folder contents are updated "
@@ -15489,21 +16040,21 @@ msgstr ""
 "de créer un dossier contenant les résultats d'une recherche complexe. Les "
 "contenus des dossiers de recherche sont mis à jour dynamiquement."
 
-#: ../C/evolution.xml:7345(glossterm)
+#: ../C/evolution.xml:7678(glossterm)
 msgid "search scope"
 msgstr "étendue de la recherche"
 
-#: ../C/evolution.xml:7347(para)
+#: ../C/evolution.xml:7680(para)
 msgid "Search Scope states how much of the search base to search."
 msgstr ""
 "L'étendue de la recherche précise l'empans de recherche à partir de la base "
 "de recherche."
 
-#: ../C/evolution.xml:7351(glossterm)
+#: ../C/evolution.xml:7684(glossterm)
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../C/evolution.xml:7353(para)
+#: ../C/evolution.xml:7686(para)
 msgid ""
 "A program that sends mail. Evolution can use it instead of SMTP; some people "
 "prefer it because it offers more flexibility; however, it is more difficult "
@@ -15513,11 +16064,11 @@ msgstr ""
 "de SMTP et certaines personnes le préfèrent à cause de sa plus grande "
 "flexibilité ; cependant, il est plus difficile à configurer."
 
-#: ../C/evolution.xml:7357(glossterm)
+#: ../C/evolution.xml:7690(glossterm)
 msgid "switcher"
 msgstr "sélecteur"
 
-#: ../C/evolution.xml:7359(para)
+#: ../C/evolution.xml:7692(para)
 msgid ""
 "An area of Evolution that offers users fast access to the most frequently "
 "used features of the application."
@@ -15525,11 +16076,11 @@ msgstr ""
 "Une zone d'Evolution qui offre aux utilisateurs un accès rapide aux "
 "fonctions les plus fréquemment utilisées de l'application."
 
-#: ../C/evolution.xml:7363(glossterm)
+#: ../C/evolution.xml:7696(glossterm)
 msgid "signature"
 msgstr "signature"
 
-#: ../C/evolution.xml:7365(para)
+#: ../C/evolution.xml:7698(para)
 msgid ""
 "Text placed at the end of every email sent, similar to a hand-written "
 "signature at the bottom of a written letter. A signature can be anything "
@@ -15541,11 +16092,11 @@ msgstr ""
 "contenir une citation favorite qu'un lien vers une page Web, mais l'usage "
 "correct demande qu'elle ne fasse pas plus de quatre lignes."
 
-#: ../C/evolution.xml:7369(glossterm)
+#: ../C/evolution.xml:7702(glossterm)
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../C/evolution.xml:7371(para)
+#: ../C/evolution.xml:7704(para)
 msgid ""
 "Simple Mail Transfer Protocol. The most common way of transporting mail "
 "messages from your computer to the server."
@@ -15553,11 +16104,11 @@ msgstr ""
 "Simple Mail Transfer Protocol. La façon la plus courante de transmettre des "
 "messages électroniques de votre ordinateur vers le serveur."
 
-#: ../C/evolution.xml:7375(glossterm)
+#: ../C/evolution.xml:7708(glossterm)
 msgid "tooltip"
 msgstr "info-bulle"
 
-#: ../C/evolution.xml:7377(para)
+#: ../C/evolution.xml:7710(para)
 msgid ""
 "A small box of explanatory text that appears when the mouse pointer is held "
 "over a button or other interface element."
@@ -15566,11 +16117,11 @@ msgstr ""
 "pointeur de la souris demeure au-dessus d'un bouton ou d'un autre élément "
 "d'interface."
 
-#: ../C/evolution.xml:7381(glossterm)
+#: ../C/evolution.xml:7714(glossterm)
 msgid "virus"
 msgstr "virus"
 
-#: ../C/evolution.xml:7383(para)
+#: ../C/evolution.xml:7716(para)
 msgid ""
 "A program that inserts itself into other files or programs. When executed, "
 "it spreads to more programs and other computers. A virus can cause "
@@ -15582,11 +16133,11 @@ msgstr ""
 "Un virus peut provoquer des dommages importants en saturant des réseaux ou "
 "des disques, en supprimant des fichiers ou en créant des failles de sécurité."
 
-#: ../C/evolution.xml:7387(glossterm)
+#: ../C/evolution.xml:7720(glossterm)
 msgid "vCard"
 msgstr "vCard"
 
-#: ../C/evolution.xml:7389(para)
+#: ../C/evolution.xml:7722(para)
 msgid ""
 "A file format for the exchange of contact information. When you get an "
 "address card attached to an email, it is probably in vCard format."
@@ -15595,11 +16146,11 @@ msgstr ""
 "recevez une carte de visite jointe à un courriel, celle-ci est probablement "
 "au format vCard."
 
-#: ../C/evolution.xml:7395(title)
+#: ../C/evolution.xml:7728(title)
 msgid "Legal Notices"
 msgstr "Mentions légales"
 
-#: ../C/evolution.xml:7397(member)
+#: ../C/evolution.xml:7730(member)
 msgid ""
 "Novell, Inc. makes no representations or warranties with respect to the "
 "contents or use of this documentation, and specifically disclaims any "
@@ -15615,7 +16166,7 @@ msgstr ""
 "sans obligation de notifier qui que ce soit de telles révisions ou "
 "modifications."
 
-#: ../C/evolution.xml:7398(member)
+#: ../C/evolution.xml:7731(member)
 msgid ""
 "Further, Novell, Inc. makes no representations or warranties with respect to "
 "any software, and specifically disclaims any express or implied warranties "
@@ -15630,7 +16181,7 @@ msgstr ""
 "outre le droit de modifier à tout moment tout ou partie des logiciels "
 "Novell, sans notification préalable de ces modifications à quiconque."
 
-#: ../C/evolution.xml:7401(member)
+#: ../C/evolution.xml:7734(member)
 msgid ""
 "You may not use, export, or re-export this product in violation of any "
 "applicable laws or regulations including, without limitation, U.S. export "
@@ -15642,7 +16193,7 @@ msgstr ""
 "matière d'exportation ou la législation en vigueur dans votre pays de "
 "résidence."
 
-#: ../C/evolution.xml:7404(member)
+#: ../C/evolution.xml:7737(member)
 msgid ""
 "Copyright 2007 Novell, Inc. Permission is granted to copy, distribute, and/"
 "or modify this document under the terms of the GNU Free Documentation "
@@ -15659,7 +16210,7 @@ msgstr ""
 "trouverez un exemplaire de cette licence sur http://www.fsf.org/licenses/fdl."
 "html."
 
-#: ../C/evolution.xml:7405(member)
+#: ../C/evolution.xml:7738(member)
 msgid ""
 "THIS DOCUMENT AND MODIFIED VERSIONS OF THIS DOCUMENT ARE PROVIDED UNDER THE "
 "TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING "
@@ -15668,7 +16219,7 @@ msgstr ""
 "LE PRÉSENT DOCUMENT ET SES VERSIONS MODIFIÉES SONT FOURNIS SELON LES TERMES "
 "DE LA LICENCE DE DOCUMENTATION LIBRE GNU SACHANT QUE :"
 
-#: ../C/evolution.xml:7406(member)
+#: ../C/evolution.xml:7739(member)
 msgid ""
 "1. THE DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY "
 "KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES "
@@ -15695,7 +16246,7 @@ msgstr ""
 "SA VERSION MODIFIÉE N'EST AUTORISÉE AUX TERMES DU PRÉSENT ACCORD, EXCEPTÉ "
 "SOUS CETTE DÉNÉGATION DE RESPONSABILITÉ ; "
 
-#: ../C/evolution.xml:7407(member)
+#: ../C/evolution.xml:7740(member)
 msgid ""
 "2. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT "
 "(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL "
@@ -15721,31 +16272,31 @@ msgstr ""
 "À JOUR, ET CE MÊME SI CES PARTIES ONT ÉTÉ INFORMÉES DE LA POSSIBILITÉ DE "
 "TELS DOMMAGES."
 
-#: ../C/evolution.xml:7410(member)
+#: ../C/evolution.xml:7743(member)
 msgid "Novell, Inc."
 msgstr "Novell, Inc."
 
-#: ../C/evolution.xml:7411(member)
+#: ../C/evolution.xml:7744(member)
 msgid "404 Wyman Street, Suite 500"
 msgstr "404·Wyman·Street,·Suite·500"
 
-#: ../C/evolution.xml:7412(member)
+#: ../C/evolution.xml:7745(member)
 msgid "Waltham, MA 02451"
 msgstr "Waltham, MA 02451"
 
-#: ../C/evolution.xml:7413(member)
+#: ../C/evolution.xml:7746(member)
 msgid "U.S.A."
 msgstr "États-Unis"
 
-#: ../C/evolution.xml:7414(member)
+#: ../C/evolution.xml:7747(member)
 msgid "www.novell.com"
 msgstr "www.novell.com"
 
-#: ../C/evolution.xml:7417(para)
+#: ../C/evolution.xml:7750(para)
 msgid "July 2007"
 msgstr "Juillet 2007"
 
-#: ../C/evolution.xml:7419(member)
+#: ../C/evolution.xml:7752(member)
 msgid ""
 "To access the online documentation for this and other Novell products, and "
 "to get updates, see www.novell.com/documentation"
@@ -15754,11 +16305,11 @@ msgstr ""
 "Novell, ainsi que pour obtenir des mises à jour, consultez www.novell.com/"
 "documentation."
 
-#: ../C/evolution.xml:7422(member)
+#: ../C/evolution.xml:7755(member)
 msgid "Evolution is a trademark of Novell, Inc."
 msgstr "Evolution est une marque déposée de Novell, Inc."
 
-#: ../C/evolution.xml:7423(member)
+#: ../C/evolution.xml:7756(member)
 msgid ""
 "GroupWise is a registered trademark of Novell, Inc. in the United States and "
 "other countries."
@@ -15766,7 +16317,7 @@ msgstr ""
 "GroupWise est une marque déposée de Novell Inc. aux États-Unis et dans "
 "d'autres pays."
 
-#: ../C/evolution.xml:7424(member)
+#: ../C/evolution.xml:7757(member)
 msgid ""
 "Novell is a registered trademark of Novell, Inc. in the United States and "
 "other countries."
@@ -15774,11 +16325,11 @@ msgstr ""
 "Novell est une marque déposée de Novell Inc. aux États-Unis et dans d'autres "
 "pays."
 
-#: ../C/evolution.xml:7425(member)
+#: ../C/evolution.xml:7758(member)
 msgid "SUSE is a registered trademark of SUSE AG, a Novell company."
 msgstr "SUSE est une marque déposée de SUSE AG, une filiale de Novell."
 
-#: ../C/evolution.xml:7426(member)
+#: ../C/evolution.xml:7759(member)
 msgid ""
 "Ximian is a registered trademark of Novell, Inc. in the United States and "
 "other countries."
@@ -15786,7 +16337,7 @@ msgstr ""
 "Ximian est une marque déposée de Novell Inc. aux États-Unis et dans d'autres "
 "pays."
 
-#: ../C/evolution.xml:7429(member)
+#: ../C/evolution.xml:7762(member)
 msgid "All third-party trademarks are the property of their respective owners."
 msgstr ""
 "Toutes les marques tierces appartiennent à leurs propriétaires respectifs."
@@ -15798,4 +16349,3 @@ msgstr ""
 "Marc Lorber <Linux-Lorber@club-internet.fr>, 2006.\n"
 "Jonathan Ernst <jonathan@ernstfamily.ch>, 2007.\n"
 "Claude Paroz <claude@2xlibre.net>, 2007-2008."
-
diff --git a/iconv-detect.c b/iconv-detect.c
index adcb500211..cbc1a1e5ea 100644
--- a/iconv-detect.c
+++ b/iconv-detect.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  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.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/ChangeLog b/mail/ChangeLog
index f882497878..d8d68f1a4a 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,263 @@
+2008-10-01  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #554418
+
+	* em-utils.c: (em_utils_snoop_type):
+	* em-popup.c: (emp_standard_menu_factory):
+	Guess mime_type based on the filename only.
+
+2008-10-01  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #554458
+
+	* em-popup.c: (emp_standard_menu_factory):
+	Use content-type to call of g_app_info_get_all_for_type.
+
+2008-10-01  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* em-composer-utils.c:
+
+2008-09-30  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fix for bug #545045
+
+	* mail-send-recv.c (build_dialog): Don't show SMTP in the
+	Send/Receive dialogue if there are no unsent mails.
+
+2008-09-30  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* mail-ops.c:
+
+2008-09-30  Sankar P  <psankar@novell.com>
+
+	* mail/message-list.c:
+	Remove unnecessary FIXME. 
+	normalized columns are for internal manipulation.
+
+2008-09-30  Sankar P  <psankar@novell.com>
+
+	** Committed on behalf of Hans Petter Jansson  <hpj@novell.com>
+
+	** Fix for bug #554107
+
+	* message-list.c (get_trimmed_subject), (ml_tree_value_at):
+	* message-list.etspec:
+	* message-list.h:
+	Add "Subject - Trimmed" column which enables to read 
+	mailing list mails in a better way.
+
+2008-09-29  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* mail-config.glade: Mark some forgotten strings for translation. Fixes bug #553067
+
+2008-09-29  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #530716
+
+	* mail-session.c: (user_message_response), (user_message_exec),
+	(user_message_response_free): Differentiate between response
+	with valid message pointer and with one already freed.
+
+2008-09-29  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #530691
+
+	* em-folder-utils.c: (emfu_delete_rec), (emfu_delete_done),
+	(emfu_delete_folders), (emfu_delete_response),
+	(em_folder_utils_delete_folder):
+	* mail-ops.h: (mail_remove_folder):
+	* mail-ops.c: (mail_remove_folder), (struct _remove_folder_msg),
+	(remove_folder_desc), (remove_folder_rec), (remove_folder_exec),
+	(remove_folder_done), (remove_folder_free):
+	Remove folders in its own thread, not in main thread.
+
+2008-09-29  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* em-filter-i18n.h:
+	* em-utils.c:
+	* importers/mail-importer.c:
+	* mail-config.c:
+	* message-list.c:
+
+2008-09-26  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #552583 (Suggested by Sebastian Keller)
+
+	* mail-session.c: (get_password):
+	Do not hide auth_mech from the URL.
+
+2008-09-25  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fix for bug #552551
+
+	* em-folder-browser.c (emfb_search_search_activated): Add a NULL
+	check for search_word before calling strcmp.
+
+2008-09-25  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* mail-folder-cache.c:
+
+2008-09-24  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #313225
+
+	* message-list.c: (struct states_pixmaps), (ml_tree_value_at),
+	(message_list_create_extras): Show meeting icon in 'Attachment'
+	column on messages with '$has_cal' user flag set.
+
+2008-09-24  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* em-folder-browser.c:
+
+2008-09-24  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fixes bug #553479
+
+	* em-migrate.c (migrate_to_db):
+	* evolution-mail.schemas.in: String capitalisation improvements.
+
+2008-09-23  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #553273
+
+	* em-composer-utils.c: (em_utils_handle_receipt):
+	* em-folder-view.c: (emfv_delete_msg_response):
+	Always end e_error_run/e_error_new calls with NULL parameter.
+
+2008-09-22  Luca Ferretti  <elle.uca@libero.it>
+
+	* default/Makefile.am:
+	* default/it/Inbox:
+	* default/it/Makefile.am:
+	Added Italian translation for default email message.
+
+2008-09-22  Petr Kovar  <pknbe@volny.cz>
+
+	* default/cs/Inbox: Added Czech translation of default email
+	message by Jiri Eischmann.
+	* default/cs/Makefile.am: Ditto.
+	* default/Makefile.am: Ditto.
+
+2008-09-21  Wadim Dziedzic  <wdziedzic@aviary.pl>
+
+	* default/pl/Inbox: Updated Polish translation
+
+2008-09-19  Gintautas Miliauskas  <gintas@akl.lt>
+
+	* default/lt/Inbox: Updated Lithuanian translation.
+
+2008-09-19  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* em-folder-tree-model.c:
+	* em-folder-tree.c:
+	* em-folder-view.c:
+	* em-format-html-display.c:
+	* em-format-html.c:
+	* em-migrate.c:
+	* mail-component.c:
+
+2008-09-17  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* default/hu/Makefile.am: Add this too
+
+2008-09-17  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* default/hu/Inbox: Default welcome mail translation added.
+	* default/Makefile.am: Added hu
+
+2008-09-16  Goran Rakić  <grakic@devbase.net>
+
+        * default/Makefile.am:
+        * default/sr/*, default/sr@latin/*: Added Serbian welcome message translation.
+
+2008-09-16  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* em-account-editor.c:
+	* em-account-prefs.c:
+	* em-format.c:
+	* em-message-browser.c:
+	* em-popup.c:
+	* em-subscribe-editor.c:
+	* importers/pine-importer.c:
+	* mail-mt.c:
+	* mail-send-recv.c:
+
+2008-09-16  Wouter Bolsterlee  <wbolster@svn.gnome.org>
+
+	* default/nl/Inbox: Updated Dutch translation by Tino Meinen.
+
+2008-09-16  Ilkka Tuohela <hile@iki.fi>
+
+	* default/fi/Inbox: Updated Finnish default mailbox.
+
+2008-09-16  Claude Paroz  <claude@2xlibre.net>
+
+	* default/fr/Inbox: Updated French translation.
+
+2008-09-15  Daniel Nylander <po@danielnylander.se>
+
+	* default/sv/Inbox: Updated Swedish translation.
+
+2008-06-22  Sankar P <psankar@novell.com>
+
+	* Committed on behalf of Paul Bolle  <pebolle@tiscali.nl>
+
+	** Fix for bug #539536
+
+	* em-format.c: (struct default_headers):
+	* em-format-html.c: (efh_format_headers):
+	* em-format-html.c: (default_headers):
+	Add "Face" header to default headers and allow it to be hidden.
+
+2008-09-14  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #504767
+
+	* em-folder-tree.c: (emft_expand_node):
+	Expand also parent nodes, if necessary.
+
+2008-09-14  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #551915
+
+	* em-junk-hook.c: (struct manage_error_idle_data), (free_mei),
+	(manage_error_idle), (manage_error):
+	Manage error on idle, to call gtk functions in the main thread.
+
+2008-09-12  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* em-icon-stream.c:
+	* em-mailer-prefs.c:
+	* em-mailer-prefs.h:
+	* em-network-prefs.c:
+	* em-network-prefs.h:
+	* importers/evolution-mbox-importer.c:
+
+2008-09-11  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #534039
+
+	* mail-vfolder.c: (vfolder_load_storage): Load store to mail component
+	first, to have all notifications registered in time of adding rules.
+	* mail-folder-cache.c: (real_flush_updates): Dropped unnecessary and
+	offending code causing infinite loops when deleting search folder.
+
 2008-09-09  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #493298
diff --git a/mail/default/Makefile.am b/mail/default/Makefile.am
index 46f55622f6..dcc70dce00 100644
--- a/mail/default/Makefile.am
+++ b/mail/default/Makefile.am
@@ -1,4 +1,4 @@
 
-SUBDIRS=C zh_CN de es fi fr ja ko lt mk nl pl pt sv
+SUBDIRS=C cs zh_CN de es fi fr hu it ja ko lt mk nl pl pt sr sr@latin sv
 
 
diff --git a/mail/default/cs/Inbox b/mail/default/cs/Inbox
new file mode 100644
index 0000000000..b4f647b068
--- /dev/null
+++ b/mail/default/cs/Inbox
@@ -0,0 +1,315 @@
+From evolution@novell.com Wed Sep 06 07:45:12 2006
+Return-Path: <evolution@novell.com>
+Received: from pop.novell.com (IDENT:mail@localhost [127.0.0.1]) by
+	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Wed, 14 Mar 2007
+	07:45:12 -0400
+Received: from smtp.novell.com (smtp.novell.com [141.154.95.10]) by
+	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20659 for
+	<evolution@novell.com>; Wed, 14 Mar 2007 07:45:10 -0400
+Received: (qmail 5610 invoked from network); 14 Mar 2007 12:00:00 -0000
+Received: from smtp.novell.com (HELO localhost) (141.154.95.10) by
+	pop.novell.com with SMTP; 14 Mar 2007 12:00:00 -0000
+From: "Tým Evolution" <evolution@novell.com>
+To: Uživatelé Evolutionu <evolution@novell.com>
+Content-Type: multipart/related; type="multipart/alternative"; boundary="=-t4dRE6cqcdSBHOrMdTQ1"
+X-Mailer: Evolution 2.24.0
+Date: 21 September 2008 12:00:00 +0000
+Message-Id: <1001418302.27070.20.camel@spectrolite>
+Mime-Version: 1.0
+Subject: Vítejte v Evolutionu!
+Sender: evolution@novell.com
+Errors-To: evolution@novell.com
+X-Mailman-Version: 1.1
+Status:   
+X-Evolution-Source: pop://rupert@pop.novell.com/inbox
+X-Evolution: 00000002-0000
+
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: multipart/alternative; boundary="=-2gZ1roA/HoYrlRDVGyiM"
+
+
+--=-2gZ1roA/HoYrlRDVGyiM
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+
+Tým Evolution vás s hrdostí vítá v Evolutionu, kompletním systému pro správu
+vaší komunikace a osobních informací.
+
+
+Začínáme
+
+	Na levé straně okna Evolutionu je postranní panel se zkratkami
+	do všech složek vaší pošty. Pod ním naleznete tlačítka pro
+	přístup ke svým kalendářům, kontaktům, úkolům, poště a poznámkám.
+
+	Kompletního průvodce Evolutionem naleznete pod volbou
+	"Obsah" v nabídce "Nápověda", nebo stisknutím klávesy F1.
+
+Hlášení chyb
+
+	Chyby by měly být hlášeny na http://bugzilla.gnome.org.
+
+Více informací
+
+	Můžete se přihlásit do poštovní konference uživatelů Evolutionu
+	na adrese http://mail.gnome.org/mailman/listinfo/evolution-list.
+
+	Informace o projektu Evolution jsou dostupné na adrese
+	http://www.gnome.org/projects/evolution.
+
+
+S pozdravem
+Tým Evolution
+
+
+--=-2gZ1roA/HoYrlRDVGyiM
+Content-Type: text/html; charset=utf-8
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
+<HTML>
+<HEAD>
+  <META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8">
+  <META NAME="GENERATOR" CONTENT="GtkHTML/0.13.99">
+</HEAD>
+<BODY BGCOLOR="#f8fcf8">
+<TABLE BACKGROUND="cid:1001417869.27019.4.camel@spectrolite" CELLSPACING="0" CELLPADDING="0" WIDTH="100%">
+<TR><TD ALIGN="left" VALIGN="top">
+<IMG SRC="cid:1001417869.27019.5.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8"></TD>
+<TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>
+<TD ALIGN="right" VALIGN="top">
+<IMG SRC="cid:1001417929.27019.7.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8"></TD>
+</TR><TR><TD></TD><TD>
+<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="48" HEIGHT="48"></TD>
+<TD></TD><TD>
+<FONT COLOR="#f8fcf8"><FONT SIZE="4">
+
+
+<B>Tým Evolution</B> vás s hrdostí vítá v <B>Evolutionu</B>, kompletním systému pro správu
+vaší komunikace a osobních informací.
+
+
+</FONT SIZE="4"></FONT>
+</TD><TD></TD><TD>
+<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="48" HEIGHT="48">
+</TD><TD></TD></TR><TR><TD ALIGN="left" VALIGN="bottom">
+<IMG SRC="cid:1001417929.27019.8.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8">
+</TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>
+<TD ALIGN="right" VALIGN="bottom"><div align=right>
+<IMG SRC="cid:1001417929.27019.9.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8">
+</div></TD></TR></TABLE>
+
+
+<h2>
+Začínáme
+</h2>
+
+<blockquote>
+
+	Na levé straně okna Evolutionu je postranní panel se zkratkami
+	do všech složek vaší pošty. Pod ním naleznete tlačítka pro
+	přístup ke svým kalendářům, kontaktům, úkolům, poště a poznámkám.
+
+<br><br>
+
+	Kompletního průvodce Evolutionem naleznete pod volbou
+	<b>Obsah</b> v nabídce <b>Nápověda</b>, nebo stisknutím klávesy <b>F1</b>.	
+
+<br><br>
+</blockquote>
+
+<h2>
+Hlášení chyb
+</h2>
+<blockquote>
+	Chyby by měly být hlášeny na <a href="http://bugzilla.gnome.org">http://bugzilla.gnome.org</a>.
+<br><br>
+</blockquote> 
+
+<h2>
+Více informací
+</h2>
+
+<blockquote>	
+	Můžete se přihlásit do poštovní konference uživatelů Evolutionu
+	na adrese <a href="http://lists.gnome.org/mailman/listinfo/evolution">http://mail.gnome.org/mailman/listinfo/evolution-list</a>.
+
+	Informace o projektu Evolution jsou dostupné na adrese
+	<a href="http://www.gnome.org/projects/evolution">http://www.gnome.org/projects/evolution</a>.	
+	<!--
+	Seznam často kladených otázek (FAQ) naleznete na adrese
+	<a href="http://go-evolution.org/FAQ">http://go-evolution.org/FAQ</a>.
+	-->
+<br><br>	
+</blockquote>
+
+S pozdravem
+<br>
+Tým Evolution
+
+</BODY>
+</HTML>
+
+--=-2gZ1roA/HoYrlRDVGyiM--
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: image/png
+Content-ID: <1001417929.27019.9.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-bottomright.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsBAVf+8XgAAAA7SURB
+VHjaY/z//z8DPsDEgB8IE1JgSkhBGMP///9xYbP/eCSF////f/4/Hp3n/0MBsg6P////z/uPBgDp
+AG5RDY2ymwAAAABJRU5ErkJggg==
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: image/png
+Content-ID: <1001417989.27019.11.camel@spectrolite>
+Content-Disposition: attachment; filename=evolution-icon.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAANbY1E9YMgAAABl0RVh0
+U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAABPQSURBVHjaYtzEuI6BCQgZoRDGRtDIJCrP
+6r8dAxQwATEjlEbGjFD5/0D8Dw3DxBgeMt7BsJdYtwAEEON3xk8EHQqmGSG8X//+IzsahFmAmBWI
+2YGYDUqzQsWZoWpBDv0DxL+g+CcS+w+Spxi0mFQIuwWJBAggRmsmUyL8DmFt+7cX5nBmqGM5gZgH
+iA2B2AWIzYFYCoglGbCD20B8E4hPAfEeIH4OxF+B+BvUM39BHilgyiToFhgLIIAYG5gqCCor/VfL
+AE0OIIdzQB2tCcThQOyHx8GEwBEg3gjEW4H4AxB/hsYOKFb+72BazyCdpMjwfN4juFvEkmwY3s47
+ziBc/BCoYwEDQAAxXhIXYNB7+YWBQZGH4f+NEwz3nrCi2KCsrAwLdVCIcwOxPBAXAXE0A/XACyDu
+g3rmHRB/gcbIv7t37+LVCBBAjPgUQB3PAg11QSAOAuJmIObFpcfWiJtBTpKFQV4C6Of/f6GYgeHQ
++V8Mj178ZXj08h8+91wE4mIgvgWNke/Q2GDA5U6AAGIhwvFcQCwCxP3Q5IIC+HlYGHwdhRl8HYQY
+fBwEwA7+/x9o5//fwPD7xcD47wfD/38/GSr//mf4B8QPnv5l2HL4J8Py3d8Zrtz/i26cPhBvAOIK
+IN4JxK+h+eM3LncCBBDWGEByPCitK7Gxsi7T09JSv3brFsO3798hDudlYciOVmDIiVEAstmgWeQf
+2AOMQMf///8LyAQmZ6AHGP8B9fz9DuT/ZfgL8gjQf39//QfHSvfybwzHr2F1XwcQLwTil9Ak9Rub
+WwECCMMDaCGvIijAv8zMwFD9xLmzDB8/fYYkExNhhpktRgzyMnxAd6OVluAkAwr9n9DQBzkcGIhA
+zAjE/4Ce+PfnP8NfEAb67w/QIzM3fmfoW/uN4dO3/+ju6wLi+dA8AvLEH3T3AgQQigeQMizI8eLA
+kJ9jaWricP7yFYZPnyGOr8pUZ6jONWdgk85iYGTmZbh9bgaDnMRfSAzA0/xPsAcY/v4A0iDHfwEK
+fwV64CuY/v/nH9ADkFj48xNC33vylyF1wieG648xklUdEK+AegKUnP4iuxkggJjQYwRa2oAybJmh
+ro7Djdt34I6f2WzIUFPkzcCp3MXAwq3H8ODhEwYL71kM4dm7GT5+B+ZzVqA2Fn5ghIAwMHZYgIUW
+MzfDYWBSOXIemKyYOBgYmdiBGFhIA21mZAbSzCAaWLSJMzEsL+Nj0JRhRvdAORAbQd0ETqvQgAYD
+gABiwpJ0QEWlm5K8XNqHT58YXr5+DXW8AUNsuC0Du1QG2J9/vpxjSExKY0hIymBg5tJi0LSdyrBl
+72MGJlZ+BkYgZmABFlTAGPrwlZUhvPASQ2DBA4ay/ldAPgvQA8xAzAB3PNhDQM/w8zAxLCniY9CQ
+RvEEyD3VQCwBzZMoBQ9AADGhJR1QM0CYg4O9gpeXh+HmHUhUZUfLM8QEaTKwiQQBMygwDf98wjBh
+Qg+wWGQA0hMYGhoawNrlFRQZDp16xfAR5EgWHnDol3VeYlBS0WFoampiOH5ThkEr8D7D5sO/wI5m
+ZIR4AhwbUMzPzcQwJYWXgZeDEdmdukAcCcSi0CKdCRYLAAGEnISYoT6MlJaUULn/8DFYUE+Nh6Gr
+XIeBld8RXDv///OZ4e71bQwtfTsYFixYAFbz4MEDBn5+bqAHlBhSi5YzaFh1MGzefY/h8OnXDEvX
+32Tg4uIC47y8PIa4xGyGxKavDBFVH4B1wl+IR6COh3lERpiJoSWCGz0pgSpOZWiMwGMBIICYkGhw
+2mdjY81gAgYLLN13laoCk4QE0HBBoOM/AUvDqwwp+fMZEhLTGRwcHMBqQLSikhaDpGoikNZmWLBw
+OUNayWYGj8jFDPX19QwsLCwMJSUlDOfOnWMwMjJi6OnpYfjJacdgk/qOYfq6b/B2KyhGwDTQU07a
+rAwOmiitAlDouwOxEDSlgGMBIIAYkSo0UCaJFxcT7f79+w/Du/fvGWyN+Rh2zjFlYOVzA3pCCJgJ
+2RkmzF7JMGXBFYYLFy4wCAgI4KxSP3z4wJCQkMBw4MABeEyB+EpKSgxRUVEMIiIiDDdu3GCYM2cO
+g7rkJ4amBG4gzcLw+8d/ht/AauPXj38MD5//ZfDp/YRs7BsgDgHiG9Amx2+AAIK12WGZ14WNjY3h
+y9evkCIzTQqYyQQgxeHvDwz3719laOnfA3YQyPGvXr3C6QGQ/IYNG8B5JDAwEOwhUFK7d+8eQ11d
+HcOuXbsYNDQ0wLEhquzF4FLyAVwXwMpCUMNNSoCJwV4dJRZEoC1fXqibGQECiBmafEDNYnFgVDcw
+MTGxffnyFdieYWXoKpZjYGYSB0YtC8N/xn8MwZlLGDx9YxkyMjIYnj17xnDlymWGz8CkJiwszMDM
+jCg5Pn78yMDBwQFmgzxhYGDAUFFRweDh4cFw8+ZNhtWrVzPMnj2b4cSJEwxycnIM5ubm4KS1bt8j
+YKX2FFgKsTBI8DOCa2yW/4wMu1Fr6q/Q5jgoan4BBBDMA6DM6wZ0RNDPnz8Y/gE7LTHe/AyuVgJA
+hwGLRaa/DJMWn2PYffwzw4oVKxh+//7NcOfObQYZGRmGly9fMjx+/IiBjY2dgZeXF8h+zLBo8WKG
+Hz9/MkhKSjI8efKEoaOjg+HFixcMO3bsYJCQkAAnHZDH/vz5Ay3BGMCesLGxAbbcOBl6ll5jePfp
+F4MO0CNKQkwMc4/8ZEArbPZAk9APgABihkYFsOBm8Adii79/Ia3FpiwhBgVpbnDJ8PD5F4aYkqMM
+HZ29DBYWFgy/fv0CJof7YMcqKiqBMx/IE++B+UZeXoGBFZhpT50+zXADGNpubm4M6urqDD9+/AB7
+BBQTIBqUpEA0KHYaGxsZjhw5Ao8NEN537gXD5E0PGXSkmBmev//H8OLTf+RktB7W0AMIIGZo9w+U
+gYP///+vBW+E5PMxcHKwAD3AxCDAx8nw/TczQ3HNHLCcu7s7w6RJkxhqamqBxScfg6ysLDC0pRje
+vn3L8PTpE6An5BmsrKwYngA9eOz4cQYNTU2GyMhIcIzNmDEDnHRAMQlKZqDkCMrcII+C8sO7d+8Y
+dHV1wflj6/ZdDOHG7Aw/gD2DC0/+oneEHoA6QAABxABt96gD8QVoRxuMvxyR/P/thOr/b2eM/n87
+7/j/6yX//8fXev7X1RD6D3Tgf35+/v/9/f1gtp6e3v/Fixf9B+aJ/2fOnP6/e/cuMP3t2zcgfeb/
+pMmT/1++fPn//fv3wfpA5ufn58P1A2PuPwiA5P39/f9zcnL+BwbK/xQ7jv9HS/n+59ix/0d2G7RP
+AuoRcgEEEHIpBK/UbAyAkfLvH7Al+QvYegQ2i/+BGmXfgZUaJ8OOhW4MH949B2fUgIAAcHHq6OgI
+DMlMhqlTpzJ8Bza3ZWXlwJn75MkTDKKiIgxxsbEMOjo64JAGYaBDwfoKCwvBfFhxrKCgAM4bYWFh
+DH8+P2WINGMH2g2svYQx2kewQQMmgABiQurrIgDQj/+BGfk/rEMCbMuDW5X/vjJMXXCBwcDIkgEY
+UmDLQJaDisotW7YwHDt2HOyg/fv3Ax0uCs7Ut4B9CFDRDCp6QcUoKNOCHArSZ29vD9YLCgiQHKz+
+AJnbGMjFwM3GAPbAf8xOHHzYBiCAGKAlkB4QX4JFka4yy/+Pe8X+fzko/v/rUen/X06o/f9y2vD/
+8eUGYPnz58//nz9//n99ff3/6ABY84LVxMbG/t++ffv/d+/egpMIKOkAPQZWA6JBfJA4CIOSEyxJ
+gpIQsAb+f6Ze4P+xMv7/B/P4/vf6cqEnoS5o740XIIBgrT1tZA+A8PtdYv8/7QN64hDIEzJgT+iq
+cYIdCAIgi0HqQOkWHYDEgKH7X1xcHOxYkKNAakEeXr9+PTjdgxyLDEDqQPLARtz/QzX8/0/WCPw/
+Usz3f3823/9MC4w80AFt4PEABBCsFAI23hk0oIJgEOHMwSDAwwStFf8xTF35keHKU2Vw6QECoBIE
+lI5BxSOoaEWvhUFJCdQGApUyFy9eBKd7kJ6CggKwHlCSglV2MD2g5JTj+ItBC9ikAHVy/v6G9Nj2
+3/nNcOM1SjpaCcT3QCkOIICYoINJv6CDTHBw6dZvoAGQ/uv9J38Y2uZ9AluADECNOFg7BxsAORaU
+tkH5BVTew2ppkD5QPkDWC8obosxPGXwN2MAOh3Q7IfTdtyiOB5YoDO9hwy4AAcQAbYXKAHE6cjSl
+enP+f7VR9P/bbaL/rfVYwekUlDRAaT8+Ph5elOJKRugAlnRAGKQexgclNRAblHS2AYtMUNo/Xs7/
+/1A+3/896bz/18ZwoycfUCclAIjlQG4HCCBYDIB8dRXa5wSD7ad+gqNx8+GfDEcv/QaHFigUYW0b
+EA0qMWClESEAK3JBAFbygPggs0CNvWhrdgZxXiaGP7//g2P+z5//4NA/9hA8LMQgxC/AwMbKBhs7
++gR18z+AAGKB+uoXtFY7DcT2IFVPgGlu2/GfDJ++/2fg42KEOxq9CQ1yCMhBIHlQcoEVh+gA1KwG
+eRiWXGDpHpSU1CWZGdIcOBh+gzr4IMeDkhAQ/we6bPftPwxMjKDWAB/Du49g/WdhDTmQBwACiBnq
+ASZoZgYBD5ilr4BtkPpoboYAG3aGbYfuMnRPXgq2EFTNwwCs8gE5EBSiIBoEQI029Pwyc+ZMsONh
+HSGQZyMiIhjq/ZgZxIBdSfAoxS8GaAb+z3AR2B9YcuEXgyA/P8Pfv38Zvn7/9hCobRW0GQHKB38A
+Agh5hE4UGvrXkdNcdxL3/wcLhf8/XiL8f24R739gbICLRVj1jw5AeQWE0QFIj6Ys839eTkawPEg/
+KP1HAovIU3XAMh+U7gv4/u/L5P2/M5nn/84knv/Aluh/FmaW/8qycv+BJdp/6PCKA7SDDw5wgABi
+go6x/IOOQ76BKoKDpuXfgL2zf+DoddJjYzjWL8jA+m4HOOTRSyVYkkLPEyD+vl2bGBYX8DGsL+Nn
+OLplKjjJ3bpwmCHFloPhz8//EPwLgkFBt/7qL4Z77/4xiAoJMXz59g3U9Aaln91Iw43g1h1AAIEH
+tqA9fDZoUxWUPqYDsRrMAWaqLEDL+SEjCNChkJM3fzOUzPnCoKJjC87gIA8hl+mg5AQSA6V7kGPT
+bd4w+Juwg0fk/gGTxx5gwQAqJm2UmIFJhgHueFCz4e7bvwxZG78z8PHwgD3wENh5AnpgFtDodUB8
+GYjfgobhQW4HCCDkUYk/0Iz8FIgnIpdIp4AZqXzBF0h/FdpnNVFgZdhcI8Cgx3sK2CdQhGdM9FgA
+l+8sTxl8gOX7b2A/9w/YDAYGa0UWBhsFZiAf2FuFxgDM8aXbvzOwA9tPIMe/BQYA0PGgZH0QVLZA
+3QjvogEEELOUlBTDnj17GNDK2t/QfGEEU3jj2V9gyfSXwV6DFTx6+A+IWYG1tJkyK4MzMGlNWrCH
+Yc7ideAMDooBWO+rtDCLYWoCDwM3MyM4g8IzKRD/hta0IDZ4CB3q+N/A5C0D1Pv123eGt+/ffwRK
+TYY2dZ6ij5ECBBD62CgjdMhCDIhVQQEIal2jlCaarAxNwVzgohU+FAKdy1ty+AfD9L0/GILD4xgW
+LlzIAGzbMDhL3GKIADaL/8FGpf9A6d+QAd5/0H4KqMRp3At0/H9WBmlJCXB38+mLlz/+/fsHSs47
+oCMRb6B59T/M3QABxAzsPDAYGxszzJo1i+Ho0aOwmPgLxaD5LEVoTQ0p+t78Y9hx8TeDiggzgziw
+rQSu7kExAqS1pVgY3LTZGFbtOMfw/OM/Br7/rxmqPbmgIc4Ab9uA0zzQA6By/gsw6cw984thMrDO
+YefgYhAHNsP//PnL8Ozli5/AvvlcoJX7gfgOkuNRZm0AAgjf8DoPdO4LlKlLgdgSvcQxlGNhSAHW
+oIayiOHK//8hpchBYFtKAlizgjojwL4RPAZAAwYMUIevv/YbXNp8/83IICIsxMDNxQUe0nn99h2o
+loU5/jq0nfYZ2/A6QACB84C2tjZcAJon/iE18n5ADfkH7TcgJraAobztym+wY78DHcQMdBg/KxM4
+pGX4mBj42SDpHtYo/AzMwGeAfduVl34xTAKG+Lln/xg4uXgZRIGOBw0EvAb2qT9++vwKWgoehqYA
+2NzA3/LycnBqQQYAAYRvhgbWdeOGVnIK0PyQAp1KxQn0gU2D/7DECAUvv/wDYogAGysrAxcXJwMX
+MPkyMzMxfANm1ncfPoJi7xC0qAQFGKjWfQXLtMjpHpTc09LSwGyAAGLEJoglOXFCRy4koQOs3kDs
+BSrysXkANJIBNhySw8GOBA18gRzOCsQsQPY/YFL7/v0HOMkAHX4FOid2DtpMeAKd5INVWP9xTfIB
+BBAxs5SwwSR2aL4QhXpEFjQYBi1q4ZUeyNGg5MAI9ATIIyA+EyMjeMD2399/4DbNL2D5CSxdPkNn
+I0Hl+zWoo59AMytsvvgvoWlWgABiBA0uhYaGwgVAw37IfCSPMCJNufJAYwTkGXGoZ3ShbXQlaONQ
+FsmIT1AMaoA9g87Y34ZO4L2ENg/eIzn8N75QRwYAAcRIjCK02ICtj2CH5g8e6MgeP7STzQv1JDvS
+aAesQPgOHdv8CPXQR6ijvyE5/B++eWF0ABBALMROpcMMBHrkH9IijR9QR7yGOpgdadEH8lgT+mKP
+H0iLPv7A1kgg2wNKCcQAgAACJyFyAGiME2liEHmpDTMSH3m5DWx5zV+0JTfgognmDq/+Dga9lyA/
+mTD8/zmDIZFnPrjwEwWPJtowJIJLVltg+j0MpgECDADuXybnyFX8nAAAAABJRU5ErkJggg==
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: image/png
+Content-ID: <1001417929.27019.8.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-bottomleft.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsBCVkleUoAAAA/SURB
+VHjaY/z//z8DPsDEwMAgTEiBKSEFYXjt+A8BZv///2fAhmEKzv///18YnwKYIjN8CmBg3v///z1g
+JgIAui9uUdDfxKcAAAAASUVORK5CYII=
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: image/png
+Content-ID: <1001417929.27019.7.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-topright.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsANW9RNIwAAAA7SURB
+VHjahcwxDcAwEATBCwZzCQajNCVDGlduouh/petGFwQDE8un/OzFrsB93BW4Tx6kaHVgdmB0IAcq
+73eg4H8gZQAAAABJRU5ErkJggg==
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: image/png
+Content-ID: <1001417869.27019.5.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-topleft.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsAJuvvdVIAAABISURB
+VHjafcxRDYAwDAbhYxbqZRpQOQGYQQkabk8kzRj9kz59l+J3Qz3VUCHBrXaVfCSMFXPQd/gG4w9V
+GnBR7FADeKqgesAEj0KK3Z8K59sAAAAASUVORK5CYII=
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: image/png
+Content-ID: <1001417869.27019.4.camel@spectrolite>
+Content-Disposition: attachment; filename=bluestripes.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsLBap83esAAACESURB
+VHja7dRBDcAgEADBgwDBEj4wUvdN+2h1kJvVMNmy9vVF4mokr93PGwRkFjBHJ8ADCPAAAjyAAA8g
+wAMI8AACPIAADyDAAwjwAAI8gAAPIMADCPAAAjyAAA8gwAMI8AACPIAADyDAAwjwAAI8gAAPIMAD
+CPAAAjyAAA8gwAMIOL8fcegyqOBdwTkAAAAASUVORK5CYII=
+
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Transfer-Encoding: 8bit
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+
diff --git a/mail/default/cs/Makefile.am b/mail/default/cs/Makefile.am
new file mode 100644
index 0000000000..008ec2588d
--- /dev/null
+++ b/mail/default/cs/Makefile.am
@@ -0,0 +1,7 @@
+
+defaultlocaldir = $(privdatadir)/default/cs/mail/local
+
+defaultlocal_DATA = \
+	Inbox
+
+EXTRA_DIST = $(defaultlocal_DATA)
diff --git a/mail/default/de/Inbox b/mail/default/de/Inbox
index b8038ae947..a5f2e7ce57 100644
--- a/mail/default/de/Inbox
+++ b/mail/default/de/Inbox
@@ -50,20 +50,6 @@ Erste Schritte
 	Sie die F1-Taste.
 
 
-Neue Funktionen
-
-	Evolution 2.8 bietet
-
-	* Eine neue Suchfunktion und eine globale Suche in der Mail-Komponente
-	* Einen Breitbild-Modus mit vertikaler Vorschau in der Mail-Komponente
-	* Verbesserte Darstellung (durch Integration von »Cairo«)
-	* Verbesserte Leistung und reduzierten Speicherverbrauch
-	* Unterstützung für GroupWise-Erinnerungsnotizen und Zurückziehen von
-	  E-Mails
-	* Gemeinsame Notizen (im Dateisystem)
-	* Integration des GNOME-Schlüsselbunds
-	* Viele behobene Fehler und weitere Verbesserungen
-
 Fehlerberichte
 
 	Falls Sie einen Fehler entdecken, erstellen Sie bitte einen 
@@ -160,23 +146,6 @@ Content-Type: text/html; charset=utf-8
 <br><br>
 </blockquote>
 
-<h2>Neue Funktionen</h2>
-<blockquote>
-	Evolution 2.8 bietet
-	<ul>
-	<li>Eine neue Suchfunktion und eine globale Suche in der Mail-Komponente</li>
-	<li>Einen Breitbild-Modus mit vertikaler Vorschau in der Mail-Komponente</li>
-	<li>Verbesserte Darstellung (durch Integration von »Cairo«)</li>
-	<li>Verbesserte Leistung und reduzierten Speicherverbrauch</li>
-	<li>Unterstützung für GroupWise-Erinnerungsnotizen und Zurückziehen von
-	  E-Mails</li>
-	<li>Gemeinsame Notizen (im Dateisystem)</li>
-	<li>Integration des GNOME-Schlüsselbunds</li>
-	<li>Viele behobene Fehler und weitere Verbesserungen</li>
-	</ul>
-<br>
-</blockquote>
-
 <h2>Fehlerberichte</h2>
 <blockquote>
 	Falls Sie einen Fehler entdecken, erstellen Sie bitte einen
diff --git a/mail/default/es/Inbox b/mail/default/es/Inbox
index d8b89756ae..0ab344592a 100644
--- a/mail/default/es/Inbox
+++ b/mail/default/es/Inbox
@@ -1,19 +1,19 @@
 From evolution@novell.com Wed Sep 06 07:45:12 2006
 Return-Path: <evolution@novell.com>
 Received: from pop.novell.com (IDENT:mail@localhost [127.0.0.1]) by
-	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Wed, 06 Sep 2006
+	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Mon, 21 Sep 2008
 	07:45:12 -0400
 Received: from smtp.novell.com (smtp.novell.com [141.154.95.10]) by
 	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20659 for
-	<evolution@novell.com>; Wed, 06 Sep 2006 07:45:10 -0400
-Received: (qmail 5610 invoked from network); 06 Sep 2006 12:00:00 -0000
+	<evolution@novell.com>; Wed, 21 Sep 2008 07:45:10 -0400
+Received: (qmail 5610 invoked from network); 21 Sep 2008 12:00:00 -0000
 Received: from smtp.novell.com (HELO localhost) (141.154.95.10) by
-	pop.novell.com with SMTP; 06 Sep 2006 12:00:00 -0000
+	pop.novell.com with SMTP; 21 Sep 2008 12:00:00 -0000
 From: "El equipo de Evolution" <evolution@novell.com>
 To: Usuarios de Evolution <evolution@novell.com>
 Content-Type: multipart/related; type="multipart/alternative"; boundary="=-t4dRE6cqcdSBHOrMdTQ1"
-X-Mailer: Evolution 2.8.0
-Date: 06 September 2006 12:00:00 +0000
+X-Mailer: Evolution 2.24.0
+Date: 21 Septiembre 2008 12:00:00 +0000
 Message-Id: <1001418302.27070.20.camel@spectrolite>
 Mime-Version: 1.0
 Subject: Bienvenido a Evolution
@@ -41,47 +41,29 @@ personal.
 
 Introducción
  	
-	A la izquierda de la ventana de evolution está la barra lateral,
+	A la izquierda de la ventana de Evolution está la barra lateral,
         con accesos a todas sus carpetas de correo. Debajo de ésta,
         encontrará botones para sus calendarios, contactos, tareas,
         correo y notas.
 
-        Para una guía completa de uso de Evolution, seleccione Contenido
-        en el menú Ayuda, o pulse la tecla F1.
-
-Características nuevas
-
-        Evolution 2.8 tiene
-              * Un interfaz de búsqueda nuevo y una búsqueda global en
-                el interfaz del correo
-              * Un modo de pantalla panorámica, y vista previa vertical
-                en el interfaz del correo
-              * Apariencia mejorada con integración de  «Cairo»
-              * Rendimiento más rápido, montones de optimizaciones de
-                memoria y reducción del uso de memoria
-              * Suporte para Recordatorios de notas GroupWise y Mail
-                Retract
-              * Notas compatibles en el Diario (sistema de ficheros)
-              * Soporte para el gestor de depósitos de claves de GNOME
-              * Montones de errores corregidos y otras mejoras
-
+        Para una guía completa de uso de Evolution, seleccione «Índice»
+        en el menú «Ayuda», o pulse la tecla F1.
 
 Información de errores
 
-        Los errores se deben notificar en el Bugzilla de GNOME
-        http://bugzilla.gnome.org.
+        Los errores se deben notificar en http://bugzilla.gnome.org.
 
 
 Más información
 
         Puede suscribirse a la lista de correo de usuarios de Evolution
-        en http://lists.gnome.org/mailman/listinfo/evolution. La
-        información acerca del proyecto Evolution está disponible en
-        http://www.go-evolution.org.
+        en http://lists.gnome.org/mailman/listinfo/evolution. 
+
+	La información acerca del proyecto Evolution está disponible en
+        http://www.gnome.org/projects/evolution.
 
 Con afecto,
 El equipo de Evolution
-evolution@novell.com
 
 
 --=-2gZ1roA/HoYrlRDVGyiM
@@ -126,51 +108,20 @@ Introducci&#243;n
 
 <blockquote>
 
-	 A la izquierda de la ventana de Evolution est&#225; la barra
+	A la izquierda de la ventana de Evolution est&#225; la barra
 	lateral, con accesos a todas sus carpetas de correo. Debajo de
 	&#233;sta, encontrar&#225; botones para sus calendarios, contactos,
 	tareas, correo y notas.
 <br><br>
 
-    Para una gu&#237;a completa de uso de Evolution, seleccione
-<B>Contenido</B> en el men&#250; <B>Ayuda</B>, o pulse la tecla
-<B>F1</B>.
+	Para una gu&#237;a completa de uso de Evolution, seleccione
+	<B>&#205;ndice</B> en el men&#250; <B>Ayuda</B>, o pulse la tecla
+	<B>F1</B>.
 
 <br><br>
 </blockquote>
 
 <h2>
-Caracter&#237;sticas nuevas
-</h2>
-
-<blockquote>
-	Evolution 2.8 tiene 
-	<ul>
-	<li>
-	Un interfaz de b&#250;squeda nuevo y una b&#250;squeda global en
-	el interfaz del correo
-	</li><li>
-	Un modo de pantalla panor&#225;mica, y vista previa vertical en
-	el interfaz del correo
-	</li><li>
-	Apariencia mejorada con integraci&#243;n de &nbsp;&#171;Cairo&#187;
-	</li><li>
-	Rendimiento m&#225;s r&#225;pido, montones de optimizaciones de
-	memoria y reducci&#243;n del uso de memoria
-	</li><li>
-	Soporte para Recordatorios de notas GroupWise y Mail Retract
-	</li><li>
-	Notas compatibles en el Diario (sistema de ficheros)
-	</li><li>
-	Soporte para el gestor de dep&#243;sitos de claves de GNOME
-	</li><li>
-	Montones de errores corregidos y otras mejoras
-	</li>
-	</ul>
-<br>
-</blockquote>
-
-<h2>
 Informaci&#243;n de errores
 </h2>
 <blockquote>
@@ -183,12 +134,11 @@ M&#225;s informaci&#243;n
 </h2>
 
 <blockquote>
-	Puede suscribirse a la lista de correo de usuarios de Evolution
-en
+	Puede suscribirse a la lista de correo de usuarios de Evolution	en
 	<a href="http://lists.gnome.org/mailman/listinfo/evolution">http://lists.gnome.org/mailman/listinfo/evolution</a>.
 
 	La informaci&#243;n acerca del proyecto Evolution est&#225;
-disponible en&nbsp;
+	disponible en&nbsp;
 	<a href="http://www.gnome.org/projects/evolution">http://www.gnome.org/projects/evolution</a>.
 	<!--
 	You can find a list of answers to Frequently Asked Questions (FAQ) at
@@ -200,7 +150,6 @@ disponible en&nbsp;
 Con afecto,
 <br>
 El equipo de Evolution
-<br><a href="mailto:evolution@novell.com">evolution@novell.com</a>
 
 </BODY>
 </HTML>
diff --git a/mail/default/fi/Inbox b/mail/default/fi/Inbox
index cb45a9aed5..a4f162acfd 100644
--- a/mail/default/fi/Inbox
+++ b/mail/default/fi/Inbox
@@ -1,19 +1,19 @@
 From evolution@novell.com Wed Sep 06 12:00:00 2006
 Return-Path: <evolution@novell.com>
 Received: from pop.novell.com (IDENT:mail@localhost [127.0.0.1]) by
-	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Wed, 06 Sep 2006
+	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Wed, 14 Mar 2007
 	07:45:12 -0400
 Received: from smtp.novell.com (smtp.novell.com [141.154.95.10]) by
 	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20659 for
-	<evolution@novell.com>; Wed, 06 Sep 2006 07:45:10 -0400
-Received: (qmail 5610 invoked from network); 06 Sep 2006 12:00:00 -0000
+	<evolution@novell.com>; Wed, 14 Mar 2007 07:45:10 -0400
+Received: (qmail 5610 invoked from network); 14 Mar 2007 12:00:00 -0000
 Received: from smtp.novell.com (HELO localhost) (141.154.95.10) by
-	pop.novell.com with SMTP; 06 Sep 2006 12:00:00 -0000
+	pop.novell.com with SMTP; 14 Mar 2007 12:00:00 -0000
 From: "Evolution-tiimi" <evolution@novell.com>
 To: Evolutionin käyttäjät <evolution@novell.com>
 Content-Type: multipart/related; type="multipart/alternative"; boundary="=-t4dRE6cqcdSBHOrMdTQ1"
-X-Mailer: Evolution 2.8.0
-Date: 15 March 2006 12:00:00 +0000
+X-Mailer: Evolution 2.24.0
+Date: 14 March 2007 12:00:00 +0000
 Message-Id: <1001418302.27070.20.camel@spectrolite>
 Mime-Version: 1.0
 Subject: Tervetuloa Evolutioniin!
@@ -22,7 +22,7 @@ Errors-To: evolution@novell.com
 X-Mailman-Version: 1.1
 Status:   
 X-Evolution-Source: pop://rupert@pop.novell.com/inbox
-X-Evolution: 00000ddd-0030
+X-Evolution: 00000002-0000
 
 
 --=-t4dRE6cqcdSBHOrMdTQ1
@@ -30,7 +30,7 @@ Content-Type: multipart/alternative; boundary="=-2gZ1roA/HoYrlRDVGyiM"
 
 
 --=-2gZ1roA/HoYrlRDVGyiM
-Content-Type: text/plain; charset=utf-8
+Content-Type: text/plain
 Content-Transfer-Encoding: 7bit
 
 Evolution-tiimi toivottaa sinut tervetulleeksi käyttämään Evolutionia. 
@@ -39,7 +39,7 @@ kohtaiset tietosi.
 
 Ohjeita uusille käyttäjille
 
-    Evolution-ikkunan vasemman reunan sivupalkissa on lista, josta 
+    Evolution-ikkunan vasemman reunan sivupalkissa on luettelo, josta 
     löydät kaikki sähköpostikansiosi. Tämän listan alla on ryhmä
     painikkeita, joista voit vaihtaa näkymää sähköpostin, kalenterin, 
     yhteystietojen, tehtävien ja muistilappujen välillä.
@@ -48,18 +48,6 @@ Ohjeita uusille käyttäjille
     kohta "Sisältö" valikosta tai painamalla F1-näppäintä. Valitettavasti 
     tätä ohjetta ei vielä kuitenkaan ole suomennettu.
 
-Uusia ominaisuuksia
-
-    Evolutionin version 2.8 uusia ominaisuuksia ovat muun muassa
-
-    # Uusi käyttöliittymä tekstin hakuun kaikista sähköposteista
-    # Leveän näytön tila ja pystysuuntainen viestin esikatselu
-    # Parannettu käyttötuntuma ja Cairo-tuki
-    # Nopeampi suorituskyky ja pienempi muistinkäytö
-    # Tuki Groupwise-tilien muistilapuille ja viestien perumiselle
-    # Tiedostojärjestelmässä tuetua jaettuvat päiväkirjan muistilaput
-    # Paljon korjattuja vikoja ja muita parannuksia 
-
 Vikailmoitukset
 
     Raportoi löytämäsi viat osoitteessa http://bugzilla.gnome.org.
@@ -73,7 +61,7 @@ Lisätietoja
 	http://www.gnome.org/projects/evolution.
 
 
-Evolution-tiimi 
+Evolution-tiimi,
 evolution@novell.com
 
 
@@ -141,7 +129,7 @@ Content-Type: text/html; charset=utf-8
 <h2> Ohjeita uusille käyttäjille </h2>
 
 <blockquote>
-    Evolution-ikkunan vasemman reunan sivupalkissa on lista, josta 
+    Evolution-ikkunan vasemman reunan sivupalkissa on luettelo, josta 
     löydät kaikki sähköpostikansiosi. Tämän listan alla on ryhmä
     painikkeita, joista voit vaihtaa näkymää sähköpostin, kalenterin, 
     yhteystietojen, tehtävien ja muistilappujen välillä.
@@ -154,24 +142,6 @@ Content-Type: text/html; charset=utf-8
 
 </blockquote>
 
-<h2> Uusia ominaisuuksia </h2>
-
-<blockquote>
-
-    Evolutionin version 2.8 uusia ominaisuuksia ovat muun muassa
-    <br /><br />
-    <ul>
-    <li>  Uusi käyttöliittymä tekstin hakuun kaikista sähköposteista </li>
-    <li>  Leveän näytön tila ja pystysuuntainen viestin esikatselu </li>
-    <li>  Parannettu käyttötuntuma ja Cairo-tuki </li>
-    <li>  Nopeampi suorituskyky ja pienempi muistinkäytö </li>
-    <li>  Tuki Groupwise-tilien muistilapuille ja viestien perumiselle </li>
-    <li>  Tiedostojärjestelmässä tuetua jaettuvat päiväkirjan muistilaput </li>
-    <li>  Paljon korjattuja vikoja ja muita parannuksia  </li>
-    </ul>
-
-</blockquote>
-
 <h2> Vikailmoitukset </h2>
 
 <blockquote>
diff --git a/mail/default/fr/Inbox b/mail/default/fr/Inbox
index 93453ea665..7e64293ab5 100644
--- a/mail/default/fr/Inbox
+++ b/mail/default/fr/Inbox
@@ -1,19 +1,19 @@
-From evolution@novell.com Wed Mar 15 07:45:12 2006
+From evolution@novell.com Tue Sep 16 07:45:12 2008
 Return-Path: <evolution@novell.com>
 Received: from pop.novell.com (IDENT:mail@localhost [127.0.0.1]) by
-	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Wed, 15 Mar 2006
+	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Tue, 16 Sep 2008
 	07:45:12 -0400
 Received: from smtp.novell.com (smtp.novell.com [141.154.95.10]) by
 	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20659 for
-	<evolution@novell.com>; Wed, 15 Mar 2006 07:45:10 -0400
-Received: (qmail 5610 invoked from network); 15 Mar 2006 12:00:00 -0000
+	<evolution@novell.com>; Tue, 16 Sep 2008 07:45:10 -0400
+Received: (qmail 5610 invoked from network); 16 Sep 2008 12:00:00 -0000
 Received: from smtp.novell.com (HELO localhost) (141.154.95.10) by
-	pop.novell.com with SMTP; 15 Mar 2006 12:00:00 -0000
+	pop.novell.com with SMTP; 16 Sep 2008 12:00:00 -0000
 From: "L'équipe d'Evolution" <evolution@novell.com>
 To: Utilisateurs d'Evolution <evolution@novell.com>
 Content-Type: multipart/related; type="multipart/alternative"; boundary="=-t4dRE6cqcdSBHOrMdTQ1"
-X-Mailer: Evolution 2.6.0
-Date: 15 March 2006 12:00:00 +0000
+X-Mailer: Evolution 2.24.0
+Date: 16 September 2008 12:00:00 +0000
 Message-Id: <1001418302.27070.20.camel@spectrolite>
 Mime-Version: 1.0
 Subject: Bienvenue dans Evolution !
@@ -22,6 +22,7 @@ Errors-To: evolution@novell.com
 X-Mailman-Version: 1.1
 Status:   
 X-Evolution-Source: pop://rupert@pop.novell.com/inbox
+X-Evolution: 00000002-0000
 
 
 --=-t4dRE6cqcdSBHOrMdTQ1
@@ -29,67 +30,41 @@ Content-Type: multipart/alternative; boundary="=-2gZ1roA/HoYrlRDVGyiM"
 
 
 --=-2gZ1roA/HoYrlRDVGyiM
-Content-Type: text/plain; charset=ISO-8859-15
+Content-Type: text/plain; charset=utf-8
 Content-Transfer-Encoding: 8bit
 
-L'�quipe
-d'Evolution est fi�re de vous pr�senter Evolution, un syst�me complet pour g�rer votre correspondance num�rique et vos donn�es personnelles.
+L'équipe d'Evolution est fière de vous présenter Evolution, un système 
+complet pour gérer votre correspondance numérique et vos données personnelles.
 
 Introduction
 
-        La partie gauche de la fen�tre d'Evolution affiche un panneau de
+        La partie gauche de la fenêtre d'Evolution affiche un panneau de
         navigation contenant les raccourcis vers vos dossiers de
-        courriels. En dessous, vous trouverez les boutons donnant acc�s
-        � vos calendriers, contacts, t�ches, courriels et m�mos. 
+        courriels. En dessous, vous trouverez les boutons donnant accès
+        à vos calendriers, contacts, tâches, courriels et mémos. 
         
-        Pour acc�der au guide complet sur l'utilisation d'Evolution,
-        s�lectionnez Sommaire dans le menu Aide ou appuyez sur la touche
+        Pour accéder au guide complet sur l'utilisation d'Evolution,
+        sélectionnez Sommaire dans le menu Aide ou appuyez sur la touche
         F1.
 
-Nouvelles fonctionnalit�s
-
-        Evolution 2.6 contient : 
-              * un nouveau composant M�mo ; 
-              * une nouvelle interface pour l'�diteur d'�v�nements,
-                T�ches et R�unions ; 
-              * la possibilit� de publier des calendriers ; 
-              * la prise en charge de CalDAV ; 
-              * la prise en charge de l'outil Network Manager ; 
-              * la prise en charge de la connectivit� Hula ; 
-              * une am�lioration du support GroupWise ; 
-              * une am�lioration du support des �v�nements r�currents ; 
-              * les astuces de calendrier ; 
-              * les importateurs CSV depuis les formats Mozilla, Outlook
-                et Evolution ; 
-              * la prise en charge des listes de contacts dans les carnets
-                d'adresses LDAP ; 
-              * la possibilit� de sauvegarder les recherches avanc�es
-                sur les carnets d'adresses ; 
-              * la possibilit� de fixer la priorit� des messages dans
-                l'�diteur ; 
-              * et de tr�s nombreuses corrections de bogues et
-                am�liorations de l'interface utilisateur. 
-
 Rapport de bogues
 
-        Les bogues doivent �tres signal�s sur http://bugzilla.gnome.org.
+        Les bogues doivent êtres signalés sur http://bugzilla.gnome.org.
 
-Informations suppl�mentaires
+Informations supplémentaires
 
-        Vous pouvez vous inscrire � la liste de diffusion anglophone des
-        utilisateurs d'Evolution �
-        http://lists.gnome.org/mailman/listinfo/evolution. Des
-        informations sur le projet Evolution sont disponibles �
+        Vous pouvez vous inscrire à la liste de diffusion anglophone des
+        utilisateurs d'Evolution à
+        http://mail.gnome.org/mailman/listinfo/evolution-list. Des
+        informations sur le projet Evolution sont disponibles à
         http://www.gnome.org/projects/evolution.
 
 
 Cordialement,
-L'�quipe d'Evolution
-evolution@novell.com
+L'équipe d'Evolution
 
 --=-2gZ1roA/HoYrlRDVGyiM
 Content-Type: text/html; charset=utf-8
-Content-Transfer-Encoding: 8bit
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
 <HTML>
@@ -99,62 +74,27 @@ Content-Transfer-Encoding: 8bit
 </HEAD>
 <BODY BGCOLOR="#f8fcf8">
 <TABLE BACKGROUND="cid:1001417869.27019.4.camel@spectrolite" CELLSPACING="0" CELLPADDING="0" WIDTH="100%">
-<TR>
-<TD ALIGN="left" VALIGN="top">
-<IMG SRC="cid:1001417869.27019.5.camel@spectrolite" WIDTH="8" HEIGHT="8" ALIGN="top" BORDER="0">
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
+<TR><TD ALIGN="left" VALIGN="top">
+<IMG SRC="cid:1001417869.27019.5.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8"></TD>
+<TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>
 <TD ALIGN="right" VALIGN="top">
-<IMG SRC="cid:1001417929.27019.7.camel@spectrolite" WIDTH="8" HEIGHT="8" ALIGN="top" BORDER="0">
-</TD>
+<IMG SRC="cid:1001417929.27019.7.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8"></TD>
 </TR>
-<TR>
-<TD>
-</TD>
-<TD>
-<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" WIDTH="48" HEIGHT="48" ALIGN="top" BORDER="0">
-</TD>
-<TD>
-</TD>
-<TD>
-<B><FONT SIZE="4"><FONT COLOR="#f8fcf8">L'&#233;quipe d'Evolution</FONT></FONT></B><FONT COLOR="#f8fcf8"><FONT SIZE="4"> est fi&#232;re de vous pr&#233;senter </FONT></FONT><FONT COLOR="#f8fcf8"><B><FONT SIZE="4">Evolution</FONT></B></FONT><FONT COLOR="#f8fcf8"><FONT SIZE="4">, un syst&#232;me complet pour g&#233;rer votre correspondance num&#233;rique et vos donn&#233;es personnelles.</FONT></FONT>
-</TD>
-<TD>
-</TD>
-<TD>
-<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" WIDTH="48" HEIGHT="48" ALIGN="top" BORDER="0">
-</TD>
-<TD>
-</TD>
-</TR>
-<TR>
-<TD ALIGN="left" VALIGN="bottom">
-<IMG SRC="cid:1001417929.27019.8.camel@spectrolite" WIDTH="8" HEIGHT="8" ALIGN="top" BORDER="0">
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
+<TR><TD></TD><TD>
+<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="48" HEIGHT="48"></TD>
+<TD></TD><TD>
+<FONT COLOR="#f8fcf8"><FONT SIZE="4">
+<B>L'&#233;quipe d'Evolution</B> est fi&#232;re de vous pr&#233;senter <B>Evolution</B>, un syst&#232;me complet pour g&#233;rer votre correspondance num&#233;rique et vos donn&#233;es personnelles.
+</FONT></FONT>
+</TD><TD></TD><TD>
+<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="48" HEIGHT="48">
+</TD><TD></TD></TR><TR><TD ALIGN="left" VALIGN="bottom">
+<IMG SRC="cid:1001417929.27019.8.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8">
+</TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>
 <TD ALIGN="right" VALIGN="bottom">
-<DIV ALIGN=right><IMG SRC="cid:1001417929.27019.9.camel@spectrolite" WIDTH="8" HEIGHT="8" ALIGN="top" BORDER="0"></DIV>
-</TD>
-</TR>
-</TABLE>
+<DIV ALIGN=right><IMG SRC="cid:1001417929.27019.9.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8">
+</DIV></TD></TR></TABLE>
+
 <H2>Introduction</H2>
 
 <BLOCKQUOTE>
@@ -163,27 +103,6 @@ Content-Transfer-Encoding: 8bit
     Pour acc&#233;der au guide complet sur l'utilisation d'Evolution, s&#233;lectionnez <B>Sommaire</B> dans le menu <B>Aide</B> ou appuyez sur la touche <B>F1</B>.
 </BLOCKQUOTE>
 
-<H2>Nouvelles fonctionnalit&#233;s</H2>
-<BLOCKQUOTE>
-    Evolution 2.6 contient : 
-    <UL>
-        <LI>un nouveau composant M&#233;mo ; 
-        <LI>une nouvelle interface pour l'&#233;diteur d'&#201;v&#232;nements, T&#226;ches et R&#233;unions ; 
-        <LI>la possibilit&#233; de publier des calendriers ; 
-        <LI>la prise en charge de CalDAV ; 
-        <LI>la prise en charge de l'outil Network Manager ; 
-        <LI>la prise en charge de la connectivit&#233; Hula ; 
-        <LI>une am&#233;lioration du support GroupWise ; 
-        <LI>une am&#233;lioration du support des &#233;v&#232;nements r&#233;currents ; 
-        <LI>les astuces de calendrier ; 
-        <LI>les importateurs CSV depuis les formats Mozilla, Outlook et Evolution ; 
-        <LI>la prise en charge des listes de contacts dans les carnets d'adresses LDAP ; 
-        <LI>la possibilit&#233; de sauvegarder les recherches avanc&#233;es sur les carnets d'adresses ; 
-        <LI>la possibilit&#233; de fixer la priorit&#233; des messages dans l'&#233;diteur ; 
-        <LI>et de tr&#232;s nombreuses corrections de bogues et am&#233;liorations de l'interface utilisateur. 
-    </UL>
-</BLOCKQUOTE>
-
 <H2>Rapport de bogues</H2>
 <BLOCKQUOTE>
     Les bogues doivent &#234;tres signal&#233;s sur <A HREF="http://bugzilla.gnome.org">http://bugzilla.gnome.org</A>.
@@ -191,13 +110,12 @@ Content-Transfer-Encoding: 8bit
 
 <H2>Informations suppl&#233;mentaires</H2>
 <BLOCKQUOTE>
-    Vous pouvez vous inscrire &#224; la liste de diffusion anglophone des utilisateurs d'Evolution &#224; <A HREF="http://lists.gnome.org/mailman/listinfo/evolution">http://lists.gnome.org/mailman/listinfo/evolution</A>. Des informations sur le projet Evolution sont disponibles &#224; <A HREF="http://www.gnome.org/projects/evolution">http://www.gnome.org/projects/evolution</A>.
+    Vous pouvez vous inscrire &#224; la liste de diffusion anglophone des utilisateurs d'Evolution &#224; <A HREF="http://mail.gnome.org/mailman/listinfo/evolution-list">http://mail.gnome.org/mailman/listinfo/evolution-list</A>. Des informations sur le projet Evolution sont disponibles &#224; <A HREF="http://www.gnome.org/projects/evolution">http://www.gnome.org/projects/evolution</A>.
 <BR><BR>
 </BLOCKQUOTE>
 
 Cordialement,<BR>
 L'&#233;quipe d'Evolution<BR>
-<A HREF="mailto:evolution@novell.com">evolution@novell.com</A>
 </BODY>
 </HTML>
 
diff --git a/mail/default/hu/Inbox b/mail/default/hu/Inbox
new file mode 100644
index 0000000000..5cb2c28a0c
--- /dev/null
+++ b/mail/default/hu/Inbox
@@ -0,0 +1,314 @@
+From evolution@novell.com Wed 10 Sep 07:45:12 2008
+Return-Path: <evolution@novell.com>
+Received: from pop.novell.com (IDENT:mail@localhost [127.0.0.1]) by
+	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Wed, 10 Sep 2008
+	07:45:12 -0400
+Received: from smtp.novell.com (smtp.novell.com [141.154.95.10]) by
+	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20659 for
+	<evolution@novell.com>; Wed, 10 Sep 2008 07:45:10 -0400
+Received: (qmail 5610 invoked from network); 10 Sep 2008 12:00:00 -0000
+Received: from smtp.novell.com (HELO localhost) (141.154.95.10) by
+	pop.novell.com with SMTP; 10 Sep 2008 12:00:00 -0000
+From: "Az Evolution csapat" <evolution@novell.com>
+To: Evolution felhasználók <evolution@novell.com>
+Content-Type: multipart/related; type="multipart/alternative"; boundary="=-t4dRE6cqcdSBHOrMdTQ1"
+X-Mailer: Evolution 2.24.0
+Date: Wed Sep 10 2008 19:35:00 +0200
+Message-Id: <1001418302.27070.20.camel@spectrolite>
+Mime-Version: 1.0
+Subject: Üdvözli az Evolution!
+Sender: evolution@novell.com
+Errors-To: evolution@novell.com
+X-Mailman-Version: 1.1
+Status:   
+X-Evolution-Source: pop://rupert@pop.novell.com/inbox
+X-Evolution: 00000002-0000
+
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: multipart/alternative; boundary="=-2gZ1roA/HoYrlRDVGyiM"
+
+
+--=-2gZ1roA/HoYrlRDVGyiM
+Content-Type: text/plain
+Content-Transfer-Encoding: 7bit
+
+
+Az Evolution csapat örömmel üdvözli az Evolution felhasználójaként, amellyel egységes 
+rendszerben kezelheti a kommunikációját és személyes információit.
+
+
+Kezdeti lépések
+
+	Az Evolution ablak bal oldalán található oldalsávban a levelezőmappáira
+	mutató hivatkozások vannak. Ezek alatt gombokat talál, amelyekkel a 
+	naptárakra, névjegyekre, feladatokra, levelekre és feljegyzésekre válthat.
+
+	Az Evolution teljes kézikönyve a „Súgó” menü „Tartalomjegyzék” pontjának
+	kiválasztásával, vagy az F1 billentyű megnyomásával érhető el.
+
+Hibajelentés
+
+	Az alkalmazás hibái a http://bugzilla.gnome.org oldalon jelenthetők be.
+
+További információk
+
+	Az Evolution felhasználók (angol nyelvű) levelezőlistájára a
+	http://mail.gnome.org/mailman/listinfo/evolution-list címen iratkozhat fel.
+
+	Az Evolution projekttel kapcsolatos információk a
+	http://www.gnome.org/projects/evolution címen érhetők el.
+
+
+Tisztelettel,
+Az Evolution csapat
+
+
+--=-2gZ1roA/HoYrlRDVGyiM
+Content-Type: text/html; charset=utf-8
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
+<HTML>
+<HEAD>
+  <META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8">
+  <META NAME="GENERATOR" CONTENT="GtkHTML/0.13.99">
+</HEAD>
+<BODY BGCOLOR="#f8fcf8">
+<TABLE BACKGROUND="cid:1001417869.27019.4.camel@spectrolite" CELLSPACING="0" CELLPADDING="0" WIDTH="100%">
+<TR><TD ALIGN="left" VALIGN="top">
+<IMG SRC="cid:1001417869.27019.5.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8"></TD>
+<TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>
+<TD ALIGN="right" VALIGN="top">
+<IMG SRC="cid:1001417929.27019.7.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8"></TD>
+</TR><TR><TD></TD><TD>
+<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="48" HEIGHT="48"></TD>
+<TD></TD><TD>
+<FONT COLOR="#f8fcf8"><FONT SIZE="4">
+
+
+<B>Az Evolution csapat</B> örömmel üdvözli az <B>Evolution</B> felhasználójaként, amellyel egységes 
+rendszerben kezelheti a kommunikációját és személyes információit.
+
+
+</FONT SIZE="4"></FONT>
+</TD><TD></TD><TD>
+<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="48" HEIGHT="48">
+</TD><TD></TD></TR><TR><TD ALIGN="left" VALIGN="bottom">
+<IMG SRC="cid:1001417929.27019.8.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8">
+</TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>
+<TD ALIGN="right" VALIGN="bottom"><div align=right>
+<IMG SRC="cid:1001417929.27019.9.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8">
+</div></TD></TR></TABLE>
+
+
+<h2>
+Kezdeti lépések
+</h2>
+
+<blockquote>
+
+	Az Evolution ablak bal oldalán található oldalsávban a levelezőmappáira
+	mutató hivatkozások vannak. Ezek alatt gombokat talál, amelyekkel a 
+	naptárakra, névjegyekre, feladatokra, levelekre és feljegyzésekre válthat.
+
+<br><br>
+
+    Az Evolution teljes kézikönyve a <b>Súgó</b> menü <b>Tartalomjegyzék</b> pontjának
+    kiválasztásával, vagy az <b>F1</b> billentyű megnyomásával érhető el.
+
+<br><br>
+</blockquote>
+
+<h2>
+Hibajelentés
+</h2>
+<blockquote>
+Az alkalmazás hibái a <a href="http://bugzilla.gnome.org">http://bugzilla.gnome.org</a> oldalon jelenthetők be.
+<br><br>
+</blockquote> 
+
+<h2>
+További információk
+</h2>
+
+<blockquote>
+	Az Evolution felhasználók (angol nyelvű) levelezőlistájára a
+	<a href="http://lists.gnome.org/mailman/listinfo/evolution">http://lists.gnome.org/mailman/listinfo/evolution</a> címen iratkozhat fel.
+
+	Az Evolution projekttel kapcsolatos információk a
+	<a href="http://www.gnome.org/projects/evolution">http://www.gnome.org/projects/evolution</a> címen érhetők el.
+	<!--
+	A gyakran feltett kérdésekre adott válaszok a 
+	<a href="http://go-evolution.org/FAQ">http://go-evolution.org/FAQ</a> oldalon találhatók.
+	-->
+<br><br>	
+</blockquote>
+
+Tisztelettel
+<br>
+Az Evolution csapat
+
+</BODY>
+</HTML>
+
+--=-2gZ1roA/HoYrlRDVGyiM--
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: image/png
+Content-ID: <1001417929.27019.9.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-bottomright.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsBAVf+8XgAAAA7SURB
+VHjaY/z//z8DPsDEgB8IE1JgSkhBGMP///9xYbP/eCSF////f/4/Hp3n/0MBsg6P////z/uPBgDp
+AG5RDY2ymwAAAABJRU5ErkJggg==
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: image/png
+Content-ID: <1001417989.27019.11.camel@spectrolite>
+Content-Disposition: attachment; filename=evolution-icon.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAANbY1E9YMgAAABl0RVh0
+U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAABPQSURBVHjaYtzEuI6BCQgZoRDGRtDIJCrP
+6r8dAxQwATEjlEbGjFD5/0D8Dw3DxBgeMt7BsJdYtwAEEON3xk8EHQqmGSG8X//+IzsahFmAmBWI
+2YGYDUqzQsWZoWpBDv0DxL+g+CcS+w+Spxi0mFQIuwWJBAggRmsmUyL8DmFt+7cX5nBmqGM5gZgH
+iA2B2AWIzYFYCoglGbCD20B8E4hPAfEeIH4OxF+B+BvUM39BHilgyiToFhgLIIAYG5gqCCor/VfL
+AE0OIIdzQB2tCcThQOyHx8GEwBEg3gjEW4H4AxB/hsYOKFb+72BazyCdpMjwfN4juFvEkmwY3s47
+ziBc/BCoYwEDQAAxXhIXYNB7+YWBQZGH4f+NEwz3nrCi2KCsrAwLdVCIcwOxPBAXAXE0A/XACyDu
+g3rmHRB/gcbIv7t37+LVCBBAjPgUQB3PAg11QSAOAuJmIObFpcfWiJtBTpKFQV4C6Of/f6GYgeHQ
++V8Mj178ZXj08h8+91wE4mIgvgWNke/Q2GDA5U6AAGIhwvFcQCwCxP3Q5IIC+HlYGHwdhRl8HYQY
+fBwEwA7+/x9o5//fwPD7xcD47wfD/38/GSr//mf4B8QPnv5l2HL4J8Py3d8Zrtz/i26cPhBvAOIK
+IN4JxK+h+eM3LncCBBDWGEByPCitK7Gxsi7T09JSv3brFsO3798hDudlYciOVmDIiVEAstmgWeQf
+2AOMQMf///8LyAQmZ6AHGP8B9fz9DuT/ZfgL8gjQf39//QfHSvfybwzHr2F1XwcQLwTil9Ak9Rub
+WwECCMMDaCGvIijAv8zMwFD9xLmzDB8/fYYkExNhhpktRgzyMnxAd6OVluAkAwr9n9DQBzkcGIhA
+zAjE/4Ce+PfnP8NfEAb67w/QIzM3fmfoW/uN4dO3/+ju6wLi+dA8AvLEH3T3AgQQigeQMizI8eLA
+kJ9jaWricP7yFYZPnyGOr8pUZ6jONWdgk85iYGTmZbh9bgaDnMRfSAzA0/xPsAcY/v4A0iDHfwEK
+fwV64CuY/v/nH9ADkFj48xNC33vylyF1wieG648xklUdEK+AegKUnP4iuxkggJjQYwRa2oAybJmh
+ro7Djdt34I6f2WzIUFPkzcCp3MXAwq3H8ODhEwYL71kM4dm7GT5+B+ZzVqA2Fn5ghIAwMHZYgIUW
+MzfDYWBSOXIemKyYOBgYmdiBGFhIA21mZAbSzCAaWLSJMzEsL+Nj0JRhRvdAORAbQd0ETqvQgAYD
+gABiwpJ0QEWlm5K8XNqHT58YXr5+DXW8AUNsuC0Du1QG2J9/vpxjSExKY0hIymBg5tJi0LSdyrBl
+72MGJlZ+BkYgZmABFlTAGPrwlZUhvPASQ2DBA4ay/ldAPgvQA8xAzAB3PNhDQM/w8zAxLCniY9CQ
+RvEEyD3VQCwBzZMoBQ9AADGhJR1QM0CYg4O9gpeXh+HmHUhUZUfLM8QEaTKwiQQBMygwDf98wjBh
+Qg+wWGQA0hMYGhoawNrlFRQZDp16xfAR5EgWHnDol3VeYlBS0WFoampiOH5ThkEr8D7D5sO/wI5m
+ZIR4AhwbUMzPzcQwJYWXgZeDEdmdukAcCcSi0CKdCRYLAAGEnISYoT6MlJaUULn/8DFYUE+Nh6Gr
+XIeBld8RXDv///OZ4e71bQwtfTsYFixYAFbz4MEDBn5+bqAHlBhSi5YzaFh1MGzefY/h8OnXDEvX
+32Tg4uIC47y8PIa4xGyGxKavDBFVH4B1wl+IR6COh3lERpiJoSWCGz0pgSpOZWiMwGMBIICYkGhw
+2mdjY81gAgYLLN13laoCk4QE0HBBoOM/AUvDqwwp+fMZEhLTGRwcHMBqQLSikhaDpGoikNZmWLBw
+OUNayWYGj8jFDPX19QwsLCwMJSUlDOfOnWMwMjJi6OnpYfjJacdgk/qOYfq6b/B2KyhGwDTQU07a
+rAwOmiitAlDouwOxEDSlgGMBIIAYkSo0UCaJFxcT7f79+w/Du/fvGWyN+Rh2zjFlYOVzA3pCCJgJ
+2RkmzF7JMGXBFYYLFy4wCAgI4KxSP3z4wJCQkMBw4MABeEyB+EpKSgxRUVEMIiIiDDdu3GCYM2cO
+g7rkJ4amBG4gzcLw+8d/ht/AauPXj38MD5//ZfDp/YRs7BsgDgHiG9Amx2+AAIK12WGZ14WNjY3h
+y9evkCIzTQqYyQQgxeHvDwz3719laOnfA3YQyPGvXr3C6QGQ/IYNG8B5JDAwEOwhUFK7d+8eQ11d
+HcOuXbsYNDQ0wLEhquzF4FLyAVwXwMpCUMNNSoCJwV4dJRZEoC1fXqibGQECiBmafEDNYnFgVDcw
+MTGxffnyFdieYWXoKpZjYGYSB0YtC8N/xn8MwZlLGDx9YxkyMjIYnj17xnDlymWGz8CkJiwszMDM
+jCg5Pn78yMDBwQFmgzxhYGDAUFFRweDh4cFw8+ZNhtWrVzPMnj2b4cSJEwxycnIM5ubm4KS1bt8j
+YKX2FFgKsTBI8DOCa2yW/4wMu1Fr6q/Q5jgoan4BBBDMA6DM6wZ0RNDPnz8Y/gE7LTHe/AyuVgJA
+hwGLRaa/DJMWn2PYffwzw4oVKxh+//7NcOfObQYZGRmGly9fMjx+/IiBjY2dgZeXF8h+zLBo8WKG
+Hz9/MkhKSjI8efKEoaOjg+HFixcMO3bsYJCQkAAnHZDH/vz5Ay3BGMCesLGxAbbcOBl6ll5jePfp
+F4MO0CNKQkwMc4/8ZEArbPZAk9APgABihkYFsOBm8Adii79/Ia3FpiwhBgVpbnDJ8PD5F4aYkqMM
+HZ29DBYWFgy/fv0CJof7YMcqKiqBMx/IE++B+UZeXoGBFZhpT50+zXADGNpubm4M6urqDD9+/AB7
+BBQTIBqUpEA0KHYaGxsZjhw5Ao8NEN537gXD5E0PGXSkmBmev//H8OLTf+RktB7W0AMIIGZo9w+U
+gYP///+vBW+E5PMxcHKwAD3AxCDAx8nw/TczQ3HNHLCcu7s7w6RJkxhqamqBxScfg6ysLDC0pRje
+vn3L8PTpE6An5BmsrKwYngA9eOz4cQYNTU2GyMhIcIzNmDEDnHRAMQlKZqDkCMrcII+C8sO7d+8Y
+dHV1wflj6/ZdDOHG7Aw/gD2DC0/+oneEHoA6QAABxABt96gD8QVoRxuMvxyR/P/thOr/b2eM/n87
+7/j/6yX//8fXev7X1RD6D3Tgf35+/v/9/f1gtp6e3v/Fixf9B+aJ/2fOnP6/e/cuMP3t2zcgfeb/
+pMmT/1++fPn//fv3wfpA5ufn58P1A2PuPwiA5P39/f9zcnL+BwbK/xQ7jv9HS/n+59ix/0d2G7RP
+AuoRcgEEEHIpBK/UbAyAkfLvH7Al+QvYegQ2i/+BGmXfgZUaJ8OOhW4MH949B2fUgIAAcHHq6OgI
+DMlMhqlTpzJ8Bza3ZWXlwJn75MkTDKKiIgxxsbEMOjo64JAGYaBDwfoKCwvBfFhxrKCgAM4bYWFh
+DH8+P2WINGMH2g2svYQx2kewQQMmgABiQurrIgDQj/+BGfk/rEMCbMuDW5X/vjJMXXCBwcDIkgEY
+UmDLQJaDisotW7YwHDt2HOyg/fv3Ax0uCs7Ut4B9CFDRDCp6QcUoKNOCHArSZ29vD9YLCgiQHKz+
+AJnbGMjFwM3GAPbAf8xOHHzYBiCAGKAlkB4QX4JFka4yy/+Pe8X+fzko/v/rUen/X06o/f9y2vD/
+8eUGYPnz58//nz9//n99ff3/6ABY84LVxMbG/t++ffv/d+/egpMIKOkAPQZWA6JBfJA4CIOSEyxJ
+gpIQsAb+f6Ze4P+xMv7/B/P4/vf6cqEnoS5o740XIIBgrT1tZA+A8PtdYv8/7QN64hDIEzJgT+iq
+cYIdCAIgi0HqQOkWHYDEgKH7X1xcHOxYkKNAakEeXr9+PTjdgxyLDEDqQPLARtz/QzX8/0/WCPw/
+Usz3f3823/9MC4w80AFt4PEABBCsFAI23hk0oIJgEOHMwSDAwwStFf8xTF35keHKU2Vw6QECoBIE
+lI5BxSOoaEWvhUFJCdQGApUyFy9eBKd7kJ6CggKwHlCSglV2MD2g5JTj+ItBC9ikAHVy/v6G9Nj2
+3/nNcOM1SjpaCcT3QCkOIICYoINJv6CDTHBw6dZvoAGQ/uv9J38Y2uZ9AluADECNOFg7BxsAORaU
+tkH5BVTew2ppkD5QPkDWC8obosxPGXwN2MAOh3Q7IfTdtyiOB5YoDO9hwy4AAcQAbYXKAHE6cjSl
+enP+f7VR9P/bbaL/rfVYwekUlDRAaT8+Ph5elOJKRugAlnRAGKQexgclNRAblHS2AYtMUNo/Xs7/
+/1A+3/896bz/18ZwoycfUCclAIjlQG4HCCBYDIB8dRXa5wSD7ad+gqNx8+GfDEcv/QaHFigUYW0b
+EA0qMWClESEAK3JBAFbygPggs0CNvWhrdgZxXiaGP7//g2P+z5//4NA/9hA8LMQgxC/AwMbKBhs7
++gR18z+AAGKB+uoXtFY7DcT2IFVPgGlu2/GfDJ++/2fg42KEOxq9CQ1yCMhBIHlQcoEVh+gA1KwG
+eRiWXGDpHpSU1CWZGdIcOBh+gzr4IMeDkhAQ/we6bPftPwxMjKDWAB/Du49g/WdhDTmQBwACiBnq
+ASZoZgYBD5ilr4BtkPpoboYAG3aGbYfuMnRPXgq2EFTNwwCs8gE5EBSiIBoEQI029Pwyc+ZMsONh
+HSGQZyMiIhjq/ZgZxIBdSfAoxS8GaAb+z3AR2B9YcuEXgyA/P8Pfv38Zvn7/9hCobRW0GQHKB38A
+Agh5hE4UGvrXkdNcdxL3/wcLhf8/XiL8f24R739gbICLRVj1jw5AeQWE0QFIj6Ys839eTkawPEg/
+KP1HAovIU3XAMh+U7gv4/u/L5P2/M5nn/84knv/Aluh/FmaW/8qycv+BJdp/6PCKA7SDDw5wgABi
+go6x/IOOQ76BKoKDpuXfgL2zf+DoddJjYzjWL8jA+m4HOOTRSyVYkkLPEyD+vl2bGBYX8DGsL+Nn
+OLplKjjJ3bpwmCHFloPhz8//EPwLgkFBt/7qL4Z77/4xiAoJMXz59g3U9Aaln91Iw43g1h1AAIEH
+tqA9fDZoUxWUPqYDsRrMAWaqLEDL+SEjCNChkJM3fzOUzPnCoKJjC87gIA8hl+mg5AQSA6V7kGPT
+bd4w+Juwg0fk/gGTxx5gwQAqJm2UmIFJhgHueFCz4e7bvwxZG78z8PHwgD3wENh5AnpgFtDodUB8
+GYjfgobhQW4HCCDkUYk/0Iz8FIgnIpdIp4AZqXzBF0h/FdpnNVFgZdhcI8Cgx3sK2CdQhGdM9FgA
+l+8sTxl8gOX7b2A/9w/YDAYGa0UWBhsFZiAf2FuFxgDM8aXbvzOwA9tPIMe/BQYA0PGgZH0QVLZA
+3QjvogEEELOUlBTDnj17GNDK2t/QfGEEU3jj2V9gyfSXwV6DFTx6+A+IWYG1tJkyK4MzMGlNWrCH
+Yc7ideAMDooBWO+rtDCLYWoCDwM3MyM4g8IzKRD/hta0IDZ4CB3q+N/A5C0D1Pv123eGt+/ffwRK
+TYY2dZ6ij5ECBBD62CgjdMhCDIhVQQEIal2jlCaarAxNwVzgohU+FAKdy1ty+AfD9L0/GILD4xgW
+LlzIAGzbMDhL3GKIADaL/8FGpf9A6d+QAd5/0H4KqMRp3At0/H9WBmlJCXB38+mLlz/+/fsHSs47
+oCMRb6B59T/M3QABxAzsPDAYGxszzJo1i+Ho0aOwmPgLxaD5LEVoTQ0p+t78Y9hx8TeDiggzgziw
+rQSu7kExAqS1pVgY3LTZGFbtOMfw/OM/Br7/rxmqPbmgIc4Ab9uA0zzQA6By/gsw6cw984thMrDO
+YefgYhAHNsP//PnL8Ozli5/AvvlcoJX7gfgOkuNRZm0AAgjf8DoPdO4LlKlLgdgSvcQxlGNhSAHW
+oIayiOHK//8hpchBYFtKAlizgjojwL4RPAZAAwYMUIevv/YbXNp8/83IICIsxMDNxQUe0nn99h2o
+loU5/jq0nfYZ2/A6QACB84C2tjZcAJon/iE18n5ADfkH7TcgJraAobztym+wY78DHcQMdBg/KxM4
+pGX4mBj42SDpHtYo/AzMwGeAfduVl34xTAKG+Lln/xg4uXgZRIGOBw0EvAb2qT9++vwKWgoehqYA
+2NzA3/LycnBqQQYAAYRvhgbWdeOGVnIK0PyQAp1KxQn0gU2D/7DECAUvv/wDYogAGysrAxcXJwMX
+MPkyMzMxfANm1ncfPoJi7xC0qAQFGKjWfQXLtMjpHpTc09LSwGyAAGLEJoglOXFCRy4koQOs3kDs
+BSrysXkANJIBNhySw8GOBA18gRzOCsQsQPY/YFL7/v0HOMkAHX4FOid2DtpMeAKd5INVWP9xTfIB
+BBAxs5SwwSR2aL4QhXpEFjQYBi1q4ZUeyNGg5MAI9ATIIyA+EyMjeMD2399/4DbNL2D5CSxdPkNn
+I0Hl+zWoo59AMytsvvgvoWlWgABiBA0uhYaGwgVAw37IfCSPMCJNufJAYwTkGXGoZ3ShbXQlaONQ
+FsmIT1AMaoA9g87Y34ZO4L2ENg/eIzn8N75QRwYAAcRIjCK02ICtj2CH5g8e6MgeP7STzQv1JDvS
+aAesQPgOHdv8CPXQR6ijvyE5/B++eWF0ABBALMROpcMMBHrkH9IijR9QR7yGOpgdadEH8lgT+mKP
+H0iLPv7A1kgg2wNKCcQAgAACJyFyAGiME2liEHmpDTMSH3m5DWx5zV+0JTfgognmDq/+Dga9lyA/
+mTD8/zmDIZFnPrjwEwWPJtowJIJLVltg+j0MpgECDADuXybnyFX8nAAAAABJRU5ErkJggg==
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: image/png
+Content-ID: <1001417929.27019.8.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-bottomleft.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsBCVkleUoAAAA/SURB
+VHjaY/z//z8DPsDEwMAgTEiBKSEFYXjt+A8BZv///2fAhmEKzv///18YnwKYIjN8CmBg3v///z1g
+JgIAui9uUdDfxKcAAAAASUVORK5CYII=
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: image/png
+Content-ID: <1001417929.27019.7.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-topright.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsANW9RNIwAAAA7SURB
+VHjahcwxDcAwEATBCwZzCQajNCVDGlduouh/petGFwQDE8un/OzFrsB93BW4Tx6kaHVgdmB0IAcq
+73eg4H8gZQAAAABJRU5ErkJggg==
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: image/png
+Content-ID: <1001417869.27019.5.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-topleft.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsAJuvvdVIAAABISURB
+VHjafcxRDYAwDAbhYxbqZRpQOQGYQQkabk8kzRj9kz59l+J3Qz3VUCHBrXaVfCSMFXPQd/gG4w9V
+GnBR7FADeKqgesAEj0KK3Z8K59sAAAAASUVORK5CYII=
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: image/png
+Content-ID: <1001417869.27019.4.camel@spectrolite>
+Content-Disposition: attachment; filename=bluestripes.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsLBap83esAAACESURB
+VHja7dRBDcAgEADBgwDBEj4wUvdN+2h1kJvVMNmy9vVF4mokr93PGwRkFjBHJ8ADCPAAAjyAAA8g
+wAMI8AACPIAADyDAAwjwAAI8gAAPIMADCPAAAjyAAA8gwAMI8AACPIAADyDAAwjwAAI8gAAPIMAD
+CPAAAjyAAA8gwAMIOL8fcegyqOBdwTkAAAAASUVORK5CYII=
+
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Transfer-Encoding: 8bit
+
+--=-t4dRE6cqcdSBHOrMdTQ1
diff --git a/mail/default/hu/Makefile.am b/mail/default/hu/Makefile.am
new file mode 100644
index 0000000000..b10c23df90
--- /dev/null
+++ b/mail/default/hu/Makefile.am
@@ -0,0 +1,7 @@
+
+defaultlocaldir = $(privdatadir)/default/hu/mail/local
+
+defaultlocal_DATA = \
+	Inbox
+
+EXTRA_DIST = $(defaultlocal_DATA)
diff --git a/mail/default/it/Inbox b/mail/default/it/Inbox
new file mode 100644
index 0000000000..f9fb0f1c26
--- /dev/null
+++ b/mail/default/it/Inbox
@@ -0,0 +1,1442 @@
+From evolution@novell.com Wed Mar 14 07:45:12 2007
+Return-Path: <evolution@novell.com>
+Received: from pop.novell.com (IDENT:mail@localhost [127.0.0.1]) by
+ pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Wed, 14 Mar 2007
+ 07:45:12 -0400
+Received: from smtp.novell.com (smtp.novell.com [141.154.95.10]) by
+ pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20659 for
+ <evolution@novell.com>; Wed, 14 Mar 2007 07:45:10 -0400
+Received: (qmail 5610 invoked from network); 14 Mar 2007 12:00:00 -0000
+Received: from smtp.novell.com (HELO localhost) (141.154.95.10) by
+ pop.novell.com with SMTP; 14 Mar 2007 12:00:00 -0000
+From: "Il Team di Evolution" <evolution@novell.com>
+To: Utenti di Evoltuion <evolution@novell.com>
+Subject: Welcome to Evolution!
+X-Mailman-Version: 1.1
+Content-Type: multipart/related; type="multipart/alternative";
+	boundary="=-ydrc8BainUywe3FHUoUz"
+X-Evolution-Account: 1221574499.29350.23@redrum
+X-Evolution-Format: text/html
+X-Mailer: Evolution 2.23.92 
+Date: Thu, 18 Sep 2008 13:54:55 +0200
+Message-Id: <1221738895.10577.5.camel@redrum>
+Mime-Version: 1.0
+X-Evolution: 00000002-0016
+
+
+--=-ydrc8BainUywe3FHUoUz
+Content-Type: multipart/alternative; boundary="=-Oc2kf12OQpVWvz0zUwP6"
+
+
+--=-Oc2kf12OQpVWvz0zUwP6
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: quoted-printable
+
+
+
+
+
+
+
+
+
+
+
+Il team di
+Evolution
+=C3=A8
+orgoglioso
+di darVi
+il
+benventuo
+in
+Evolution,
+un sistema
+completo
+per la
+gestione
+delle
+proprie
+comunicazioni e informazioni personali.
+
+
+
+
+
+
+
+
+
+
+
+Per cominciare
+
+        Sul lato sinistro della finestra di Evolution =C3=A8 posizonato il
+        riquadro laterale, contenente le scorciatoie alle proprie
+        cartelle di posta. Sotto di queste sono collocati i pulsanti per
+        accedere ai calendari, ai contatti, ai compiti, alla posta e ai
+        memo.
+       =20
+        Per una guida completa all'uso di Evolution (al momento in
+        inglese), selezionare Sommario nel men=C3=B9 Aiuto, oppure premere =
+il
+        tasto F1.=20
+       =20
+
+Segnalazione bug
+
+        I Bug dovrebbero essere segnalati presso
+        http://bugzilla.gnome.org.=20
+       =20
+
+Maggiori informazioni
+
+        You can subscribe to the Evolution users mailing list at
+        http://lists.gnome.org/mailman/listinfo/evolution. Information
+        on the Evolution project is available at
+        http://www.gnome.org/projects/evolution.=20
+       =20
+
+Yours Sincerely,=20
+The Evolution Team
+
+--=-Oc2kf12OQpVWvz0zUwP6
+Content-Type: text/html; charset="utf-8"
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
+<HTML>
+<HEAD>
+  <META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8">
+  <META NAME="GENERATOR" CONTENT="GtkHTML/3.23.92">
+</HEAD>
+<BODY BGCOLOR="#f8fcf8">
+<TABLE BACKGROUND="cid:1001417869.27019.4.camel@spectrolite" CELLSPACING="0" CELLPADDING="0" WIDTH="100%">
+<TR>
+<TD ALIGN="left" VALIGN="top">
+<IMG SRC="cid:1001417869.27019.5.camel@spectrolite" WIDTH="8" HEIGHT="8" ALIGN="top" BORDER="0">
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD ALIGN="right" VALIGN="top">
+<IMG SRC="cid:1001417929.27019.7.camel@spectrolite" WIDTH="8" HEIGHT="8" ALIGN="top" BORDER="0">
+</TD>
+</TR>
+<TR>
+<TD>
+<BR>
+</TD>
+<TD>
+<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" WIDTH="48" HEIGHT="48" ALIGN="top" BORDER="0">
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<B><FONT SIZE="4"><FONT COLOR="#f8fcf8">Il team di Evolution</FONT></FONT></B><FONT COLOR="#f8fcf8"><FONT SIZE="4"> &#232; orgoglioso di darVi il benventuo in </FONT></FONT><FONT COLOR="#f8fcf8"><B><FONT SIZE="4">Evolution</FONT></B></FONT><FONT COLOR="#f8fcf8"><FONT SIZE="4">, un sistema completo per la gestione delle proprie comunicazioni e informazioni personali.</FONT></FONT>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" WIDTH="48" HEIGHT="48" ALIGN="top" BORDER="0">
+</TD>
+<TD>
+<BR>
+</TD>
+</TR>
+<TR>
+<TD ALIGN="left" VALIGN="bottom">
+<IMG SRC="cid:1001417929.27019.8.camel@spectrolite" WIDTH="8" HEIGHT="8" ALIGN="top" BORDER="0">
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD ALIGN="right" VALIGN="bottom">
+<DIV ALIGN=right><IMG SRC="cid:1001417929.27019.9.camel@spectrolite" WIDTH="8" HEIGHT="8" ALIGN="top" BORDER="0"></DIV>
+</TD>
+</TR>
+</TABLE>
+<H2>
+<B><FONT SIZE="5">Per cominciare</FONT></B>
+</H2>
+<BLOCKQUOTE>
+    Sul lato sinistro della finestra di Evolution &#232; posizonato il riquadro laterale, contenente le scorciatoie alle proprie cartelle di posta. Sotto di queste sono collocati i pulsanti per accedere ai calendari, ai contatti, ai compiti, alla posta e ai memo.<BR>
+    <BR>
+    Per una guida completa all'uso di Evolution (al momento in inglese), selezionare <B>Sommario</B> nel men&#249; <B>Aiuto</B>, oppure premere il tasto <B>F1</B>. <BR>
+    <BR>
+</BLOCKQUOTE>
+<H2>
+<B><FONT SIZE="5">Segnalazione bug</FONT></B>
+</H2>
+<BLOCKQUOTE>
+    I Bug dovrebbero essere segnalati presso <A HREF="http://bugzilla.gnome.org">http://bugzilla.gnome.org</A>. <BR>
+    <BR>
+</BLOCKQUOTE>
+<H2>
+<B><FONT SIZE="5">Maggiori informazioni</FONT></B>
+</H2>
+<BLOCKQUOTE>
+    You can subscribe to the Evolution users mailing list at <A HREF="http://lists.gnome.org/mailman/listinfo/evolution">http://lists.gnome.org/mailman/listinfo/evolution</A>. Information on the Evolution project is available at <A HREF="http://www.gnome.org/projects/evolution">http://www.gnome.org/projects/evolution</A>. <BR>
+    <BR>
+</BLOCKQUOTE>
+Yours Sincerely, <BR>
+The Evolution Team
+</BODY>
+</HTML>
+
+--=-Oc2kf12OQpVWvz0zUwP6--
+
+--=-ydrc8BainUywe3FHUoUz
+Content-Type: image/png
+Content-ID: <1001417929.27019.9.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-bottomright.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsBAVf+8XgAAAA7SURB
+VHjaY/z//z8DPsDEgB8IE1JgSkhBGMP///9xYbP/eCSF////f/4/Hp3n/0MBsg6P////z/uPBgDp
+AG5RDY2ymwAAAABJRU5ErkJggg==
+
+--=-ydrc8BainUywe3FHUoUz
+Content-Type: image/png
+Content-ID: <1001417929.27019.8.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-bottomleft.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsBCVkleUoAAAA/SURB
+VHjaY/z//z8DPsDEwMAgTEiBKSEFYXjt+A8BZv///2fAhmEKzv///18YnwKYIjN8CmBg3v///z1g
+JgIAui9uUdDfxKcAAAAASUVORK5CYII=
+
+--=-ydrc8BainUywe3FHUoUz
+Content-Type: image/png
+Content-ID: <1001417989.27019.11.camel@spectrolite>
+Content-Disposition: attachment; filename=evolution-icon.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAANbY1E9YMgAAABl0RVh0
+U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAABPQSURBVHjaYtzEuI6BCQgZoRDGRtDIJCrP
+6r8dAxQwATEjlEbGjFD5/0D8Dw3DxBgeMt7BsJdYtwAEEON3xk8EHQqmGSG8X//+IzsahFmAmBWI
+2YGYDUqzQsWZoWpBDv0DxL+g+CcS+w+Spxi0mFQIuwWJBAggRmsmUyL8DmFt+7cX5nBmqGM5gZgH
+iA2B2AWIzYFYCoglGbCD20B8E4hPAfEeIH4OxF+B+BvUM39BHilgyiToFhgLIIAYG5gqCCor/VfL
+AE0OIIdzQB2tCcThQOyHx8GEwBEg3gjEW4H4AxB/hsYOKFb+72BazyCdpMjwfN4juFvEkmwY3s47
+ziBc/BCoYwEDQAAxXhIXYNB7+YWBQZGH4f+NEwz3nrCi2KCsrAwLdVCIcwOxPBAXAXE0A/XACyDu
+g3rmHRB/gcbIv7t37+LVCBBAjPgUQB3PAg11QSAOAuJmIObFpcfWiJtBTpKFQV4C6Of/f6GYgeHQ
++V8Mj178ZXj08h8+91wE4mIgvgWNke/Q2GDA5U6AAGIhwvFcQCwCxP3Q5IIC+HlYGHwdhRl8HYQY
+fBwEwA7+/x9o5//fwPD7xcD47wfD/38/GSr//mf4B8QPnv5l2HL4J8Py3d8Zrtz/i26cPhBvAOIK
+IN4JxK+h+eM3LncCBBDWGEByPCitK7Gxsi7T09JSv3brFsO3798hDudlYciOVmDIiVEAstmgWeQf
+2AOMQMf///8LyAQmZ6AHGP8B9fz9DuT/ZfgL8gjQf39//QfHSvfybwzHr2F1XwcQLwTil9Ak9Rub
+WwECCMMDaCGvIijAv8zMwFD9xLmzDB8/fYYkExNhhpktRgzyMnxAd6OVluAkAwr9n9DQBzkcGIhA
+zAjE/4Ce+PfnP8NfEAb67w/QIzM3fmfoW/uN4dO3/+ju6wLi+dA8AvLEH3T3AgQQigeQMizI8eLA
+kJ9jaWricP7yFYZPnyGOr8pUZ6jONWdgk85iYGTmZbh9bgaDnMRfSAzA0/xPsAcY/v4A0iDHfwEK
+fwV64CuY/v/nH9ADkFj48xNC33vylyF1wieG648xklUdEK+AegKUnP4iuxkggJjQYwRa2oAybJmh
+ro7Djdt34I6f2WzIUFPkzcCp3MXAwq3H8ODhEwYL71kM4dm7GT5+B+ZzVqA2Fn5ghIAwMHZYgIUW
+MzfDYWBSOXIemKyYOBgYmdiBGFhIA21mZAbSzCAaWLSJMzEsL+Nj0JRhRvdAORAbQd0ETqvQgAYD
+gABiwpJ0QEWlm5K8XNqHT58YXr5+DXW8AUNsuC0Du1QG2J9/vpxjSExKY0hIymBg5tJi0LSdyrBl
+72MGJlZ+BkYgZmABFlTAGPrwlZUhvPASQ2DBA4ay/ldAPgvQA8xAzAB3PNhDQM/w8zAxLCniY9CQ
+RvEEyD3VQCwBzZMoBQ9AADGhJR1QM0CYg4O9gpeXh+HmHUhUZUfLM8QEaTKwiQQBMygwDf98wjBh
+Qg+wWGQA0hMYGhoawNrlFRQZDp16xfAR5EgWHnDol3VeYlBS0WFoampiOH5ThkEr8D7D5sO/wI5m
+ZIR4AhwbUMzPzcQwJYWXgZeDEdmdukAcCcSi0CKdCRYLAAGEnISYoT6MlJaUULn/8DFYUE+Nh6Gr
+XIeBld8RXDv///OZ4e71bQwtfTsYFixYAFbz4MEDBn5+bqAHlBhSi5YzaFh1MGzefY/h8OnXDEvX
+32Tg4uIC47y8PIa4xGyGxKavDBFVH4B1wl+IR6COh3lERpiJoSWCGz0pgSpOZWiMwGMBIICYkGhw
+2mdjY81gAgYLLN13laoCk4QE0HBBoOM/AUvDqwwp+fMZEhLTGRwcHMBqQLSikhaDpGoikNZmWLBw
+OUNayWYGj8jFDPX19QwsLCwMJSUlDOfOnWMwMjJi6OnpYfjJacdgk/qOYfq6b/B2KyhGwDTQU07a
+rAwOmiitAlDouwOxEDSlgGMBIIAYkSo0UCaJFxcT7f79+w/Du/fvGWyN+Rh2zjFlYOVzA3pCCJgJ
+2RkmzF7JMGXBFYYLFy4wCAgI4KxSP3z4wJCQkMBw4MABeEyB+EpKSgxRUVEMIiIiDDdu3GCYM2cO
+g7rkJ4amBG4gzcLw+8d/ht/AauPXj38MD5//ZfDp/YRs7BsgDgHiG9Amx2+AAIK12WGZ14WNjY3h
+y9evkCIzTQqYyQQgxeHvDwz3719laOnfA3YQyPGvXr3C6QGQ/IYNG8B5JDAwEOwhUFK7d+8eQ11d
+HcOuXbsYNDQ0wLEhquzF4FLyAVwXwMpCUMNNSoCJwV4dJRZEoC1fXqibGQECiBmafEDNYnFgVDcw
+MTGxffnyFdieYWXoKpZjYGYSB0YtC8N/xn8MwZlLGDx9YxkyMjIYnj17xnDlymWGz8CkJiwszMDM
+jCg5Pn78yMDBwQFmgzxhYGDAUFFRweDh4cFw8+ZNhtWrVzPMnj2b4cSJEwxycnIM5ubm4KS1bt8j
+YKX2FFgKsTBI8DOCa2yW/4wMu1Fr6q/Q5jgoan4BBBDMA6DM6wZ0RNDPnz8Y/gE7LTHe/AyuVgJA
+hwGLRaa/DJMWn2PYffwzw4oVKxh+//7NcOfObQYZGRmGly9fMjx+/IiBjY2dgZeXF8h+zLBo8WKG
+Hz9/MkhKSjI8efKEoaOjg+HFixcMO3bsYJCQkAAnHZDH/vz5Ay3BGMCesLGxAbbcOBl6ll5jePfp
+F4MO0CNKQkwMc4/8ZEArbPZAk9APgABihkYFsOBm8Adii79/Ia3FpiwhBgVpbnDJ8PD5F4aYkqMM
+HZ29DBYWFgy/fv0CJof7YMcqKiqBMx/IE++B+UZeXoGBFZhpT50+zXADGNpubm4M6urqDD9+/AB7
+BBQTIBqUpEA0KHYaGxsZjhw5Ao8NEN537gXD5E0PGXSkmBmev//H8OLTf+RktB7W0AMIIGZo9w+U
+gYP///+vBW+E5PMxcHKwAD3AxCDAx8nw/TczQ3HNHLCcu7s7w6RJkxhqamqBxScfg6ysLDC0pRje
+vn3L8PTpE6An5BmsrKwYngA9eOz4cQYNTU2GyMhIcIzNmDEDnHRAMQlKZqDkCMrcII+C8sO7d+8Y
+dHV1wflj6/ZdDOHG7Aw/gD2DC0/+oneEHoA6QAABxABt96gD8QVoRxuMvxyR/P/thOr/b2eM/n87
+7/j/6yX//8fXev7X1RD6D3Tgf35+/v/9/f1gtp6e3v/Fixf9B+aJ/2fOnP6/e/cuMP3t2zcgfeb/
+pMmT/1++fPn//fv3wfpA5ufn58P1A2PuPwiA5P39/f9zcnL+BwbK/xQ7jv9HS/n+59ix/0d2G7RP
+AuoRcgEEEHIpBK/UbAyAkfLvH7Al+QvYegQ2i/+BGmXfgZUaJ8OOhW4MH949B2fUgIAAcHHq6OgI
+DMlMhqlTpzJ8Bza3ZWXlwJn75MkTDKKiIgxxsbEMOjo64JAGYaBDwfoKCwvBfFhxrKCgAM4bYWFh
+DH8+P2WINGMH2g2svYQx2kewQQMmgABiQurrIgDQj/+BGfk/rEMCbMuDW5X/vjJMXXCBwcDIkgEY
+UmDLQJaDisotW7YwHDt2HOyg/fv3Ax0uCs7Ut4B9CFDRDCp6QcUoKNOCHArSZ29vD9YLCgiQHKz+
+AJnbGMjFwM3GAPbAf8xOHHzYBiCAGKAlkB4QX4JFka4yy/+Pe8X+fzko/v/rUen/X06o/f9y2vD/
+8eUGYPnz58//nz9//n99ff3/6ABY84LVxMbG/t++ffv/d+/egpMIKOkAPQZWA6JBfJA4CIOSEyxJ
+gpIQsAb+f6Ze4P+xMv7/B/P4/vf6cqEnoS5o740XIIBgrT1tZA+A8PtdYv8/7QN64hDIEzJgT+iq
+cYIdCAIgi0HqQOkWHYDEgKH7X1xcHOxYkKNAakEeXr9+PTjdgxyLDEDqQPLARtz/QzX8/0/WCPw/
+Usz3f3823/9MC4w80AFt4PEABBCsFAI23hk0oIJgEOHMwSDAwwStFf8xTF35keHKU2Vw6QECoBIE
+lI5BxSOoaEWvhUFJCdQGApUyFy9eBKd7kJ6CggKwHlCSglV2MD2g5JTj+ItBC9ikAHVy/v6G9Nj2
+3/nNcOM1SjpaCcT3QCkOIICYoINJv6CDTHBw6dZvoAGQ/uv9J38Y2uZ9AluADECNOFg7BxsAORaU
+tkH5BVTew2ppkD5QPkDWC8obosxPGXwN2MAOh3Q7IfTdtyiOB5YoDO9hwy4AAcQAbYXKAHE6cjSl
+enP+f7VR9P/bbaL/rfVYwekUlDRAaT8+Ph5elOJKRugAlnRAGKQexgclNRAblHS2AYtMUNo/Xs7/
+/1A+3/896bz/18ZwoycfUCclAIjlQG4HCCBYDIB8dRXa5wSD7ad+gqNx8+GfDEcv/QaHFigUYW0b
+EA0qMWClESEAK3JBAFbygPggs0CNvWhrdgZxXiaGP7//g2P+z5//4NA/9hA8LMQgxC/AwMbKBhs7
++gR18z+AAGKB+uoXtFY7DcT2IFVPgGlu2/GfDJ++/2fg42KEOxq9CQ1yCMhBIHlQcoEVh+gA1KwG
+eRiWXGDpHpSU1CWZGdIcOBh+gzr4IMeDkhAQ/we6bPftPwxMjKDWAB/Du49g/WdhDTmQBwACiBnq
+ASZoZgYBD5ilr4BtkPpoboYAG3aGbYfuMnRPXgq2EFTNwwCs8gE5EBSiIBoEQI029Pwyc+ZMsONh
+HSGQZyMiIhjq/ZgZxIBdSfAoxS8GaAb+z3AR2B9YcuEXgyA/P8Pfv38Zvn7/9hCobRW0GQHKB38A
+Agh5hE4UGvrXkdNcdxL3/wcLhf8/XiL8f24R739gbICLRVj1jw5AeQWE0QFIj6Ys839eTkawPEg/
+KP1HAovIU3XAMh+U7gv4/u/L5P2/M5nn/84knv/Aluh/FmaW/8qycv+BJdp/6PCKA7SDDw5wgABi
+go6x/IOOQ76BKoKDpuXfgL2zf+DoddJjYzjWL8jA+m4HOOTRSyVYkkLPEyD+vl2bGBYX8DGsL+Nn
+OLplKjjJ3bpwmCHFloPhz8//EPwLgkFBt/7qL4Z77/4xiAoJMXz59g3U9Aaln91Iw43g1h1AAIEH
+tqA9fDZoUxWUPqYDsRrMAWaqLEDL+SEjCNChkJM3fzOUzPnCoKJjC87gIA8hl+mg5AQSA6V7kGPT
+bd4w+Juwg0fk/gGTxx5gwQAqJm2UmIFJhgHueFCz4e7bvwxZG78z8PHwgD3wENh5AnpgFtDodUB8
+GYjfgobhQW4HCCDkUYk/0Iz8FIgnIpdIp4AZqXzBF0h/FdpnNVFgZdhcI8Cgx3sK2CdQhGdM9FgA
+l+8sTxl8gOX7b2A/9w/YDAYGa0UWBhsFZiAf2FuFxgDM8aXbvzOwA9tPIMe/BQYA0PGgZH0QVLZA
+3QjvogEEELOUlBTDnj17GNDK2t/QfGEEU3jj2V9gyfSXwV6DFTx6+A+IWYG1tJkyK4MzMGlNWrCH
+Yc7ideAMDooBWO+rtDCLYWoCDwM3MyM4g8IzKRD/hta0IDZ4CB3q+N/A5C0D1Pv123eGt+/ffwRK
+TYY2dZ6ij5ECBBD62CgjdMhCDIhVQQEIal2jlCaarAxNwVzgohU+FAKdy1ty+AfD9L0/GILD4xgW
+LlzIAGzbMDhL3GKIADaL/8FGpf9A6d+QAd5/0H4KqMRp3At0/H9WBmlJCXB38+mLlz/+/fsHSs47
+oCMRb6B59T/M3QABxAzsPDAYGxszzJo1i+Ho0aOwmPgLxaD5LEVoTQ0p+t78Y9hx8TeDiggzgziw
+rQSu7kExAqS1pVgY3LTZGFbtOMfw/OM/Br7/rxmqPbmgIc4Ab9uA0zzQA6By/gsw6cw984thMrDO
+YefgYhAHNsP//PnL8Ozli5/AvvlcoJX7gfgOkuNRZm0AAgjf8DoPdO4LlKlLgdgSvcQxlGNhSAHW
+oIayiOHK//8hpchBYFtKAlizgjojwL4RPAZAAwYMUIevv/YbXNp8/83IICIsxMDNxQUe0nn99h2o
+loU5/jq0nfYZ2/A6QACB84C2tjZcAJon/iE18n5ADfkH7TcgJraAobztym+wY78DHcQMdBg/KxM4
+pGX4mBj42SDpHtYo/AzMwGeAfduVl34xTAKG+Lln/xg4uXgZRIGOBw0EvAb2qT9++vwKWgoehqYA
+2NzA3/LycnBqQQYAAYRvhgbWdeOGVnIK0PyQAp1KxQn0gU2D/7DECAUvv/wDYogAGysrAxcXJwMX
+MPkyMzMxfANm1ncfPoJi7xC0qAQFGKjWfQXLtMjpHpTc09LSwGyAAGLEJoglOXFCRy4koQOs3kDs
+BSrysXkANJIBNhySw8GOBA18gRzOCsQsQPY/YFL7/v0HOMkAHX4FOid2DtpMeAKd5INVWP9xTfIB
+BBAxs5SwwSR2aL4QhXpEFjQYBi1q4ZUeyNGg5MAI9ATIIyA+EyMjeMD2399/4DbNL2D5CSxdPkNn
+I0Hl+zWoo59AMytsvvgvoWlWgABiBA0uhYaGwgVAw37IfCSPMCJNufJAYwTkGXGoZ3ShbXQlaONQ
+FsmIT1AMaoA9g87Y34ZO4L2ENg/eIzn8N75QRwYAAcRIjCK02ICtj2CH5g8e6MgeP7STzQv1JDvS
+aAesQPgOHdv8CPXQR6ijvyE5/B++eWF0ABBALMROpcMMBHrkH9IijR9QR7yGOpgdadEH8lgT+mKP
+H0iLPv7A1kgg2wNKCcQAgAACJyFyAGiME2liEHmpDTMSH3m5DWx5zV+0JTfgognmDq/+Dga9lyA/
+mTD8/zmDIZFnPrjwEwWPJtowJIJLVltg+j0MpgECDADuXybnyFX8nAAAAABJRU5ErkJggg==
+
+--=-ydrc8BainUywe3FHUoUz
+Content-Type: image/png
+Content-ID: <1001417929.27019.7.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-topright.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsANW9RNIwAAAA7SURB
+VHjahcwxDcAwEATBCwZzCQajNCVDGlduouh/petGFwQDE8un/OzFrsB93BW4Tx6kaHVgdmB0IAcq
+73eg4H8gZQAAAABJRU5ErkJggg==
+
+--=-ydrc8BainUywe3FHUoUz
+Content-Type: image/png
+Content-ID: <1001417869.27019.5.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-topleft.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsAJuvvdVIAAABISURB
+VHjafcxRDYAwDAbhYxbqZRpQOQGYQQkabk8kzRj9kz59l+J3Qz3VUCHBrXaVfCSMFXPQd/gG4w9V
+GnBR7FADeKqgesAEj0KK3Z8K59sAAAAASUVORK5CYII=
+
+--=-ydrc8BainUywe3FHUoUz
+Content-Type: image/png
+Content-ID: <1001417869.27019.4.camel@spectrolite>
+Content-Disposition: attachment; filename=bluestripes.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsLBap83esAAACESURB
+VHja7dRBDcAgEADBgwDBEj4wUvdN+2h1kJvVMNmy9vVF4mokr93PGwRkFjBHJ8ADCPAAAjyAAA8g
+wAMI8AACPIAADyDAAwjwAAI8gAAPIMADCPAAAjyAAA8gwAMI8AACPIAADyDAAwjwAAI8gAAPIMAD
+CPAAAjyAAA8gwAMIOL8fcegyqOBdwTkAAAAASUVORK5CYII=
+
+
+--=-ydrc8BainUywe3FHUoUz--
+
+From elle.uca@libero.it Thu Sep 18 13:56:53 2008
+Subject: Benvenuti in Evolution!
+From: Luca Ferretti <elle.uca@libero.it>
+To: Utenti <evolution@novell.com>
+X-Mailman-Version: 1.1
+Content-Type: multipart/related; type="multipart/alternative";
+	boundary="=-KY6mBUirEUuiJCdWIcAx"
+X-Evolution-Account: 1221574499.29350.23@redrum
+X-Evolution-Format: text/html
+X-Mailer: Evolution 2.23.92 
+Date: Thu, 18 Sep 2008 13:56:53 +0200
+Message-Id: <1221739013.10577.8.camel@redrum>
+Mime-Version: 1.0
+X-Evolution: 00000004-0016
+
+
+--=-KY6mBUirEUuiJCdWIcAx
+Content-Type: multipart/alternative; boundary="=-Q0rJVCE2imk+KLUdd1JN"
+
+
+--=-Q0rJVCE2imk+KLUdd1JN
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: quoted-printable
+
+
+
+
+
+
+
+
+
+
+
+Il team di
+Evolution
+=C3=A8
+orgoglioso
+di darVi
+il
+benventuo
+in
+Evolution,
+un sistema
+completo
+per la
+gestione
+delle
+proprie
+comunicazioni e informazioni personali.
+
+
+
+
+
+
+
+
+
+
+
+Per cominciare
+
+        Sul lato sinistro della finestra di Evolution =C3=A8 posizonato il
+        riquadro laterale, contenente le scorciatoie alle proprie
+        cartelle di posta. Sotto di queste sono collocati i pulsanti per
+        accedere ai calendari, ai contatti, ai compiti, alla posta e ai
+        memo.
+       =20
+        Per una guida completa all'uso di Evolution (al momento in
+        inglese), selezionare Sommario nel men=C3=B9 Aiuto, oppure premere =
+il
+        tasto F1.=20
+       =20
+
+Segnalazione bug
+
+        I Bug dovrebbero essere segnalati presso
+        http://bugzilla.gnome.org.=20
+       =20
+
+Maggiori informazioni
+
+        =C3=88 possibile effettuare la sottoscrizione alla mailing list deg=
+li
+        utenti di Evolution (in inglese) presso
+        http://lists.gnome.org/mailman/listinfo/evolution.
+       =20
+        Altre informazioni sul progetto Evolution sono disponibili
+        presso http://www.gnome.org/projects/evolution.=20
+       =20
+
+Yours Sincerely,=20
+Il team di Evolution
+
+--=-Q0rJVCE2imk+KLUdd1JN
+Content-Type: text/html; charset="utf-8"
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
+<HTML>
+<HEAD>
+  <META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8">
+  <META NAME="GENERATOR" CONTENT="GtkHTML/3.23.92">
+</HEAD>
+<BODY BGCOLOR="#f8fcf8">
+<TABLE BACKGROUND="cid:1001417869.27019.4.camel@spectrolite" CELLSPACING="0" CELLPADDING="0" WIDTH="100%">
+<TR>
+<TD ALIGN="left" VALIGN="top">
+<IMG SRC="cid:1001417869.27019.5.camel@spectrolite" WIDTH="8" HEIGHT="8" ALIGN="top" BORDER="0">
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD ALIGN="right" VALIGN="top">
+<IMG SRC="cid:1001417929.27019.7.camel@spectrolite" WIDTH="8" HEIGHT="8" ALIGN="top" BORDER="0">
+</TD>
+</TR>
+<TR>
+<TD>
+<BR>
+</TD>
+<TD>
+<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" WIDTH="48" HEIGHT="48" ALIGN="top" BORDER="0">
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<B><FONT SIZE="4"><FONT COLOR="#f8fcf8">Il team di Evolution</FONT></FONT></B><FONT COLOR="#f8fcf8"><FONT SIZE="4"> &#232; orgoglioso di darVi il benventuo in </FONT></FONT><FONT COLOR="#f8fcf8"><B><FONT SIZE="4">Evolution</FONT></B></FONT><FONT COLOR="#f8fcf8"><FONT SIZE="4">, un sistema completo per la gestione delle proprie comunicazioni e informazioni personali.</FONT></FONT>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" WIDTH="48" HEIGHT="48" ALIGN="top" BORDER="0">
+</TD>
+<TD>
+<BR>
+</TD>
+</TR>
+<TR>
+<TD ALIGN="left" VALIGN="bottom">
+<IMG SRC="cid:1001417929.27019.8.camel@spectrolite" WIDTH="8" HEIGHT="8" ALIGN="top" BORDER="0">
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD ALIGN="right" VALIGN="bottom">
+<DIV ALIGN=right><IMG SRC="cid:1001417929.27019.9.camel@spectrolite" WIDTH="8" HEIGHT="8" ALIGN="top" BORDER="0"></DIV>
+</TD>
+</TR>
+</TABLE>
+<H2>
+<B><FONT SIZE="5">Per cominciare</FONT></B>
+</H2>
+<BLOCKQUOTE>
+    Sul lato sinistro della finestra di Evolution &#232; posizonato il riquadro laterale, contenente le scorciatoie alle proprie cartelle di posta. Sotto di queste sono collocati i pulsanti per accedere ai calendari, ai contatti, ai compiti, alla posta e ai memo.<BR>
+    <BR>
+    Per una guida completa all'uso di Evolution (al momento in inglese), selezionare <B>Sommario</B> nel men&#249; <B>Aiuto</B>, oppure premere il tasto <B>F1</B>. <BR>
+    <BR>
+</BLOCKQUOTE>
+<H2>
+<B><FONT SIZE="5">Segnalazione bug</FONT></B>
+</H2>
+<BLOCKQUOTE>
+    I Bug dovrebbero essere segnalati presso <A HREF="http://bugzilla.gnome.org">http://bugzilla.gnome.org</A>. <BR>
+    <BR>
+</BLOCKQUOTE>
+<H2>
+<B><FONT SIZE="5">Maggiori informazioni</FONT></B>
+</H2>
+<BLOCKQUOTE>
+    &#200; possibile effettuare la sottoscrizione alla mailing list degli utenti di Evolution (in inglese) presso <A HREF="http://lists.gnome.org/mailman/listinfo/evolution.">http://lists.gnome.org/mailman/listinfo/evolution.</A><BR>
+    <!--+GtkHTML:<DATA class="ClueFlow" key="orig" value="0">--><BR>
+    Altre informazioni sul progetto Evolution sono disponibili presso <A HREF="http://www.gnome.org/projects/evolution">http://www.gnome.org/projects/evolution</A>. <BR>
+    <!--+GtkHTML:<DATA class="ClueFlow" clear="orig">--><BR>
+</BLOCKQUOTE>
+Yours Sincerely, <BR>
+Il team di Evolution
+</BODY>
+</HTML>
+
+--=-Q0rJVCE2imk+KLUdd1JN--
+
+--=-KY6mBUirEUuiJCdWIcAx
+Content-Type: image/png
+Content-ID: <1001417929.27019.9.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-bottomright.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsBAVf+8XgAAAA7SURB
+VHjaY/z//z8DPsDEgB8IE1JgSkhBGMP///9xYbP/eCSF////f/4/Hp3n/0MBsg6P////z/uPBgDp
+AG5RDY2ymwAAAABJRU5ErkJggg==
+
+--=-KY6mBUirEUuiJCdWIcAx
+Content-Type: image/png
+Content-ID: <1001417929.27019.8.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-bottomleft.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsBCVkleUoAAAA/SURB
+VHjaY/z//z8DPsDEwMAgTEiBKSEFYXjt+A8BZv///2fAhmEKzv///18YnwKYIjN8CmBg3v///z1g
+JgIAui9uUdDfxKcAAAAASUVORK5CYII=
+
+--=-KY6mBUirEUuiJCdWIcAx
+Content-Type: image/png
+Content-ID: <1001417989.27019.11.camel@spectrolite>
+Content-Disposition: attachment; filename=evolution-icon.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAANbY1E9YMgAAABl0RVh0
+U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAABPQSURBVHjaYtzEuI6BCQgZoRDGRtDIJCrP
+6r8dAxQwATEjlEbGjFD5/0D8Dw3DxBgeMt7BsJdYtwAEEON3xk8EHQqmGSG8X//+IzsahFmAmBWI
+2YGYDUqzQsWZoWpBDv0DxL+g+CcS+w+Spxi0mFQIuwWJBAggRmsmUyL8DmFt+7cX5nBmqGM5gZgH
+iA2B2AWIzYFYCoglGbCD20B8E4hPAfEeIH4OxF+B+BvUM39BHilgyiToFhgLIIAYG5gqCCor/VfL
+AE0OIIdzQB2tCcThQOyHx8GEwBEg3gjEW4H4AxB/hsYOKFb+72BazyCdpMjwfN4juFvEkmwY3s47
+ziBc/BCoYwEDQAAxXhIXYNB7+YWBQZGH4f+NEwz3nrCi2KCsrAwLdVCIcwOxPBAXAXE0A/XACyDu
+g3rmHRB/gcbIv7t37+LVCBBAjPgUQB3PAg11QSAOAuJmIObFpcfWiJtBTpKFQV4C6Of/f6GYgeHQ
++V8Mj178ZXj08h8+91wE4mIgvgWNke/Q2GDA5U6AAGIhwvFcQCwCxP3Q5IIC+HlYGHwdhRl8HYQY
+fBwEwA7+/x9o5//fwPD7xcD47wfD/38/GSr//mf4B8QPnv5l2HL4J8Py3d8Zrtz/i26cPhBvAOIK
+IN4JxK+h+eM3LncCBBDWGEByPCitK7Gxsi7T09JSv3brFsO3798hDudlYciOVmDIiVEAstmgWeQf
+2AOMQMf///8LyAQmZ6AHGP8B9fz9DuT/ZfgL8gjQf39//QfHSvfybwzHr2F1XwcQLwTil9Ak9Rub
+WwECCMMDaCGvIijAv8zMwFD9xLmzDB8/fYYkExNhhpktRgzyMnxAd6OVluAkAwr9n9DQBzkcGIhA
+zAjE/4Ce+PfnP8NfEAb67w/QIzM3fmfoW/uN4dO3/+ju6wLi+dA8AvLEH3T3AgQQigeQMizI8eLA
+kJ9jaWricP7yFYZPnyGOr8pUZ6jONWdgk85iYGTmZbh9bgaDnMRfSAzA0/xPsAcY/v4A0iDHfwEK
+fwV64CuY/v/nH9ADkFj48xNC33vylyF1wieG648xklUdEK+AegKUnP4iuxkggJjQYwRa2oAybJmh
+ro7Djdt34I6f2WzIUFPkzcCp3MXAwq3H8ODhEwYL71kM4dm7GT5+B+ZzVqA2Fn5ghIAwMHZYgIUW
+MzfDYWBSOXIemKyYOBgYmdiBGFhIA21mZAbSzCAaWLSJMzEsL+Nj0JRhRvdAORAbQd0ETqvQgAYD
+gABiwpJ0QEWlm5K8XNqHT58YXr5+DXW8AUNsuC0Du1QG2J9/vpxjSExKY0hIymBg5tJi0LSdyrBl
+72MGJlZ+BkYgZmABFlTAGPrwlZUhvPASQ2DBA4ay/ldAPgvQA8xAzAB3PNhDQM/w8zAxLCniY9CQ
+RvEEyD3VQCwBzZMoBQ9AADGhJR1QM0CYg4O9gpeXh+HmHUhUZUfLM8QEaTKwiQQBMygwDf98wjBh
+Qg+wWGQA0hMYGhoawNrlFRQZDp16xfAR5EgWHnDol3VeYlBS0WFoampiOH5ThkEr8D7D5sO/wI5m
+ZIR4AhwbUMzPzcQwJYWXgZeDEdmdukAcCcSi0CKdCRYLAAGEnISYoT6MlJaUULn/8DFYUE+Nh6Gr
+XIeBld8RXDv///OZ4e71bQwtfTsYFixYAFbz4MEDBn5+bqAHlBhSi5YzaFh1MGzefY/h8OnXDEvX
+32Tg4uIC47y8PIa4xGyGxKavDBFVH4B1wl+IR6COh3lERpiJoSWCGz0pgSpOZWiMwGMBIICYkGhw
+2mdjY81gAgYLLN13laoCk4QE0HBBoOM/AUvDqwwp+fMZEhLTGRwcHMBqQLSikhaDpGoikNZmWLBw
+OUNayWYGj8jFDPX19QwsLCwMJSUlDOfOnWMwMjJi6OnpYfjJacdgk/qOYfq6b/B2KyhGwDTQU07a
+rAwOmiitAlDouwOxEDSlgGMBIIAYkSo0UCaJFxcT7f79+w/Du/fvGWyN+Rh2zjFlYOVzA3pCCJgJ
+2RkmzF7JMGXBFYYLFy4wCAgI4KxSP3z4wJCQkMBw4MABeEyB+EpKSgxRUVEMIiIiDDdu3GCYM2cO
+g7rkJ4amBG4gzcLw+8d/ht/AauPXj38MD5//ZfDp/YRs7BsgDgHiG9Amx2+AAIK12WGZ14WNjY3h
+y9evkCIzTQqYyQQgxeHvDwz3719laOnfA3YQyPGvXr3C6QGQ/IYNG8B5JDAwEOwhUFK7d+8eQ11d
+HcOuXbsYNDQ0wLEhquzF4FLyAVwXwMpCUMNNSoCJwV4dJRZEoC1fXqibGQECiBmafEDNYnFgVDcw
+MTGxffnyFdieYWXoKpZjYGYSB0YtC8N/xn8MwZlLGDx9YxkyMjIYnj17xnDlymWGz8CkJiwszMDM
+jCg5Pn78yMDBwQFmgzxhYGDAUFFRweDh4cFw8+ZNhtWrVzPMnj2b4cSJEwxycnIM5ubm4KS1bt8j
+YKX2FFgKsTBI8DOCa2yW/4wMu1Fr6q/Q5jgoan4BBBDMA6DM6wZ0RNDPnz8Y/gE7LTHe/AyuVgJA
+hwGLRaa/DJMWn2PYffwzw4oVKxh+//7NcOfObQYZGRmGly9fMjx+/IiBjY2dgZeXF8h+zLBo8WKG
+Hz9/MkhKSjI8efKEoaOjg+HFixcMO3bsYJCQkAAnHZDH/vz5Ay3BGMCesLGxAbbcOBl6ll5jePfp
+F4MO0CNKQkwMc4/8ZEArbPZAk9APgABihkYFsOBm8Adii79/Ia3FpiwhBgVpbnDJ8PD5F4aYkqMM
+HZ29DBYWFgy/fv0CJof7YMcqKiqBMx/IE++B+UZeXoGBFZhpT50+zXADGNpubm4M6urqDD9+/AB7
+BBQTIBqUpEA0KHYaGxsZjhw5Ao8NEN537gXD5E0PGXSkmBmev//H8OLTf+RktB7W0AMIIGZo9w+U
+gYP///+vBW+E5PMxcHKwAD3AxCDAx8nw/TczQ3HNHLCcu7s7w6RJkxhqamqBxScfg6ysLDC0pRje
+vn3L8PTpE6An5BmsrKwYngA9eOz4cQYNTU2GyMhIcIzNmDEDnHRAMQlKZqDkCMrcII+C8sO7d+8Y
+dHV1wflj6/ZdDOHG7Aw/gD2DC0/+oneEHoA6QAABxABt96gD8QVoRxuMvxyR/P/thOr/b2eM/n87
+7/j/6yX//8fXev7X1RD6D3Tgf35+/v/9/f1gtp6e3v/Fixf9B+aJ/2fOnP6/e/cuMP3t2zcgfeb/
+pMmT/1++fPn//fv3wfpA5ufn58P1A2PuPwiA5P39/f9zcnL+BwbK/xQ7jv9HS/n+59ix/0d2G7RP
+AuoRcgEEEHIpBK/UbAyAkfLvH7Al+QvYegQ2i/+BGmXfgZUaJ8OOhW4MH949B2fUgIAAcHHq6OgI
+DMlMhqlTpzJ8Bza3ZWXlwJn75MkTDKKiIgxxsbEMOjo64JAGYaBDwfoKCwvBfFhxrKCgAM4bYWFh
+DH8+P2WINGMH2g2svYQx2kewQQMmgABiQurrIgDQj/+BGfk/rEMCbMuDW5X/vjJMXXCBwcDIkgEY
+UmDLQJaDisotW7YwHDt2HOyg/fv3Ax0uCs7Ut4B9CFDRDCp6QcUoKNOCHArSZ29vD9YLCgiQHKz+
+AJnbGMjFwM3GAPbAf8xOHHzYBiCAGKAlkB4QX4JFka4yy/+Pe8X+fzko/v/rUen/X06o/f9y2vD/
+8eUGYPnz58//nz9//n99ff3/6ABY84LVxMbG/t++ffv/d+/egpMIKOkAPQZWA6JBfJA4CIOSEyxJ
+gpIQsAb+f6Ze4P+xMv7/B/P4/vf6cqEnoS5o740XIIBgrT1tZA+A8PtdYv8/7QN64hDIEzJgT+iq
+cYIdCAIgi0HqQOkWHYDEgKH7X1xcHOxYkKNAakEeXr9+PTjdgxyLDEDqQPLARtz/QzX8/0/WCPw/
+Usz3f3823/9MC4w80AFt4PEABBCsFAI23hk0oIJgEOHMwSDAwwStFf8xTF35keHKU2Vw6QECoBIE
+lI5BxSOoaEWvhUFJCdQGApUyFy9eBKd7kJ6CggKwHlCSglV2MD2g5JTj+ItBC9ikAHVy/v6G9Nj2
+3/nNcOM1SjpaCcT3QCkOIICYoINJv6CDTHBw6dZvoAGQ/uv9J38Y2uZ9AluADECNOFg7BxsAORaU
+tkH5BVTew2ppkD5QPkDWC8obosxPGXwN2MAOh3Q7IfTdtyiOB5YoDO9hwy4AAcQAbYXKAHE6cjSl
+enP+f7VR9P/bbaL/rfVYwekUlDRAaT8+Ph5elOJKRugAlnRAGKQexgclNRAblHS2AYtMUNo/Xs7/
+/1A+3/896bz/18ZwoycfUCclAIjlQG4HCCBYDIB8dRXa5wSD7ad+gqNx8+GfDEcv/QaHFigUYW0b
+EA0qMWClESEAK3JBAFbygPggs0CNvWhrdgZxXiaGP7//g2P+z5//4NA/9hA8LMQgxC/AwMbKBhs7
++gR18z+AAGKB+uoXtFY7DcT2IFVPgGlu2/GfDJ++/2fg42KEOxq9CQ1yCMhBIHlQcoEVh+gA1KwG
+eRiWXGDpHpSU1CWZGdIcOBh+gzr4IMeDkhAQ/we6bPftPwxMjKDWAB/Du49g/WdhDTmQBwACiBnq
+ASZoZgYBD5ilr4BtkPpoboYAG3aGbYfuMnRPXgq2EFTNwwCs8gE5EBSiIBoEQI029Pwyc+ZMsONh
+HSGQZyMiIhjq/ZgZxIBdSfAoxS8GaAb+z3AR2B9YcuEXgyA/P8Pfv38Zvn7/9hCobRW0GQHKB38A
+Agh5hE4UGvrXkdNcdxL3/wcLhf8/XiL8f24R739gbICLRVj1jw5AeQWE0QFIj6Ys839eTkawPEg/
+KP1HAovIU3XAMh+U7gv4/u/L5P2/M5nn/84knv/Aluh/FmaW/8qycv+BJdp/6PCKA7SDDw5wgABi
+go6x/IOOQ76BKoKDpuXfgL2zf+DoddJjYzjWL8jA+m4HOOTRSyVYkkLPEyD+vl2bGBYX8DGsL+Nn
+OLplKjjJ3bpwmCHFloPhz8//EPwLgkFBt/7qL4Z77/4xiAoJMXz59g3U9Aaln91Iw43g1h1AAIEH
+tqA9fDZoUxWUPqYDsRrMAWaqLEDL+SEjCNChkJM3fzOUzPnCoKJjC87gIA8hl+mg5AQSA6V7kGPT
+bd4w+Juwg0fk/gGTxx5gwQAqJm2UmIFJhgHueFCz4e7bvwxZG78z8PHwgD3wENh5AnpgFtDodUB8
+GYjfgobhQW4HCCDkUYk/0Iz8FIgnIpdIp4AZqXzBF0h/FdpnNVFgZdhcI8Cgx3sK2CdQhGdM9FgA
+l+8sTxl8gOX7b2A/9w/YDAYGa0UWBhsFZiAf2FuFxgDM8aXbvzOwA9tPIMe/BQYA0PGgZH0QVLZA
+3QjvogEEELOUlBTDnj17GNDK2t/QfGEEU3jj2V9gyfSXwV6DFTx6+A+IWYG1tJkyK4MzMGlNWrCH
+Yc7ideAMDooBWO+rtDCLYWoCDwM3MyM4g8IzKRD/hta0IDZ4CB3q+N/A5C0D1Pv123eGt+/ffwRK
+TYY2dZ6ij5ECBBD62CgjdMhCDIhVQQEIal2jlCaarAxNwVzgohU+FAKdy1ty+AfD9L0/GILD4xgW
+LlzIAGzbMDhL3GKIADaL/8FGpf9A6d+QAd5/0H4KqMRp3At0/H9WBmlJCXB38+mLlz/+/fsHSs47
+oCMRb6B59T/M3QABxAzsPDAYGxszzJo1i+Ho0aOwmPgLxaD5LEVoTQ0p+t78Y9hx8TeDiggzgziw
+rQSu7kExAqS1pVgY3LTZGFbtOMfw/OM/Br7/rxmqPbmgIc4Ab9uA0zzQA6By/gsw6cw984thMrDO
+YefgYhAHNsP//PnL8Ozli5/AvvlcoJX7gfgOkuNRZm0AAgjf8DoPdO4LlKlLgdgSvcQxlGNhSAHW
+oIayiOHK//8hpchBYFtKAlizgjojwL4RPAZAAwYMUIevv/YbXNp8/83IICIsxMDNxQUe0nn99h2o
+loU5/jq0nfYZ2/A6QACB84C2tjZcAJon/iE18n5ADfkH7TcgJraAobztym+wY78DHcQMdBg/KxM4
+pGX4mBj42SDpHtYo/AzMwGeAfduVl34xTAKG+Lln/xg4uXgZRIGOBw0EvAb2qT9++vwKWgoehqYA
+2NzA3/LycnBqQQYAAYRvhgbWdeOGVnIK0PyQAp1KxQn0gU2D/7DECAUvv/wDYogAGysrAxcXJwMX
+MPkyMzMxfANm1ncfPoJi7xC0qAQFGKjWfQXLtMjpHpTc09LSwGyAAGLEJoglOXFCRy4koQOs3kDs
+BSrysXkANJIBNhySw8GOBA18gRzOCsQsQPY/YFL7/v0HOMkAHX4FOid2DtpMeAKd5INVWP9xTfIB
+BBAxs5SwwSR2aL4QhXpEFjQYBi1q4ZUeyNGg5MAI9ATIIyA+EyMjeMD2399/4DbNL2D5CSxdPkNn
+I0Hl+zWoo59AMytsvvgvoWlWgABiBA0uhYaGwgVAw37IfCSPMCJNufJAYwTkGXGoZ3ShbXQlaONQ
+FsmIT1AMaoA9g87Y34ZO4L2ENg/eIzn8N75QRwYAAcRIjCK02ICtj2CH5g8e6MgeP7STzQv1JDvS
+aAesQPgOHdv8CPXQR6ijvyE5/B++eWF0ABBALMROpcMMBHrkH9IijR9QR7yGOpgdadEH8lgT+mKP
+H0iLPv7A1kgg2wNKCcQAgAACJyFyAGiME2liEHmpDTMSH3m5DWx5zV+0JTfgognmDq/+Dga9lyA/
+mTD8/zmDIZFnPrjwEwWPJtowJIJLVltg+j0MpgECDADuXybnyFX8nAAAAABJRU5ErkJggg==
+
+--=-KY6mBUirEUuiJCdWIcAx
+Content-Type: image/png
+Content-ID: <1001417929.27019.7.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-topright.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsANW9RNIwAAAA7SURB
+VHjahcwxDcAwEATBCwZzCQajNCVDGlduouh/petGFwQDE8un/OzFrsB93BW4Tx6kaHVgdmB0IAcq
+73eg4H8gZQAAAABJRU5ErkJggg==
+
+--=-KY6mBUirEUuiJCdWIcAx
+Content-Type: image/png
+Content-ID: <1001417869.27019.5.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-topleft.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsAJuvvdVIAAABISURB
+VHjafcxRDYAwDAbhYxbqZRpQOQGYQQkabk8kzRj9kz59l+J3Qz3VUCHBrXaVfCSMFXPQd/gG4w9V
+GnBR7FADeKqgesAEj0KK3Z8K59sAAAAASUVORK5CYII=
+
+--=-KY6mBUirEUuiJCdWIcAx
+Content-Type: image/png
+Content-ID: <1001417869.27019.4.camel@spectrolite>
+Content-Disposition: attachment; filename=bluestripes.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsLBap83esAAACESURB
+VHja7dRBDcAgEADBgwDBEj4wUvdN+2h1kJvVMNmy9vVF4mokr93PGwRkFjBHJ8ADCPAAAjyAAA8g
+wAMI8AACPIAADyDAAwjwAAI8gAAPIMADCPAAAjyAAA8gwAMI8AACPIAADyDAAwjwAAI8gAAPIMAD
+CPAAAjyAAA8gwAMIOL8fcegyqOBdwTkAAAAASUVORK5CYII=
+
+
+--=-KY6mBUirEUuiJCdWIcAx--
+
+From elle.uca@libero.it Thu Sep 18 13:57:36 2008
+Subject: Benvenuti in Evolution!
+From: Luca Ferretti <elle.uca@libero.it>
+To: Utenti <evolution@novell.com>
+X-Mailman-Version: 1.1
+Content-Type: multipart/related; type="multipart/alternative";
+	boundary="=-npCA7I/c/xZ7QcYvWHkm"
+X-Evolution-Account: 1221574499.29350.23@redrum
+X-Evolution-Format: text/html
+X-Mailer: Evolution 2.23.92 
+Date: Thu, 18 Sep 2008 13:57:36 +0200
+Message-Id: <1221739056.10577.9.camel@redrum>
+Mime-Version: 1.0
+X-Evolution: 00000006-0016
+
+
+--=-npCA7I/c/xZ7QcYvWHkm
+Content-Type: multipart/alternative; boundary="=-FJCMO2gDerI10Ur+ADpg"
+
+
+--=-FJCMO2gDerI10Ur+ADpg
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: quoted-printable
+
+
+
+
+
+
+
+
+
+
+
+Il team di
+Evolution
+=C3=A8
+orgoglioso
+di darVi
+il
+benvenuto
+in
+Evolution,
+un sistema
+completo
+per la
+gestione
+delle
+proprie
+comunicazioni e informazioni personali.
+
+
+
+
+
+
+
+
+
+
+
+Per cominciare
+
+        Sul lato sinistro della finestra di Evolution =C3=A8 posizonato il
+        riquadro laterale, contenente le scorciatoie alle proprie
+        cartelle di posta. Sotto di queste sono collocati i pulsanti per
+        accedere ai calendari, ai contatti, ai compiti, alla posta e ai
+        memo.
+       =20
+        Per una guida completa all'uso di Evolution (al momento in
+        inglese), selezionare Sommario nel men=C3=B9 Aiuto, oppure premere =
+il
+        tasto F1.=20
+       =20
+
+Segnalazione bug
+
+        I Bug dovrebbero essere segnalati presso
+        http://bugzilla.gnome.org.=20
+       =20
+
+Maggiori informazioni
+
+        =C3=88 possibile effettuare la sottoscrizione alla mailing list deg=
+li
+        utenti di Evolution (in inglese) presso
+        http://lists.gnome.org/mailman/listinfo/evolution.
+       =20
+        Altre informazioni sul progetto Evolution sono disponibili
+        presso http://www.gnome.org/projects/evolution.=20
+       =20
+
+Yours Sincerely,=20
+Il team di Evolution
+
+--=-FJCMO2gDerI10Ur+ADpg
+Content-Type: text/html; charset="utf-8"
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
+<HTML>
+<HEAD>
+  <META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8">
+  <META NAME="GENERATOR" CONTENT="GtkHTML/3.23.92">
+</HEAD>
+<BODY BGCOLOR="#f8fcf8">
+<TABLE BACKGROUND="cid:1001417869.27019.4.camel@spectrolite" CELLSPACING="0" CELLPADDING="0" WIDTH="100%">
+<TR>
+<TD ALIGN="left" VALIGN="top">
+<IMG SRC="cid:1001417869.27019.5.camel@spectrolite" WIDTH="8" HEIGHT="8" ALIGN="top" BORDER="0">
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD ALIGN="right" VALIGN="top">
+<IMG SRC="cid:1001417929.27019.7.camel@spectrolite" WIDTH="8" HEIGHT="8" ALIGN="top" BORDER="0">
+</TD>
+</TR>
+<TR>
+<TD>
+<BR>
+</TD>
+<TD>
+<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" WIDTH="48" HEIGHT="48" ALIGN="top" BORDER="0">
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<B><FONT SIZE="4"><FONT COLOR="#f8fcf8">Il team di Evolution</FONT></FONT></B><FONT COLOR="#f8fcf8"><FONT SIZE="4"> &#232; orgoglioso di darVi il benvenuto in </FONT></FONT><FONT COLOR="#f8fcf8"><B><FONT SIZE="4">Evolution</FONT></B></FONT><FONT COLOR="#f8fcf8"><FONT SIZE="4">, un sistema completo per la gestione delle proprie comunicazioni e informazioni personali.</FONT></FONT>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" WIDTH="48" HEIGHT="48" ALIGN="top" BORDER="0">
+</TD>
+<TD>
+<BR>
+</TD>
+</TR>
+<TR>
+<TD ALIGN="left" VALIGN="bottom">
+<IMG SRC="cid:1001417929.27019.8.camel@spectrolite" WIDTH="8" HEIGHT="8" ALIGN="top" BORDER="0">
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD ALIGN="right" VALIGN="bottom">
+<DIV ALIGN=right><IMG SRC="cid:1001417929.27019.9.camel@spectrolite" WIDTH="8" HEIGHT="8" ALIGN="top" BORDER="0"></DIV>
+</TD>
+</TR>
+</TABLE>
+<H2>
+<B><FONT SIZE="5">Per cominciare</FONT></B>
+</H2>
+<BLOCKQUOTE>
+    Sul lato sinistro della finestra di Evolution &#232; posizonato il riquadro laterale, contenente le scorciatoie alle proprie cartelle di posta. Sotto di queste sono collocati i pulsanti per accedere ai calendari, ai contatti, ai compiti, alla posta e ai memo.<BR>
+    <BR>
+    Per una guida completa all'uso di Evolution (al momento in inglese), selezionare <B>Sommario</B> nel men&#249; <B>Aiuto</B>, oppure premere il tasto <B>F1</B>. <BR>
+    <BR>
+</BLOCKQUOTE>
+<H2>
+<B><FONT SIZE="5">Segnalazione bug</FONT></B>
+</H2>
+<BLOCKQUOTE>
+    I Bug dovrebbero essere segnalati presso <A HREF="http://bugzilla.gnome.org">http://bugzilla.gnome.org</A>. <BR>
+    <BR>
+</BLOCKQUOTE>
+<H2>
+<B><FONT SIZE="5">Maggiori informazioni</FONT></B>
+</H2>
+<BLOCKQUOTE>
+    &#200; possibile effettuare la sottoscrizione alla mailing list degli utenti di Evolution (in inglese) presso <A HREF="http://lists.gnome.org/mailman/listinfo/evolution.">http://lists.gnome.org/mailman/listinfo/evolution.</A><BR>
+    <!--+GtkHTML:<DATA class="ClueFlow" key="orig" value="0">--><BR>
+    Altre informazioni sul progetto Evolution sono disponibili presso <A HREF="http://www.gnome.org/projects/evolution">http://www.gnome.org/projects/evolution</A>. <BR>
+    <!--+GtkHTML:<DATA class="ClueFlow" clear="orig">--><BR>
+</BLOCKQUOTE>
+Yours Sincerely, <BR>
+Il team di Evolution
+</BODY>
+</HTML>
+
+--=-FJCMO2gDerI10Ur+ADpg--
+
+--=-npCA7I/c/xZ7QcYvWHkm
+Content-Type: image/png
+Content-ID: <1001417929.27019.9.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-bottomright.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsBAVf+8XgAAAA7SURB
+VHjaY/z//z8DPsDEgB8IE1JgSkhBGMP///9xYbP/eCSF////f/4/Hp3n/0MBsg6P////z/uPBgDp
+AG5RDY2ymwAAAABJRU5ErkJggg==
+
+--=-npCA7I/c/xZ7QcYvWHkm
+Content-Type: image/png
+Content-ID: <1001417929.27019.8.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-bottomleft.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsBCVkleUoAAAA/SURB
+VHjaY/z//z8DPsDEwMAgTEiBKSEFYXjt+A8BZv///2fAhmEKzv///18YnwKYIjN8CmBg3v///z1g
+JgIAui9uUdDfxKcAAAAASUVORK5CYII=
+
+--=-npCA7I/c/xZ7QcYvWHkm
+Content-Type: image/png
+Content-ID: <1001417989.27019.11.camel@spectrolite>
+Content-Disposition: attachment; filename=evolution-icon.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAANbY1E9YMgAAABl0RVh0
+U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAABPQSURBVHjaYtzEuI6BCQgZoRDGRtDIJCrP
+6r8dAxQwATEjlEbGjFD5/0D8Dw3DxBgeMt7BsJdYtwAEEON3xk8EHQqmGSG8X//+IzsahFmAmBWI
+2YGYDUqzQsWZoWpBDv0DxL+g+CcS+w+Spxi0mFQIuwWJBAggRmsmUyL8DmFt+7cX5nBmqGM5gZgH
+iA2B2AWIzYFYCoglGbCD20B8E4hPAfEeIH4OxF+B+BvUM39BHilgyiToFhgLIIAYG5gqCCor/VfL
+AE0OIIdzQB2tCcThQOyHx8GEwBEg3gjEW4H4AxB/hsYOKFb+72BazyCdpMjwfN4juFvEkmwY3s47
+ziBc/BCoYwEDQAAxXhIXYNB7+YWBQZGH4f+NEwz3nrCi2KCsrAwLdVCIcwOxPBAXAXE0A/XACyDu
+g3rmHRB/gcbIv7t37+LVCBBAjPgUQB3PAg11QSAOAuJmIObFpcfWiJtBTpKFQV4C6Of/f6GYgeHQ
++V8Mj178ZXj08h8+91wE4mIgvgWNke/Q2GDA5U6AAGIhwvFcQCwCxP3Q5IIC+HlYGHwdhRl8HYQY
+fBwEwA7+/x9o5//fwPD7xcD47wfD/38/GSr//mf4B8QPnv5l2HL4J8Py3d8Zrtz/i26cPhBvAOIK
+IN4JxK+h+eM3LncCBBDWGEByPCitK7Gxsi7T09JSv3brFsO3798hDudlYciOVmDIiVEAstmgWeQf
+2AOMQMf///8LyAQmZ6AHGP8B9fz9DuT/ZfgL8gjQf39//QfHSvfybwzHr2F1XwcQLwTil9Ak9Rub
+WwECCMMDaCGvIijAv8zMwFD9xLmzDB8/fYYkExNhhpktRgzyMnxAd6OVluAkAwr9n9DQBzkcGIhA
+zAjE/4Ce+PfnP8NfEAb67w/QIzM3fmfoW/uN4dO3/+ju6wLi+dA8AvLEH3T3AgQQigeQMizI8eLA
+kJ9jaWricP7yFYZPnyGOr8pUZ6jONWdgk85iYGTmZbh9bgaDnMRfSAzA0/xPsAcY/v4A0iDHfwEK
+fwV64CuY/v/nH9ADkFj48xNC33vylyF1wieG648xklUdEK+AegKUnP4iuxkggJjQYwRa2oAybJmh
+ro7Djdt34I6f2WzIUFPkzcCp3MXAwq3H8ODhEwYL71kM4dm7GT5+B+ZzVqA2Fn5ghIAwMHZYgIUW
+MzfDYWBSOXIemKyYOBgYmdiBGFhIA21mZAbSzCAaWLSJMzEsL+Nj0JRhRvdAORAbQd0ETqvQgAYD
+gABiwpJ0QEWlm5K8XNqHT58YXr5+DXW8AUNsuC0Du1QG2J9/vpxjSExKY0hIymBg5tJi0LSdyrBl
+72MGJlZ+BkYgZmABFlTAGPrwlZUhvPASQ2DBA4ay/ldAPgvQA8xAzAB3PNhDQM/w8zAxLCniY9CQ
+RvEEyD3VQCwBzZMoBQ9AADGhJR1QM0CYg4O9gpeXh+HmHUhUZUfLM8QEaTKwiQQBMygwDf98wjBh
+Qg+wWGQA0hMYGhoawNrlFRQZDp16xfAR5EgWHnDol3VeYlBS0WFoampiOH5ThkEr8D7D5sO/wI5m
+ZIR4AhwbUMzPzcQwJYWXgZeDEdmdukAcCcSi0CKdCRYLAAGEnISYoT6MlJaUULn/8DFYUE+Nh6Gr
+XIeBld8RXDv///OZ4e71bQwtfTsYFixYAFbz4MEDBn5+bqAHlBhSi5YzaFh1MGzefY/h8OnXDEvX
+32Tg4uIC47y8PIa4xGyGxKavDBFVH4B1wl+IR6COh3lERpiJoSWCGz0pgSpOZWiMwGMBIICYkGhw
+2mdjY81gAgYLLN13laoCk4QE0HBBoOM/AUvDqwwp+fMZEhLTGRwcHMBqQLSikhaDpGoikNZmWLBw
+OUNayWYGj8jFDPX19QwsLCwMJSUlDOfOnWMwMjJi6OnpYfjJacdgk/qOYfq6b/B2KyhGwDTQU07a
+rAwOmiitAlDouwOxEDSlgGMBIIAYkSo0UCaJFxcT7f79+w/Du/fvGWyN+Rh2zjFlYOVzA3pCCJgJ
+2RkmzF7JMGXBFYYLFy4wCAgI4KxSP3z4wJCQkMBw4MABeEyB+EpKSgxRUVEMIiIiDDdu3GCYM2cO
+g7rkJ4amBG4gzcLw+8d/ht/AauPXj38MD5//ZfDp/YRs7BsgDgHiG9Amx2+AAIK12WGZ14WNjY3h
+y9evkCIzTQqYyQQgxeHvDwz3719laOnfA3YQyPGvXr3C6QGQ/IYNG8B5JDAwEOwhUFK7d+8eQ11d
+HcOuXbsYNDQ0wLEhquzF4FLyAVwXwMpCUMNNSoCJwV4dJRZEoC1fXqibGQECiBmafEDNYnFgVDcw
+MTGxffnyFdieYWXoKpZjYGYSB0YtC8N/xn8MwZlLGDx9YxkyMjIYnj17xnDlymWGz8CkJiwszMDM
+jCg5Pn78yMDBwQFmgzxhYGDAUFFRweDh4cFw8+ZNhtWrVzPMnj2b4cSJEwxycnIM5ubm4KS1bt8j
+YKX2FFgKsTBI8DOCa2yW/4wMu1Fr6q/Q5jgoan4BBBDMA6DM6wZ0RNDPnz8Y/gE7LTHe/AyuVgJA
+hwGLRaa/DJMWn2PYffwzw4oVKxh+//7NcOfObQYZGRmGly9fMjx+/IiBjY2dgZeXF8h+zLBo8WKG
+Hz9/MkhKSjI8efKEoaOjg+HFixcMO3bsYJCQkAAnHZDH/vz5Ay3BGMCesLGxAbbcOBl6ll5jePfp
+F4MO0CNKQkwMc4/8ZEArbPZAk9APgABihkYFsOBm8Adii79/Ia3FpiwhBgVpbnDJ8PD5F4aYkqMM
+HZ29DBYWFgy/fv0CJof7YMcqKiqBMx/IE++B+UZeXoGBFZhpT50+zXADGNpubm4M6urqDD9+/AB7
+BBQTIBqUpEA0KHYaGxsZjhw5Ao8NEN537gXD5E0PGXSkmBmev//H8OLTf+RktB7W0AMIIGZo9w+U
+gYP///+vBW+E5PMxcHKwAD3AxCDAx8nw/TczQ3HNHLCcu7s7w6RJkxhqamqBxScfg6ysLDC0pRje
+vn3L8PTpE6An5BmsrKwYngA9eOz4cQYNTU2GyMhIcIzNmDEDnHRAMQlKZqDkCMrcII+C8sO7d+8Y
+dHV1wflj6/ZdDOHG7Aw/gD2DC0/+oneEHoA6QAABxABt96gD8QVoRxuMvxyR/P/thOr/b2eM/n87
+7/j/6yX//8fXev7X1RD6D3Tgf35+/v/9/f1gtp6e3v/Fixf9B+aJ/2fOnP6/e/cuMP3t2zcgfeb/
+pMmT/1++fPn//fv3wfpA5ufn58P1A2PuPwiA5P39/f9zcnL+BwbK/xQ7jv9HS/n+59ix/0d2G7RP
+AuoRcgEEEHIpBK/UbAyAkfLvH7Al+QvYegQ2i/+BGmXfgZUaJ8OOhW4MH949B2fUgIAAcHHq6OgI
+DMlMhqlTpzJ8Bza3ZWXlwJn75MkTDKKiIgxxsbEMOjo64JAGYaBDwfoKCwvBfFhxrKCgAM4bYWFh
+DH8+P2WINGMH2g2svYQx2kewQQMmgABiQurrIgDQj/+BGfk/rEMCbMuDW5X/vjJMXXCBwcDIkgEY
+UmDLQJaDisotW7YwHDt2HOyg/fv3Ax0uCs7Ut4B9CFDRDCp6QcUoKNOCHArSZ29vD9YLCgiQHKz+
+AJnbGMjFwM3GAPbAf8xOHHzYBiCAGKAlkB4QX4JFka4yy/+Pe8X+fzko/v/rUen/X06o/f9y2vD/
+8eUGYPnz58//nz9//n99ff3/6ABY84LVxMbG/t++ffv/d+/egpMIKOkAPQZWA6JBfJA4CIOSEyxJ
+gpIQsAb+f6Ze4P+xMv7/B/P4/vf6cqEnoS5o740XIIBgrT1tZA+A8PtdYv8/7QN64hDIEzJgT+iq
+cYIdCAIgi0HqQOkWHYDEgKH7X1xcHOxYkKNAakEeXr9+PTjdgxyLDEDqQPLARtz/QzX8/0/WCPw/
+Usz3f3823/9MC4w80AFt4PEABBCsFAI23hk0oIJgEOHMwSDAwwStFf8xTF35keHKU2Vw6QECoBIE
+lI5BxSOoaEWvhUFJCdQGApUyFy9eBKd7kJ6CggKwHlCSglV2MD2g5JTj+ItBC9ikAHVy/v6G9Nj2
+3/nNcOM1SjpaCcT3QCkOIICYoINJv6CDTHBw6dZvoAGQ/uv9J38Y2uZ9AluADECNOFg7BxsAORaU
+tkH5BVTew2ppkD5QPkDWC8obosxPGXwN2MAOh3Q7IfTdtyiOB5YoDO9hwy4AAcQAbYXKAHE6cjSl
+enP+f7VR9P/bbaL/rfVYwekUlDRAaT8+Ph5elOJKRugAlnRAGKQexgclNRAblHS2AYtMUNo/Xs7/
+/1A+3/896bz/18ZwoycfUCclAIjlQG4HCCBYDIB8dRXa5wSD7ad+gqNx8+GfDEcv/QaHFigUYW0b
+EA0qMWClESEAK3JBAFbygPggs0CNvWhrdgZxXiaGP7//g2P+z5//4NA/9hA8LMQgxC/AwMbKBhs7
++gR18z+AAGKB+uoXtFY7DcT2IFVPgGlu2/GfDJ++/2fg42KEOxq9CQ1yCMhBIHlQcoEVh+gA1KwG
+eRiWXGDpHpSU1CWZGdIcOBh+gzr4IMeDkhAQ/we6bPftPwxMjKDWAB/Du49g/WdhDTmQBwACiBnq
+ASZoZgYBD5ilr4BtkPpoboYAG3aGbYfuMnRPXgq2EFTNwwCs8gE5EBSiIBoEQI029Pwyc+ZMsONh
+HSGQZyMiIhjq/ZgZxIBdSfAoxS8GaAb+z3AR2B9YcuEXgyA/P8Pfv38Zvn7/9hCobRW0GQHKB38A
+Agh5hE4UGvrXkdNcdxL3/wcLhf8/XiL8f24R739gbICLRVj1jw5AeQWE0QFIj6Ys839eTkawPEg/
+KP1HAovIU3XAMh+U7gv4/u/L5P2/M5nn/84knv/Aluh/FmaW/8qycv+BJdp/6PCKA7SDDw5wgABi
+go6x/IOOQ76BKoKDpuXfgL2zf+DoddJjYzjWL8jA+m4HOOTRSyVYkkLPEyD+vl2bGBYX8DGsL+Nn
+OLplKjjJ3bpwmCHFloPhz8//EPwLgkFBt/7qL4Z77/4xiAoJMXz59g3U9Aaln91Iw43g1h1AAIEH
+tqA9fDZoUxWUPqYDsRrMAWaqLEDL+SEjCNChkJM3fzOUzPnCoKJjC87gIA8hl+mg5AQSA6V7kGPT
+bd4w+Juwg0fk/gGTxx5gwQAqJm2UmIFJhgHueFCz4e7bvwxZG78z8PHwgD3wENh5AnpgFtDodUB8
+GYjfgobhQW4HCCDkUYk/0Iz8FIgnIpdIp4AZqXzBF0h/FdpnNVFgZdhcI8Cgx3sK2CdQhGdM9FgA
+l+8sTxl8gOX7b2A/9w/YDAYGa0UWBhsFZiAf2FuFxgDM8aXbvzOwA9tPIMe/BQYA0PGgZH0QVLZA
+3QjvogEEELOUlBTDnj17GNDK2t/QfGEEU3jj2V9gyfSXwV6DFTx6+A+IWYG1tJkyK4MzMGlNWrCH
+Yc7ideAMDooBWO+rtDCLYWoCDwM3MyM4g8IzKRD/hta0IDZ4CB3q+N/A5C0D1Pv123eGt+/ffwRK
+TYY2dZ6ij5ECBBD62CgjdMhCDIhVQQEIal2jlCaarAxNwVzgohU+FAKdy1ty+AfD9L0/GILD4xgW
+LlzIAGzbMDhL3GKIADaL/8FGpf9A6d+QAd5/0H4KqMRp3At0/H9WBmlJCXB38+mLlz/+/fsHSs47
+oCMRb6B59T/M3QABxAzsPDAYGxszzJo1i+Ho0aOwmPgLxaD5LEVoTQ0p+t78Y9hx8TeDiggzgziw
+rQSu7kExAqS1pVgY3LTZGFbtOMfw/OM/Br7/rxmqPbmgIc4Ab9uA0zzQA6By/gsw6cw984thMrDO
+YefgYhAHNsP//PnL8Ozli5/AvvlcoJX7gfgOkuNRZm0AAgjf8DoPdO4LlKlLgdgSvcQxlGNhSAHW
+oIayiOHK//8hpchBYFtKAlizgjojwL4RPAZAAwYMUIevv/YbXNp8/83IICIsxMDNxQUe0nn99h2o
+loU5/jq0nfYZ2/A6QACB84C2tjZcAJon/iE18n5ADfkH7TcgJraAobztym+wY78DHcQMdBg/KxM4
+pGX4mBj42SDpHtYo/AzMwGeAfduVl34xTAKG+Lln/xg4uXgZRIGOBw0EvAb2qT9++vwKWgoehqYA
+2NzA3/LycnBqQQYAAYRvhgbWdeOGVnIK0PyQAp1KxQn0gU2D/7DECAUvv/wDYogAGysrAxcXJwMX
+MPkyMzMxfANm1ncfPoJi7xC0qAQFGKjWfQXLtMjpHpTc09LSwGyAAGLEJoglOXFCRy4koQOs3kDs
+BSrysXkANJIBNhySw8GOBA18gRzOCsQsQPY/YFL7/v0HOMkAHX4FOid2DtpMeAKd5INVWP9xTfIB
+BBAxs5SwwSR2aL4QhXpEFjQYBi1q4ZUeyNGg5MAI9ATIIyA+EyMjeMD2399/4DbNL2D5CSxdPkNn
+I0Hl+zWoo59AMytsvvgvoWlWgABiBA0uhYaGwgVAw37IfCSPMCJNufJAYwTkGXGoZ3ShbXQlaONQ
+FsmIT1AMaoA9g87Y34ZO4L2ENg/eIzn8N75QRwYAAcRIjCK02ICtj2CH5g8e6MgeP7STzQv1JDvS
+aAesQPgOHdv8CPXQR6ijvyE5/B++eWF0ABBALMROpcMMBHrkH9IijR9QR7yGOpgdadEH8lgT+mKP
+H0iLPv7A1kgg2wNKCcQAgAACJyFyAGiME2liEHmpDTMSH3m5DWx5zV+0JTfgognmDq/+Dga9lyA/
+mTD8/zmDIZFnPrjwEwWPJtowJIJLVltg+j0MpgECDADuXybnyFX8nAAAAABJRU5ErkJggg==
+
+--=-npCA7I/c/xZ7QcYvWHkm
+Content-Type: image/png
+Content-ID: <1001417929.27019.7.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-topright.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsANW9RNIwAAAA7SURB
+VHjahcwxDcAwEATBCwZzCQajNCVDGlduouh/petGFwQDE8un/OzFrsB93BW4Tx6kaHVgdmB0IAcq
+73eg4H8gZQAAAABJRU5ErkJggg==
+
+--=-npCA7I/c/xZ7QcYvWHkm
+Content-Type: image/png
+Content-ID: <1001417869.27019.5.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-topleft.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsAJuvvdVIAAABISURB
+VHjafcxRDYAwDAbhYxbqZRpQOQGYQQkabk8kzRj9kz59l+J3Qz3VUCHBrXaVfCSMFXPQd/gG4w9V
+GnBR7FADeKqgesAEj0KK3Z8K59sAAAAASUVORK5CYII=
+
+--=-npCA7I/c/xZ7QcYvWHkm
+Content-Type: image/png
+Content-ID: <1001417869.27019.4.camel@spectrolite>
+Content-Disposition: attachment; filename=bluestripes.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsLBap83esAAACESURB
+VHja7dRBDcAgEADBgwDBEj4wUvdN+2h1kJvVMNmy9vVF4mokr93PGwRkFjBHJ8ADCPAAAjyAAA8g
+wAMI8AACPIAADyDAAwjwAAI8gAAPIMADCPAAAjyAAA8gwAMI8AACPIAADyDAAwjwAAI8gAAPIMAD
+CPAAAjyAAA8gwAMIOL8fcegyqOBdwTkAAAAASUVORK5CYII=
+
+
+--=-npCA7I/c/xZ7QcYvWHkm--
+
+From elle.uca@libero.it Thu Sep 18 14:00:35 2008
+Subject: Benvenuti in Evolution!
+From: Luca Ferretti <elle.uca@libero.it>
+To: Utenti <evolution@novell.com>
+X-Mailman-Version: 1.1
+Content-Type: multipart/related; type="multipart/alternative";
+	boundary="=-WMAIwqnePon/ifCZPTbp"
+X-Evolution-Account: 1221574499.29350.23@redrum
+X-Evolution-Format: text/html
+X-Mailer: Evolution 2.23.92 
+Date: Thu, 18 Sep 2008 14:00:35 +0200
+Message-Id: <1221739235.10577.11.camel@redrum>
+Mime-Version: 1.0
+X-Evolution: 00000008-0014
+
+
+--=-WMAIwqnePon/ifCZPTbp
+Content-Type: multipart/alternative; boundary="=-UYZVBiCl89Ffkeb0GNKv"
+
+
+--=-UYZVBiCl89Ffkeb0GNKv
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: quoted-printable
+
+
+
+
+
+
+
+
+
+Logo di
+evolution
+
+Il team di
+Evolution
+=C3=A8
+orgoglioso
+di darVi
+il
+benvenuto
+in
+Evolution,
+un sistema
+completo
+per la
+gestione
+delle
+proprie
+comunicazioni e informazioni personali.
+
+Logo di
+Evolution
+
+
+
+
+
+
+
+
+
+Per cominciare
+
+        Sul lato sinistro della finestra di Evolution =C3=A8 posizonato il
+        riquadro laterale, contenente le scorciatoie alle proprie
+        cartelle di posta. Sotto di queste sono collocati i pulsanti per
+        accedere ai calendari, ai contatti, ai compiti, alla posta e ai
+        memo.
+       =20
+        Per una guida completa all'uso di Evolution (al momento in
+        inglese), selezionare Sommario nel men=C3=B9 Aiuto, oppure premere =
+il
+        tasto F1.=20
+       =20
+
+Segnalazione bug
+
+        I Bug dovrebbero essere segnalati presso
+        http://bugzilla.gnome.org.=20
+       =20
+
+Maggiori informazioni
+
+        =C3=88 possibile effettuare la sottoscrizione alla mailing list deg=
+li
+        utenti di Evolution (in inglese) presso
+        http://lists.gnome.org/mailman/listinfo/evolution.
+       =20
+        Altre informazioni sul progetto Evolution sono disponibili
+        presso http://www.gnome.org/projects/evolution.=20
+       =20
+
+Sinceramente Vostro,=20
+Il team di Evolution
+
+--=-UYZVBiCl89Ffkeb0GNKv
+Content-Type: text/html; charset="utf-8"
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
+<HTML>
+<HEAD>
+  <META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8">
+  <META NAME="GENERATOR" CONTENT="GtkHTML/3.23.92">
+</HEAD>
+<BODY BGCOLOR="#f8fcf8">
+<TABLE BACKGROUND="cid:1001417869.27019.4.camel@spectrolite" CELLSPACING="0" CELLPADDING="0" WIDTH="100%">
+<TR>
+<TD ALIGN="left" VALIGN="top">
+<IMG SRC="cid:1001417869.27019.5.camel@spectrolite" WIDTH="8" HEIGHT="8" ALIGN="top" BORDER="0">
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD ALIGN="right" VALIGN="top">
+<IMG SRC="cid:1001417929.27019.7.camel@spectrolite" WIDTH="8" HEIGHT="8" ALIGN="top" BORDER="0">
+</TD>
+</TR>
+<TR>
+<TD>
+<BR>
+</TD>
+<TD>
+<IMG SRC="cid:1221739235.10577.10.camel@redrum" ALIGN="top" ALT="Logo di evolution" BORDER="0">
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<B><FONT SIZE="4"><FONT COLOR="#f8fcf8">Il team di Evolution</FONT></FONT></B><FONT COLOR="#f8fcf8"><FONT SIZE="4"> &#232; orgoglioso di darVi il benvenuto in </FONT></FONT><FONT COLOR="#f8fcf8"><B><FONT SIZE="4">Evolution</FONT></B></FONT><FONT COLOR="#f8fcf8"><FONT SIZE="4">, un sistema completo per la gestione delle proprie comunicazioni e informazioni personali.</FONT></FONT>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<IMG SRC="cid:1221739235.10577.10.camel@redrum" WIDTH="48" ALIGN="top" ALT="Logo di Evolution" BORDER="0">
+</TD>
+<TD>
+<BR>
+</TD>
+</TR>
+<TR>
+<TD ALIGN="left" VALIGN="bottom">
+<IMG SRC="cid:1001417929.27019.8.camel@spectrolite" WIDTH="8" HEIGHT="8" ALIGN="top" BORDER="0">
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD>
+<BR>
+</TD>
+<TD ALIGN="right" VALIGN="bottom">
+<DIV ALIGN=right><IMG SRC="cid:1001417929.27019.9.camel@spectrolite" WIDTH="8" HEIGHT="8" ALIGN="top" BORDER="0"></DIV>
+</TD>
+</TR>
+</TABLE>
+<H2>
+<B><FONT SIZE="5">Per cominciare</FONT></B>
+</H2>
+<BLOCKQUOTE>
+    Sul lato sinistro della finestra di Evolution &#232; posizonato il riquadro laterale, contenente le scorciatoie alle proprie cartelle di posta. Sotto di queste sono collocati i pulsanti per accedere ai calendari, ai contatti, ai compiti, alla posta e ai memo.<BR>
+    <BR>
+    Per una guida completa all'uso di Evolution (al momento in inglese), selezionare <B>Sommario</B> nel men&#249; <B>Aiuto</B>, oppure premere il tasto <B>F1</B>. <BR>
+    <BR>
+</BLOCKQUOTE>
+<H2>
+<B><FONT SIZE="5">Segnalazione bug</FONT></B>
+</H2>
+<BLOCKQUOTE>
+    I Bug dovrebbero essere segnalati presso <A HREF="http://bugzilla.gnome.org">http://bugzilla.gnome.org</A>. <BR>
+    <BR>
+</BLOCKQUOTE>
+<H2>
+<B><FONT SIZE="5">Maggiori informazioni</FONT></B>
+</H2>
+<BLOCKQUOTE>
+    &#200; possibile effettuare la sottoscrizione alla mailing list degli utenti di Evolution (in inglese) presso <A HREF="http://lists.gnome.org/mailman/listinfo/evolution.">http://lists.gnome.org/mailman/listinfo/evolution.</A><BR>
+    <!--+GtkHTML:<DATA class="ClueFlow" key="orig" value="0">--><BR>
+    Altre informazioni sul progetto Evolution sono disponibili presso <A HREF="http://www.gnome.org/projects/evolution">http://www.gnome.org/projects/evolution</A>. <BR>
+    <!--+GtkHTML:<DATA class="ClueFlow" clear="orig">--><BR>
+</BLOCKQUOTE>
+Sinceramente Vostro, <BR>
+Il team di Evolution
+</BODY>
+</HTML>
+
+--=-UYZVBiCl89Ffkeb0GNKv--
+
+--=-WMAIwqnePon/ifCZPTbp
+Content-Type: image/png
+Content-ID: <1001417929.27019.9.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-bottomright.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsBAVf+8XgAAAA7SURB
+VHjaY/z//z8DPsDEgB8IE1JgSkhBGMP///9xYbP/eCSF////f/4/Hp3n/0MBsg6P////z/uPBgDp
+AG5RDY2ymwAAAABJRU5ErkJggg==
+
+--=-WMAIwqnePon/ifCZPTbp
+Content-Type: image/png
+Content-ID: <1001417929.27019.8.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-bottomleft.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsBCVkleUoAAAA/SURB
+VHjaY/z//z8DPsDEwMAgTEiBKSEFYXjt+A8BZv///2fAhmEKzv///18YnwKYIjN8CmBg3v///z1g
+JgIAui9uUdDfxKcAAAAASUVORK5CYII=
+
+--=-WMAIwqnePon/ifCZPTbp
+Content-ID: <1221739235.10577.10.camel@redrum>
+Content-Disposition: attachment; filename="evolution.png"
+Content-Type: image/png; name="evolution.png"
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz
+AAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAA3dSURB
+VGiB1Zl7cBzVlYe/npnueUoz0kijN5ItW5ZsYxuQ1rFNUtnEmIeBDQlrHsY8vDEUpBaW2qSyf+2G
+qtSGgPELA4YNxqFSdqIlu2RZWIclJqA14BhjwDa2LAnJetqS5q3pnkd33/1DmrFedrAtksqtOnWn
+penu33fOueeenpaEEPwlD8ufW8Cljr94ANulnPzkTx670SLbnzMN3WOaAtM0MRFgmphCYJrClITY
+cvR42782NzcbMyV6/JAuZg1s3PhYQJHdP581q3bFNauuz7PZbIy/TvazaZoc/MOB5L7fvdmpxtTv
+/HTz5uMzpnxsXDDA448/NsfldLXcdvu6kqKiYimVSpFMJnOihRiNhBACWZbJz88nEg7z3HNPh6Kh
+0C0bt2x/988GsOWJHzfYHK537rlvQ7HT6SQej5PJZBBC5CwrPmuSJOH3+8lkMmzbtjEcC0VufXLz
+0/v+5ACbNv10scthf2vdPd8tkmWFWCyGYRjnFT/+uLi4GMMweHrbpkgsHl6zceP2//2TAWx96vEm
+p8e9d+1d6wtlWSYajU4QP1n4uWBKSkowDINnn9kaCUeCd2za9MzeLx1gy5YnGlxOd8td6+7zW61W
+IpHIBHHn8/p0x1mIZ7ZvjQRDw9dt3/78gS8NYPPmzRUup/XQnWvvLVEUO6FQ6ILEnuu4oqKCZDLJ
+9qc3B8ORkWU7duxou1iAc25kW7Zs8Xlccst3br0z4HA4CYVCo3V+zAzDuOjj3t5eXC4X962/3+/x
+ON5+8MEHAzMKsGvXYw6PW3nnuutvqvb5fFIwGJwg4FLEm6ZJJpPh1KlTBAIB1q69u8zlkt+5++67
+3TMGYBqBF/5q6bKGsvIKSzAYJJPJzIh4TdPo7+8nGAySSqXo7u7mssuqLatX31xbXFTwwowAPP/s
+tuuKigO31NcvkCORCKlUKidkchT+2HE6nSYSidDR0UE8HqeqqopVq1axfPlyEokEmqYxNDTE/PkL
+5bKy0hsfeODvVl0owJReyO5QXli58npPIpEgkUhc0OLMejm72GfNmkVdXR15eXmjkR0Dc7vdSJIE
+QDQaRVEUbrv9rvynNj6+E6i8JADAoSgKQ0NDOW+eT3w6nSYajRKLxQgEAtTU1NDY2IjNZsudn0ql
+6Ozo4fCHx/i8vYdIJI6mJjFNE7vdhsvjZOGieWTSkveSIwBgsVhAAt3QQTBBvGEYaJrG8PAwNpuN
+mpoa5s2bh8vlAsilkaZpmKbJey0f8fqrv8cfKKKypprLm5qQFRlTN9FNAyNjMJJQOTM0hFOpcq+/
+44cDAvMfd/1y4x7xBXbZKfvArp07Bu++9/7idDrNibYTOGQH6XSacDjMyMgI5eXlVFVVUVhYiMVi
+QQiRy39d14FR4FOdffz83/6DPJ+XphXL0A2DSChCKBxBTSTJpNOYpoEkgc1mw+1x43J7MHSd40eO
+qPFwtFPo+h0vNW86ckEAL+3cMXjPvfcXp1Ip0uk0hz85zOya2QQCARwOB3A2l3VdxzCMnOjs/OGB
+I/z6V79l+V9/jfKKUrq6+gmFI5iGiWkYgIHNJhCmIJFIoWcMDEPH1A083nyKS0s43dNPd1vbiAG3
+79rz5OsXDJBMjuZoPBFH0zSqq6rRdR1d1zFNc4ro7Nzy+4P84f1jfPWbXyeZydDTfRpd11HkDG6X
+wGYDp9NBQUEBQhioqoZpCJJJnfa2M4SCcSwSBMrKEcDnx0+oSU19YOfuJ38xHcC0a2D8YvW4PMTi
+MfYf2M+ShUumFZ2d21q72PfmAW689W/o6T1NLJ7AapUo8KYpKS3g8oXzcxXp5Mk2vF4vRUV+dF0n
+kUhQWtZP96lBPj7URk9XJ558L7ULFrhOHProhfV3/KBt554np/RN52wlxlea0uJSZFnmWOuxCZvT
++DkaifPyz17l6pVfZ2g4RDgcRbZm8PuSLF26mKtXLOODDw5gtVoxDIPdu/ewd+9vkSQJq9WKx+Oh
+vn4OV1xZz823XE2hP59YKMRINELV3DlOIcQbD6z5pylVairAOI+Ot4a5DYSjYVrbWtE0DVVVSSaT
+aJpGKpXiv1/dx5wF9TicTnp7BpAkgyK/hWuu+QaVlRVYLBaam5tpaWnB4XBw5523c8MN12GxWLBY
+LEiShCRJFBUVUDOrghtuWoFilxk+3Y8rz4MvUORJW4x/vqgIZK1pSRPd/d1093WjqiqJRAJVVent
+7qejvZf6+fNob+vENEz8BSbLljXhcDhyIh999B/YunUbFouFhQsXUlZWlhOeNQBZlvH7fVy7ehmG
+Kejr6qSyZrZik20PrVv3aNlFA1gkC1+56iu0dbYxODyIqqrE43EOHjhCw6JFDAwMkhhJ4PUKamur
+8XpHI54V19jYiKqqtLa25sSea1YUG9U15dTNq0YdGSEWDlFSWS7LumXtHwWYTnzWXE4XTUuaaO9u
+p/d0L5+0fsJnRzsoKilmaHAYEOTnW2lomDfhmllhjzzyMFu3bjuX3yZ83+lUuG71V0EIwsPD5BcU
+WoUQ6y4IYLrHRX+Bn4A/QEpPsXLFKvLcXgxdR1M1bFaToqJiJEma8kuFaZqsXr2a99//gMHBwdz/
+zjc7XQ5sNivqSBybLKM4XQ3fW/M9z0VHIKNnOHT0EGWlZXzrhm8RCcXIK/SSGElgmiYOh4VAwD/t
+uVlnrFt3F9///g945ZVXcs/W54KQJImKyhKEaaImEjicroyG87KLAkhoCT49/ilLr1jK4gWLiUVj
+DPSfQVEUNC2JaRh4fU683nwOHvyQlpb/m/BskLXXX3+DK6+8iubmV9i9e/eU+4yMJNi8eQvt7R0o
+ipVZtVWjzkulkG0ySFRltZ5zIxsPAhCOhkloCVZ+bSW6rue6VVVNIllspNMpTMPA5VKQZYV3320h
+Fotx9dUrJngToK+vjw0bNlBRUcF77+2f0vV2dXXS3PzveL1e6uvrKS0rxhQmekbHKlutQOF5ASZH
+4czwGUoDpdTNqSMWi6Gqau57LreDdCqJ4rCPAiUyaJrGhg3fBUSu7ciKNwwDl8vFkiVL8Hg87Nz5
+sym/cjQ0NLBnz27KykqxWW10tHcjTIFNtpFUVQOrdGbaFJIkySbEaH+U7TIj8QgNdQ34vD6GhoZQ
+VXUCnCfPTVJTkSwWDMMgGIwzMjKCw2HH5XJNeVp74oknGRw8w2uv/YZ33nmb2traCYs8e93Kyoqx
+QmChq6MHIUxku51MOi0Zptk7JQKSJDkBtxDCkl2ssixTV1tHPD4qanKKAfiLfUSCUSprZmEaBvGo
+RjyuUlJy1vNZ++ijwzz11CZ27nyR8vLyaZ/oJpuiyPT1DIAAlycPTU3YLM787gkAkiTJgAvwmEJI
+pmni8/oAUFUVi8WSa8Imrw23243H4yCVSiMrMtFIIte12my2nHhN03jooYdYs+ZvufbaVRPa8PEA
+46Nrt9sZGgqiGzoer49UIkEmlTmw61c/SU6OgHXMZNMwzNf+69dR0xSSME1MAQgDc3ylMAWmKcbe
+BQhs9rR9+MyQ3VdYyEBPL4cPnsTj8VBWVpwDOHz4Y6xWGz/60b9MED9dmc3OLmce2554FmGalJZX
+EQ4GMxLSy+PTPgtgjFnmxZd2fTs/31smhLBIkmRiGEx4M2HAhL8YoNhd3uqyK7fNv+oqu9PlovPz
+AeoaQvh8+TgcCpIk0dTUyL59bwHkBE6GGA/gdufz1t4W+vtOU1AcwOF20d12MqkIa/MUACFERpIk
+FZAOHjzcBQwA0hjUFxq33TR7Z09H+/qqOXPsidYTvP3mQcrKirBa87FaLbkqBKDrBg8//DCNjY3c
+e+89UyLhdueR0jK89p9vYbVZqZ5bT8exYxqSeOz55sej00UAIYQmSVIKSAAORitU5osCnDx59McO
+l+fbXr+/pLisnP5TXex5+X+4Zc1KAiUF2GxnITKZNF1dpygvL5+Q91arlfx8H58daWPXC80Yhs7s
++YsYGugTWmLkdH48s33yfS/qFdO5xl23/f3ldtn9QcOVV7giw8MM9veBECxdvphvrlqG1SYBgkxG
+R4hR4TabDUWxY7FYsVpkXtzxS458fBwJqJw9B6/fz8lPPomfHhpYtnff7lYhhD7jAJIkWQEn4Lh5
+1drVJaWXPV89d67dKst0t7eR0jS8vjwWLJxLXcNsZtdW4fG4QLIQCUfpaDvFiWPtfPThEdSEhivP
+w9z5C1ETCfo6O7WurtYNv9v/m3eBFJAEkkKI9IwASJKkMJpyzizE8sZrmubMWvhMUXmZu7y6xjLY
+18NgX9+EhWsd2/jOppAJAspqZlFaVcWpkyeNSDAU/fiz/Y8c/ezg8axwQBuzpBBCuyQAaTSpndNZ
+dcXcyqVXfeOH+V7f4svm1ikuj4doMEgsHCKlaSSTKRACxW5HcTjwFfrxFRURj0To7ehIh6PBQ/sP
+vLH9zPDAmXGiJ1tiJiLgZDQCLs5GIheRRfOXLqqvXbzeW+Cfm19YKPK8XllW7NjtCkJAOpUinUoR
+i4Qz8XCYcDh48sjxD35x8vOjrZz1uspE72uAKoRQZwJAAhTAPSZ8vNmz5vUW+hbOa1zq9wYWKYoz
+YFPkQiGE0PV0KJnUBoeCA58eO37ocCIZG2E018dbctysAnEgI4QQM1aFxkDsnI2AMslkRsu2ldES
+bWF0rwEwx8wAdEbLd9ZSQHpMeCK7eHP3nckyOgnGMibcPglgsngAMQ5CHxOc9b4uhDjnhvqlAJxv
+SGe35OwsAMRFCvl/+CNMclXsrwcAAAAASUVORK5CYII=
+
+
+--=-WMAIwqnePon/ifCZPTbp
+Content-Type: image/png
+Content-ID: <1001417929.27019.7.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-topright.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsANW9RNIwAAAA7SURB
+VHjahcwxDcAwEATBCwZzCQajNCVDGlduouh/petGFwQDE8un/OzFrsB93BW4Tx6kaHVgdmB0IAcq
+73eg4H8gZQAAAABJRU5ErkJggg==
+
+--=-WMAIwqnePon/ifCZPTbp
+Content-Type: image/png
+Content-ID: <1001417869.27019.5.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-topleft.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsAJuvvdVIAAABISURB
+VHjafcxRDYAwDAbhYxbqZRpQOQGYQQkabk8kzRj9kz59l+J3Qz3VUCHBrXaVfCSMFXPQd/gG4w9V
+GnBR7FADeKqgesAEj0KK3Z8K59sAAAAASUVORK5CYII=
+
+--=-WMAIwqnePon/ifCZPTbp
+Content-Type: image/png
+Content-ID: <1001417869.27019.4.camel@spectrolite>
+Content-Disposition: attachment; filename=bluestripes.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsLBap83esAAACESURB
+VHja7dRBDcAgEADBgwDBEj4wUvdN+2h1kJvVMNmy9vVF4mokr93PGwRkFjBHJ8ADCPAAAjyAAA8g
+wAMI8AACPIAADyDAAwjwAAI8gAAPIMADCPAAAjyAAA8gwAMI8AACPIAADyDAAwjwAAI8gAAPIMAD
+CPAAAjyAAA8gwAMIOL8fcegyqOBdwTkAAAAASUVORK5CYII=
+
+
+--=-WMAIwqnePon/ifCZPTbp--
+
diff --git a/mail/default/it/Makefile.am b/mail/default/it/Makefile.am
new file mode 100644
index 0000000000..f1d367f64a
--- /dev/null
+++ b/mail/default/it/Makefile.am
@@ -0,0 +1,7 @@
+
+defaultlocaldir = $(privdatadir)/default/it/mail/local
+
+defaultlocal_DATA = \
+	Inbox
+
+EXTRA_DIST = $(defaultlocal_DATA)
diff --git a/mail/default/ko/Inbox b/mail/default/ko/Inbox
index 7691dea800..50a720ecc9 100644
--- a/mail/default/ko/Inbox
+++ b/mail/default/ko/Inbox
@@ -12,7 +12,7 @@ Received: from smtp.novell.com (HELO localhost) (141.154.95.10) by
 From: "The Evolution Team" <evolution@novell.com>
 To: Evolution Users <evolution@novell.com>
 Content-Type: multipart/related; type="multipart/alternative"; boundary="=-t4dRE6cqcdSBHOrMdTQ1"
-X-Mailer: Evolution 2.10.0
+X-Mailer: Evolution 2.24.0
 Date: 14 March 2007 12:00:00 +0000
 Message-Id: <1001418302.27070.20.camel@spectrolite>
 Mime-Version: 1.0
@@ -48,14 +48,6 @@ Content-Transfer-Encoding: 8bit
 	에볼루션 사용법에 대한 안내서를 보시려면, 도움말 메뉴의 차례를
 	선택하시거나, F1 키를 누르십시오.
 
-새 기능
-
-	에볼루션 2.10에는 다음과 같은 사항이 바뀌었습니다. 	
-	# gtk-print 기능 통합
-	# IMAP 헤더 가져오기 기능 사용자 지정
-	# 빠른 성능, 메모리 문제 해결, 메모리 사용량 감소
-	# 여러가지 버그 수정 및 여러가지 기능 향상
-                
 버그 보고하기
 
 	버그는 http://bugzilla.gnome.org 사이트에 보고해 주십시오.
@@ -69,7 +61,6 @@ Content-Transfer-Encoding: 8bit
 	프로젝트에 대한 정보가 있습니다.
 
 에볼루션 팀 드림.
-evolution@novell.com
 
 
 --=-2gZ1roA/HoYrlRDVGyiM
@@ -127,26 +118,6 @@ Content-Type: text/html; charset=utf-8
 </blockquote>
 
 <h2>
-새 기능
-</h2>
-
-<blockquote>
-	에볼루션 2.10에는 다음과 같은 사항이 바뀌었습니다.
-	<ul>
-	<li>
-	gtk-print 기능 통합
-	</li><li>
-	IMAP 헤더 가져오기 기능 사용자 지정
-	</li><li>
-	빠른 성능, 메모리 문제 해결, 메모리 사용량 감소
-	</li><li>
-	여러가지 버그 수정 및 여러가지 기능 향상
-	</li>
-	</ul>
-<br>
-</blockquote>
-
-<h2>
 버그 보고하기
 </h2>
 <blockquote>
@@ -172,7 +143,6 @@ Content-Type: text/html; charset=utf-8
 </blockquote>
 
 에볼루션 팀 드림.
-<br><a href="mailto:evolution@novell.com">evolution@novell.com</a>
 
 </BODY>
 </HTML>
diff --git a/mail/default/lt/Inbox b/mail/default/lt/Inbox
index 5609fc929a..c1ce706b12 100644
--- a/mail/default/lt/Inbox
+++ b/mail/default/lt/Inbox
@@ -1,28 +1,28 @@
-From evolution@novell.com Wed Mar 15 12:00:00 2006
+From evolution@novell.com Wed Sep 06 07:45:12 2006
 Return-Path: <evolution@novell.com>
 Received: from pop.novell.com (IDENT:mail@localhost [127.0.0.1]) by
-	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Wed, 15 Mar 2006
+	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Wed, 14 Mar 2007
 	07:45:12 -0400
 Received: from smtp.novell.com (smtp.novell.com [141.154.95.10]) by
 	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20659 for
-	<evolution@novell.com>; Wed, 15 Mar 2006 07:45:10 -0400
-Received: (qmail 5610 invoked from network); 15 Mar 2006 12:00:00 -0000
+	<evolution@novell.com>; Wed, 14 Mar 2007 07:45:10 -0400
+Received: (qmail 5610 invoked from network); 14 Mar 2007 12:00:00 -0000
 Received: from smtp.novell.com (HELO localhost) (141.154.95.10) by
-	pop.novell.com with SMTP; 15 Mar 2006 12:00:00 -0000
-From: "The Evolution Team" <evolution@novell.com>
-To: Evolution Users <evolution@novell.com>
+	pop.novell.com with SMTP; 14 Mar 2007 12:00:00 -0000
+From: "Evolution komanda" <evolution@novell.com>
+To: Evolution naudotojai <evolution@novell.com>
 Content-Type: multipart/related; type="multipart/alternative"; boundary="=-t4dRE6cqcdSBHOrMdTQ1"
-X-Mailer: Evolution 2.6.0
-Date: 15 March 2006 12:00:00 +0000
+X-Mailer: Evolution 2.10.0
+Date: 14 March 2007 12:00:00 +0000
 Message-Id: <1001418302.27070.20.camel@spectrolite>
 Mime-Version: 1.0
-Subject: Welcome to Evolution!
+Subject: Sveiki, Evolution naudotojai!
 Sender: evolution@novell.com
 Errors-To: evolution@novell.com
 X-Mailman-Version: 1.1
-Status:   
+Status:
 X-Evolution-Source: pop://rupert@pop.novell.com/inbox
-X-Evolution: 00000ddd-0030
+X-Evolution: 00000002-0000
 
 
 --=-t4dRE6cqcdSBHOrMdTQ1
@@ -34,14 +34,15 @@ Content-Type: text/plain
 Content-Transfer-Encoding: 7bit
 
 
-Evolution komanda didžiuojasi galėdami Jums pristatyti Evolution -
-universalią bendravio ir asmeninės informacijos valdymui skirtą
+Evolution komanda džiaugiasi galėdama Jums pristatyti Evolution –
+universalią bendravimui ir asmeninės informacijos valdymui skirtą
 programą.
 
+
 Pirmieji žingsniai
 
 	Kairėje Evolution lango pusėje yra šoninis skydelis, kuriame
-	yra nuorodos į visus Jūsų pašto aplankus. Po juo rasite Jūsų
+	yra nuorodos į visus pašto aplankus. Po juo rasite
 	kalendorių, kontaktų, užduočių, pašto bei raštelių mygtukus.
 
 	Norėdami pamatyti pilną Evolution žinyną, meniu „Žinynas“
@@ -49,33 +50,23 @@ Pirmieji žingsniai
 
 Naujos funkcijos
 
-	Evolution 2.6 yra
-	
-	# naujas Raštelių komponentas
-	# naujos išvaizdos Įvykių/užduočių/susitikimų redaktorius
-	# kalendorių publikavimo palaikymas
-	# CalDAV palaikymas
-	# Network Manager palaikymas
-	# prisijungimo prie HULA palaikymas
-	# pagerintas GroupWise palaikymas
-	# pagerintas Įvykių pasikartojimo palaikymas
-	# kalendorių paaiškinimai
-	# Mozilla, Outlook ir Evolution formatų CSV/tab importavimas
-	# kontaktų sąrašų palaikymas LDAP adresų knygoms
-	# sudėtingų paieškų adresų knygose išsaugojimo palaikymas
-	# laiškų prioritetų palaikymas rašyklėje
-	# daug ištaisytų klaidų bei kitų naudotojo sąsajos patobulinimų
+	Evolution 2.10 atsirado
+
+	# Integracija su gtk-print
+	# Nustatomas IMAP antraščių parsiuntimas
+	# Didesnis greitis ir mažesnis atminties naudojimas
+	# Daug smulkių pataisymų ir kitų patobulinimų
 
 Pranešimas apie klaidas
 
-	Apie klaidas turėtų būti pranešta http://bugzilla.gnome.org.
+	Apie klaidas galite pranešti adresu http://bugzilla.gnome.org.
 
 Papildoma informacija
 
 	Evolution naudotojų pašto konferenciją galite užsisakyti adresu
 	http://mail.gnome.org/mailman/listinfo/evolution-list.
 
-	Informacija apie Evolution projektą galite rasti
+	Informaciją apie Evolution projektą galite rasti
 	http://www.gnome.org/projects/evolution.
 
 
@@ -95,116 +86,100 @@ Content-Type: text/html; charset=utf-8
 </HEAD>
 <BODY BGCOLOR="#f8fcf8">
 <TABLE BACKGROUND="cid:1001417869.27019.4.camel@spectrolite" CELLSPACING="0" CELLPADDING="0" WIDTH="100%">
-<TR>
-<TD ALIGN="left" VALIGN="top">
+<TR><TD ALIGN="left" VALIGN="top">
 <IMG SRC="cid:1001417869.27019.5.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8"></TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
+<TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>
 <TD ALIGN="right" VALIGN="top">
 <IMG SRC="cid:1001417929.27019.7.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8"></TD>
-</TR>
-<TR>
-<TD>
-</TD>
-<TD>
+</TR><TR><TD></TD><TD>
 <IMG SRC="cid:1001417989.27019.11.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="48" HEIGHT="48"></TD>
-<TD>
-</TD>
-<TD>
-<FONT COLOR="#f8fcf8"><FONT SIZE="4"><B>Evolution komanda</FONT></B></FONT SIZE="4"><FONT COLOR="#f8fcf8"><FONT SIZE="4"> didžiuojasi galėdami Jums pristatyti</FONT></FONT SIZE="4"><FONT COLOR="#f8fcf8"><FONT SIZE="4"><B>Evolution</FONT></B></FONT SIZE="4"><FONT COLOR="#f8fcf8"><FONT SIZE="4"> - universalią bendravimo ir asmeninės informacijos valdymui skirtą programą.</FONT></FONT SIZE="4"></TD>
-<TD>
-</TD>
-<TD>
-<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="48" HEIGHT="48"></TD>
-<TD>
-</TD>
-</TR>
-<TR>
-<TD ALIGN="left" VALIGN="bottom">
-<IMG SRC="cid:1001417929.27019.8.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8"></TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD>
-</TD>
-<TD ALIGN="right" VALIGN="bottom">
-<div align=right>
-<IMG SRC="cid:1001417929.27019.9.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8"></div>
-</TD>
-</TR>
-</TABLE>
-<h2>Pirmieji žingsniai</h2>
+<TD></TD><TD>
+<FONT COLOR="#f8fcf8"><FONT SIZE="4">
+
+
+<B>Evolution komanda</B> džiaugiasi galėdama pristatyti <B>Evolution</B> –
+universalią bendravimui ir asmeninės informacijos valdymui skirtą
+programą.
+
+
+</FONT SIZE="4"></FONT>
+</TD><TD></TD><TD>
+<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="48" HEIGHT="48">
+</TD><TD></TD></TR><TR><TD ALIGN="left" VALIGN="bottom">
+<IMG SRC="cid:1001417929.27019.8.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8">
+</TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>
+<TD ALIGN="right" VALIGN="bottom"><div align=right>
+<IMG SRC="cid:1001417929.27019.9.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8">
+</div></TD></TR></TABLE>
+
+
+<h2>
+Pirmieji žingsniai
+</h2>
 
 <blockquote>
+
 	Kairėje Evolution lango pusėje yra šoninis skydelis, kuriame
-        yra nuorodos į visus Jūsų pašto aplankus. Po juo rasite Jūsų
-        kalendorių, kontaktų, užduočių, pašto bei raštelių mygtukus.
+	yra nuorodos į visus pašto aplankus. Po juo rasite
+	kalendorių, kontaktų, užduočių, pašto bei raštelių mygtukus.
+
 <br><br>
-	Norėdami pamatyti pilną Evolution žinyną, meniu <b>Žinynas</b>
-	pasirinkite punktą <b>Turinys</b>, arba paspauskite klavišą <b>F1</b>.
+
+	Norėdami pamatyti pilną Evolution žinyną, meniu „Žinynas“
+	pasirinkite punktą „Turinys“, arba paspauskite klavišą F1.
+
 <br><br>
 </blockquote>
 
-<h2>Naujos funkcijos</h2>
+<h2>
+Naujos funkcijos
+</h2>
+
 <blockquote>
-	Evolution 2.6 yra 
+	Evolution 2.10 atsirado
 	<ul>
-	<li>Naujas Raštelių komponentas</li>
-	<li>Naujos išvaizdos Įvykių/užduočių/susitikimų redaktorius</li>
-	<li>Kalendorių publikavimo palaikymas</li>
-	<li>CalDAV palaikymas</li>
-	<li>Network Manager palaikymas</li>
-	<li>Prisijungimo prie HULA palaikymas</li>
-	<li>Pagerintas GroupWise palaikymas</li>
-	<li>Pagerintas Įvykių pasikartojimo palaikymas</li>
-	<li>Kalendorių paaiškinimai</li>
-	<li>Mozilla, Outlook ir Evolution formatų CSV/tab importavimas</li>
-	<li>Kontaktų sąrašų palaikymas LDAP adresų knygoms</li>
-	<li>Sudėtingų paieškų adresų knygose išsaugojimo palaikymas</li>
-	<li>Laiškų prioritetų palaikymas rašyklėje</li>
-	<li>Daug ištaisytų klaidų bei kitų naudotojo sąsajos patobulinimų</li>
+	<li>
+	Integracija su gtk-print
+	</li><li>
+	Nustatomas IMAP antraščių parsiuntimas
+	</li><li>
+	Didesnis greitis ir mažesnis atminties naudojimas
+	</li><li>
+	Daug smulkių pataisymų ir kitų patobulinimų
+	</li>
 	</ul>
 <br>
 </blockquote>
 
-<h2>Pranešimas apie klaidas</h2>
+<h2>
+Pranešimas apie klaidas
+</h2>
 <blockquote>
-	Apie klaidas turėtų būti pranešta <a href="http://bugzilla.gnome.org">http://bugzilla.gnome.org</a>.
+	Apie klaidas galite pranešti adresu <a href="http://bugzilla.gnome.org">http://bugzilla.gnome.org</a>.
 <br><br>
-</blockquote> 
+</blockquote>
 
-<h2>Papildoma informacija</h2>
+<h2>
+Papildoma informacija
+</h2>
 
 <blockquote>
 	Evolution naudotojų pašto konferenciją galite užsisakyti adresu
-	<a
-	href="http://lists.gnome.org/mailman/listinfo/evolution">http://lists.gnome.org/mailman/listinfo/evolution</a>.
+	<a href="http://lists.gnome.org/mailman/listinfo/evolution">http://lists.gnome.org/mailman/listinfo/evolution</a>.
 
-	Informacija apie Evolution projektą galite rasti
+	Informaciją apie Evolution projektą galite rasti adresu
 	<a href="http://www.gnome.org/projects/evolution">http://www.gnome.org/projects/evolution</a>.
 	<!--
-	Galite rasti atsakymus į Dažniausiai užduodamus klausimus (DUK) 
+	Atsakymus į dažniausiai užduodamus klausimus galite rasti adresu
 	<a href="http://go-evolution.org/FAQ">http://go-evolution.org/FAQ</a>.
 	-->
-<br><br>	
+<br><br>
 </blockquote>
 
-Pagarbiai,<br>
-Evolution komanda<br>
-<a href="mailto:evolution@novell.com">evolution@novell.com</a>
+Pagarbiai,
+<br>
+Evolution komanda
+<br><a href="mailto:evolution@novell.com">evolution@novell.com</a>
 
 </BODY>
 </HTML>
@@ -365,4 +340,9 @@ VHja7dRBDcAgEADBgwDBEj4wUvdN+2h1kJvVMNmy9vVF4mokr93PGwRkFjBHJ8ADCPAAAjyAAA8g
 wAMI8AACPIAADyDAAwjwAAI8gAAPIMADCPAAAjyAAA8gwAMI8AACPIAADyDAAwjwAAI8gAAPIMAD
 CPAAAjyAAA8gwAMIOL8fcegyqOBdwTkAAAAASUVORK5CYII=
 
+
 --=-t4dRE6cqcdSBHOrMdTQ1
+Content-Transfer-Encoding: 8bit
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+
diff --git a/mail/default/nl/Inbox b/mail/default/nl/Inbox
index a6f4feb39e..a9ef61a85d 100644
--- a/mail/default/nl/Inbox
+++ b/mail/default/nl/Inbox
@@ -1,22 +1,22 @@
 From evolution@novell.com Wed Sep 06 07:45:12 2006
 Return-Path: <evolution@novell.com>
 Received: from pop.novell.com (IDENT:mail@localhost [127.0.0.1]) by
-	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Wed, 06 Sep 2006
+	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Wed, 14 Mar 2007
 	07:45:12 -0400
 Received: from smtp.novell.com (smtp.novell.com [141.154.95.10]) by
 	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20659 for
-	<evolution@novell.com>; Wed, 06 Sep 2006 07:45:10 -0400
-Received: (qmail 5610 invoked from network); 06 Sep 2006 12:00:00 -0000
+	<evolution@novell.com>; Wed, 14 Mar 2007 07:45:10 -0400
+Received: (qmail 5610 invoked from network); 14 Mar 2007 12:00:00 -0000
 Received: from smtp.novell.com (HELO localhost) (141.154.95.10) by
-	pop.novell.com with SMTP; 06 Sep 2006 12:00:00 -0000
+	pop.novell.com with SMTP; 14 Mar 2007 12:00:00 -0000
 From: "The Evolution Team" <evolution@novell.com>
-To: Evolution Users <evolution@novell.com>
+To: Evolution-gebruikers <evolution@novell.com>
 Content-Type: multipart/related; type="multipart/alternative"; boundary="=-t4dRE6cqcdSBHOrMdTQ1"
-X-Mailer: Evolution 2.8.0
-Date: 06 September 2006 12:00:00 +0000
+X-Mailer: Evolution 2.24.0
+Date: 14 March 2007 12:00:00 +0000
 Message-Id: <1001418302.27070.20.camel@spectrolite>
 Mime-Version: 1.0
-Subject: Welcome bij Evolution!
+Subject: Welkom bij Evolution!
 Sender: evolution@novell.com
 Errors-To: evolution@novell.com
 X-Mailman-Version: 1.1
@@ -34,50 +34,36 @@ Content-Type: text/plain
 Content-Transfer-Encoding: 7bit
 
 
-Het Evolution-team heeft het genoegen u deze nieuwe versie van Evolution te
-presenteren; het programma waarmee u uw e-mail en persoonlijke informatie
-kunt beheren.
+Het Evolution-team heeft het genoegen u deze nieuwe versie van Evolution
+te presenteren; het programma waarmee u uw e-mail en persoonlijke
+informatie kunt beheren.
 
 
-Korte uitleg
+Aan de slag
 
-	Aan de linkerkant van het Evolution-venster ziet u de zijbalk met de
-	snelkoppelingen naar al uw e-mailmappen. Daaronder ziet u knoppen voor uw
-	agenda's, contacten, taken, e-mail en memo's.
-	
-	Voor een uitgebreidere uitleg over het gebruik van Evolution selecteert u
-	"Inhoudsopgave" uit het menu "Hulp" of drukt u op de F1 toets.
+	Aan de linkerkant van het Evolutionvenster ziet u het zijpaneel met de
+	snelkoppeling naar al uw e-mailmappen. Daaronder ziet u knoppen voor
+	uw agenda's, contacten, taken, e-mail en memo's.
 
+	Voor een meer uitgebreide uitleg over het gebruik van Evolution 
+	selecteert u "Inhoud" uit het menu "Hulp", of drukt u op de F1-toets. 
 
-Nieuwe functies
+Fouten rapporteren
 
-	Evolution 2.8 heeft
-
-	# Een nieuwe zoekinterface en algemene zoekfunctie voor e-mail
-	# Een breedbeeldweergave / verticale weergave voor e-mail
-	# Verbeterd uiterlijk en gevoel ("Cairo"-integratie)
-	# Meer snelheid en een lager geheugengebruik
-	# Ondersteuning voor GroupWise-herinneringen en intrekken van e-mail
-	# Deelbare notities in het dagboek (bestandssysteem)
-	# Integratie met Gnome-sleutelbossen
-	# Veel minder problemen en vele kleine verbeteringen
-
-Fouten melden
-
-	Fouten kunnen gemeld worden op http://bugzilla.gnome.org.
+	Fouten moeten gerapporteerd worden op http://bugzilla.gnome.org.
 
 Meer informatie
 
-	U kunt zich abonneren op de (engelstalige) gebruikerslijst van Evolution
-	op http://mail.gnome.org/mailman/listinfo/evolution-list.
-
-	Informatie over het Evolution-project is beschikbaar op
+	U kunt kunt u abonneren op de (engelstalige) gebruikerslijst van 
+	Evolution op http://mail.gnome.org/mailman/listinfo/evolution-list.
+	Informatie over het Evolution project is beschikbaar op 
 	http://www.gnome.org/projects/evolution.
+	U kunt een lijst met (Engelstalige) antwoorden op veelgestelde
+	vragen vinden (FAQ) op http://go-evolution.org/FAQ
 
 
 Hoogachtend,
-Het Evolution-Team
-evolution@novell.com
+Het Evolution-team
 
 
 --=-2gZ1roA/HoYrlRDVGyiM
@@ -102,9 +88,7 @@ Content-Type: text/html; charset=utf-8
 <FONT COLOR="#f8fcf8"><FONT SIZE="4">
 
 
-<B>Het Evolution-team</B> heeft het genoegen u deze nieuwe versie van Evolution te presenteren; het programma waarmee u uw e-mail en persoonlijke informatie kunt beheren.
-
-
+<B>Het Evolution-team</B> heeft het genoegen u deze nieuwe versie van <B>Evolution</B> te presenteren; het programma waarmee u uw e-mail en persoonlijke informatie kunt beheren.
 
 
 </FONT SIZE="4"></FONT>
@@ -119,56 +103,30 @@ Content-Type: text/html; charset=utf-8
 
 
 <h2>
-Korte uitleg
+Aan de slag
 </h2>
 
 <blockquote>
 
-	Aan de linkerkant van het Evolution-venster ziet u de zijbalk met de
-	snelkoppelingen naar al uw e-mailmappen. Daaronder ziet u knoppen voor uw
-	agenda's, contacten, taken, e-mail en memo's.
+	Aan de linkerkant van het Evolution-venster ziet u het zijpaneel 
+	met de snelkoppelingen naar al uw e-mailmappen. Daaronder ziet 
+	u knoppen voor uw agenda's, contacten, taken, e-mail en memo's. 
 
 <br><br>
 
-    Voor een uitgebreidere uitleg over het gebruik van Evolution selecteert
-    u "Inhoudsopgave" uit het menu "Hulp" of drukt u op de F1 toets.
+	Voor een meer uitgebreide uitleg over het gebruik van Evolution 
+	selecteert u <b>Inhoud</b> uit het menu <b>Hulp</b>, of drukt u 
+	op de <b>F1</b>-toets.
 
 <br><br>
 </blockquote>
 
 <h2>
-Nieuwe functies
-</h2>
-
-<blockquote>
-	Evolution 2.8 heeft 
-	<ul>
-	<li>
-	Een nieuwe zoekinterface en algemene zoekfunctie voor e-mail
-	</li><li>
-	Een breedbeeldweergave / verticale weergave voor e-mail
-	</li><li>
-	Verbeterd uiterlijk en gevoel ("Cairo"-integratie)
-	</li><li>
-	Meer snelheid en een lager geheugengebruik
-	</li><li>
-	Ondersteuning voor GroupWise-herinneringen en intrekken van e-mail
-	</li><li>
-	Deelbare notities in het dagboek (bestandssysteem)
-	</li><li>
-	Integratie met Gnome-sleutelbossen
-	</li><li>
-	Veel minder problemen en vele kleine verbeteringen
-	</li>
-	</ul>
-<br>
-</blockquote>
-
-<h2>
-Fouten melden
+Fouten rapporteren
 </h2>
 <blockquote>
-	Fouten kunnen gemeld worden op <a href="http://bugzilla.gnome.org">http://bugzilla.gnome.org</a>.
+	Fouten moeten gerapporteerd worden op
+	 <a href="http://bugzilla.gnome.org">http://bugzilla.gnome.org</a>.
 <br><br>
 </blockquote> 
 
@@ -177,19 +135,22 @@ Meer informatie
 </h2>
 
 <blockquote>
-	U kunt zich abonneren op de (engelstalige) gebruikerslijst van Evolution
-	op <a href="http://lists.gnome.org/mailman/listinfo/evolution">http://lists.gnome.org/mailman/listinfo/evolution</a>.
+	U kunt kunt u abonneren op de (Engelstalige) gebruikerslijst van 
+	Evolution op <a href="http://lists.gnome.org/mailman/listinfo/evolution">http://lists.gnome.org/mailman/listinfo/evolution</a>.
 
-	Informatie over het Evolution-project is beschikbaar op
+	Informatie over het Evolution project is beschikbaar op
 	<a href="http://www.gnome.org/projects/evolution">http://www.gnome.org/projects/evolution</a>.
-
+	<!--
+	U kunt een lijst met (Engelstalige) antwoorden op veelgestelde
+	vragen vinden (FAQ) op
+	<a href="http://go-evolution.org/FAQ">http://go-evolution.org/FAQ</a>.
+	-->
 <br><br>	
 </blockquote>
 
 Hoogachtend,
 <br>
-Het Evolution-Team
-<br><a href="mailto:evolution@novell.com">evolution@novell.com</a>
+Het Evolution-team
 
 </BODY>
 </HTML>
diff --git a/mail/default/pl/Inbox b/mail/default/pl/Inbox
index 77d570f0c4..ae1db66ea8 100644
--- a/mail/default/pl/Inbox
+++ b/mail/default/pl/Inbox
@@ -48,15 +48,6 @@ Zaczynamy
 	wybierając pozycję "Zawartość" z menu "Pomoc" lub naciskając
 	klawisz F1 na klawiaturze.
 
-Nowości
-
-	Evolution 2.10:
-	
-	# Integracja z gtk-print
-	# Konfigurowalne pobieranie nagłówków IMAP
-	# Lepsza wydajność, mniej wycieków i mniejsze zużycie pamięci
-	# Wiele innych ulepszeń poprawionych błędów
-
 Zgłaszanie błędów
 
 	Napotkane błędy prosimy zgłaszać pod adresem http://bugzilla.gnome.org.
@@ -128,26 +119,6 @@ Zaczynamy
 </blockquote>
 
 <h2>
-Nowości
-</h2>
-
-<blockquote>
-	Evolution 2.10:
-	<ul>
-	<li>
-	Integracja z gtk-print
-	</li><li>
-	Konfigurowalne pobieranie nagłówków IMAP
-	</li><li>
-	Lepsza wydajność, mniej wycieków i mniejsze zużycie pamięci
-	</li><li>
-	Wiele innych ulepszeń poprawionych błędów
-	</li>
-	</ul>
-<br>
-</blockquote>
-
-<h2>
 Zgłaszanie błędów
 </h2>
 <blockquote>
diff --git a/mail/default/sr/Inbox b/mail/default/sr/Inbox
new file mode 100644
index 0000000000..5c357a2a8c
--- /dev/null
+++ b/mail/default/sr/Inbox
@@ -0,0 +1,318 @@
+From evolution@novell.com Wed Sep 06 07:45:12 2006
+Return-Path: <evolution@novell.com>
+Received: from pop.novell.com (IDENT:mail@localhost [127.0.0.1]) by
+	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Wed, 14 Mar 2007
+	07:45:12 -0400
+Received: from smtp.novell.com (smtp.novell.com [141.154.95.10]) by
+	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20659 for
+	<evolution@novell.com>; Wed, 14 Mar 2007 07:45:10 -0400
+Received: (qmail 5610 invoked from network); 14 Mar 2007 12:00:00 -0000
+Received: from smtp.novell.com (HELO localhost) (141.154.95.10) by
+	pop.novell.com with SMTP; 14 Mar 2007 12:00:00 -0000
+From: =?UTF-8?Q?=D0=A2=D0=B8=D0=BC_?= =?UTF-8?Q?=D0=95=D0=B2=D0=BE=D0=BB=D1=83=D1=86=D0=B8=D1=98=D0=B5?= <evolution@novell.com>
+To: =?UTF-8?Q?=D0=9A=D0=BE=D1=80=D0=B8=D1=81=D0=BD=D0=B8=D1=86=D0=B8_?= =?UTF-8?Q?=D0=95=D0=B2=D0=BE=D0=BB=D1=83=D1=86=D0=B8=D1=98=D0=B5?= <evolution@novell.com>
+Content-Type: multipart/related; type="multipart/alternative"; boundary="=-t4dRE6cqcdSBHOrMdTQ1"
+X-Mailer: Evolution 2.24.0
+Date: 14 March 2007 12:00:00 +0000
+Message-Id: <1001418302.27070.20.camel@spectrolite>
+Mime-Version: 1.0
+Subject:
+        =?UTF-8?Q?=D0=94=D0=BE=D0=B1=D1=80=D0=BE=D0=B4=D0=BE=D1=88=D0=BB=D0=B8?=
+        =?UTF-8?Q?_=D1=83?=
+        =?UTF-8?Q?_=D0=95=D0=B2=D0=BE=D0=BB=D1=83=D1=86=D0=B8=D1=98=D1=83!?=
+Sender: evolution@novell.com
+Errors-To: evolution@novell.com
+X-Mailman-Version: 1.1
+Status:   
+X-Evolution-Source: pop://rupert@pop.novell.com/inbox
+X-Evolution: 00000002-0000
+
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: multipart/alternative; boundary="=-2gZ1roA/HoYrlRDVGyiM"
+
+
+--=-2gZ1roA/HoYrlRDVGyiM
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: 7bit
+
+
+Тим Еволуције вам са поносом жели доброшлицу у Еволуцију, потпуни систем
+за управљање комуникацијом и личним подацима.
+
+
+Први кораци
+
+    Лево од прозора Еволуције је панел са стране у коме су
+    пречице ка свим фолдерима е-поште. Испод ћете пронаћи
+    дугмад која воде ка календарима, адресару, задацима, пошти
+    и подсетнику.
+
+    За потпуни водич кроз Еволуцију одаберите „Садржај“ из менија
+    „Помоћ“ или притисните тастер F1.
+
+Пријава грешака
+
+    Све грешке можете пријавити на http://bugzilla.gnome.org.
+
+Више информација
+
+    Можете се пријавити на дописну листу корисника Еволуције (енгл.) на
+    http://mail.gnome.org/mailman/listinfo/evolution-list.
+
+    Више о пројекту Еволуције (енгл.) пронађите на
+    http://www.gnome.org/projects/evolution.
+
+
+С поштовањем,
+Тим Еволуције
+
+
+--=-2gZ1roA/HoYrlRDVGyiM
+Content-Type: text/html; charset=utf-8
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
+<HTML>
+<HEAD>
+  <META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8">
+  <META NAME="GENERATOR" CONTENT="GtkHTML/0.13.99">
+</HEAD>
+<BODY BGCOLOR="#f8fcf8">
+<TABLE BACKGROUND="cid:1001417869.27019.4.camel@spectrolite" CELLSPACING="0" CELLPADDING="0" WIDTH="100%">
+<TR><TD ALIGN="left" VALIGN="top">
+<IMG SRC="cid:1001417869.27019.5.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8"></TD>
+<TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>
+<TD ALIGN="right" VALIGN="top">
+<IMG SRC="cid:1001417929.27019.7.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8"></TD>
+</TR><TR><TD></TD><TD>
+<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="48" HEIGHT="48"></TD>
+<TD></TD><TD>
+<FONT COLOR="#f8fcf8"><FONT SIZE="4">
+
+
+<B>Тим Еволуције</B> вам са поносом жели доброшлицу у <B>Еволуцију</B>, потпуни систем за управљање комуникацијом и личним подацима.
+
+
+</FONT SIZE="4"></FONT>
+</TD><TD></TD><TD>
+<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="48" HEIGHT="48">
+</TD><TD></TD></TR><TR><TD ALIGN="left" VALIGN="bottom">
+<IMG SRC="cid:1001417929.27019.8.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8">
+</TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>
+<TD ALIGN="right" VALIGN="bottom"><div align=right>
+<IMG SRC="cid:1001417929.27019.9.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8">
+</div></TD></TR></TABLE>
+
+
+<h2>
+Први кораци
+</h2>
+
+<blockquote>
+
+	Лево од прозора Еволуције је панел са стране у коме су
+	пречице ка свим фолдерима е-поште. Испод ћете пронаћи
+	дугмад која воде ка календарима, адресару, задацима, пошти
+	и подсетнику.
+
+<br><br>
+
+    За потпуни водич кроз Еволуцију одаберите „<b>Садржај</b>“ из менија
+    „<b>Помоћ</b>“ или притисните тастер <b>F1</b>.
+
+<br><br>
+</blockquote>
+
+<h2>
+Пријава грешака
+</h2>
+<blockquote>
+	Све грешке можете пријавити на <a href="http://bugzilla.gnome.org">http://bugzilla.gnome.org</a>.
+<br><br>
+</blockquote> 
+
+<h2>
+Више информација
+</h2>
+
+<blockquote>
+	Можете се пријавити на дописну листу корисника Еволуције (енгл.) на
+	<a href="http://lists.gnome.org/mailman/listinfo/evolution">http://lists.gnome.org/mailman/listinfo/evolution</a>.
+
+	Више о пројекту Еволуције (енгл.) пронађите на
+	<a href="http://www.gnome.org/projects/evolution">http://www.gnome.org/projects/evolution</a>.
+	<!--
+	You can find a list of answers to Frequently Asked Questions (FAQ) at
+	<a href="http://go-evolution.org/FAQ">http://go-evolution.org/FAQ</a>.
+	-->
+<br><br>	
+</blockquote>
+
+С поштовањем,
+<br>
+Тим Еволуције
+
+</BODY>
+</HTML>
+
+--=-2gZ1roA/HoYrlRDVGyiM--
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: image/png
+Content-ID: <1001417929.27019.9.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-bottomright.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsBAVf+8XgAAAA7SURB
+VHjaY/z//z8DPsDEgB8IE1JgSkhBGMP///9xYbP/eCSF////f/4/Hp3n/0MBsg6P////z/uPBgDp
+AG5RDY2ymwAAAABJRU5ErkJggg==
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: image/png
+Content-ID: <1001417989.27019.11.camel@spectrolite>
+Content-Disposition: attachment; filename=evolution-icon.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAANbY1E9YMgAAABl0RVh0
+U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAABPQSURBVHjaYtzEuI6BCQgZoRDGRtDIJCrP
+6r8dAxQwATEjlEbGjFD5/0D8Dw3DxBgeMt7BsJdYtwAEEON3xk8EHQqmGSG8X//+IzsahFmAmBWI
+2YGYDUqzQsWZoWpBDv0DxL+g+CcS+w+Spxi0mFQIuwWJBAggRmsmUyL8DmFt+7cX5nBmqGM5gZgH
+iA2B2AWIzYFYCoglGbCD20B8E4hPAfEeIH4OxF+B+BvUM39BHilgyiToFhgLIIAYG5gqCCor/VfL
+AE0OIIdzQB2tCcThQOyHx8GEwBEg3gjEW4H4AxB/hsYOKFb+72BazyCdpMjwfN4juFvEkmwY3s47
+ziBc/BCoYwEDQAAxXhIXYNB7+YWBQZGH4f+NEwz3nrCi2KCsrAwLdVCIcwOxPBAXAXE0A/XACyDu
+g3rmHRB/gcbIv7t37+LVCBBAjPgUQB3PAg11QSAOAuJmIObFpcfWiJtBTpKFQV4C6Of/f6GYgeHQ
++V8Mj178ZXj08h8+91wE4mIgvgWNke/Q2GDA5U6AAGIhwvFcQCwCxP3Q5IIC+HlYGHwdhRl8HYQY
+fBwEwA7+/x9o5//fwPD7xcD47wfD/38/GSr//mf4B8QPnv5l2HL4J8Py3d8Zrtz/i26cPhBvAOIK
+IN4JxK+h+eM3LncCBBDWGEByPCitK7Gxsi7T09JSv3brFsO3798hDudlYciOVmDIiVEAstmgWeQf
+2AOMQMf///8LyAQmZ6AHGP8B9fz9DuT/ZfgL8gjQf39//QfHSvfybwzHr2F1XwcQLwTil9Ak9Rub
+WwECCMMDaCGvIijAv8zMwFD9xLmzDB8/fYYkExNhhpktRgzyMnxAd6OVluAkAwr9n9DQBzkcGIhA
+zAjE/4Ce+PfnP8NfEAb67w/QIzM3fmfoW/uN4dO3/+ju6wLi+dA8AvLEH3T3AgQQigeQMizI8eLA
+kJ9jaWricP7yFYZPnyGOr8pUZ6jONWdgk85iYGTmZbh9bgaDnMRfSAzA0/xPsAcY/v4A0iDHfwEK
+fwV64CuY/v/nH9ADkFj48xNC33vylyF1wieG648xklUdEK+AegKUnP4iuxkggJjQYwRa2oAybJmh
+ro7Djdt34I6f2WzIUFPkzcCp3MXAwq3H8ODhEwYL71kM4dm7GT5+B+ZzVqA2Fn5ghIAwMHZYgIUW
+MzfDYWBSOXIemKyYOBgYmdiBGFhIA21mZAbSzCAaWLSJMzEsL+Nj0JRhRvdAORAbQd0ETqvQgAYD
+gABiwpJ0QEWlm5K8XNqHT58YXr5+DXW8AUNsuC0Du1QG2J9/vpxjSExKY0hIymBg5tJi0LSdyrBl
+72MGJlZ+BkYgZmABFlTAGPrwlZUhvPASQ2DBA4ay/ldAPgvQA8xAzAB3PNhDQM/w8zAxLCniY9CQ
+RvEEyD3VQCwBzZMoBQ9AADGhJR1QM0CYg4O9gpeXh+HmHUhUZUfLM8QEaTKwiQQBMygwDf98wjBh
+Qg+wWGQA0hMYGhoawNrlFRQZDp16xfAR5EgWHnDol3VeYlBS0WFoampiOH5ThkEr8D7D5sO/wI5m
+ZIR4AhwbUMzPzcQwJYWXgZeDEdmdukAcCcSi0CKdCRYLAAGEnISYoT6MlJaUULn/8DFYUE+Nh6Gr
+XIeBld8RXDv///OZ4e71bQwtfTsYFixYAFbz4MEDBn5+bqAHlBhSi5YzaFh1MGzefY/h8OnXDEvX
+32Tg4uIC47y8PIa4xGyGxKavDBFVH4B1wl+IR6COh3lERpiJoSWCGz0pgSpOZWiMwGMBIICYkGhw
+2mdjY81gAgYLLN13laoCk4QE0HBBoOM/AUvDqwwp+fMZEhLTGRwcHMBqQLSikhaDpGoikNZmWLBw
+OUNayWYGj8jFDPX19QwsLCwMJSUlDOfOnWMwMjJi6OnpYfjJacdgk/qOYfq6b/B2KyhGwDTQU07a
+rAwOmiitAlDouwOxEDSlgGMBIIAYkSo0UCaJFxcT7f79+w/Du/fvGWyN+Rh2zjFlYOVzA3pCCJgJ
+2RkmzF7JMGXBFYYLFy4wCAgI4KxSP3z4wJCQkMBw4MABeEyB+EpKSgxRUVEMIiIiDDdu3GCYM2cO
+g7rkJ4amBG4gzcLw+8d/ht/AauPXj38MD5//ZfDp/YRs7BsgDgHiG9Amx2+AAIK12WGZ14WNjY3h
+y9evkCIzTQqYyQQgxeHvDwz3719laOnfA3YQyPGvXr3C6QGQ/IYNG8B5JDAwEOwhUFK7d+8eQ11d
+HcOuXbsYNDQ0wLEhquzF4FLyAVwXwMpCUMNNSoCJwV4dJRZEoC1fXqibGQECiBmafEDNYnFgVDcw
+MTGxffnyFdieYWXoKpZjYGYSB0YtC8N/xn8MwZlLGDx9YxkyMjIYnj17xnDlymWGz8CkJiwszMDM
+jCg5Pn78yMDBwQFmgzxhYGDAUFFRweDh4cFw8+ZNhtWrVzPMnj2b4cSJEwxycnIM5ubm4KS1bt8j
+YKX2FFgKsTBI8DOCa2yW/4wMu1Fr6q/Q5jgoan4BBBDMA6DM6wZ0RNDPnz8Y/gE7LTHe/AyuVgJA
+hwGLRaa/DJMWn2PYffwzw4oVKxh+//7NcOfObQYZGRmGly9fMjx+/IiBjY2dgZeXF8h+zLBo8WKG
+Hz9/MkhKSjI8efKEoaOjg+HFixcMO3bsYJCQkAAnHZDH/vz5Ay3BGMCesLGxAbbcOBl6ll5jePfp
+F4MO0CNKQkwMc4/8ZEArbPZAk9APgABihkYFsOBm8Adii79/Ia3FpiwhBgVpbnDJ8PD5F4aYkqMM
+HZ29DBYWFgy/fv0CJof7YMcqKiqBMx/IE++B+UZeXoGBFZhpT50+zXADGNpubm4M6urqDD9+/AB7
+BBQTIBqUpEA0KHYaGxsZjhw5Ao8NEN537gXD5E0PGXSkmBmev//H8OLTf+RktB7W0AMIIGZo9w+U
+gYP///+vBW+E5PMxcHKwAD3AxCDAx8nw/TczQ3HNHLCcu7s7w6RJkxhqamqBxScfg6ysLDC0pRje
+vn3L8PTpE6An5BmsrKwYngA9eOz4cQYNTU2GyMhIcIzNmDEDnHRAMQlKZqDkCMrcII+C8sO7d+8Y
+dHV1wflj6/ZdDOHG7Aw/gD2DC0/+oneEHoA6QAABxABt96gD8QVoRxuMvxyR/P/thOr/b2eM/n87
+7/j/6yX//8fXev7X1RD6D3Tgf35+/v/9/f1gtp6e3v/Fixf9B+aJ/2fOnP6/e/cuMP3t2zcgfeb/
+pMmT/1++fPn//fv3wfpA5ufn58P1A2PuPwiA5P39/f9zcnL+BwbK/xQ7jv9HS/n+59ix/0d2G7RP
+AuoRcgEEEHIpBK/UbAyAkfLvH7Al+QvYegQ2i/+BGmXfgZUaJ8OOhW4MH949B2fUgIAAcHHq6OgI
+DMlMhqlTpzJ8Bza3ZWXlwJn75MkTDKKiIgxxsbEMOjo64JAGYaBDwfoKCwvBfFhxrKCgAM4bYWFh
+DH8+P2WINGMH2g2svYQx2kewQQMmgABiQurrIgDQj/+BGfk/rEMCbMuDW5X/vjJMXXCBwcDIkgEY
+UmDLQJaDisotW7YwHDt2HOyg/fv3Ax0uCs7Ut4B9CFDRDCp6QcUoKNOCHArSZ29vD9YLCgiQHKz+
+AJnbGMjFwM3GAPbAf8xOHHzYBiCAGKAlkB4QX4JFka4yy/+Pe8X+fzko/v/rUen/X06o/f9y2vD/
+8eUGYPnz58//nz9//n99ff3/6ABY84LVxMbG/t++ffv/d+/egpMIKOkAPQZWA6JBfJA4CIOSEyxJ
+gpIQsAb+f6Ze4P+xMv7/B/P4/vf6cqEnoS5o740XIIBgrT1tZA+A8PtdYv8/7QN64hDIEzJgT+iq
+cYIdCAIgi0HqQOkWHYDEgKH7X1xcHOxYkKNAakEeXr9+PTjdgxyLDEDqQPLARtz/QzX8/0/WCPw/
+Usz3f3823/9MC4w80AFt4PEABBCsFAI23hk0oIJgEOHMwSDAwwStFf8xTF35keHKU2Vw6QECoBIE
+lI5BxSOoaEWvhUFJCdQGApUyFy9eBKd7kJ6CggKwHlCSglV2MD2g5JTj+ItBC9ikAHVy/v6G9Nj2
+3/nNcOM1SjpaCcT3QCkOIICYoINJv6CDTHBw6dZvoAGQ/uv9J38Y2uZ9AluADECNOFg7BxsAORaU
+tkH5BVTew2ppkD5QPkDWC8obosxPGXwN2MAOh3Q7IfTdtyiOB5YoDO9hwy4AAcQAbYXKAHE6cjSl
+enP+f7VR9P/bbaL/rfVYwekUlDRAaT8+Ph5elOJKRugAlnRAGKQexgclNRAblHS2AYtMUNo/Xs7/
+/1A+3/896bz/18ZwoycfUCclAIjlQG4HCCBYDIB8dRXa5wSD7ad+gqNx8+GfDEcv/QaHFigUYW0b
+EA0qMWClESEAK3JBAFbygPggs0CNvWhrdgZxXiaGP7//g2P+z5//4NA/9hA8LMQgxC/AwMbKBhs7
++gR18z+AAGKB+uoXtFY7DcT2IFVPgGlu2/GfDJ++/2fg42KEOxq9CQ1yCMhBIHlQcoEVh+gA1KwG
+eRiWXGDpHpSU1CWZGdIcOBh+gzr4IMeDkhAQ/we6bPftPwxMjKDWAB/Du49g/WdhDTmQBwACiBnq
+ASZoZgYBD5ilr4BtkPpoboYAG3aGbYfuMnRPXgq2EFTNwwCs8gE5EBSiIBoEQI029Pwyc+ZMsONh
+HSGQZyMiIhjq/ZgZxIBdSfAoxS8GaAb+z3AR2B9YcuEXgyA/P8Pfv38Zvn7/9hCobRW0GQHKB38A
+Agh5hE4UGvrXkdNcdxL3/wcLhf8/XiL8f24R739gbICLRVj1jw5AeQWE0QFIj6Ys839eTkawPEg/
+KP1HAovIU3XAMh+U7gv4/u/L5P2/M5nn/84knv/Aluh/FmaW/8qycv+BJdp/6PCKA7SDDw5wgABi
+go6x/IOOQ76BKoKDpuXfgL2zf+DoddJjYzjWL8jA+m4HOOTRSyVYkkLPEyD+vl2bGBYX8DGsL+Nn
+OLplKjjJ3bpwmCHFloPhz8//EPwLgkFBt/7qL4Z77/4xiAoJMXz59g3U9Aaln91Iw43g1h1AAIEH
+tqA9fDZoUxWUPqYDsRrMAWaqLEDL+SEjCNChkJM3fzOUzPnCoKJjC87gIA8hl+mg5AQSA6V7kGPT
+bd4w+Juwg0fk/gGTxx5gwQAqJm2UmIFJhgHueFCz4e7bvwxZG78z8PHwgD3wENh5AnpgFtDodUB8
+GYjfgobhQW4HCCDkUYk/0Iz8FIgnIpdIp4AZqXzBF0h/FdpnNVFgZdhcI8Cgx3sK2CdQhGdM9FgA
+l+8sTxl8gOX7b2A/9w/YDAYGa0UWBhsFZiAf2FuFxgDM8aXbvzOwA9tPIMe/BQYA0PGgZH0QVLZA
+3QjvogEEELOUlBTDnj17GNDK2t/QfGEEU3jj2V9gyfSXwV6DFTx6+A+IWYG1tJkyK4MzMGlNWrCH
+Yc7ideAMDooBWO+rtDCLYWoCDwM3MyM4g8IzKRD/hta0IDZ4CB3q+N/A5C0D1Pv123eGt+/ffwRK
+TYY2dZ6ij5ECBBD62CgjdMhCDIhVQQEIal2jlCaarAxNwVzgohU+FAKdy1ty+AfD9L0/GILD4xgW
+LlzIAGzbMDhL3GKIADaL/8FGpf9A6d+QAd5/0H4KqMRp3At0/H9WBmlJCXB38+mLlz/+/fsHSs47
+oCMRb6B59T/M3QABxAzsPDAYGxszzJo1i+Ho0aOwmPgLxaD5LEVoTQ0p+t78Y9hx8TeDiggzgziw
+rQSu7kExAqS1pVgY3LTZGFbtOMfw/OM/Br7/rxmqPbmgIc4Ab9uA0zzQA6By/gsw6cw984thMrDO
+YefgYhAHNsP//PnL8Ozli5/AvvlcoJX7gfgOkuNRZm0AAgjf8DoPdO4LlKlLgdgSvcQxlGNhSAHW
+oIayiOHK//8hpchBYFtKAlizgjojwL4RPAZAAwYMUIevv/YbXNp8/83IICIsxMDNxQUe0nn99h2o
+loU5/jq0nfYZ2/A6QACB84C2tjZcAJon/iE18n5ADfkH7TcgJraAobztym+wY78DHcQMdBg/KxM4
+pGX4mBj42SDpHtYo/AzMwGeAfduVl34xTAKG+Lln/xg4uXgZRIGOBw0EvAb2qT9++vwKWgoehqYA
+2NzA3/LycnBqQQYAAYRvhgbWdeOGVnIK0PyQAp1KxQn0gU2D/7DECAUvv/wDYogAGysrAxcXJwMX
+MPkyMzMxfANm1ncfPoJi7xC0qAQFGKjWfQXLtMjpHpTc09LSwGyAAGLEJoglOXFCRy4koQOs3kDs
+BSrysXkANJIBNhySw8GOBA18gRzOCsQsQPY/YFL7/v0HOMkAHX4FOid2DtpMeAKd5INVWP9xTfIB
+BBAxs5SwwSR2aL4QhXpEFjQYBi1q4ZUeyNGg5MAI9ATIIyA+EyMjeMD2399/4DbNL2D5CSxdPkNn
+I0Hl+zWoo59AMytsvvgvoWlWgABiBA0uhYaGwgVAw37IfCSPMCJNufJAYwTkGXGoZ3ShbXQlaONQ
+FsmIT1AMaoA9g87Y34ZO4L2ENg/eIzn8N75QRwYAAcRIjCK02ICtj2CH5g8e6MgeP7STzQv1JDvS
+aAesQPgOHdv8CPXQR6ijvyE5/B++eWF0ABBALMROpcMMBHrkH9IijR9QR7yGOpgdadEH8lgT+mKP
+H0iLPv7A1kgg2wNKCcQAgAACJyFyAGiME2liEHmpDTMSH3m5DWx5zV+0JTfgognmDq/+Dga9lyA/
+mTD8/zmDIZFnPrjwEwWPJtowJIJLVltg+j0MpgECDADuXybnyFX8nAAAAABJRU5ErkJggg==
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: image/png
+Content-ID: <1001417929.27019.8.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-bottomleft.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsBCVkleUoAAAA/SURB
+VHjaY/z//z8DPsDEwMAgTEiBKSEFYXjt+A8BZv///2fAhmEKzv///18YnwKYIjN8CmBg3v///z1g
+JgIAui9uUdDfxKcAAAAASUVORK5CYII=
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: image/png
+Content-ID: <1001417929.27019.7.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-topright.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsANW9RNIwAAAA7SURB
+VHjahcwxDcAwEATBCwZzCQajNCVDGlduouh/petGFwQDE8un/OzFrsB93BW4Tx6kaHVgdmB0IAcq
+73eg4H8gZQAAAABJRU5ErkJggg==
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: image/png
+Content-ID: <1001417869.27019.5.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-topleft.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsAJuvvdVIAAABISURB
+VHjafcxRDYAwDAbhYxbqZRpQOQGYQQkabk8kzRj9kz59l+J3Qz3VUCHBrXaVfCSMFXPQd/gG4w9V
+GnBR7FADeKqgesAEj0KK3Z8K59sAAAAASUVORK5CYII=
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: image/png
+Content-ID: <1001417869.27019.4.camel@spectrolite>
+Content-Disposition: attachment; filename=bluestripes.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsLBap83esAAACESURB
+VHja7dRBDcAgEADBgwDBEj4wUvdN+2h1kJvVMNmy9vVF4mokr93PGwRkFjBHJ8ADCPAAAjyAAA8g
+wAMI8AACPIAADyDAAwjwAAI8gAAPIMADCPAAAjyAAA8gwAMI8AACPIAADyDAAwjwAAI8gAAPIMAD
+CPAAAjyAAA8gwAMIOL8fcegyqOBdwTkAAAAASUVORK5CYII=
+
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Transfer-Encoding: 8bit
+
+--=-t4dRE6cqcdSBHOrMdTQ1
diff --git a/mail/default/sr/Makefile.am b/mail/default/sr/Makefile.am
new file mode 100644
index 0000000000..7941835475
--- /dev/null
+++ b/mail/default/sr/Makefile.am
@@ -0,0 +1,7 @@
+
+defaultlocaldir = $(privdatadir)/default/sr/mail/local
+
+defaultlocal_DATA = \
+	Inbox
+
+EXTRA_DIST = $(defaultlocal_DATA)
diff --git a/mail/default/sr@latin/Inbox b/mail/default/sr@latin/Inbox
new file mode 100644
index 0000000000..25764917db
--- /dev/null
+++ b/mail/default/sr@latin/Inbox
@@ -0,0 +1,315 @@
+From evolution@novell.com Wed Sep 06 07:45:12 2006
+Return-Path: <evolution@novell.com>
+Received: from pop.novell.com (IDENT:mail@localhost [127.0.0.1]) by
+	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Wed, 14 Mar 2007
+	07:45:12 -0400
+Received: from smtp.novell.com (smtp.novell.com [141.154.95.10]) by
+	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20659 for
+	<evolution@novell.com>; Wed, 14 Mar 2007 07:45:10 -0400
+Received: (qmail 5610 invoked from network); 14 Mar 2007 12:00:00 -0000
+Received: from smtp.novell.com (HELO localhost) (141.154.95.10) by
+	pop.novell.com with SMTP; 14 Mar 2007 12:00:00 -0000
+From: Tim Evolucije <evolution@novell.com>
+To: Korisnici Evolucije <evolution@novell.com>
+Content-Type: multipart/related; type="multipart/alternative"; boundary="=-t4dRE6cqcdSBHOrMdTQ1"
+X-Mailer: Evolution 2.24.0
+Date: 14 March 2007 12:00:00 +0000
+Message-Id: <1001418302.27070.20.camel@spectrolite>
+Mime-Version: 1.0
+Subject: =?UTF-8?Q?Dobrodo=C5=A1li?= u Evoluciju!
+Sender: evolution@novell.com
+Errors-To: evolution@novell.com
+X-Mailman-Version: 1.1
+Status:   
+X-Evolution-Source: pop://rupert@pop.novell.com/inbox
+X-Evolution: 00000002-0000
+
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: multipart/alternative; boundary="=-2gZ1roA/HoYrlRDVGyiM"
+
+
+--=-2gZ1roA/HoYrlRDVGyiM
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: 7bit
+
+
+Tim Evolucije vam sa ponosom želi dobrošlicu u Evoluciju, potpuni sistem
+za upravljanje komunikacijom i ličnim podacima.
+
+
+Prvi koraci
+
+    Levo od prozora Evolucije je panel sa strane u kome su
+    prečice ka svim folderima e-pošte. Ispod ćete pronaći
+    dugmad koja vode ka kalendarima, adresaru, zadacima, pošti
+    i podsetniku.
+
+    Za potpuni vodič kroz Evoluciju odaberite „Sadržaj“ iz menija
+    „Pomoć“ ili pritisnite taster F1.
+
+Prijava grešaka
+
+    Sve greške možete prijaviti na http://bugzilla.gnome.org.
+
+Više informacija
+
+    Možete se prijaviti na dopisnu listu korisnika Evolucije (engl.) na
+    http://mail.gnome.org/mailman/listinfo/evolution-list.
+
+    Više o projektu Evolucije (engl.) pronađite na
+    http://www.gnome.org/projects/evolution.
+
+
+S poštovanjem,
+Tim Evolucije
+
+
+--=-2gZ1roA/HoYrlRDVGyiM
+Content-Type: text/html; charset=utf-8
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
+<HTML>
+<HEAD>
+  <META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8">
+  <META NAME="GENERATOR" CONTENT="GtkHTML/0.13.99">
+</HEAD>
+<BODY BGCOLOR="#f8fcf8">
+<TABLE BACKGROUND="cid:1001417869.27019.4.camel@spectrolite" CELLSPACING="0" CELLPADDING="0" WIDTH="100%">
+<TR><TD ALIGN="left" VALIGN="top">
+<IMG SRC="cid:1001417869.27019.5.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8"></TD>
+<TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>
+<TD ALIGN="right" VALIGN="top">
+<IMG SRC="cid:1001417929.27019.7.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8"></TD>
+</TR><TR><TD></TD><TD>
+<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="48" HEIGHT="48"></TD>
+<TD></TD><TD>
+<FONT COLOR="#f8fcf8"><FONT SIZE="4">
+
+
+<B>Tim Evolucije</B> vam sa ponosom želi dobrošlicu u <B>Evoluciju</B>, potpuni sistem za upravljanje komunikacijom i ličnim podacima.
+
+
+</FONT SIZE="4"></FONT>
+</TD><TD></TD><TD>
+<IMG SRC="cid:1001417989.27019.11.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="48" HEIGHT="48">
+</TD><TD></TD></TR><TR><TD ALIGN="left" VALIGN="bottom">
+<IMG SRC="cid:1001417929.27019.8.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8">
+</TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>
+<TD ALIGN="right" VALIGN="bottom"><div align=right>
+<IMG SRC="cid:1001417929.27019.9.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8">
+</div></TD></TR></TABLE>
+
+
+<h2>
+Prvi koraci
+</h2>
+
+<blockquote>
+
+	Levo od prozora Evolucije je panel sa strane u kome su
+	prečice ka svim folderima e-pošte. Ispod ćete pronaći
+	dugmad koja vode ka kalendarima, adresaru, zadacima, pošti
+	i podsetniku.
+
+<br><br>
+
+    Za potpuni vodič kroz Evoluciju odaberite „<b>Sadržaj</b>“ iz menija
+    „<b>Pomoć</b>“ ili pritisnite taster <b>F1</b>.
+
+<br><br>
+</blockquote>
+
+<h2>
+Prijava grešaka
+</h2>
+<blockquote>
+	Sve greške možete prijaviti na <a href="http://bugzilla.gnome.org">http://bugzilla.gnome.org</a>.
+<br><br>
+</blockquote> 
+
+<h2>
+Više informacija
+</h2>
+
+<blockquote>
+	Možete se prijaviti na dopisnu listu korisnika Evolucije (engl.) na
+	<a href="http://lists.gnome.org/mailman/listinfo/evolution">http://lists.gnome.org/mailman/listinfo/evolution</a>.
+
+	Više o projektu Evolucije (engl.) pronađite na
+	<a href="http://www.gnome.org/projects/evolution">http://www.gnome.org/projects/evolution</a>.
+	<!--
+	You can find a list of answers to Frequently Asked Questions (FAQ) at
+	<a href="http://go-evolution.org/FAQ">http://go-evolution.org/FAQ</a>.
+	-->
+<br><br>	
+</blockquote>
+
+S poštovanjem,
+<br>
+Tim Evolucije
+
+</BODY>
+</HTML>
+
+--=-2gZ1roA/HoYrlRDVGyiM--
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: image/png
+Content-ID: <1001417929.27019.9.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-bottomright.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsBAVf+8XgAAAA7SURB
+VHjaY/z//z8DPsDEgB8IE1JgSkhBGMP///9xYbP/eCSF////f/4/Hp3n/0MBsg6P////z/uPBgDp
+AG5RDY2ymwAAAABJRU5ErkJggg==
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: image/png
+Content-ID: <1001417989.27019.11.camel@spectrolite>
+Content-Disposition: attachment; filename=evolution-icon.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAANbY1E9YMgAAABl0RVh0
+U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAABPQSURBVHjaYtzEuI6BCQgZoRDGRtDIJCrP
+6r8dAxQwATEjlEbGjFD5/0D8Dw3DxBgeMt7BsJdYtwAEEON3xk8EHQqmGSG8X//+IzsahFmAmBWI
+2YGYDUqzQsWZoWpBDv0DxL+g+CcS+w+Spxi0mFQIuwWJBAggRmsmUyL8DmFt+7cX5nBmqGM5gZgH
+iA2B2AWIzYFYCoglGbCD20B8E4hPAfEeIH4OxF+B+BvUM39BHilgyiToFhgLIIAYG5gqCCor/VfL
+AE0OIIdzQB2tCcThQOyHx8GEwBEg3gjEW4H4AxB/hsYOKFb+72BazyCdpMjwfN4juFvEkmwY3s47
+ziBc/BCoYwEDQAAxXhIXYNB7+YWBQZGH4f+NEwz3nrCi2KCsrAwLdVCIcwOxPBAXAXE0A/XACyDu
+g3rmHRB/gcbIv7t37+LVCBBAjPgUQB3PAg11QSAOAuJmIObFpcfWiJtBTpKFQV4C6Of/f6GYgeHQ
++V8Mj178ZXj08h8+91wE4mIgvgWNke/Q2GDA5U6AAGIhwvFcQCwCxP3Q5IIC+HlYGHwdhRl8HYQY
+fBwEwA7+/x9o5//fwPD7xcD47wfD/38/GSr//mf4B8QPnv5l2HL4J8Py3d8Zrtz/i26cPhBvAOIK
+IN4JxK+h+eM3LncCBBDWGEByPCitK7Gxsi7T09JSv3brFsO3798hDudlYciOVmDIiVEAstmgWeQf
+2AOMQMf///8LyAQmZ6AHGP8B9fz9DuT/ZfgL8gjQf39//QfHSvfybwzHr2F1XwcQLwTil9Ak9Rub
+WwECCMMDaCGvIijAv8zMwFD9xLmzDB8/fYYkExNhhpktRgzyMnxAd6OVluAkAwr9n9DQBzkcGIhA
+zAjE/4Ce+PfnP8NfEAb67w/QIzM3fmfoW/uN4dO3/+ju6wLi+dA8AvLEH3T3AgQQigeQMizI8eLA
+kJ9jaWricP7yFYZPnyGOr8pUZ6jONWdgk85iYGTmZbh9bgaDnMRfSAzA0/xPsAcY/v4A0iDHfwEK
+fwV64CuY/v/nH9ADkFj48xNC33vylyF1wieG648xklUdEK+AegKUnP4iuxkggJjQYwRa2oAybJmh
+ro7Djdt34I6f2WzIUFPkzcCp3MXAwq3H8ODhEwYL71kM4dm7GT5+B+ZzVqA2Fn5ghIAwMHZYgIUW
+MzfDYWBSOXIemKyYOBgYmdiBGFhIA21mZAbSzCAaWLSJMzEsL+Nj0JRhRvdAORAbQd0ETqvQgAYD
+gABiwpJ0QEWlm5K8XNqHT58YXr5+DXW8AUNsuC0Du1QG2J9/vpxjSExKY0hIymBg5tJi0LSdyrBl
+72MGJlZ+BkYgZmABFlTAGPrwlZUhvPASQ2DBA4ay/ldAPgvQA8xAzAB3PNhDQM/w8zAxLCniY9CQ
+RvEEyD3VQCwBzZMoBQ9AADGhJR1QM0CYg4O9gpeXh+HmHUhUZUfLM8QEaTKwiQQBMygwDf98wjBh
+Qg+wWGQA0hMYGhoawNrlFRQZDp16xfAR5EgWHnDol3VeYlBS0WFoampiOH5ThkEr8D7D5sO/wI5m
+ZIR4AhwbUMzPzcQwJYWXgZeDEdmdukAcCcSi0CKdCRYLAAGEnISYoT6MlJaUULn/8DFYUE+Nh6Gr
+XIeBld8RXDv///OZ4e71bQwtfTsYFixYAFbz4MEDBn5+bqAHlBhSi5YzaFh1MGzefY/h8OnXDEvX
+32Tg4uIC47y8PIa4xGyGxKavDBFVH4B1wl+IR6COh3lERpiJoSWCGz0pgSpOZWiMwGMBIICYkGhw
+2mdjY81gAgYLLN13laoCk4QE0HBBoOM/AUvDqwwp+fMZEhLTGRwcHMBqQLSikhaDpGoikNZmWLBw
+OUNayWYGj8jFDPX19QwsLCwMJSUlDOfOnWMwMjJi6OnpYfjJacdgk/qOYfq6b/B2KyhGwDTQU07a
+rAwOmiitAlDouwOxEDSlgGMBIIAYkSo0UCaJFxcT7f79+w/Du/fvGWyN+Rh2zjFlYOVzA3pCCJgJ
+2RkmzF7JMGXBFYYLFy4wCAgI4KxSP3z4wJCQkMBw4MABeEyB+EpKSgxRUVEMIiIiDDdu3GCYM2cO
+g7rkJ4amBG4gzcLw+8d/ht/AauPXj38MD5//ZfDp/YRs7BsgDgHiG9Amx2+AAIK12WGZ14WNjY3h
+y9evkCIzTQqYyQQgxeHvDwz3719laOnfA3YQyPGvXr3C6QGQ/IYNG8B5JDAwEOwhUFK7d+8eQ11d
+HcOuXbsYNDQ0wLEhquzF4FLyAVwXwMpCUMNNSoCJwV4dJRZEoC1fXqibGQECiBmafEDNYnFgVDcw
+MTGxffnyFdieYWXoKpZjYGYSB0YtC8N/xn8MwZlLGDx9YxkyMjIYnj17xnDlymWGz8CkJiwszMDM
+jCg5Pn78yMDBwQFmgzxhYGDAUFFRweDh4cFw8+ZNhtWrVzPMnj2b4cSJEwxycnIM5ubm4KS1bt8j
+YKX2FFgKsTBI8DOCa2yW/4wMu1Fr6q/Q5jgoan4BBBDMA6DM6wZ0RNDPnz8Y/gE7LTHe/AyuVgJA
+hwGLRaa/DJMWn2PYffwzw4oVKxh+//7NcOfObQYZGRmGly9fMjx+/IiBjY2dgZeXF8h+zLBo8WKG
+Hz9/MkhKSjI8efKEoaOjg+HFixcMO3bsYJCQkAAnHZDH/vz5Ay3BGMCesLGxAbbcOBl6ll5jePfp
+F4MO0CNKQkwMc4/8ZEArbPZAk9APgABihkYFsOBm8Adii79/Ia3FpiwhBgVpbnDJ8PD5F4aYkqMM
+HZ29DBYWFgy/fv0CJof7YMcqKiqBMx/IE++B+UZeXoGBFZhpT50+zXADGNpubm4M6urqDD9+/AB7
+BBQTIBqUpEA0KHYaGxsZjhw5Ao8NEN537gXD5E0PGXSkmBmev//H8OLTf+RktB7W0AMIIGZo9w+U
+gYP///+vBW+E5PMxcHKwAD3AxCDAx8nw/TczQ3HNHLCcu7s7w6RJkxhqamqBxScfg6ysLDC0pRje
+vn3L8PTpE6An5BmsrKwYngA9eOz4cQYNTU2GyMhIcIzNmDEDnHRAMQlKZqDkCMrcII+C8sO7d+8Y
+dHV1wflj6/ZdDOHG7Aw/gD2DC0/+oneEHoA6QAABxABt96gD8QVoRxuMvxyR/P/thOr/b2eM/n87
+7/j/6yX//8fXev7X1RD6D3Tgf35+/v/9/f1gtp6e3v/Fixf9B+aJ/2fOnP6/e/cuMP3t2zcgfeb/
+pMmT/1++fPn//fv3wfpA5ufn58P1A2PuPwiA5P39/f9zcnL+BwbK/xQ7jv9HS/n+59ix/0d2G7RP
+AuoRcgEEEHIpBK/UbAyAkfLvH7Al+QvYegQ2i/+BGmXfgZUaJ8OOhW4MH949B2fUgIAAcHHq6OgI
+DMlMhqlTpzJ8Bza3ZWXlwJn75MkTDKKiIgxxsbEMOjo64JAGYaBDwfoKCwvBfFhxrKCgAM4bYWFh
+DH8+P2WINGMH2g2svYQx2kewQQMmgABiQurrIgDQj/+BGfk/rEMCbMuDW5X/vjJMXXCBwcDIkgEY
+UmDLQJaDisotW7YwHDt2HOyg/fv3Ax0uCs7Ut4B9CFDRDCp6QcUoKNOCHArSZ29vD9YLCgiQHKz+
+AJnbGMjFwM3GAPbAf8xOHHzYBiCAGKAlkB4QX4JFka4yy/+Pe8X+fzko/v/rUen/X06o/f9y2vD/
+8eUGYPnz58//nz9//n99ff3/6ABY84LVxMbG/t++ffv/d+/egpMIKOkAPQZWA6JBfJA4CIOSEyxJ
+gpIQsAb+f6Ze4P+xMv7/B/P4/vf6cqEnoS5o740XIIBgrT1tZA+A8PtdYv8/7QN64hDIEzJgT+iq
+cYIdCAIgi0HqQOkWHYDEgKH7X1xcHOxYkKNAakEeXr9+PTjdgxyLDEDqQPLARtz/QzX8/0/WCPw/
+Usz3f3823/9MC4w80AFt4PEABBCsFAI23hk0oIJgEOHMwSDAwwStFf8xTF35keHKU2Vw6QECoBIE
+lI5BxSOoaEWvhUFJCdQGApUyFy9eBKd7kJ6CggKwHlCSglV2MD2g5JTj+ItBC9ikAHVy/v6G9Nj2
+3/nNcOM1SjpaCcT3QCkOIICYoINJv6CDTHBw6dZvoAGQ/uv9J38Y2uZ9AluADECNOFg7BxsAORaU
+tkH5BVTew2ppkD5QPkDWC8obosxPGXwN2MAOh3Q7IfTdtyiOB5YoDO9hwy4AAcQAbYXKAHE6cjSl
+enP+f7VR9P/bbaL/rfVYwekUlDRAaT8+Ph5elOJKRugAlnRAGKQexgclNRAblHS2AYtMUNo/Xs7/
+/1A+3/896bz/18ZwoycfUCclAIjlQG4HCCBYDIB8dRXa5wSD7ad+gqNx8+GfDEcv/QaHFigUYW0b
+EA0qMWClESEAK3JBAFbygPggs0CNvWhrdgZxXiaGP7//g2P+z5//4NA/9hA8LMQgxC/AwMbKBhs7
++gR18z+AAGKB+uoXtFY7DcT2IFVPgGlu2/GfDJ++/2fg42KEOxq9CQ1yCMhBIHlQcoEVh+gA1KwG
+eRiWXGDpHpSU1CWZGdIcOBh+gzr4IMeDkhAQ/we6bPftPwxMjKDWAB/Du49g/WdhDTmQBwACiBnq
+ASZoZgYBD5ilr4BtkPpoboYAG3aGbYfuMnRPXgq2EFTNwwCs8gE5EBSiIBoEQI029Pwyc+ZMsONh
+HSGQZyMiIhjq/ZgZxIBdSfAoxS8GaAb+z3AR2B9YcuEXgyA/P8Pfv38Zvn7/9hCobRW0GQHKB38A
+Agh5hE4UGvrXkdNcdxL3/wcLhf8/XiL8f24R739gbICLRVj1jw5AeQWE0QFIj6Ys839eTkawPEg/
+KP1HAovIU3XAMh+U7gv4/u/L5P2/M5nn/84knv/Aluh/FmaW/8qycv+BJdp/6PCKA7SDDw5wgABi
+go6x/IOOQ76BKoKDpuXfgL2zf+DoddJjYzjWL8jA+m4HOOTRSyVYkkLPEyD+vl2bGBYX8DGsL+Nn
+OLplKjjJ3bpwmCHFloPhz8//EPwLgkFBt/7qL4Z77/4xiAoJMXz59g3U9Aaln91Iw43g1h1AAIEH
+tqA9fDZoUxWUPqYDsRrMAWaqLEDL+SEjCNChkJM3fzOUzPnCoKJjC87gIA8hl+mg5AQSA6V7kGPT
+bd4w+Juwg0fk/gGTxx5gwQAqJm2UmIFJhgHueFCz4e7bvwxZG78z8PHwgD3wENh5AnpgFtDodUB8
+GYjfgobhQW4HCCDkUYk/0Iz8FIgnIpdIp4AZqXzBF0h/FdpnNVFgZdhcI8Cgx3sK2CdQhGdM9FgA
+l+8sTxl8gOX7b2A/9w/YDAYGa0UWBhsFZiAf2FuFxgDM8aXbvzOwA9tPIMe/BQYA0PGgZH0QVLZA
+3QjvogEEELOUlBTDnj17GNDK2t/QfGEEU3jj2V9gyfSXwV6DFTx6+A+IWYG1tJkyK4MzMGlNWrCH
+Yc7ideAMDooBWO+rtDCLYWoCDwM3MyM4g8IzKRD/hta0IDZ4CB3q+N/A5C0D1Pv123eGt+/ffwRK
+TYY2dZ6ij5ECBBD62CgjdMhCDIhVQQEIal2jlCaarAxNwVzgohU+FAKdy1ty+AfD9L0/GILD4xgW
+LlzIAGzbMDhL3GKIADaL/8FGpf9A6d+QAd5/0H4KqMRp3At0/H9WBmlJCXB38+mLlz/+/fsHSs47
+oCMRb6B59T/M3QABxAzsPDAYGxszzJo1i+Ho0aOwmPgLxaD5LEVoTQ0p+t78Y9hx8TeDiggzgziw
+rQSu7kExAqS1pVgY3LTZGFbtOMfw/OM/Br7/rxmqPbmgIc4Ab9uA0zzQA6By/gsw6cw984thMrDO
+YefgYhAHNsP//PnL8Ozli5/AvvlcoJX7gfgOkuNRZm0AAgjf8DoPdO4LlKlLgdgSvcQxlGNhSAHW
+oIayiOHK//8hpchBYFtKAlizgjojwL4RPAZAAwYMUIevv/YbXNp8/83IICIsxMDNxQUe0nn99h2o
+loU5/jq0nfYZ2/A6QACB84C2tjZcAJon/iE18n5ADfkH7TcgJraAobztym+wY78DHcQMdBg/KxM4
+pGX4mBj42SDpHtYo/AzMwGeAfduVl34xTAKG+Lln/xg4uXgZRIGOBw0EvAb2qT9++vwKWgoehqYA
+2NzA3/LycnBqQQYAAYRvhgbWdeOGVnIK0PyQAp1KxQn0gU2D/7DECAUvv/wDYogAGysrAxcXJwMX
+MPkyMzMxfANm1ncfPoJi7xC0qAQFGKjWfQXLtMjpHpTc09LSwGyAAGLEJoglOXFCRy4koQOs3kDs
+BSrysXkANJIBNhySw8GOBA18gRzOCsQsQPY/YFL7/v0HOMkAHX4FOid2DtpMeAKd5INVWP9xTfIB
+BBAxs5SwwSR2aL4QhXpEFjQYBi1q4ZUeyNGg5MAI9ATIIyA+EyMjeMD2399/4DbNL2D5CSxdPkNn
+I0Hl+zWoo59AMytsvvgvoWlWgABiBA0uhYaGwgVAw37IfCSPMCJNufJAYwTkGXGoZ3ShbXQlaONQ
+FsmIT1AMaoA9g87Y34ZO4L2ENg/eIzn8N75QRwYAAcRIjCK02ICtj2CH5g8e6MgeP7STzQv1JDvS
+aAesQPgOHdv8CPXQR6ijvyE5/B++eWF0ABBALMROpcMMBHrkH9IijR9QR7yGOpgdadEH8lgT+mKP
+H0iLPv7A1kgg2wNKCcQAgAACJyFyAGiME2liEHmpDTMSH3m5DWx5zV+0JTfgognmDq/+Dga9lyA/
+mTD8/zmDIZFnPrjwEwWPJtowJIJLVltg+j0MpgECDADuXybnyFX8nAAAAABJRU5ErkJggg==
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: image/png
+Content-ID: <1001417929.27019.8.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-bottomleft.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsBCVkleUoAAAA/SURB
+VHjaY/z//z8DPsDEwMAgTEiBKSEFYXjt+A8BZv///2fAhmEKzv///18YnwKYIjN8CmBg3v///z1g
+JgIAui9uUdDfxKcAAAAASUVORK5CYII=
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: image/png
+Content-ID: <1001417929.27019.7.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-topright.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsANW9RNIwAAAA7SURB
+VHjahcwxDcAwEATBCwZzCQajNCVDGlduouh/petGFwQDE8un/OzFrsB93BW4Tx6kaHVgdmB0IAcq
+73eg4H8gZQAAAABJRU5ErkJggg==
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: image/png
+Content-ID: <1001417869.27019.5.camel@spectrolite>
+Content-Disposition: attachment; filename=corner-topleft.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsAJuvvdVIAAABISURB
+VHjafcxRDYAwDAbhYxbqZRpQOQGYQQkabk8kzRj9kz59l+J3Qz3VUCHBrXaVfCSMFXPQd/gG4w9V
+GnBR7FADeKqgesAEj0KK3Z8K59sAAAAASUVORK5CYII=
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Type: image/png
+Content-ID: <1001417869.27019.4.camel@spectrolite>
+Content-Disposition: attachment; filename=bluestripes.png
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE
+AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsLBap83esAAACESURB
+VHja7dRBDcAgEADBgwDBEj4wUvdN+2h1kJvVMNmy9vVF4mokr93PGwRkFjBHJ8ADCPAAAjyAAA8g
+wAMI8AACPIAADyDAAwjwAAI8gAAPIMADCPAAAjyAAA8gwAMI8AACPIAADyDAAwjwAAI8gAAPIMAD
+CPAAAjyAAA8gwAMIOL8fcegyqOBdwTkAAAAASUVORK5CYII=
+
+
+--=-t4dRE6cqcdSBHOrMdTQ1
+Content-Transfer-Encoding: 8bit
+
+--=-t4dRE6cqcdSBHOrMdTQ1
diff --git a/mail/default/sr@latin/Makefile.am b/mail/default/sr@latin/Makefile.am
new file mode 100644
index 0000000000..c8af647ecd
--- /dev/null
+++ b/mail/default/sr@latin/Makefile.am
@@ -0,0 +1,7 @@
+
+defaultlocaldir = $(privdatadir)/default/sr@latin/mail/local
+
+defaultlocal_DATA = \
+	Inbox
+
+EXTRA_DIST = $(defaultlocal_DATA)
diff --git a/mail/default/sv/Inbox b/mail/default/sv/Inbox
index d58c1122a9..d2d80c2880 100644
--- a/mail/default/sv/Inbox
+++ b/mail/default/sv/Inbox
@@ -10,9 +10,9 @@ Received: (qmail 5610 invoked from network); 14 Mar 2007 12:00:00 -0000
 Received: from smtp.novell.com (HELO localhost) (141.154.95.10) by
 	pop.novell.com with SMTP; 14 Mar 2007 12:00:00 -0000
 From: "Evolution-teamet" <evolution@novell.com>
-To: Evolution Users <evolution@novell.com>
+To: Evolution-användare <evolution@novell.com>
 Content-Type: multipart/related; type="multipart/alternative"; boundary="=-t4dRE6cqcdSBHOrMdTQ1"
-X-Mailer: Evolution 2.10.0
+X-Mailer: Evolution 2.24.0
 Date: 14 March 2007 12:00:00 +0000
 Message-Id: <1001418302.27070.20.camel@spectrolite>
 Mime-Version: 1.0
@@ -34,27 +34,18 @@ Content-Type: text/plain
 Content-Transfer-Encoding: 7bit
 
 
-Evolution-teamet är stolta över att välkomna dig till Evolution, ett komplett system
-för att hantera dina kommunikationer och personlig information.
+Evolution-teamet är stolta över att välkomna dig till Evolution, ett komplett 
+system för att hantera dina kommunikationer och personlig information.
 
 
 Komma igång
 
-	På vänster sida av Evolution-fönstret finns det en sidopanel med
-	genvägar till alla dina e-postmappar. I sidopanelen hittar du knappar
-	för dina kalendrar, kontakter, uppgifter, e-post och memon.
-
-	För en komplett användarguide för Evolution kan du välja "Innehåll"
-	från "Hjälp"-menyn eller trycka på F1-tangenten. 
-
-Nya funktioner
-
-	Evolution 2.10 erbjuder dig
-	
-	# Integration med gtk-print
-	# Anpassningsbar hämtning av IMAP-rubriker.
-	# Ökad prestanda, en mängd av felrättningar för minnesanvändning
-	# En mängd andra felrättningar och andra förbättringar
+	På vänster sida av Evolution-fönstret finns det en sidopanel
+	med genvägar till alla dina e-postmappar. I sidopanelen hittar
+	du knappar för dina kalendrar, kontakter, uppgifter, e-post och memon. 
+        
+        För en komplett användarguide för Evolution kan du välja Innehålls- 
+	förteckning från Hjälp-menyn eller trycka på F1-tangenten. 
 
 Felrapportering
 
@@ -62,16 +53,15 @@ Felrapportering
 
 Mer information
 
-	Du kan prenumerera på sändlistan "Evolution users" på
-	http://mail.gnome.org/mailman/listinfo/evolution-list.
-
-	Information om Evolution-projektet finns tillgänglig på
-	http://www.gnome.org/projects/evolution.
+	Du kan prenumerera på sändlistan Evolution users på 
+	http://lists.gnome.org/mailman/listinfo/evolution.
+	
+	Information om Evolution-projektet finns tillgängligt på 
+	http://www.gnome.org/projects/evolution. 
 
 
-Med vänliga hälsningar,
-Evolution-teamet
-evolution@novell.com
+Med vänliga hälsningar, 
+Evolution-teamet 
 
 
 --=-2gZ1roA/HoYrlRDVGyiM
@@ -95,7 +85,6 @@ Content-Type: text/html; charset=utf-8
 <TD></TD><TD>
 <FONT COLOR="#f8fcf8"><FONT SIZE="4">
 
-
 <B>Evolution-teamet</B> är stolta över att välkomna dig till <B>Evolution</B>, ett komplett system för att hantera dina kommunikationer och personlig information.
 
 
@@ -116,39 +105,19 @@ Komma igång
 
 <blockquote>
 
-	På vänster sida av Evolution-fönstret finns det en sidopanel med
-	genvägar till alla dina e-postmappar. I sidopanelen hittar du knappar
-	för dina kalendrar, kontakter, uppgifter, e-post och memon.
+	På vänster sida av Evolution-fönstret finns det en sidopanel
+	med genvägar till alla dina e-postmappar. I sidopanelen hittar
+	du knappar för dina kalendrar, kontakter, uppgifter, e-post och memon. 
 
 <br><br>
 
-	För en komplett användarguide för Evolution kan du välja <b>Innehåll</b> 
-	från <b>Hjälp</b>-menyn eller trycka på <B>F1</B>-tangenten. 
+    För en komplett användarguide för Evolution kan du välja Innehålls-
+    förteckning från Hjälp-menyn eller trycka på F1-tangenten. 
 
 <br><br>
 </blockquote>
 
 <h2>
-Nya funktioner
-</h2>
-
-<blockquote>
-	Evolution 2.10 erbjuder dig 
-	<ul>
-	<li>
-	Integration med gtk-print
-	</li><li>
-	Anpassningsbar hämtning av IMAP-rubriker
-	</li><li>
-	Ökad prestanda, en mängd av felrättningar för minnesanvändning
-	</li><li>
-	En mängd andra felrättningar och andra förbättringar
-	</li>
-	</ul>
-<br>
-</blockquote>
-
-<h2>
 Felrapportering
 </h2>
 <blockquote>
@@ -161,13 +130,12 @@ Mer information
 </h2>
 
 <blockquote>
-	Du kan prenumerera på sändlistan <b>Evolution users</b> på
-	<a href="http://lists.gnome.org/mailman/listinfo/evolution">http://lists.gnome.org/mailman/listinfo/evolution</a>.
+	Du kan prenumerera på sändlistan Evolution users på <a href="http://lists.gnome.org/mailman/listinfo/evolution">http://lists.gnome.org/mailman/listinfo/evolution</a>.
+
+	Information om Evolution-projektet finns tillgängligt på <a href="http://www.gnome.org/projects/evolution">http://www.gnome.org/projects/evolution</a>.
 
-	Information om Evolution-projektet finns tillgänglig på
-	<a href="http://www.gnome.org/projects/evolution">http://www.gnome.org/projects/evolution</a>.
 	<!--
-	Du kan hitta en lista med svar på ofta ställda frågor (FAQ) på
+	Du kan hitta en lista med frågor och svar (FAQ) på
 	<a href="http://go-evolution.org/FAQ">http://go-evolution.org/FAQ</a>.
 	-->
 <br><br>	
@@ -176,7 +144,6 @@ Mer information
 Med vänliga hälsningar,
 <br>
 Evolution-teamet
-<br><a href="mailto:evolution@novell.com">evolution@novell.com</a>
 
 </BODY>
 </HTML>
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 5e691c71fa..caa8aa50f5 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -1,25 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors:
- *    Dan Winship <danw@ximian.com>
- *    Jeffrey Stedfast <fejj@ximian.com>
- *    Michael Zucchi <notzed@ximian.com>
- *
- *  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 version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Dan Winship <danw@ximian.com>
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *		Michael Zucchi <notzed@ximian.com>
  *
- * 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.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-account-prefs.c b/mail/em-account-prefs.c
index 91a9d25cbe..56bb4ce1df 100644
--- a/mail/em-account-prefs.c
+++ b/mail/em-account-prefs.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  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.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 415a3d7193..3d18fc824c 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  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.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
@@ -1419,7 +1419,7 @@ em_utils_handle_receipt (CamelFolder *folder, const char *uid, CamelMimeMessage
 	}
 
 	if (account && (account->receipt_policy == E_ACCOUNT_RECEIPT_ALWAYS || account->receipt_policy == E_ACCOUNT_RECEIPT_ASK)
-	    && e_error_run (NULL, "mail:ask-receipt", addr, camel_mime_message_get_subject(msg)) == GTK_RESPONSE_YES)
+	    && e_error_run (NULL, "mail:ask-receipt", addr, camel_mime_message_get_subject(msg), NULL) == GTK_RESPONSE_YES)
 		em_utils_send_receipt(folder, msg);
 }
 
diff --git a/mail/em-filter-i18n.h b/mail/em-filter-i18n.h
index 7db8144860..6805e595d9 100644
--- a/mail/em-filter-i18n.h
+++ b/mail/em-filter-i18n.h
@@ -1,3 +1,19 @@
+/*
+ * 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. */
 char *s = N_("Adjust Score");
 char *s = N_("Assign Color");
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index a427c0f03e..159d77d557 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *           Jeffrey Stedfast <fejj@ximian.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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  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.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Michael Zucchi <notzed@ximian.com>
+ *      Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
@@ -1141,7 +1141,7 @@ emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb)
 		    g_free (word);
 		    word = NULL;
 		    g_object_get (esb, "query", &search_word, NULL);
-		    if (efb->account_search_vf && !strcmp (search_word, ((CamelVeeFolder *) efb->account_search_vf)->expression) ) {
+		    if (search_word && efb->account_search_vf && !strcmp (search_word, ((CamelVeeFolder *) efb->account_search_vf)->expression) ) {
 			    break;
 		    }
 		    gtk_widget_set_sensitive (esb->scopeoption, FALSE);
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index eb6191199e..6f716d7e13 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  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.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 6d887be3c8..8181c9a91a 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  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.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
@@ -662,7 +662,7 @@ emft_expand_node (EMFolderTreeModel *model, const char *key, EMFolderTree *emft)
 		row = si->row;
 
 	path = gtk_tree_row_reference_get_path (row);
-	gtk_tree_view_expand_row (priv->treeview, path, FALSE);
+	gtk_tree_view_expand_to_path (priv->treeview, path);
 
 	u = g_hash_table_lookup(emft->priv->select_uris_table, key);
 	if (u)
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index ef0af85bd2..195b66a815 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -367,84 +367,32 @@ em_folder_utils_copy_folder(CamelFolderInfo *folderinfo, int delete)
 }
 
 static void
-emfu_delete_rec (CamelStore *store, CamelFolderInfo *fi, CamelException *ex)
+emfu_delete_done (CamelFolder *folder, gboolean removed, CamelException *ex, void *data)
 {
-	while (fi) {
-		CamelFolder *folder;
+	GtkWidget *dialog = data;
 
-		if (fi->child) {
-			emfu_delete_rec (store, fi->child, ex);
-			if (camel_exception_is_set (ex))
-				return;
-		}
-
-		d(printf ("deleting folder '%s'\n", fi->full_name));
-
-		/* shouldn't camel do this itself? */
-		if (camel_store_supports_subscriptions (store))
-			camel_store_unsubscribe_folder (store, fi->full_name, NULL);
-
-		if (!(folder = camel_store_get_folder (store, fi->full_name, 0, ex)))
-			return;
-
-		if (!CAMEL_IS_VEE_FOLDER (folder)) {
-			GPtrArray *uids = camel_folder_get_uids (folder);
-			int i;
-
-			camel_folder_freeze (folder);
-			for (i = 0; i < uids->len; i++)
-				camel_folder_delete_message (folder, uids->pdata[i]);
-
-			camel_folder_free_uids (folder, uids);
-
-			camel_folder_sync (folder, TRUE, NULL);
-			camel_folder_thaw (folder);
-		}
-
-		camel_store_delete_folder (store, fi->full_name, ex);
-		if (camel_exception_is_set (ex))
-			return;
-
-		fi = fi->next;
+	if (ex && camel_exception_is_set (ex)) {
+		GtkWidget *w = e_error_new (NULL,
+			    "mail:no-delete-folder", folder->full_name, camel_exception_get_description (ex), NULL);
+		em_utils_show_error_silent (w);
+		camel_exception_clear (ex);
 	}
-}
 
-static void
-emfu_delete_folders (CamelStore *store, const char *full_name, CamelException *ex)
-{
-	guint32 flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED;
-	CamelFolderInfo *fi;
-
-	fi = camel_store_get_folder_info (store, full_name, flags, ex);
-	if (camel_exception_is_set (ex))
-		return;
-
-	emfu_delete_rec (store, fi, ex);
-	camel_store_free_folder_info (store, fi);
+	if (dialog)
+		gtk_widget_destroy (dialog);
 }
 
 static void
 emfu_delete_response (GtkWidget *dialog, int response, gpointer data)
 {
-	CamelStore *store;
-	CamelException ex;
-	char *full_name;
-
-	full_name = g_object_get_data ((GObject *) dialog, "full_name");
-	store = g_object_get_data ((GObject *) dialog, "store");
-
 	if (response == GTK_RESPONSE_OK) {
-		camel_exception_init (&ex);
-		emfu_delete_folders (store, full_name, &ex);
-		if (camel_exception_is_set (&ex)) {
-			GtkWidget *w = e_error_new(NULL,
-				    "mail:no-delete-folder", full_name, ex.desc, NULL);
-			em_utils_show_error_silent (w);
-			camel_exception_clear (&ex);
-		}
-	}
+		/* disable dialog until operation finishes */
+		gtk_widget_set_sensitive (dialog, FALSE);
 
-	gtk_widget_destroy (dialog);
+		mail_remove_folder (g_object_get_data ((GObject *) dialog, "folder"), emfu_delete_done, dialog);
+	} else {
+		gtk_widget_destroy (dialog);
+	}
 }
 
 /* FIXME: these functions must be documented */
@@ -462,13 +410,12 @@ em_folder_utils_delete_folder (CamelFolder *folder)
 		return;
 	}
 
-	camel_object_ref (folder->parent_store);
+	camel_object_ref (folder);
 
 	dialog = e_error_new(NULL,
 			     (folder->parent_store && CAMEL_IS_VEE_STORE(folder->parent_store))?"mail:ask-delete-vfolder":"mail:ask-delete-folder",
 			     folder->full_name, NULL);
-	g_object_set_data_full ((GObject *) dialog, "full_name", g_strdup (folder->full_name), g_free);
-	g_object_set_data_full ((GObject *) dialog, "store", folder->parent_store, camel_object_unref);
+	g_object_set_data_full ((GObject *) dialog, "folder", folder, camel_object_unref);
 	g_signal_connect (dialog, "response", G_CALLBACK (emfu_delete_response), NULL);
 	gtk_widget_show (dialog);
 }
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 7f6ba0898e..2e673fde84 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@ximian.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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  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.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
@@ -1091,7 +1091,7 @@ emfv_delete_msg_response (GtkWidget *dialog, int response, gpointer data)
 							_("You do not have sufficient permissions to delete this mail."));
 					gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK);
 				} else {
-					GtkWidget *w = e_error_new (NULL, "mail:no-delete-permission", "", "");
+					GtkWidget *w = e_error_new (NULL, "mail:no-delete-permission", "", NULL);
 					em_utils_show_error_silent (w);
 				}
 
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 5bb9cc32d3..90e6acb54e 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@ximian.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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  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.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 99c670e5ae..caa5c0f51c 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@ximian.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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  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.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
@@ -1931,10 +1931,11 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part)
 	} else {
 		int mailer_shown = FALSE;
 		while (h->next) {
-			int mailer;
+			int mailer, face;
 
 			header = ((CamelMimePart *)part)->headers;
 			mailer = !g_ascii_strcasecmp (h->name, "X-Evolution-Mailer");
+			face = !g_ascii_strcasecmp (h->name, "Face");
 
 			while (header) {
 				if (emf->show_photo && !photo_name && !g_ascii_strcasecmp (header->name, "From"))
@@ -1967,7 +1968,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part)
 					efh_format_header (emf, stream, part, &xmailer, h->flags, charset);
 					if (strstr(use_header->value, "Evolution"))
 						have_icon = TRUE;
-				} else if (!g_ascii_strcasecmp (header->name, "Face") && !face_decoded) {
+				} else if (!face_decoded && face && !g_ascii_strcasecmp (header->name, "Face")) {
 					char *cp = header->value;
 					
 					/* Skip over spaces */
@@ -1978,7 +1979,8 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part)
 					face_header_value = g_realloc (face_header_value, face_header_len + 1);
 					face_header_value[face_header_len] = 0;
 					face_decoded = TRUE;
-				} else if (!g_ascii_strcasecmp (header->name, h->name)) {
+				/* Showing an encoded "Face" header makes little sense */
+				} else if (!g_ascii_strcasecmp (header->name, h->name) && !face) {
 					efh_format_header(emf, stream, part, header, h->flags, charset);
 				}
 
diff --git a/mail/em-format.c b/mail/em-format.c
index 483b86cf34..9b05b1ef6e 100644
--- a/mail/em-format.c
+++ b/mail/em-format.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *           Jeffrey Stedfast <fejj@ximian.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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  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.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Michael Zucchi <notzed@ximian.com>
+ *      Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
@@ -889,6 +889,7 @@ static const struct {
 	{ N_("Subject"), EM_FORMAT_HEADER_BOLD },
 	{ N_("Date"), EM_FORMAT_HEADER_BOLD },
 	{ N_("Newsgroups"), EM_FORMAT_HEADER_BOLD },
+	{ N_("Face"), 0 },
 };
 
 /**
diff --git a/mail/em-icon-stream.c b/mail/em-icon-stream.c
index ea9a1c3a20..673559440f 100644
--- a/mail/em-icon-stream.c
+++ b/mail/em-icon-stream.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Authors: Jeffrey Stedfast <fejj@ximian.com>
- *	    Michael Zucchi <notzed@ximian.com>
- *
- * 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 version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
  *
- * 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.
+ *
+ * Authors:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *	    Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-junk-hook.c b/mail/em-junk-hook.c
index 62a05fd4ff..c4ea8b16f3 100644
--- a/mail/em-junk-hook.c
+++ b/mail/em-junk-hook.c
@@ -300,18 +300,52 @@ emjh_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root)
 	return 0;
 }
 
+struct manage_error_idle_data
+{
+	const char *msg;
+	GError *error;
+};
+
 static void
-manage_error (const char *msg, GError *error)
+free_mei (gpointer data)
+{
+	struct manage_error_idle_data *mei = (struct manage_error_idle_data*) data;
+
+	if (!mei)
+		return;
+
+	g_error_free (mei->error);
+	g_free (mei);
+}
+
+static gboolean
+manage_error_idle (gpointer data)
 {
 	GtkWidget *w;
+	struct manage_error_idle_data *mei = (struct manage_error_idle_data *) data;
+
+	if (!mei)
+		return FALSE;
+
+	w = e_error_new (NULL, mei->msg, mei->error->message, NULL);
+	em_utils_show_error_silent (w);
+
+	return FALSE;
+}
+
+static void
+manage_error (const char *msg, GError *error)
+{
+	struct manage_error_idle_data *mei;
 
 	if (!error)
 		return;
 
-	w = e_error_new (NULL, msg, error->message, NULL);
-	em_utils_show_error_silent (w);
+	mei = g_new0 (struct manage_error_idle_data, 1);
+	mei->msg = msg; /* it's a static string, should be safe to use it as this */
+	mei->error = error;
 
-	g_error_free (error);
+	g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, manage_error_idle, mei, free_mei);
 }
 
 /*XXX: don't think we need here*/
diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c
index 6b7c4e8cae..ef9aa94aa5 100644
--- a/mail/em-mailer-prefs.c
+++ b/mail/em-mailer-prefs.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  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.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
@@ -80,6 +80,7 @@ static const char *default_headers[] = {
 	N_("Subject"),
 	N_("Date"),
 	N_("Newsgroups"),
+	N_("Face"),
 	"x-evolution-mailer", /* DO NOT translate */
 };
 
diff --git a/mail/em-mailer-prefs.h b/mail/em-mailer-prefs.h
index 6400f2d2d0..63c85af65e 100644
--- a/mail/em-mailer-prefs.h
+++ b/mail/em-mailer-prefs.h
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  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.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-message-browser.c b/mail/em-message-browser.c
index fc507bb2ce..728b27ec43 100644
--- a/mail/em-message-browser.c
+++ b/mail/em-message-browser.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@ximian.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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  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.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-migrate.c b/mail/em-migrate.c
index 332848ed39..e22cbae273 100644
--- a/mail/em-migrate.c
+++ b/mail/em-migrate.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  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.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
@@ -2895,10 +2895,9 @@ migrate_to_db()
 	len = e_list_length ((EList *) accounts);
 	
 	camel_session_set_online ((CamelSession *) session, FALSE);
-	em_migrate_setup_progress_dialog (
-		_("The summary format for Evolution's mailbox folders "
-		  "has changed.\n\nPlease be patient while Evolution "
-		  "migrates your folders to the new format..."));
+	em_migrate_setup_progress_dialog (_("The summary format of the Evolution mailbox "
+			     "folders has been moved to SQLite since Evolution 2.24.\n\nPlease be "
+			     "patient while Evolution migrates your folders..."));
 
 	em_migrate_set_progress ( (double)i/(len+1));
 	store = setup_local_store (component);
diff --git a/mail/em-network-prefs.c b/mail/em-network-prefs.c
index 2f3f85d791..b5ca55d451 100644
--- a/mail/em-network-prefs.c
+++ b/mail/em-network-prefs.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Veerapuram Varadhan  <vvaradhan@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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  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.
+ * 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/>  
  *
- *  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 Street #330, Boston, MA 02111-1307, USA.
+ * Authors:
+ *		Veerapuram Varadhan  <vvaradhan@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-network-prefs.h b/mail/em-network-prefs.h
index c0fa2ad4f9..de0951714f 100644
--- a/mail/em-network-prefs.h
+++ b/mail/em-network-prefs.h
@@ -1,26 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Veerapuram Varadhan  <vvaradhan@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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  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.
+ * 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/>  
  *
- *  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 Street #330, Boston, MA 02111-1307, USA.
+ * Authors:
+ *		Veerapuram Varadhan  <vvaradhan@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
-
 #ifndef __EM_NETWORK_PREFS_H__
 #define __EM_NETWORK_PREFS_H__
 
diff --git a/mail/em-popup.c b/mail/em-popup.c
index 10fae903be..34abb6a0a9 100644
--- a/mail/em-popup.c
+++ b/mail/em-popup.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <notzed@ximian.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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  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.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
@@ -799,17 +799,18 @@ emp_standard_menu_factory(EPopup *emp, void *data)
                 for (cp = mime_type; *cp != '\0'; cp++)
                         *cp = g_ascii_tolower (*cp);
 
-		/* TODO: g_app_info_get_all_for_type expects content_type, not a mime_type, thus it will work fine
-		    on Linux/Unix systems, but not on Win32. They will add hopefully some function to convert between
-		    these two soon. */
-		apps = g_app_info_get_all_for_type (mime_type);
+		cp = g_content_type_from_mime_type (mime_type);
+		apps = g_app_info_get_all_for_type (cp ? cp : mime_type);
+		g_free (cp);
 
 		if (apps == NULL && strcmp (mime_type, "application/octet-stream") == 0) {
 			if (filename != NULL) {
 				gchar *name_type;
 
-				name_type = e_util_guess_mime_type (filename);
-				apps = g_app_info_get_all_for_type (name_type);
+				name_type = e_util_guess_mime_type (filename, FALSE);
+				cp = g_content_type_from_mime_type (name_type);
+				apps = g_app_info_get_all_for_type (cp ? cp : name_type);
+				g_free (cp);
 				g_free (name_type);
 			}
 		}
diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c
index 8a5e3fd0dd..3eb738cd8d 100644
--- a/mail/em-subscribe-editor.c
+++ b/mail/em-subscribe-editor.c
@@ -1,23 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- * em-subscribe-editor.c *
- *
- * Authors: Michael Zucchi <notzed@ximian.com>
- *
- * 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 version 2 of the GNU 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
- * General Public License for more details.
+ * Lesser 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.
+ * 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/>  
+ *
+ *
+ * Authors:
+ *		Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 4fd8a98958..01b18eb461 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  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.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
@@ -2260,7 +2260,7 @@ em_utils_snoop_type(CamelMimePart *part)
 
 	filename = camel_mime_part_get_filename (part);
 	if (filename != NULL)
-		name_type = e_util_guess_mime_type (filename);
+		name_type = e_util_guess_mime_type (filename, FALSE);
 
 	dw = camel_medium_get_content_object((CamelMedium *)part);
 	if (!camel_data_wrapper_is_offline(dw)) {
diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in
index f32428aa4a..5e328b5457 100644
--- a/mail/evolution-mail.schemas.in
+++ b/mail/evolution-mail.schemas.in
@@ -315,9 +315,9 @@
       <type>int</type>
       <default>0</default>
       <locale name="C">
-         <short>Load images for HTML messages over http</short>
+         <short>Load images for HTML messages over HTTP</short>
          <long>
-          Load images for HTML messages over http(s). Possible values are:
+          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.
@@ -390,11 +390,11 @@
       <type>list</type>
       <list_type>string</list_type>
       <locale name="C">
-         <short>List of mime types to check for bonobo component viewers</short>
+         <short>List of MIME types to check for Bonobo component viewers</short>
          <long>
-           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.
          </long>
       </locale>
     </schema>
@@ -633,7 +633,7 @@
       <type>bool</type>
       <default>true</default>
       <locale name="C">
-         <short>Allows evolution to display text part of limited size</short>
+         <short>Allows Evolution to display text part of limited size</short>
          <long>
 	 Enable to render message text part of limited size.
          </long>
@@ -650,7 +650,7 @@
          <short>Text message part limit</short>
          <long>
 	 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.
 	 </long>
       </locale>
     </schema>
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index a2e3ce54ae..2943772b68 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -1,25 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* evolution-mbox-importer.c
- *
- * Authors: Iain Holmes <iain@ximian.com>
- *	    Michael Zucchi <notzed@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * 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 version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Iain Holmes <iain@ximian.com>
+ *	    Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index ead046ec22..3f26cddb7f 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -1,25 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* mail-importer.c
- *
- * Authors: Iain Holmes <iain@ximian.com>
- *          Michael Zucchi <notzed@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * 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 version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Iain Holmes <iain@ximian.com>
+ *      Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index 48d0637275..1036724ad8 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -1,26 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* pine-importer.c
- *
- * Authors:
- *    Iain Holmes  <iain@ximian.com>
- *    Michael Zucchi <notzed@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- * 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 version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Iain Holmes  <iain@ximian.com>
+ *    	Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/mail/mail-component.c b/mail/mail-component.c
index bbb4f7e971..ba39c9f273 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -1,25 +1,24 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* mail-component.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Ettore Perazzoli <ettore@ximian.com>
- *	    Michael Zucchi <notzed@ximian.com>
- *	    Jeffrey Stedfast <fejj@ximian.com>
- *
- * This  program is free  software; you  can redistribute  it and/or
- * modify it under the terms of version 2  of the GNU 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 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.
+ * 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/>  
+ *
+ *
+ * Authors:
+ *		Ettore Perazzoli <ettore@ximian.com>
+ *	    Michael Zucchi <notzed@ximian.com>
+ *	    Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/mail-config.c b/mail/mail-config.c
index c8634e8853..9c2bff8a61 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@ximian.com>
- *           Radek Doulik     <rodo@ximian.com>
- *
- *  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 version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *      Radek Doulik <rodo@ximian.com>
  *
- * 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.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index 05e1843bbf..445f0bb175 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -2804,7 +2804,7 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
 				<widget class="Custom" id="sent_button">
 				  <property name="visible">True</property>
 				  <property name="creation_function">em_account_editor_folder_selector_button_new</property>
-				  <property name="string1">Select Sent Folder</property>
+				  <property name="string1" translatable="yes">Select Sent Folder</property>
 				  <property name="int1">0</property>
 				  <property name="int2">0</property>
 				  <property name="last_modification_time">Tue, 14 Dec 2004 17:07:09 GMT</property>
@@ -2823,7 +2823,7 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
 				<widget class="Custom" id="drafts_button">
 				  <property name="visible">True</property>
 				  <property name="creation_function">em_account_editor_folder_selector_button_new</property>
-				  <property name="string1">Select Drafts Folder</property>
+				  <property name="string1" translatable="yes">Select Drafts Folder</property>
 				  <property name="int1">0</property>
 				  <property name="int2">0</property>
 				  <property name="last_modification_time">Tue, 14 Dec 2004 17:07:02 GMT</property>
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index 63a8f2cf90..546526c8ab 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -1,23 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Authors: Peter Williams <peterw@ximian.com>
- *	    Michael Zucchi <notzed@ximian.com>
- *
- * 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 version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Peter Williams <peterw@ximian.com>
+ *	    Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 9657da5f13..2fa9969cc0 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -1,19 +1,18 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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
- * General Public License for more details.
+ * Lesser 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.
+ * 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)
  */
 
 #include <config.h>
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 6a8c998343..d12ac23a13 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -1,27 +1,28 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* mail-ops.c: callbacks for the mail toolbar/menus */
-
 /*
- * Authors: Dan Winship <danw@ximian.com>
- *  	    Jeffrey Stedfast <fejj@ximian.com>
- *          Peter Williams <peterw@ximian.com>
- *          Michael Zucchi <notzed@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * mail-ops.c: callbacks for the mail toolbar/menus 
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Dan Winship <danw@ximian.com>
+ *  	Jeffrey Stedfast <fejj@ximian.com>
+ *      Peter Williams <peterw@ximian.com>
+ *      Michael Zucchi <notzed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
  */
 
 #include <config.h>
@@ -1400,68 +1401,94 @@ mail_get_store (const char *uri, CamelOperation *op, void (*done) (char *uri, Ca
 struct _remove_folder_msg {
 	MailMsg base;
 
-	char *uri;
+	CamelFolder *folder;
 	gboolean removed;
-	void (*done) (char *uri, gboolean removed, void *data);
+	void (*done) (CamelFolder *folder, gboolean removed, CamelException *ex, void *data);
 	void *data;
 };
 
 static gchar *
 remove_folder_desc (struct _remove_folder_msg *m)
 {
-	return g_strdup_printf (_("Removing folder %s"), m->uri);
+	return g_strdup_printf (_("Removing folder %s"), m->folder->full_name);
+}
+
+static void
+remove_folder_rec (CamelStore *store, CamelFolderInfo *fi, CamelException *ex)
+{
+	while (fi) {
+		CamelFolder *folder;
+
+		if (fi->child) {
+			remove_folder_rec (store, fi->child, ex);
+			if (camel_exception_is_set (ex))
+				return;
+		}
+
+		d(printf ("deleting folder '%s'\n", fi->full_name));
+
+		if (!(folder = camel_store_get_folder (store, fi->full_name, 0, ex)))
+			return;
+
+		if (!CAMEL_IS_VEE_FOLDER (folder)) {
+			GPtrArray *uids = camel_folder_get_uids (folder);
+			int i;
+
+			/* Delete every message in this folder, then expunge it */
+			camel_folder_freeze (folder);
+			for (i = 0; i < uids->len; i++)
+				camel_folder_delete_message (folder, uids->pdata[i]);
+
+			camel_folder_free_uids (folder, uids);
+
+			camel_folder_sync (folder, TRUE, NULL);
+			camel_folder_thaw (folder);
+		}
+
+		/* if the store supports subscriptions, unsubscribe from this folder... */
+		if (camel_store_supports_subscriptions (store))
+			camel_store_unsubscribe_folder (store, fi->full_name, NULL);
+
+		/* Then delete the folder from the store */
+		camel_store_delete_folder (store, fi->full_name, ex);
+		if (camel_exception_is_set (ex))
+			return;
+
+		fi = fi->next;
+	}
 }
 
 static void
 remove_folder_exec (struct _remove_folder_msg *m)
 {
 	CamelStore *store;
-	CamelFolder *folder;
-	GPtrArray *uids;
-	int i;
+	CamelFolderInfo *fi;
 
 	m->removed = FALSE;
 
-	folder = mail_tool_uri_to_folder (m->uri, 0, &m->base.ex);
-	if (!folder)
-		return;
+	store = m->folder->parent_store;
 
-	store = folder->parent_store;
-
-	/* Delete every message in this folder, then expunge it */
-	uids = camel_folder_get_uids (folder);
-	camel_folder_freeze(folder);
-	for (i = 0; i < uids->len; i++)
-		camel_folder_delete_message (folder, uids->pdata[i]);
-	camel_folder_sync (folder, TRUE, NULL);
-	camel_folder_thaw(folder);
-	camel_folder_free_uids (folder, uids);
+	fi = camel_store_get_folder_info (store, m->folder->full_name, CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, &m->base.ex);
+	if (camel_exception_is_set (&m->base.ex))
+		return;
 
-	/* if the store supports subscriptions, unsubscribe from this folder... */
-	if (camel_store_supports_subscriptions (store))
-		camel_store_unsubscribe_folder (store, folder->full_name, NULL);
+	remove_folder_rec (store, fi, &m->base.ex);
+	camel_store_free_folder_info (store, fi);
 
-	/* Then delete the folder from the store */
-	camel_store_delete_folder (store, folder->full_name, &m->base.ex);
 	m->removed = !camel_exception_is_set (&m->base.ex);
-	camel_object_unref (folder);
 }
 
 static void
 remove_folder_done (struct _remove_folder_msg *m)
 {
-	if (m->removed) {
-		/* FIXME: Remove this folder from the folder cache ??? */
-	}
-
 	if (m->done)
-		m->done (m->uri, m->removed, m->data);
+		m->done (m->folder, m->removed, &m->base.ex, m->data);
 }
 
 static void
 remove_folder_free (struct _remove_folder_msg *m)
 {
-	g_free (m->uri);
+	camel_object_unref (m->folder);
 }
 
 static MailMsgInfo remove_folder_info = {
@@ -1473,12 +1500,15 @@ static MailMsgInfo remove_folder_info = {
 };
 
 void
-mail_remove_folder (const char *uri, void (*done) (char *uri, gboolean removed, void *data), void *data)
+mail_remove_folder (CamelFolder *folder, void (*done) (CamelFolder *folder, gboolean removed, CamelException *ex, void *data), void *data)
 {
 	struct _remove_folder_msg *m;
 
+	g_return_if_fail (folder != NULL);
+
 	m = mail_msg_new (&remove_folder_info);
-	m->uri = g_strdup (uri);
+	m->folder = folder;
+	camel_object_ref (folder);
 	m->data = data;
 	m->done = done;
 
diff --git a/mail/mail-ops.h b/mail/mail-ops.h
index 14654aa0b4..e615a9121d 100644
--- a/mail/mail-ops.h
+++ b/mail/mail-ops.h
@@ -111,8 +111,8 @@ int mail_get_folderinfo (CamelStore *store, CamelOperation *op,
 			 void *data);
 
 /* remove an existing folder */
-void mail_remove_folder (const char *uri,
-			 void (*done) (char *uri, gboolean removed, void *data),
+void mail_remove_folder (CamelFolder *folder,
+			 void (*done) (CamelFolder *folder, gboolean removed, CamelException *ex, void *data),
 			 void *data);
 
 /* transfer (copy/move) a folder */
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 139bc2dc25..29cbb57322 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -1,22 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Michael Zucchi <NotZed@ximian.com>
- *
- *  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 version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
  *
- * 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.
+ *
+ * Authors:
+ *		Michael Zucchi <NotZed@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
@@ -415,6 +415,10 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati
 
 	g_object_unref (iter);
 
+	/* Check to see if we have to send any mails --- if we don't, don't display the SMTP row in the table */
+	if (outbox && destination && camel_folder_get_message_count (outbox) == 0)
+		num_sources--;
+
 	table = gtk_table_new (num_sources, 4, FALSE);
 	gtk_container_set_border_width (GTK_CONTAINER (table), 6);
 	gtk_table_set_row_spacings (GTK_TABLE (table), 6);
@@ -539,7 +543,8 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati
 	target = em_event_target_new_send_receive (em_event_peek(), table, data, row, EM_EVENT_SEND_RECEIVE);
 	e_event_emit ((EEvent *)em_event_peek (), "mail.sendreceive", (EEventTarget *) target);
 
-	if (outbox && destination) {
+	/* Skip displaying the SMTP row if we've got no outbox, destination or unsent mails */
+	if (outbox && destination && camel_folder_get_message_count (outbox) != 0) {
 		info = g_hash_table_lookup (data->active, SEND_URI_KEY);
 		if (info == NULL) {
 			info = g_malloc0 (sizeof (*info));
@@ -601,9 +606,9 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati
 		g_signal_connect (
 			cancel_button, "clicked",
 			G_CALLBACK (receive_cancel), info);
-		gtk_widget_show_all (table);
 	}
 
+	gtk_widget_show_all (table);
 	gtk_widget_show (GTK_WIDGET (gd));
 
 	g_signal_connect (gd, "response", G_CALLBACK (dialog_response), data);
diff --git a/mail/mail-session.c b/mail/mail-session.c
index d86242d393..9009bb607b 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -171,7 +171,7 @@ get_password (CamelSession *session, CamelService *service, const char *domain,
 	char *ret = NULL;
 	EAccount *account = NULL;
 
-	url = service?camel_url_to_string(service->url, CAMEL_URL_HIDE_ALL):NULL;
+	url = service ? camel_url_to_string (service->url, CAMEL_URL_HIDE_ALL & (~CAMEL_URL_HIDE_AUTH)) : NULL;
 
 	if (!strcmp(item, "popb4smtp_uri")) {
 		/* not 100% mt safe, but should be ok */
@@ -286,20 +286,13 @@ struct _user_message_msg {
 
 static void user_message_exec (struct _user_message_msg *m);
 
-/* clicked, send back the reply */
 static void
-user_message_response (GtkDialog *dialog, int button, struct _user_message_msg *m)
+user_message_response_free (GtkDialog *dialog, int button, struct _user_message_msg *m)
 {
 	gtk_widget_destroy ((GtkWidget *) dialog);
 
 	user_message_dialog = NULL;
 
-	/* if !allow_cancel, then we've already replied */
-	if (m->allow_cancel) {
-		m->result = button == GTK_RESPONSE_OK;
-		e_flag_set (m->done);
-	}
-
 	/* check for pendings */
 	if (!g_queue_is_empty (&user_message_queue)) {
 		m = g_queue_pop_head (&user_message_queue);
@@ -308,6 +301,19 @@ user_message_response (GtkDialog *dialog, int button, struct _user_message_msg *
 	}
 }
 
+/* clicked, send back the reply */
+static void
+user_message_response (GtkDialog *dialog, int button, struct _user_message_msg *m)
+{
+	/* if !allow_cancel, then we've already replied */
+	if (m->allow_cancel) {
+		m->result = button == GTK_RESPONSE_OK;
+		e_flag_set (m->done);
+	}
+
+	user_message_response_free (dialog, button, m);
+}
+
 static void
 user_message_exec (struct _user_message_msg *m)
 {
@@ -364,7 +370,7 @@ user_message_exec (struct _user_message_msg *m)
 	} else {
 		g_signal_connect (
 			user_message_dialog, "response",
-			G_CALLBACK (user_message_response), m);
+			G_CALLBACK (user_message_response_free), m);
 		g_object_set_data (
 			user_message_dialog, "response-handled",
 			GINT_TO_POINTER (TRUE));
@@ -375,8 +381,8 @@ user_message_exec (struct _user_message_msg *m)
 static void
 user_message_free (struct _user_message_msg *m)
 {
-	g_free(m->prompt);
-	e_flag_free(m->done);
+	g_free (m->prompt);
+	e_flag_free (m->done);
 }
 
 static MailMsgInfo user_message_info = {
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index d0d9997203..951bcc51e7 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -956,6 +956,9 @@ vfolder_load_storage(void)
 	g_signal_connect(context, "rule_added", G_CALLBACK(context_rule_added), context);
 	g_signal_connect(context, "rule_removed", G_CALLBACK(context_rule_removed), context);
 
+	/* load store to mail component */
+	mail_component_load_store_by_uri (mail_component_peek (), storeuri, _("Search Folders"));
+
 	/* and setup the rules we have */
 	rule = NULL;
 	while ( (rule = rule_context_next_rule((RuleContext *)context, rule, NULL)) ) {
@@ -966,9 +969,6 @@ vfolder_load_storage(void)
 			d(printf("invalid rule (%p) encountered: rule->name is NULL\n", rule));
 	}
 
-	/* load store to mail component at the end, when everything is loaded */
-	mail_component_load_store_by_uri (mail_component_peek (), storeuri, _("Search Folders"));
-
 	g_free(storeuri);
 
 	/* reenable the feature if required */
diff --git a/mail/message-list.c b/mail/message-list.c
index 306133610a..576bc1505d 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -1,24 +1,24 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Miguel de Icaza (miguel@ximian.com)
- *           Bertrand Guiheneuf (bg@aful.org)
- *           And just about everyone else in evolution ...
+ * 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.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  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.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Miguel de Icaza (miguel@ximian.com)
+ *      Bertrand Guiheneuf (bg@aful.org)
+ *      And just about everyone else in evolution ...
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
@@ -235,6 +235,7 @@ static struct {
 	{ "stock_score-highest",               NULL },
 	{ "stock_mail-flag-for-followup",      NULL },
 	{ "stock_mail-flag-for-followup-done", NULL },
+	{ "stock_new-meeting",                 NULL }
 };
 
 /* FIXME: junk prefs */
@@ -1267,6 +1268,61 @@ get_all_labels (CamelMessageInfo *msg_info, char **label_str, gboolean get_tags)
 	return count;
 }
 
+static const char *
+get_trimmed_subject (CamelMessageInfo *info)
+{
+	const char *subject;
+	const char *mlist;
+	int mlist_len = 0;
+	gboolean found_mlist;
+
+	subject = camel_message_info_subject (info);
+	if (!subject || !*subject)
+		return subject;
+
+	mlist = camel_message_info_mlist (info);
+
+	if (mlist && *mlist) {
+		const char *mlist_end;
+
+		mlist_end = strchr (mlist, '@');
+		if (mlist_end)
+			mlist_len = mlist_end - mlist;
+		else
+			mlist_len = strlen (mlist);
+	}
+
+	do {
+		found_mlist = FALSE;
+
+		while (!g_ascii_strncasecmp ((char *) subject, "Re:", 3)) {
+			subject += 3;
+
+			/* jump over any spaces */
+			while (*subject && isspace ((int) *subject))
+				subject++;
+		}
+
+		if (mlist_len &&
+		    *subject == '[' &&
+		    !g_ascii_strncasecmp ((char *) subject + 1, mlist, mlist_len) &&
+		    subject [1 + mlist_len] == ']') {
+			subject += 1 + mlist_len + 1;  /* jump over "[mailing-list]" */
+			found_mlist = TRUE;
+
+			/* jump over any spaces */
+			while (*subject && isspace ((int) *subject))
+				subject++;
+		}
+	} while (found_mlist);
+
+	/* jump over any spaces */
+	while (*subject && isspace ((int) *subject))
+		subject++;
+
+	return subject;
+}
+
 static void *
 ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data)
 {
@@ -1340,6 +1396,8 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data)
 		str = camel_message_info_user_tag(msg_info, "follow-up");
 		return (void *)(str ? str : "");
 	case COL_ATTACHMENT:
+		if (camel_message_info_user_flag (msg_info, "$has_cal"))
+			return GINT_TO_POINTER (2);
 		return GINT_TO_POINTER ((camel_message_info_flags(msg_info) & CAMEL_MESSAGE_ATTACHMENTS) != 0);
 	case COL_FROM:
 		str = camel_message_info_from (msg_info);
@@ -1349,6 +1407,9 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data)
 	case COL_SUBJECT:
 		str = camel_message_info_subject (msg_info);
 		return (void *)(str ? str : "");
+	case COL_SUBJECT_TRIMMED:
+		str = get_trimmed_subject (msg_info);
+		return (void *)(str ? str : "");
 	case COL_SUBJECT_NORM:
 		return (void *) get_normalised_string (message_list, msg_info, col);
 	case COL_SENT: {
@@ -1734,8 +1795,9 @@ message_list_create_extras (void)
 
 	for (i = 0; i < 2; i++)
 		images [i] = states_pixmaps [i + 6].pixbuf;
+	images [2] = states_pixmaps [18].pixbuf;
 
-	e_table_extras_add_cell (extras, "render_attachment", e_cell_toggle_new (0, 2, images));
+	e_table_extras_add_cell (extras, "render_attachment", e_cell_toggle_new (0, 3, images));
 
 	images [1] = states_pixmaps [8].pixbuf;
 	e_table_extras_add_cell (extras, "render_flagged", e_cell_toggle_new (0, 2, images));
diff --git a/mail/message-list.etspec b/mail/message-list.etspec
index 84fc12fafb..c8d438b90c 100644
--- a/mail/message-list.etspec
+++ b/mail/message-list.etspec
@@ -7,15 +7,15 @@
 
   <ETableColumn model_col="3" _title="Attachment" pixbuf="attachment" expansion="0.0" minimum_width="18" resizable="false" cell="render_attachment" compare="integer" />
 
-  <ETableColumn model_col="4" compare_col="19" _title="From" expansion="1.0" minimum_width="32" resizable="true" cell="render_text" compare="address_compare" search="string" priority="10"/>
+  <ETableColumn model_col="4" compare_col="20" _title="From" expansion="1.0" minimum_width="32" resizable="true" cell="render_text" compare="address_compare" search="string" priority="10"/>
 
-  <ETableColumn model_col="5" compare_col="20" _title="Subject" expansion="1.6" minimum_width="32" resizable="true" cell="render_tree" compare="string" search="string"/>
+  <ETableColumn model_col="5" compare_col="21" _title="Subject" expansion="1.6" minimum_width="32" resizable="true" cell="render_tree" compare="string" search="string"/>
 
   <ETableColumn model_col="6" _title="Date" expansion="0.4" minimum_width="32" resizable="true" cell="render_date" compare="integer"/>
 
   <ETableColumn model_col="7" _title="Received" expansion="0.4" minimum_width="32" resizable="true" cell="render_date" compare="integer"/>
 
-  <ETableColumn model_col="8" compare_col="21" _title="To" expansion="1.0" minimum_width="32" resizable="true" cell="render_text" compare="address_compare" search="string" priority="5"/>
+  <ETableColumn model_col="8" compare_col="22" _title="To" expansion="1.0" minimum_width="32" resizable="true" cell="render_text" compare="address_compare" search="string" priority="5"/>
 
   <ETableColumn model_col="9" _title="Size" expansion="0.2" minimum_width="32" resizable="true" cell="render_size" compare="integer"/>
 
@@ -33,6 +33,8 @@
   <ETableColumn model_col="17"  _title="Sent Messages" expansion="1.0" minimum_width="32" resizable="true" cell="render_composite_to" compare="address_compare" search="string" priority="10"   sortable="false"/>
   <ETableColumn model_col="18"  _title="Labels" expansion="1.0" minimum_width="32" resizable="true" cell="render_text" compare="string" search="string" priority="10"/>
 
+  <ETableColumn model_col="19" compare_col="21" _title="Subject - Trimmed" expansion="1.6" minimum_width="32" resizable="true" cell="render_tree" compare="string" search="string"/>
+
   <ETableState>
     <column source="0"/> <column source="3"/> <column source="1"/>
     <column source="4"/> <column source="5" expansion="1.60"/> <column source="6" expansion="0.40"/>
diff --git a/mail/message-list.h b/mail/message-list.h
index b144708208..cc58e1e798 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -60,6 +60,9 @@ enum {
 	COL_MIXED_RECIPIENTS,
 	COL_LABELS,
 
+	/* subject with junk removed */
+	COL_SUBJECT_TRIMMED,
+
 	/* normalised strings */
 	COL_FROM_NORM,
 	COL_SUBJECT_NORM,
diff --git a/plugins/attachment-reminder/ChangeLog b/plugins/attachment-reminder/ChangeLog
index fb8d1de6c6..53db95fe62 100644
--- a/plugins/attachment-reminder/ChangeLog
+++ b/plugins/attachment-reminder/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-24  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* attachment-reminder.c:
+
 2008-08-12  Bharath Acharya  <abharath@novell.com>
 
 	* Makefile.am: Have a check for OS_WIN32 and handle the schema data 
diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c
index db629f0459..15bac58080 100644
--- a/plugins/attachment-reminder/attachment-reminder.c
+++ b/plugins/attachment-reminder/attachment-reminder.c
@@ -1,21 +1,22 @@
- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * 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.
  *
- *  Author: Johnny Jacob <jjohnny@novell.com>
+ * 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.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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/>  
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of version 2 of the GNU General Public
- *  License as published by the Free Software Foundation.
  *
- *  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.
+ * Authors:
+ *		Johnny Jacob <jjohnny@novell.com>
  *
- *  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.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/audio-inline/ChangeLog b/plugins/audio-inline/ChangeLog
index d7fe8ddffc..5b82ad2fc6 100644
--- a/plugins/audio-inline/ChangeLog
+++ b/plugins/audio-inline/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-24  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fixes bug #553479
+
+	* org-gnome-audio-inline.eplug.xml: String capitalisation
+	improvements.
+
 2008-08-12  Bharath Acharya  <abharath@novell.com>
 
 	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
diff --git a/plugins/audio-inline/org-gnome-audio-inline.eplug.xml b/plugins/audio-inline/org-gnome-audio-inline.eplug.xml
index 7a8a3cc291..16c282a014 100644
--- a/plugins/audio-inline/org-gnome-audio-inline.eplug.xml
+++ b/plugins/audio-inline/org-gnome-audio-inline.eplug.xml
@@ -6,7 +6,7 @@
     location="@PLUGINDIR@/liborg-gnome-audio-inline@SOEXT@"
     _name="Audio inline plugin">
 
-    <_description>A formatter plugin which displays audio attachments inline and allows you to play them directly from evolution.</_description>
+    <_description>A formatter plugin which displays audio attachments inline and allows you to play them directly from Evolution.</_description>
     <author name="Radek Doulík" email="rodo@novell.com"/>
 
     <hook class="org.gnome.evolution.mail.format:1.0">
diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog
index 6c110fd1fc..f7b0b27e30 100644
--- a/plugins/bbdb/ChangeLog
+++ b/plugins/bbdb/ChangeLog
@@ -1,3 +1,24 @@
+2008-10-01  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #553527
+
+	* bbdb.c: (struct todo_struct), (free_todo_struct), (bbdb_do_in_thread),
+	(bbdb_do_thread), (bbdb_handle_reply): Do the EBook work in a separate
+	thread to have better performance on reply with slow address books.
+
+2008-09-29  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #497928
+
+	* bbdb.c: (source_changed_cb), (gaim_source_changed_cb):
+	Set URI to empty string when user deletes previously selected source.
+
+2008-09-19  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* bbdb.c:
+
 2008-09-02  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index f5f09274a1..547a779961 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -1,34 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * 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.
  *
- *  An Evolution EPlugin that automatically populates your addressbook
- *  as you reply to messages.  Inspired by an Emacs contact management
- *  tool called The Insidious Big Brother Database, a jwz joint.
+ * 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.
  *
- *  Nat Friedman
- *  22 October 2004
- *  Boston
+ * 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)
  *
- *  Permission is hereby granted, free of charge, to any person
- *  obtaining a copy of this software and associated documentation
- *  files (the "Software"), to deal in the Software without
- *  restriction, including without limitation the rights to use, copy,
- *  modify, merge, publish, distribute, sublicense, and/or sell copies
- *  of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
+ * Authors:
+ *		Nat Friedman <nat@novell.com>
  *
- *  The above copyright notice and this permission notice shall be
- *  included in all copies or substantial portions of the Software.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- *  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- *  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- *  DEALINGS IN THE SOFTWARE.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -143,33 +132,120 @@ bbdb_timeout (gpointer data)
 	return TRUE;
 }
 
-/* Code to populate addressbook when you reply to a mail follows */
+typedef struct
+{
+	char *name;
+	char *email;
+} todo_struct;
 
-void
-bbdb_handle_reply (EPlugin *ep, EMEventTargetMessage *target)
+static void
+free_todo_struct (todo_struct *td)
 {
-	const CamelInternetAddress *cia;
-	EBook      *book = NULL;
-	int         i;
+	if (td) {
+		g_free (td->name);
+		g_free (td->email);
+		g_free (td);
+	}
+}
+
+static GSList *todo = NULL;
+G_LOCK_DEFINE_STATIC (todo);
+
+static gpointer
+bbdb_do_in_thread (gpointer data)
+{
+	EBook *book;
 
 	/* Open the addressbook */
 	book = bbdb_open_addressbook (AUTOMATIC_CONTACTS_ADDRESSBOOK);
-	if (book == NULL)
+	if (book == NULL) {
+		G_LOCK (todo);
+
+		g_slist_foreach (todo, (GFunc)free_todo_struct, NULL);
+		g_slist_free (todo);
+		todo = NULL;
+
+		G_UNLOCK (todo);
+		return NULL;
+	}
+
+	G_LOCK (todo);
+	while (todo) {
+		todo_struct *td = todo->data;
+
+		todo = g_slist_remove (todo, td);
+
+		G_UNLOCK (todo);
+
+		if (td) {
+			bbdb_do_it (book, td->name, td->email);
+			free_todo_struct (td);
+		}
+
+		G_LOCK (todo);
+	}
+	G_UNLOCK (todo);
+
+	g_object_unref (book);
+
+	return NULL;
+}
+
+static void
+bbdb_do_thread (const char *name, const char *email)
+{
+	todo_struct *td;
+
+	if (!name && !email)
 		return;
 
+	td = g_new (todo_struct, 1);
+	td->name = g_strdup (name);
+	td->email = g_strdup (email);
+
+	G_LOCK (todo);
+	if (todo) {
+		/* the list isn't empty, which means there is a thread taking
+		   care of that, thus just add it to the queue */
+		todo = g_slist_append (todo, td);
+	} else {
+		GError *error = NULL;
+
+		/* list was empty, add item and create a thread */
+		todo = g_slist_append (todo, td);
+		g_thread_create (bbdb_do_in_thread, NULL, FALSE, &error);
+
+		if (error) {
+			g_warning ("%s: Creation of the thread failed with error: %s", G_STRFUNC, error->message);
+			g_error_free (error);
+
+			G_UNLOCK (todo);
+			bbdb_do_in_thread (NULL);
+			G_LOCK (todo);
+		}
+	}
+	G_UNLOCK (todo);
+}
+
+/* Code to populate addressbook when you reply to a mail follows */
+void
+bbdb_handle_reply (EPlugin *ep, EMEventTargetMessage *target)
+{
+	const CamelInternetAddress *cia;
+	int         i;
+
 	cia = camel_mime_message_get_from (target->message);
 	if (cia) {
 		for (i = 0; i < camel_address_length (CAMEL_ADDRESS (cia)); i ++) {
 			const char *name=NULL, *email=NULL;
 			if (!(camel_internet_address_get (cia, i, &name, &email)))
 				continue;
-			bbdb_do_it (book, name, email);
+			bbdb_do_thread (name, email);
 		}
 	}
 
 	/* If this is a reply-all event, process To: and Cc: also. */
 	if (((EEventTarget *) target)->mask & EM_EVENT_MESSAGE_REPLY_ALL) {
-		g_object_unref (G_OBJECT (book));
 		return;
 	}
 
@@ -179,7 +255,7 @@ bbdb_handle_reply (EPlugin *ep, EMEventTargetMessage *target)
 			const char *name=NULL, *email=NULL;
 			if (!(camel_internet_address_get (cia, i, &name, &email)))
 				continue;
-			bbdb_do_it (book, name, email);
+			bbdb_do_thread (name, email);
 		}
 	}
 
@@ -189,11 +265,9 @@ bbdb_handle_reply (EPlugin *ep, EMEventTargetMessage *target)
 			const char *name=NULL, *email=NULL;
 			if (!(camel_internet_address_get (cia, i, &name, &email)))
 				continue;
-			bbdb_do_it (book, name, email);
+			bbdb_do_thread (name, email);
 		}
 	}
-
-	g_object_unref (G_OBJECT (book));
 }
 
 static void
@@ -446,12 +520,11 @@ source_changed_cb (ESourceComboBox *source_combo_box,
 	GError *error = NULL;
 
 	source = e_source_combo_box_get_active (source_combo_box);
-	g_return_if_fail (source != NULL);
 
 	gconf_client_set_string (
 		stuff->target->gconf,
 		GCONF_KEY_WHICH_ADDRESSBOOK,
-		e_source_get_uri (source), &error);
+		source ? e_source_get_uri (source) : "", &error);
 
 	if (error != NULL) {
 		g_warning ("%s", error->message);
@@ -467,12 +540,11 @@ gaim_source_changed_cb (ESourceComboBox *source_combo_box,
 	GError *error = NULL;
 
 	source = e_source_combo_box_get_active (source_combo_box);
-	g_return_if_fail (source != NULL);
 
 	gconf_client_set_string (
 		stuff->target->gconf,
 		GCONF_KEY_WHICH_ADDRESSBOOK_GAIM,
-		e_source_get_uri (source), &error);
+		source ? e_source_get_uri (source) : "", &error);
 
 	if (error != NULL) {
 		g_warning ("%s", error->message);
diff --git a/plugins/default-mailer/ChangeLog b/plugins/default-mailer/ChangeLog
index 8955f0981d..5fe56f0817 100644
--- a/plugins/default-mailer/ChangeLog
+++ b/plugins/default-mailer/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-25  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* default-mailer.c:
+
 2008-08-12  Bharath Acharya  <abharath@novell.com>
 
 	* Makefile.am: Have a check for OS_WIN32 and handle the schema data 
diff --git a/plugins/default-mailer/default-mailer.c b/plugins/default-mailer/default-mailer.c
index 47cddb9db5..7069f46e7b 100644
--- a/plugins/default-mailer/default-mailer.c
+++ b/plugins/default-mailer/default-mailer.c
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Author: Jonathan Dieter <jdieter99@gmx.net>
+ * 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.
  *
- *  Copyright 2005 Jonathan Dieter
+ * 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.
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of version 2 of the GNU General Public
- *  License as published by the Free Software Foundation.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Jonathan Dieter <jdieter99@gmx.net>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * Copyright 2005 Jonathan Dieter
  *
  */
 
diff --git a/plugins/email-custom-header/ChangeLog b/plugins/email-custom-header/ChangeLog
index f69ba35622..44bf5cb76b 100644
--- a/plugins/email-custom-header/ChangeLog
+++ b/plugins/email-custom-header/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-12  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* email-custom-header.c:
+	* email-custom-header.h:
+
 2008-09-01  Matthew Barnes  <mbarnes@redhat.com>
 
 	* email-custom-header.c:
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index 847c56d315..b3feb99de2 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Authors: Ashish Shrivastava <shashish@novell.com>
- *
- * 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 version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Ashish Shrivastava <shashish@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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, MA 02110-1301.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/plugins/email-custom-header/email-custom-header.h b/plugins/email-custom-header/email-custom-header.h
index 22a997d2ee..f828a53061 100644
--- a/plugins/email-custom-header/email-custom-header.h
+++ b/plugins/email-custom-header/email-custom-header.h
@@ -1,20 +1,25 @@
- /* Evolution Email custom header options
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Authors: Ashish <shashish@novell.com>
- *
+/*
+ * Evolution Email custom header options
+ * 
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Ashish <shashish@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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, MA 02110-1301.
  */
 
 #ifndef __EMAIL_CUSTOM_HEADEROPTIONS_DIALOG_H__
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index f7f6927919..b6661445a4 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,22 @@
+2008-09-24  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* exchange-delegates-user.c:
+
+2008-09-23  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #553273
+
+	* exchange-config-listener.c: (exchange_config_listener_authenticate):
+	Always end e_error_run/e_error_new calls with NULL parameter.
+
+2008-09-16  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* exchange-user-dialog.c:
+
 2008-09-04  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c
index 913778a1b1..308e73daaf 100644
--- a/plugins/exchange-operations/exchange-config-listener.c
+++ b/plugins/exchange-operations/exchange-config-listener.c
@@ -776,7 +776,7 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
 		}
 
 		if (current_quota_usage) {
-			widget = e_error_new (NULL, error_code, current_quota_usage);
+			widget = e_error_new (NULL, error_code, current_quota_usage, NULL);
 			g_signal_connect ((GtkDialog *)widget, "response",
 					  G_CALLBACK (gtk_widget_destroy), widget);
 			gtk_widget_show (widget);
diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c
index a719059a5e..2cd3eb1c5a 100644
--- a/plugins/exchange-operations/exchange-delegates-user.c
+++ b/plugins/exchange-operations/exchange-delegates-user.c
@@ -1,20 +1,22 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* Copyright (C) 2002-2004 Novell, Inc.
- *
+/*
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Authors:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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.
  */
 
 /* ExchangeDelegatesUser: A single delegate */
diff --git a/plugins/exchange-operations/exchange-user-dialog.c b/plugins/exchange-operations/exchange-user-dialog.c
index 48c9170736..e1de8f4797 100644
--- a/plugins/exchange-operations/exchange-user-dialog.c
+++ b/plugins/exchange-operations/exchange-user-dialog.c
@@ -1,20 +1,18 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Copyright (C) 2001-2004 Novell, Inc.
- *
+/*
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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
- * 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 the program; if not, see <http://www.gnu.org/licenses/>  
  *
- * 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.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/plugins/google-account-setup/ChangeLog b/plugins/google-account-setup/ChangeLog
index c8e97a9e6b..84badcf745 100644
--- a/plugins/google-account-setup/ChangeLog
+++ b/plugins/google-account-setup/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-24  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fixes bug #553479
+
+	* org-gnome-evolution-google.eplug.xml: String capitalisation
+	improvements.
+
 2008-08-27  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml b/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml
index 93a8aeee2d..2b32a5010d 100644
--- a/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml
+++ b/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml
@@ -4,7 +4,7 @@
     location="@PLUGINDIR@/liborg-gnome-evolution-google@SOEXT@" load-on-startup="false" localedir = "@LOCALEDIR@" system_plugin="true">
     <author name="Ebby Wiselyn" email="ebbywiselyn@gmail.com"/>
     <author name="Joergen Scheibengruber" email="joergen.scheibengruber@googlemail.com"/>
-    <_description>A plugin to setup google calendar and contacts.</_description>
+    <_description>A plugin to setup Google Calendar and Contacts.</_description>
 
     <hook class="org.gnome.evolution.calendar.config:1.0">
       <group target="source" id="org.gnome.evolution.calendar.calendarProperties">
diff --git a/plugins/groupwise-account-setup/ChangeLog b/plugins/groupwise-account-setup/ChangeLog
index 3eb01e4627..8674762787 100644
--- a/plugins/groupwise-account-setup/ChangeLog
+++ b/plugins/groupwise-account-setup/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-25  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fix for bug #553148
+
+	* org-gnome-gw-account-setup.eplug.xml: Standardise "GroupWise"
+	usage in translatable strings.
+
 2008-09-02  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml b/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml
index 3174226137..d8f52a49f5 100644
--- a/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml
+++ b/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <e-plugin-list>
-  <e-plugin id="org.gnome.evolution.plugin.gw-account-setup" type="shlib" _name="Groupwise Account Setup"
+  <e-plugin id="org.gnome.evolution.plugin.gw-account-setup" type="shlib" _name="GroupWise Account Setup"
     location="@PLUGINDIR@/liborg-gnome-gw-account-setup@SOEXT@" load-on-startup="true" system_plugin="true">
     <author name="Sivaiah Nallagatla" email="snallagatla@novell.com"/>
-    <_description>A plugin to setup groupwise calendar and contacts sources.</_description>
+    <_description>A plugin to setup GroupWise calendar and contacts sources.</_description>
     
     <hook class="org.gnome.evolution.mail.config:1.0">
       <group target="account" id="org.gnome.evolution.mail.config.accountDruid">
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index 0dfbadb63c..202ce94ffa 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,63 @@
+2008-10-01  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	*  send-options.c: Mark two forgotten strings for translation. Fixes bug #553070
+
+2008-10-01  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* org-gnome-proxy-errors.xml:
+	* org-gnome-proxy-login-errors.xml:
+	* proxy.c:
+	* proxy-listing.glade:
+	* proxy-login-dialog.glade:
+	Add translator comment to the occurrences of the Proxy term. Fixes bug #554297
+
+2008-10-01  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #511947
+
+	* proxy-login.c: (proxy_login_get_cnc):
+	Pass in optional parent for password dialog.
+	* proxy-login.c: (proxy_soap_login), (proxy_login_update_tree),
+	(org_gnome_proxy_account_login): Adapt to the above change and check
+	for NULL values to prevent runtime warnings.
+
+2008-09-25  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fix for bug #553148
+
+	* org-gnome-compose-send-options.xml:
+	* org-gnome-groupwise-features.eplug.xml: Standardise "GroupWise"
+	usage in translatable strings.
+
+2008-09-24  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* proxy.c:
+
+2008-09-22  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fixes bug #552851
+
+	* org-gnome-shared-folder.errors.xml:
+	Add translator comments to the accept/decline strings, and improve
+	some other strings in the file.
+
+2008-09-19  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* install-shared.c:
+	* junk-settings.c:
+	* share-folder.c:
+	* status-track.c:
+
+2008-09-12  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* send-options.c:
+
 2008-09-02  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c
index 3d61a10675..35e3ae6c68 100644
--- a/plugins/groupwise-features/install-shared.c
+++ b/plugins/groupwise-features/install-shared.c
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Vivek Jain <jvivek@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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of version 2 of the GNU General Public
- *  License as published by the Free Software Foundation.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Vivek Jain <jvivek@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c
index c0fc0c892f..460883a61a 100644
--- a/plugins/groupwise-features/junk-settings.c
+++ b/plugins/groupwise-features/junk-settings.c
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Author: Vivek Jain <jvivek@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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of version 2 of the GNU General Public
- *  License as published by the Free Software Foundation.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Vivek Jain <jvivek@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/groupwise-features/org-gnome-compose-send-options.xml b/plugins/groupwise-features/org-gnome-compose-send-options.xml
index c5947c6a33..25ff89803e 100644
--- a/plugins/groupwise-features/org-gnome-compose-send-options.xml
+++ b/plugins/groupwise-features/org-gnome-compose-send-options.xml
@@ -1,7 +1,7 @@
 <Root>
   <commands>
   <cmd name="EPSOSendOptions" _label="Send Options"
-	  _tip="Add Send Options to groupwise messages"/>
+	  _tip="Add Send Options to GroupWise messages"/>
   </commands>
 
   <menu>
diff --git a/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml b/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
index 47f74060ec..7a707fdcc9 100644
--- a/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
+++ b/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <e-plugin-list>
-	<e-plugin id="org.gnome.evolution.groupwise_features" type="shlib" _name="Groupwise Features" 
+	<e-plugin id="org.gnome.evolution.groupwise_features" type="shlib" _name="GroupWise Features" 
 		location="@PLUGINDIR@/liborg-gnome-groupwise-features@SOEXT@">
 		<author name="Sivaiah Nallagatla" email="snallagatla@novell.com" />
 		<author name="Vivek Jain" email="jvivek@novell.com" />
@@ -10,7 +10,7 @@
     		<author name="Shreyas Srinivasan" email="sshreyas@novell.com"/>
 		<author name="Raghavendran R" email="raghavguru7@gmail.com"/>
 
-		<_description>A plugin for the features in Groupwise accounts.</_description>
+		<_description>A plugin for the features in GroupWise accounts.</_description>
 		<hook class="org.gnome.evolution.mail.config:1.0">
 			<group id="org.gnome.evolution.mail.folderConfig" target="folder"
 				check= "shared_folder_check"
diff --git a/plugins/groupwise-features/org-gnome-proxy-errors.xml b/plugins/groupwise-features/org-gnome-proxy-errors.xml
index b32164ccf9..dad6fbe8f1 100644
--- a/plugins/groupwise-features/org-gnome-proxy-errors.xml
+++ b/plugins/groupwise-features/org-gnome-proxy-errors.xml
@@ -2,6 +2,7 @@
 <error-list domain="org.gnome.evolution.proxy">
 <error id="invalid-user" type="error">
 <_primary>Invalid user</_primary>
+<!--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 -->
 <_secondary>
 Proxy access cannot be given to user &quot;{0}&quot; 
 </_secondary>
@@ -9,6 +10,7 @@ Proxy access cannot be given to user &quot;{0}&quot;
 
 <error id="no-user" type="error">
 <_primary>Specify User</_primary>
+<!--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 -->
 <_secondary>
 You have to specify a valid user name to give proxy rights.
 </_secondary>
@@ -16,6 +18,7 @@ You have to specify a valid user name to give proxy rights.
 
 <error id="user-is-proxy" type="error">
 <_primary>Specify User</_primary>
+<!--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 -->
 <_secondary>
 You have already given proxy permissions to this user. 
 </_secondary>
diff --git a/plugins/groupwise-features/org-gnome-proxy-login-errors.xml b/plugins/groupwise-features/org-gnome-proxy-login-errors.xml
index 36d8527e49..fccddfd6c6 100644
--- a/plugins/groupwise-features/org-gnome-proxy-login-errors.xml
+++ b/plugins/groupwise-features/org-gnome-proxy-login-errors.xml
@@ -3,6 +3,7 @@
 <error id="invalid-user" type="error">
 <_primary>Invalid user</_primary>
 <_secondary>
+<!--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-->
 Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email address and try again. 
 </_secondary>
 </error>
diff --git a/plugins/groupwise-features/org-gnome-shared-folder.errors.xml b/plugins/groupwise-features/org-gnome-shared-folder.errors.xml
index 5e7bfb28e5..ca63ad80aa 100644
--- a/plugins/groupwise-features/org-gnome-shared-folder.errors.xml
+++ b/plugins/groupwise-features/org-gnome-shared-folder.errors.xml
@@ -4,19 +4,20 @@
 <error id="invalid-user" type="error">
 <_primary>Invalid user</_primary>
 <_secondary>
-You cannot share folder with specified user &quot;{0}&quot; 
+You cannot share this folder with the specified user &quot;{0}&quot; 
 </_secondary>
 </error>
 
 <error id="no-user" type="error">
 <_primary>Specify User</_primary>
 <_secondary>
-	You have to specify a user name whom you want to add to the list 
+	You have to specify a user name which you want to add to the list 
 </_secondary>
 </error>
 
 <error id="recurrence-accept" type="question" default="GTK_RESPONSE_YES">
 <_primary>This is a recurring meeting</_primary>
+<!--Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting") -->
 <_secondary>Would you like to accept it?</_secondary>
  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
  <button label="This instance" response="GTK_RESPONSE_NO"/>
@@ -25,6 +26,7 @@ You cannot share folder with specified user &quot;{0}&quot;
 
 <error id="recurrence-decline" type="question" default="GTK_RESPONSE_YES">
 <_primary>This is a recurring meeting</_primary>
+<!--Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting") -->
 <_secondary>Would you like to decline it?</_secondary>
  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
  <button label="This instance" response="GTK_RESPONSE_NO"/>
diff --git a/plugins/groupwise-features/proxy-listing.glade b/plugins/groupwise-features/proxy-listing.glade
index dc4fd24820..984227c558 100644
--- a/plugins/groupwise-features/proxy-listing.glade
+++ b/plugins/groupwise-features/proxy-listing.glade
@@ -169,7 +169,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="label1">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Proxy</property>
+	      <property name="label" translatable="yes" comment="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">Proxy</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/plugins/groupwise-features/proxy-login-dialog.glade b/plugins/groupwise-features/proxy-login-dialog.glade
index 25d6ced7f7..d2e0bc8fb0 100644
--- a/plugins/groupwise-features/proxy-login-dialog.glade
+++ b/plugins/groupwise-features/proxy-login-dialog.glade
@@ -7,7 +7,7 @@
 <widget class="GtkDialog" id="proxy_login_dialog">
   <property name="visible">True</property>
   <property name="height_request">325</property>
-  <property name="title" translatable="yes">Proxy Login</property>
+  <property name="title" translatable="yes" comment="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">Proxy Login</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">True</property>
diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c
index 58a7cbc810..383e940fbe 100644
--- a/plugins/groupwise-features/proxy-login.c
+++ b/plugins/groupwise-features/proxy-login.c
@@ -219,7 +219,7 @@ proxy_get_password (EAccount *account, char **user_name, char **password)
 }
 
 static EGwConnection *
-proxy_login_get_cnc (EAccount *account)
+proxy_login_get_cnc (EAccount *account, GtkWindow *password_dlg_parrent)
 {
 	EGwConnection *cnc;
 	CamelURL *url;
@@ -254,7 +254,7 @@ proxy_login_get_cnc (EAccount *account)
 
 	if (!password)
 		password = e_passwords_ask_password (prompt, "Groupwise", key, prompt,
-				E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET, &remember, NULL);
+				E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET, &remember, password_dlg_parrent);
 
 	g_free (prompt);
 	cnc = e_gw_connection_new (uri, url->user, password);
@@ -333,7 +333,7 @@ proxy_soap_login (char *email)
 	}
 
 	srcAccount = pld->account;
-	cnc = proxy_login_get_cnc(srcAccount);
+	cnc = proxy_login_get_cnc (srcAccount, NULL);
 	proxy_get_password (srcAccount, &user_name, &password);
 
 	proxy_cnc = e_gw_connection_get_proxy_connection (cnc, user_name, password, email, &permissions);
@@ -444,10 +444,11 @@ proxy_login_update_tree (void)
 	EGwConnection *cnc;
 	proxyLoginPrivate *priv = pld->priv;
 	gchar *file_name = e_icon_factory_get_icon_filename ("stock_person", 48);
-	broken_image = gdk_pixbuf_new_from_file (file_name, NULL);
+	broken_image = file_name ? gdk_pixbuf_new_from_file (file_name, NULL) : NULL;
 
-	cnc = proxy_login_get_cnc(pld->account);
-	e_gw_connection_get_proxy_list (cnc, &proxy_list);
+	cnc = proxy_login_get_cnc (pld->account, priv->main ? (GTK_WINDOW (gtk_widget_get_toplevel (priv->main))) : NULL);
+	if (cnc)
+		e_gw_connection_get_proxy_list (cnc, &proxy_list);
 
 	gtk_tree_store_clear (priv->store);
 	if (proxy_list != NULL) {
@@ -465,7 +466,8 @@ proxy_login_update_tree (void)
 	if (broken_image)
 		g_object_unref (broken_image);
 
-	g_object_unref (cnc);
+	if (cnc)
+		g_object_unref (cnc);
 }
 
 void
@@ -477,8 +479,9 @@ org_gnome_proxy_account_login (EPopup *ep, EPopupItem *p, void *data)
 	char *gladefile;
 
 	/* This pops-up the password dialog in case the User has forgot-passwords explicitly */
-	cnc = proxy_login_get_cnc (mail_config_get_account_by_source_url (uri));
-	g_object_unref (cnc);
+	cnc = proxy_login_get_cnc (mail_config_get_account_by_source_url (uri), NULL);
+	if (cnc)
+		g_object_unref (cnc);
 
 	pld = proxy_login_new();
 	priv = pld->priv;
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index c0d3070f68..a7eed9b963 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -1,23 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * 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.
  *
- *  Authors:
- *  Shreyas Srinivasan (sshreyas@novell.com)
- *  Sankar P ( psankar@novell.com )
+ * 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.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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/>  
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of version 2 of the GNU General Public
- *  License as published by the Free Software Foundation.
  *
- *  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.
+ * Authors:
+ *		Shreyas Srinivasan <sshreyas@novell.com>
+ *  	Sankar P <psankar@novell.com>
  *
- *  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.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
@@ -688,15 +688,18 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 		} else if (account->enabled){
 			GtkWidget *label;
 			priv->tab_dialog = gtk_vbox_new (TRUE, 10);
+			/*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*/
 			label = gtk_label_new (_("The Proxy tab will be available only when the account is online."));
 			gtk_box_pack_start ((GtkBox *)priv->tab_dialog, label, TRUE, TRUE, 10);
 		} else {
 			GtkWidget *label;
 			priv->tab_dialog = gtk_vbox_new (TRUE, 10);
+			/*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*/
 			label = gtk_label_new (_("The Proxy tab will be available only when the account is enabled."));
 			gtk_box_pack_start ((GtkBox *)priv->tab_dialog, label, TRUE, TRUE, 10);
 		}
 
+		/*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*/
 		gtk_notebook_append_page ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog, gtk_label_new("Proxy"));
 		g_signal_connect ((GtkNotebook *)(data->parent), "switch-page", G_CALLBACK (proxy_page_changed_cb), account);
 		pag_num = gtk_notebook_page_num ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog);
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index 86135bbac5..124fffe8f3 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.c
@@ -1,23 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * 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.
  *
- *  Authors: Chenthill Palanisamy (pchenthill@novell.com)
+ * 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.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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/>  
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of version 2 of the GNU General Public
- *  License as published by the Free Software Foundation.
  *
- *  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.
+ * Authors:
+ *		Chenthill Palanisamy <pchenthill@novell.com>
  *
- *  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.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -200,15 +202,19 @@ org_gnome_send_options (EPlugin *epl, EConfigHookItemFactoryData *data)
 	target_account = (EMConfigTargetAccount *)data->config->target;
 	account = target_account->account;
 
+	gchar *markup;
+
 	if(!g_strrstr (account->source->url, "groupwise://"))
 		return NULL;
 
 	vbox = gtk_vbox_new (FALSE, 0);
 	frame = gtk_frame_new ("");
 	label = gtk_frame_get_label_widget (GTK_FRAME (frame));
-	gtk_label_set_markup (GTK_LABEL (label), "<b>Send Options</b>");
-	button = gtk_button_new_with_label ("Advanced send options");
+	markup = g_strdup_printf("<b>%s</b>", _("Send Options"));
+	gtk_label_set_markup (GTK_LABEL (label), markup);
+	button = gtk_button_new_with_label (_("Advanced send options"));
 	gtk_widget_show (button);
+	g_free (markup);
 
 	g_signal_connect(button, "clicked",
 			    G_CALLBACK (e_sendoptions_clicked_cb), account);
diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c
index 095a65c111..87d6564f0e 100644
--- a/plugins/groupwise-features/share-folder.c
+++ b/plugins/groupwise-features/share-folder.c
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Author: Vivek Jain <jvivek@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) version 3.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of version 2 of the GNU General Public
- *  License as published by the Free Software Foundation.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Vivek Jain <jvivek@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c
index 15199ec020..cb9e0d8028 100644
--- a/plugins/groupwise-features/status-track.c
+++ b/plugins/groupwise-features/status-track.c
@@ -1,25 +1,27 @@
 /*
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * Author(s): Chenthill Palanisamy <pchenthill@novell.com>
- *	      Parthasarathi Susarla <sparthasarathi@novell.com>
- *	      Sankar P <psankar@novell.com>
- *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Chenthill Palanisamy <pchenthill@novell.com>
+ *	    Parthasarathi Susarla <sparthasarathi@novell.com>
+ *	    Sankar P <psankar@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
diff --git a/plugins/ipod-sync/ChangeLog b/plugins/ipod-sync/ChangeLog
index c9f0e90046..e2fa79fb9c 100644
--- a/plugins/ipod-sync/ChangeLog
+++ b/plugins/ipod-sync/ChangeLog
@@ -1,3 +1,22 @@
+2008-09-19  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* evolution-ipod-sync.c:
+
+2008-09-16  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* ical-format.c:
+	* ipod-sync.c:
+
+2008-09-12  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* sync.c:
+
 2008-09-02  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/ipod-sync/evolution-ipod-sync.c b/plugins/ipod-sync/evolution-ipod-sync.c
index 63372f5459..e0f4246220 100644
--- a/plugins/ipod-sync/evolution-ipod-sync.c
+++ b/plugins/ipod-sync/evolution-ipod-sync.c
@@ -1,9 +1,24 @@
 /*
- * evolution-ipod-sync.c - Evolution->Ipod synchronisation
+ * Evolution->Ipod synchronisation
  *
- * (C)2004 Justin Wake <jwake@iinet.net.au>
+ * 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/>  
  *
- * Licensed under the GNU GPL v2. See COPYING.
+ *
+ * Authors:
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * (C)2004 Justin Wake <jwake@iinet.net.au>
  *
  */
 
diff --git a/plugins/ipod-sync/ical-format.c b/plugins/ipod-sync/ical-format.c
index 7647dd6abc..f6f96b1125 100644
--- a/plugins/ipod-sync/ical-format.c
+++ b/plugins/ipod-sync/ical-format.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * 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.
  *
- *  Authors: Rodrigo Moya <rodrigo@novell.com>
- *           Philip Van Hoof <pvanhoof@gnome.org>
+ * 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.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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/>  
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of version 2 of the GNU General Public
- *  License as published by the Free Software Foundation.
  *
- *  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.
+ * Authors:
+ *		Rodrigo Moya <rodrigo@novell.com>
+ *      Philip Van Hoof <pvanhoof@gnome.org>
  *
- *  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.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/ipod-sync/ipod-sync.c b/plugins/ipod-sync/ipod-sync.c
index 4315c1cfe2..f2d597becc 100644
--- a/plugins/ipod-sync/ipod-sync.c
+++ b/plugins/ipod-sync/ipod-sync.c
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * 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.
  *
- *  Authors: Srinivasa Ragavan <sragavan@novell.com>
+ * 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.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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/>  
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of version 2 of the GNU General Public
- *  License as published by the Free Software Foundation.
  *
- *  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.
+ * Authors:
+ *		Srinivasa Ragavan <sragavan@novell.com>
  *
- *  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.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/ipod-sync/sync.c b/plugins/ipod-sync/sync.c
index fe0fa9af9d..1da7ecd983 100644
--- a/plugins/ipod-sync/sync.c
+++ b/plugins/ipod-sync/sync.c
@@ -1,9 +1,20 @@
 /*
- * sync.c
+ * 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.
  *
- * (C)2004 Justin Wake <jwake@iinet.net.au>
+ * 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.
  *
- * Licensed under the GNU GPL v2. See COPYING.
+ * 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)
+ * Copyright (C) 2004 Justin Wake <jwake@iinet.net.au>
  *
  */
 
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index 4fc1bddaa4..b30fd70aaa 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,3 +1,24 @@
+2008-10-01  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #519491
+
+	* itip-view.c: (ensure_utf8), (itip_view_set_organizer),
+	(itip_view_set_organizer_sentby), (itip_view_set_attendee),
+	(itip_view_set_attendee_sentby), (itip_view_set_proxy),
+	(itip_view_set_delegator), (itip_view_set_summary),
+	(itip_view_set_location), (itip_view_set_status),
+	(itip_view_set_comment), (itip_view_set_description),
+	(itip_view_add_upper_info_item), (itip_view_add_lower_info_item):
+	Convert texts to valid UTF-8 texts before passing them to Gtk+
+	functions which requires that.
+
+2008-09-24  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #313225
+
+	* itip-formatter.c: (format_itip): Set the user flag '$has_cal'
+	on the message when formatting a calendar attachment.
+
 2008-08-27  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 3e200ac873..e37c0d162a 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -2243,6 +2243,11 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target)
 
 	classid = g_strdup_printf("itip:///%s", ((EMFormat *) target->format)->part_id->str);
 
+	/* mark message as containing calendar, thus it will show the icon in message list now on */
+	if (target->format->uid && target->format->folder &&
+	    !camel_folder_get_message_user_flag (target->format->folder, target->format->uid, "$has_cal"))
+		camel_folder_set_message_user_flag (target->format->folder, target->format->uid, "$has_cal", TRUE);
+
 	puri = (struct _itip_puri *)em_format_add_puri(target->format, sizeof(struct _itip_puri), classid, target->part, itip_attachment_frame);
 
 	pobj = em_format_html_add_pobject ((EMFormatHTML *) target->format, sizeof (EMFormatHTMLPObject), classid, target->part, format_itip_object);
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index e42b338e0f..1e5e41195c 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -1194,6 +1194,24 @@ itip_view_get_item_type (ItipView *view)
 	return priv->type;
 }
 
+/* ensures the returned text will be valid UTF-8 text, thus gtk functions expecting
+   only valid UTF-8 texts will not crash. Returned pointer should be freed with g_free. */
+static gchar *
+ensure_utf8 (const char *text)
+{
+	gchar *res = g_strdup (text), *p;
+
+	if (!text)
+		return res;
+
+	p = res;
+	while (!g_utf8_validate (p, -1, (const gchar **) &p)) {
+		/* make all invalid characters appear as question marks */
+		*p = '?';
+	}
+
+	return res;
+}
 
 void
 itip_view_set_organizer (ItipView *view, const char *organizer)
@@ -1208,7 +1226,7 @@ itip_view_set_organizer (ItipView *view, const char *organizer)
 	if (priv->organizer)
 		g_free (priv->organizer);
 
-	priv->organizer = g_strdup (organizer);
+	priv->organizer = ensure_utf8 (organizer);
 
 	set_sender_text (view);
 }
@@ -1239,7 +1257,7 @@ itip_view_set_organizer_sentby (ItipView *view, const char *sentby)
 	if (priv->organizer_sentby)
 		g_free (priv->organizer_sentby);
 
-	priv->organizer_sentby = g_strdup (sentby);
+	priv->organizer_sentby = ensure_utf8 (sentby);
 
 	set_sender_text (view);
 }
@@ -1270,7 +1288,7 @@ itip_view_set_attendee (ItipView *view, const char *attendee)
 	if (priv->attendee)
 		g_free (priv->attendee);
 
-	priv->attendee = g_strdup (attendee);
+	priv->attendee = ensure_utf8 (attendee);
 
 	set_sender_text (view);
 }
@@ -1301,7 +1319,7 @@ itip_view_set_attendee_sentby (ItipView *view, const char *sentby)
 	if (priv->attendee_sentby)
 		g_free (priv->attendee_sentby);
 
-	priv->attendee_sentby = g_strdup (sentby);
+	priv->attendee_sentby = ensure_utf8 (sentby);
 
 	set_sender_text (view);
 }
@@ -1332,7 +1350,7 @@ itip_view_set_proxy (ItipView *view, const char *proxy)
 	if (priv->proxy)
 		g_free (priv->proxy);
 
-	priv->proxy = g_strdup (proxy);
+	priv->proxy = ensure_utf8 (proxy);
 
 	set_sender_text (view);
 }
@@ -1363,7 +1381,7 @@ itip_view_set_delegator (ItipView *view, const char *delegator)
 	if (priv->delegator)
 		g_free (priv->delegator);
 
-	priv->delegator = g_strdup (delegator);
+	priv->delegator = ensure_utf8 (delegator);
 
 	set_sender_text (view);
 }
@@ -1394,7 +1412,7 @@ itip_view_set_summary (ItipView *view, const char *summary)
 	if (priv->summary)
 		g_free (priv->summary);
 
-	priv->summary = summary ? g_strstrip (g_strdup (summary)) : NULL;
+	priv->summary = summary ? g_strstrip (ensure_utf8 (summary)) : NULL;
 
 	set_summary_text (view);
 }
@@ -1425,7 +1443,7 @@ itip_view_set_location (ItipView *view, const char *location)
 	if (priv->location)
 		g_free (priv->location);
 
-	priv->location = location ? g_strstrip (g_strdup (location)) : NULL;
+	priv->location = location ? g_strstrip (ensure_utf8 (location)) : NULL;
 
 	set_location_text (view);
 }
@@ -1456,7 +1474,7 @@ itip_view_set_status (ItipView *view, const char *status)
 	if (priv->status)
 		g_free (priv->status);
 
-	priv->status = status ? g_strstrip (g_strdup (status)) : NULL;
+	priv->status = status ? g_strstrip (ensure_utf8 (status)) : NULL;
 
 	set_status_text (view);
 }
@@ -1487,7 +1505,7 @@ itip_view_set_comment (ItipView *view, const char *comment)
 	if (priv->comment)
 		g_free (priv->comment);
 
-	priv->comment = comment ? g_strstrip (g_strdup (comment)) : NULL;
+	priv->comment = comment ? g_strstrip (ensure_utf8 (comment)) : NULL;
 
 	set_comment_text (view);
 }
@@ -1519,7 +1537,7 @@ itip_view_set_description (ItipView *view, const char *description)
 	if (priv->description)
 		g_free (priv->description);
 
-	priv->description = description ? g_strstrip (g_strdup (description)) : NULL;
+	priv->description = description ? g_strstrip (ensure_utf8 (description)) : NULL;
 
 	set_description_text (view);
 }
@@ -1624,7 +1642,7 @@ itip_view_add_upper_info_item (ItipView *view, ItipViewInfoItemType type, const
 	item = g_new0 (ItipViewInfoItem, 1);
 
 	item->type = type;
-	item->message = g_strdup (message);
+	item->message = ensure_utf8 (message);
 	item->id = priv->next_info_item_id++;
 
 	priv->upper_info_items = g_slist_append (priv->upper_info_items, item);
@@ -1719,7 +1737,7 @@ itip_view_add_lower_info_item (ItipView *view, ItipViewInfoItemType type, const
 	item = g_new0 (ItipViewInfoItem, 1);
 
 	item->type = type;
-	item->message = g_strdup (message);
+	item->message = ensure_utf8 (message);
 	item->id = priv->next_info_item_id++;
 
 	priv->lower_info_items = g_slist_append (priv->lower_info_items, item);
diff --git a/plugins/mail-notification/ChangeLog b/plugins/mail-notification/ChangeLog
index 81039caa5c..3e489aca96 100644
--- a/plugins/mail-notification/ChangeLog
+++ b/plugins/mail-notification/ChangeLog
@@ -1,3 +1,16 @@
+2008-09-16  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* mail-notification.c:
+
+2008-09-15  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #514299
+
+	* mail-notification.c: (new_notify_status):
+	Connect to signals only once, when creating new status icon.
+
 2008-08-12  Bharath Acharya  <abharath@novell.com>
 
 	* Makefile.am: Have a check for OS_WIN32 and handle the schema data 
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index 9826f5a06d..f3da922a79 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Author: Miguel Angel Lopez Hernandez <miguel@gulev.org.mx>
+ * 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.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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.
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of version 2 of the GNU General Public
- *  License as published by the Free Software Foundation.
+ * 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/>  
  *
- *  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.
+ * Authors:
+ *		Miguel Angel Lopez Hernandez <miguel@gulev.org.mx>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
@@ -493,13 +494,15 @@ new_notify_status (EMEventTargetFolder *t)
 
 	g_free (msg);
 
-	#ifdef HAVE_LIBNOTIFY
-	g_signal_connect (G_OBJECT (status_icon), "activate", G_CALLBACK (icon_activated), notify);
-	#else
-	g_signal_connect (G_OBJECT (status_icon), "activate", G_CALLBACK (icon_activated), NULL);
-	#endif
+	if (new_icon) {
+		#ifdef HAVE_LIBNOTIFY
+		g_signal_connect (G_OBJECT (status_icon), "activate", G_CALLBACK (icon_activated), notify);
+		#else
+		g_signal_connect (G_OBJECT (status_icon), "activate", G_CALLBACK (icon_activated), NULL);
+		#endif
 
-	g_signal_connect (G_OBJECT (status_icon), "popup-menu", G_CALLBACK (popup_menu_status), NULL);
+		g_signal_connect (G_OBJECT (status_icon), "popup-menu", G_CALLBACK (popup_menu_status), NULL);
+	}
 }
 
 static void
diff --git a/plugins/mark-calendar-offline/ChangeLog b/plugins/mark-calendar-offline/ChangeLog
index e0c73095d6..a57222d5a6 100644
--- a/plugins/mark-calendar-offline/ChangeLog
+++ b/plugins/mark-calendar-offline/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-12  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* mark-calendar-offline.c:
+
 2008-08-12  Bharath Acharya  <abharath@novell.com>
 
 	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
diff --git a/plugins/mark-calendar-offline/mark-calendar-offline.c b/plugins/mark-calendar-offline/mark-calendar-offline.c
index 12e3f6ac18..68bd3f445b 100644
--- a/plugins/mark-calendar-offline/mark-calendar-offline.c
+++ b/plugins/mark-calendar-offline/mark-calendar-offline.c
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * 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.
  *
- *  Authors: Harish Krishnaswamy (kharish@novell.com)
+ * 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.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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/>  
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of version 2 of the GNU General Public
- *  License as published by the Free Software Foundation.
  *
- *  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.
+ * Authors:
+ *		Harish Krishnaswamy <kharish@novell.com>
  *
- *  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.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/publish-calendar/ChangeLog b/plugins/publish-calendar/ChangeLog
index 7b26673770..52f1d4b2c0 100644
--- a/plugins/publish-calendar/ChangeLog
+++ b/plugins/publish-calendar/ChangeLog
@@ -1,3 +1,15 @@
+2008-09-26  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fix for bug #553461 and bug #553389
+
+	* publish-calendar.c (url_remove_clicked):
+	* publish-calendar.glade:
+	* url-editor-dialog.c (create_uri), (check_input),
+	(publish_service_changed), (set_from_uri):
+	* url-editor-dialog.h: Rename the "SSH" option to "Secure FTP (SSH)"
+	and update the code accordingly. Also, change a related string to use
+	better terminology.
+
 2008-09-02  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index 28358767ae..a56c25e43d 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -592,7 +592,7 @@ url_remove_clicked (GtkButton *button, PublishUIData *ui)
 
 	confirm = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
 			                  GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
-					  _("Are you sure you want to remove this URL?"));
+					  _("Are you sure you want to remove this location?"));
 	gtk_dialog_add_button (GTK_DIALOG (confirm), GTK_STOCK_CANCEL, GTK_RESPONSE_NO);
 	gtk_dialog_add_button (GTK_DIALOG (confirm), GTK_STOCK_REMOVE, GTK_RESPONSE_YES);
 	gtk_dialog_set_default_response (GTK_DIALOG (confirm), GTK_RESPONSE_CANCEL);
diff --git a/plugins/publish-calendar/publish-calendar.glade b/plugins/publish-calendar/publish-calendar.glade
index f56eabbc10..6f6ae9dcf2 100644
--- a/plugins/publish-calendar/publish-calendar.glade
+++ b/plugins/publish-calendar/publish-calendar.glade
@@ -712,7 +712,7 @@ Free/Busy</property>
 			  <child>
 			    <widget class="GtkComboBox" id="publish_service">
 			      <property name="visible">True</property>
-			      <property name="items" translatable="yes">SSH
+			      <property name="items" translatable="yes">Secure FTP (SSH)
 Public FTP
 FTP (with login)
 Windows share
diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c
index e396372c8a..ddc1653959 100644
--- a/plugins/publish-calendar/url-editor-dialog.c
+++ b/plugins/publish-calendar/url-editor-dialog.c
@@ -54,7 +54,7 @@ create_uri (UrlEditorDialog *dialog)
 			method = "smb";
 			break;
 
-		case TYPE_SSH:
+		case TYPE_SFTP:
 			method = "sftp";
 			break;
 
@@ -110,7 +110,7 @@ check_input (UrlEditorDialog *dialog)
 	/* This should probably be more complex, since ' ' isn't a valid server name */
 	switch (uri->service_type) {
 	case TYPE_SMB:
-	case TYPE_SSH:
+	case TYPE_SFTP:
 	case TYPE_FTP:
 	case TYPE_DAV:
 	case TYPE_DAVS:
@@ -160,7 +160,7 @@ publish_service_changed (GtkComboBox *combo, UrlEditorDialog *dialog)
 		gtk_widget_show (dialog->password_hbox);
 		gtk_widget_show (dialog->remember_pw);
 		break;
-	case TYPE_SSH:
+	case TYPE_SFTP:
 	case TYPE_FTP:
 	case TYPE_DAV:
 	case TYPE_DAVS:
@@ -275,7 +275,7 @@ set_from_uri (UrlEditorDialog *dialog)
 	if (strcmp ((const char *)method, "smb") == 0)
 		uri->service_type = TYPE_SMB;
 	else if (strcmp ((const char *)method, "sftp") == 0)
-		uri->service_type = TYPE_SSH;
+		uri->service_type = TYPE_SFTP;
 	else if (strcmp ((const char *)method, "ftp") == 0)
 		/* we set TYPE_FTP here for now. if we don't find a
 		 * username later, we'll change it to TYPE_ANON_FTP */
diff --git a/plugins/publish-calendar/url-editor-dialog.h b/plugins/publish-calendar/url-editor-dialog.h
index b464ff2252..2d985e90e5 100644
--- a/plugins/publish-calendar/url-editor-dialog.h
+++ b/plugins/publish-calendar/url-editor-dialog.h
@@ -44,7 +44,7 @@ enum {
 };
 
 enum {
-	TYPE_SSH,
+	TYPE_SFTP,
 	TYPE_ANON_FTP,
 	TYPE_FTP,
 	TYPE_SMB,
diff --git a/plugins/python/ChangeLog b/plugins/python/ChangeLog
index 063418150e..38cd85f29f 100644
--- a/plugins/python/ChangeLog
+++ b/plugins/python/ChangeLog
@@ -1,3 +1,17 @@
+2008-09-24  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fixes bug #553479
+
+	* org-gnome-evolution-python.eplug.xml: String capitalisation
+	improvements.
+
+2008-09-12  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* python-plugin-loader.c:
+	* python-plugin-loader.h:
+
 2008-07-21  Johnny Jacob  <jjohnny@novell.com>
 
 	* Makefile.am (example_sources): More typo fixes. :(
diff --git a/plugins/python/org-gnome-evolution-python.eplug.xml b/plugins/python/org-gnome-evolution-python.eplug.xml
index c8cfd20f27..5f215f65e5 100644
--- a/plugins/python/org-gnome-evolution-python.eplug.xml
+++ b/plugins/python/org-gnome-evolution-python.eplug.xml
@@ -3,7 +3,7 @@
 	<e-plugin type="shlib" id="org.gnome.evolution.plugin.python" 
 	location="@PLUGINDIR@/liborg-gnome-evolution-python@SOEXT@" _name="Python Loader" load_level="1">
 
-		<_description>A plugin which loads other plugins written using python.</_description>
+		<_description>A plugin which loads other plugins written using Python.</_description>
 
 		<author name="Johnny Jacob" email="jjohnny@novell.com"/>
 	</e-plugin>
diff --git a/plugins/python/python-plugin-loader.c b/plugins/python/python-plugin-loader.c
index 3f0c52618f..5e7a83fb29 100644
--- a/plugins/python/python-plugin-loader.c
+++ b/plugins/python/python-plugin-loader.c
@@ -1,21 +1,22 @@
- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * 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.
  *
- *  Author: Johnny Jacob <jjohnny@novell.com>
+ * 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.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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/>  
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of version 2 of the GNU General Public
- *  License as published by the Free Software Foundation.
  *
- *  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.
+ * Authors:
+ *		Johnny Jacob <jjohnny@novell.com>
  *
- *  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.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/python/python-plugin-loader.h b/plugins/python/python-plugin-loader.h
index 22ac88fde7..86e94d667b 100644
--- a/plugins/python/python-plugin-loader.h
+++ b/plugins/python/python-plugin-loader.h
@@ -1,21 +1,22 @@
- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * 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.
  *
- *  Author: Johnny Jacob <jjohnny@novell.com>
+ * 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.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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/>  
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of version 2 of the GNU General Public
- *  License as published by the Free Software Foundation.
  *
- *  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.
+ * Authors:
+ *		Johnny Jacob <jjohnny@novell.com>
  *
- *  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.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/sa-junk-plugin/ChangeLog b/plugins/sa-junk-plugin/ChangeLog
index 890709261a..badfbb83ff 100644
--- a/plugins/sa-junk-plugin/ChangeLog
+++ b/plugins/sa-junk-plugin/ChangeLog
@@ -1,3 +1,24 @@
+2008-09-29  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* em-junk-filter.c:
+
+2008-09-25  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fix for bug #551121
+
+	* em-junk-filter.c (pipe_to_sa_full), (em_junk_sa_respawn_spamd):
+	* org-gnome-sa-junk-plugin.eplug.xml: Standardise use of
+	"SpamAssassin" vs. "spamassassin" or "Spamassassin".
+
+2008-09-12  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #505016
+
+	* em-junk-filter.c: (em_junk_sa_check_junk):
+	Check for NULL to prevent crash when error occurred.
+
 2008-04-25  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #273041
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index 880a7694fb..1a442b42aa 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -1,26 +1,25 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Author:
- *  Radek Doulik <rodo@ximian.com>
- *
- * 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 version 2 of the GNU 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 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/>  
+ *
+ *
+ * Authors:
+ *		Radek Doulik <rodo@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
- * 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
@@ -138,7 +137,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err,
 
 	if (pipe (fds) == -1) {
 		errnosav = errno;
-		d(printf ("failed to create a pipe (for use with spamassassin: %s\n", strerror (errno)));
+		d(printf ("failed to create a pipe (for use with SpamAssassin: %s\n", strerror (errno)));
 		g_set_error (error, EM_JUNK_ERROR, errnosav, _("Failed to create pipe: %s"), strerror (errnosav));
 		errno = errnosav;
 		return rv_err;
@@ -146,7 +145,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err,
 
 	if (output_buffer && pipe (out_fds) == -1) {
 		errnosav = errno;
-		d(printf ("failed to create a pipe (for use with spamassassin: %s\n", strerror (errno)));
+		d(printf ("failed to create a pipe (for use with SpamAssassin: %s\n", strerror (errno)));
 		g_set_error (error, EM_JUNK_ERROR, errnosav, _("Failed to create pipe: %s"), strerror (errnosav));
 		close (fds [0]);
 		close (fds [1]);
@@ -243,7 +242,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err,
 				result = waitpid (pid, &status, WNOHANG);
 					g_set_error (error, EM_JUNK_ERROR, -2, _("SpamAssassin child process does not respond, killing..."));
 			} else
-				g_set_error (error, EM_JUNK_ERROR, -3, _("Wait for Spamassassin child process interrupted, terminating..."));
+				g_set_error (error, EM_JUNK_ERROR, -3, _("Wait for SpamAssassin child process interrupted, terminating..."));
 		}
 
 		if (result != -1 && WIFEXITED (status))
@@ -541,7 +540,7 @@ em_junk_sa_respawn_spamd ()
 	em_junk_sa_kill_spamd ();
 
 	if (em_junk_sa_check_respawn_too_fast ()) {
-		g_warning ("respawning of spamd too fast => fallback to use spamassassin directly");
+		g_warning ("respawning of spamd too fast => fallback to use SpamAssassin directly");
 
 		em_junk_sa_use_spamc = em_junk_sa_use_daemon = FALSE;
 		return FALSE;
@@ -594,7 +593,7 @@ em_junk_sa_check_junk(EPlugin *ep, EMJunkHookTarget *target)
 
 	rv = pipe_to_sa_full (msg, NULL, argv, 0, 1, out, &target->error) != 0;
 
-	if (!rv && out && !strcmp ((const char *)out->data, "0/0\n")) {
+	if (!rv && out && out->data && !strcmp ((const char *)out->data, "0/0\n")) {
 		/* an error occurred */
 		if (em_junk_sa_respawn_spamd ()) {
 			g_byte_array_set_size (out, 0);
diff --git a/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml b/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml
index 83215e718c..4277040fa5 100644
--- a/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml
+++ b/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml
@@ -18,7 +18,7 @@
 		<!-- hook into the 'mail properties' menu -->
 		<hook class="org.gnome.evolution.mail.config:1.0">
 		        <group target="prefs" id="org.gnome.evolution.mail.prefs">
-				<item type="section_table" path="40.junk/10.options" _label="Spamassassin Options"/>
+				<item type="section_table" path="40.junk/10.options" _label="SpamAssassin Options"/>
 				<item type="item_table" path="40.junk/20.options" factory="org_gnome_sa_use_remote_tests"/>
 		        </group>
 			    </hook>
diff --git a/plugins/save-attachments/ChangeLog b/plugins/save-attachments/ChangeLog
index 6f27566f57..a5dede852e 100644
--- a/plugins/save-attachments/ChangeLog
+++ b/plugins/save-attachments/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-19  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* save-attachments.c:
+
 2007-12-20  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #362638
diff --git a/plugins/save-attachments/save-attachments.c b/plugins/save-attachments/save-attachments.c
index 334881dee2..c48711c55a 100644
--- a/plugins/save-attachments/save-attachments.c
+++ b/plugins/save-attachments/save-attachments.c
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * 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.
  *
- *  Authors: Michael Zucchi <notzed@ximian.com>
+ * 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.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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/>  
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of version 2 of the GNU General Public
- *  License as published by the Free Software Foundation.
  *
- *  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.
+ * Authors:
+ *		Michael Zucchi <notzed@ximian.com>
  *
- *  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.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/save-calendar/ChangeLog b/plugins/save-calendar/ChangeLog
index 5398546088..d8e69aac67 100644
--- a/plugins/save-calendar/ChangeLog
+++ b/plugins/save-calendar/ChangeLog
@@ -1,3 +1,17 @@
+2008-09-16  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* csv-format.c:
+	* ical-format.c:
+	* rdf-format.c:
+
+2008-09-12  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* save-calendar.c:
+
 2008-09-02  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c
index 46eaceb122..2762dc5dfe 100644
--- a/plugins/save-calendar/csv-format.c
+++ b/plugins/save-calendar/csv-format.c
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * 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.
  *
- *  Authors: Philip Van Hoof <pvanhoof@gnome.org>
+ * 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.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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/>  
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of version 2 of the GNU General Public
- *  License as published by the Free Software Foundation.
  *
- *  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.
+ * Authors:
+ *		Philip Van Hoof <pvanhoof@gnome.org>
  *
- *  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.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c
index de3515d109..1b7ccfb7b1 100644
--- a/plugins/save-calendar/ical-format.c
+++ b/plugins/save-calendar/ical-format.c
@@ -1,22 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * 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.
  *
- *  Authors: Rodrigo Moya <rodrigo@novell.com>
- *           Philip Van Hoof <pvanhoof@gnome.org>
+ * 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.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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/>  
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of version 2 of the GNU General Public
- *  License as published by the Free Software Foundation.
  *
- *  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.
+ * Authors:
+ *		Rodrigo Moya <rodrigo@novell.com>
+ *      Philip Van Hoof <pvanhoof@gnome.org>
  *
- *  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.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c
index 4b5cad0397..b1c8257a41 100644
--- a/plugins/save-calendar/rdf-format.c
+++ b/plugins/save-calendar/rdf-format.c
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * 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.
  *
- *  Authors: Philip Van Hoof <pvanhoof@gnome.org>
+ * 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.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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/>  
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of version 2 of the GNU General Public
- *  License as published by the Free Software Foundation.
  *
- *  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.
+ * Authors:
+ *		Philip Van Hoof <pvanhoof@gnome.org>
  *
- *  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.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c
index dbd083b9a9..7e21b23f9e 100644
--- a/plugins/save-calendar/save-calendar.c
+++ b/plugins/save-calendar/save-calendar.c
@@ -1,21 +1,22 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+/*
+ * 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.
  *
- *  Authors: Rodrigo Moya <rodrigo@novell.com>
+ * 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.
  *
- *  Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * 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/>  
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of version 2 of the GNU General Public
- *  License as published by the Free Software Foundation.
  *
- *  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.
+ * Authors:
+ *		Rodrigo Moya <rodrigo@novell.com>
  *
- *  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.
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
 
diff --git a/plugins/startup-wizard/ChangeLog b/plugins/startup-wizard/ChangeLog
index faeebb70f1..4d636b826a 100644
--- a/plugins/startup-wizard/ChangeLog
+++ b/plugins/startup-wizard/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-19  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* startup-wizard.c:
+
 2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes bug #529460
diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c
index 32cf21a217..f9594364d9 100644
--- a/plugins/startup-wizard/startup-wizard.c
+++ b/plugins/startup-wizard/startup-wizard.c
@@ -1,21 +1,23 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- *  JP Rosevear <jpr@novell.com>
- *  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 version 2 of the GNU 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
- * 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 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)
  *
- * 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.
  */
 
 #include <gconf/gconf-client.h>
diff --git a/plugins/templates/ChangeLog b/plugins/templates/ChangeLog
index 04e998ef82..f0fc942dc0 100644
--- a/plugins/templates/ChangeLog
+++ b/plugins/templates/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-15  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* plugins/templates/templates.c:
+
 2008-09-01  Matthew Barnes  <mbarnes@redhat.com>
 
 	* templates.c:
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index bb5630fc5d..3c79bbcd01 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -1,27 +1,25 @@
 /*
- * templates.c
- * This file is part of Draft Templates plugin for Evolution
+ * 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.
  *
- * Authors:
- *	Diego Escalante Urrelo <diegoe@gnome.org>
- * 	Bharath Acharya <abharath@novell.com>
- * Copyright (C) 2008 - Diego Escalante Urrelo
- * 			Bharath Acharya
+ * 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.
  *
- * Draft Templates 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.
+ * 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/>  
  *
- * Draft Templates 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 Draft Templates; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, 
- * Boston, MA  02110-1301  USA
+ * Authors:
+ *		Diego Escalante Urrelo <diegoe@gnome.org>
+ *		Bharath Acharya <abharath@novell.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * Copyright (C) 2008 - Diego Escalante Urrelo
+ *
  */
 
 #include <gtk/gtk.h>
diff --git a/plugins/tnef-attachments/ChangeLog b/plugins/tnef-attachments/ChangeLog
index 669d4373ca..6c2f54a396 100644
--- a/plugins/tnef-attachments/ChangeLog
+++ b/plugins/tnef-attachments/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-24  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fixes bug #553479
+
+	* org-gnome-tnef-attachments.eplug.xml: String capitalisation
+	improvements.
+
 2008-09-03  Sankar P  <psankar@novell.com>
 
 	* plugins/tnef-attachments/tnef-plugin.c:
diff --git a/plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml b/plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml
index 73f94fa2d6..eca319cf5e 100644
--- a/plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml
+++ b/plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml
@@ -5,7 +5,7 @@
     id="org.gnome.evolution.mail.tnefattachments"
     location="@PLUGINDIR@/liborg-gnome-tnef-attachments@SOEXT@"
     _name="TNEF Attachment decoder">
-    <_description>A simple plugin which uses ytnef to decode tnef attachments.</_description>
+    <_description>A simple plugin which uses yTNEF to decode TNEF attachments.</_description>
     <author name="Lucky Wankhede" email="wlakke@novell.com"/>
 
     <hook class="org.gnome.evolution.mail.format:1.0">
diff --git a/plugins/webdav-account-setup/ChangeLog b/plugins/webdav-account-setup/ChangeLog
index 0a512b4dd3..38eabf364e 100644
--- a/plugins/webdav-account-setup/ChangeLog
+++ b/plugins/webdav-account-setup/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-24  Philip Withnall  <philip@tecnocode.co.uk>
+
+	** Fixes bug #553479
+
+	* webdav-contacts-source.c (plugin_webdav_contacts):
+	String capitalisation improvements.
+
 2008-08-12  Bharath Acharya  <abharath@novell.com>
 
 	* Makefile.am:	Added necessary libraries to link to. Build break while 
diff --git a/plugins/webdav-account-setup/webdav-contacts-source.c b/plugins/webdav-account-setup/webdav-contacts-source.c
index 8f944de5ed..d85ffa79b6 100644
--- a/plugins/webdav-account-setup/webdav-contacts-source.c
+++ b/plugins/webdav-account-setup/webdav-contacts-source.c
@@ -335,7 +335,7 @@ plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data)
 
 	uidata->avoid_ifmatch_toggle = GTK_TOGGLE_BUTTON(
 			gtk_check_button_new_with_mnemonic(
-				_("_Avoid IfMatch (needed on apache < 2.2.8)")));
+				_("_Avoid IfMatch (needed on Apache < 2.2.8)")));
 	gtk_box_pack_start(hbox, GTK_WIDGET(uidata->avoid_ifmatch_toggle),
 	                   FALSE, FALSE, 0);
 
diff --git a/po/ChangeLog b/po/ChangeLog
index bc7c80754f..d918b68187 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,10 +1,239 @@
+2008-10-01 Og Maciel <ogmaciel@gnome.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation by Og Maciel.
+
+2008-10-01  Robert-André Mauchin  <zebob.m@pengzone.org>
+
+	* fr.po: French translation update. Fixed #554548 
+	thanks to Hanka Zalska from Sun.
+
+2008-10-01  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Ivar Smolin
+
+2008-09-30  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2008-09-30  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Alexander Shopov <ash@contact.bg>
+
+2008-09-30  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Alexander Shopov <ash@contact.bg>
+
+2008-09-29  Wouter Bolsterlee  <wbolster@svn.gnome.org>
+
+	* nl.po: Updated Dutch translation by Wouter Bolsterlee.
+
+2008-09-28  Goran Rakić  <grakic@devbase.net>
+
+	* sr.po, sr@latin.po: Updated Serbian Translations.
+
+2008-09-22  Praveen Arimbrathodiyil <pravi.a@gmail.com>
+
+	* ml.po: Malayalam translation updated by Hari Vishnu.
+
+2008-09-22  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Ivar Smolin
+
+2008-09-22  Runa Bhattacharjee  <runab@redhat.com>
+
+	* bn_IN.po: Updated Bengali India Translation
+
+2008-09-21  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+
+	* ru.po: Updated Russian translation.
+
+2008-09-21  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+
+2008-09-21  Wadim Dziedzic  <wdziedzic@aviary.pl>
+
+	* pl.po: Updated Polish translation
+
+2008-09-21  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by OsamaKhalid.
+
+2008-09-21  Rajesh Ranjan <rajeshkajha@yahoo.com>
+
+        * hi.po: Updated Hindi Translation.
+        
+2008-09-21  Rajesh Ranjan <rajeshkajha@yahoo.com>
+
+        * hi.po: Updated Hindi Translation.
+        
+2008-09-21  Rajesh Ranjan <rajeshkajha@yahoo.com>
+
+        * hi.po: Updated Hindi Translation.
+
+2008-09-21  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated.
+
+2008-09-20 Kenneth Nielsen <k.nielsen81@gmail.com>
+
+	* da.po: Updated Danish translation by Kenneth Nielsen
+
+2008-09-20  Luca Ferretti  <elle.uca@libero.it>
+
+	* it.po: Updated Italian translation.
+
+2008-09-20  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation by Fabrício Godoy,
+	Vladimir Melo and Leonardo Ferreira Fontenelle.
+
+2008-09-20  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Updated Albanian Translation.
+
+2008-09-20  Goran Rakić  <grakic@devbase.net>
+
+	* sr.po, sr@latin.po: Updated Serbian translation (by Igor Nestorović).
+
+2008-09-19  Hendrik Richter  <hendrikr@gnome.org>
+
+	* de.po: Updated German translation.
+
+2008-09-19  Simos Xenitellis  <simos@gnome.org>
+
+	* el.po: Updated Greek translation by Pierros Papadeas.
+
+2008-09-19  Žygimantas Beručka  <zygis@gnome.org>
+
+	* lt.po: Updated missing translations of msgctx strings.
+
+2008-09-19  Žygimantas Beručka  <zygis@gnome.org>
+
+	* lt.po: Updated Lithuanian translation.
+
+2008-09-18  Hendrik Richter  <hendrikr@gnome.org>
+
+	* de.po: Updated German translation.
+
+2008-09-18  I. Felix <ifelix@redhat.com>
+
+	* ta.po:  Tamil Translation updated by Tirumurthi Vasudevan
+
+2008-09-18 Inaki Larrañaga Murgoitio  <dooteo@euskalgnu.org>
+
+	* eu.po: Updated Basque translation.
+
+2008-09-18  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2008-09-18  Shankar Prasad  <svenkate@redhat.com>
+
+        * kn.po: Updated Kannada translation
+
+2008-09-18  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
+
+	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
+	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
+
+2008-09-18  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Usama Akkad.
+
+2008-09-17  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation by Usama Akkad.
+
+2008-09-17  Petr Kovar  <pknbe@volny.cz>
+
+	* cs.po: Updated Czech translation by Jiri Eischmann.
+
+2008-09-17  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-09-17  Shankar Prasad  <svenkate@redhat.com>
+
+        * kn.po: Updated Kannada translation
+
+2008-09-16  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation
+
+2008-09-16  Luca Ferretti  <elle.uca@libero.it>
+
+	* it.po: Updated Italian translation.
+
+2008-09-16  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Ivar Smolin
+
+2008-09-15  Gil Forcada  <gforcada@gnome.org>
+
+	* ca.po: Updated Catalan translation by David Planella.
+
+2008-09-15  Petr Kovar  <pknbe@volny.cz>
+
+	* cs.po: Updated Czech translation by Jiri Eischmann.
+
+2008-09-15  Wouter Bolsterlee  <wbolster@svn.gnome.org>
+
+	* nl.po: Updated Dutch translation by Tino Meinen.
+
+2008-09-15  Djihed Afifi <djihed@gmail.com>
+
+	* ar.po: Updated Arabic Translation by Abou Manal.
+
+2008-09-15  Shankar Prasad  <svenkate@redhat.com>
+
+	* kn.po: Updated Kannada translation
+
+2008-09-14  Ilkka Tuohela <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2008-09-14  Sandeep Shedmake  <sshedmak@redhat.com>
+
+	* mr.po: Updated Marathi translations.
+
+2008-09-13  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2008-09-12  Baris Cicek  <baris@teamforce.name.tr>
+
+	* tr.po: Updated Turkish translation.
+
+2008-09-12  Hendrik Richter  <hendrikr@gnome.org>
+
+	* de.po: Updated German translation.
+
+2008-09-12  Philip Withnall  <philip@tecnocode.co.uk>
+
+	* en_GB.po: Updated British English translation.
+
+2008-09-12  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Fixed Portuguese terminology.
+
+2008-09-12  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2008-09-11  Runa Bhattacharjee  <runab@redhat.com>
+
+	* bn_IN.po: Updated Bengali India Translation
+
 2008-09-11  Luca Ferretti  <elle.uca@libero.it>
 
 	* it.po: Updated Italian translation.
 
 2008-09-11  Rajesh Ranjan <rajeshkajha@yahoo.com>
 
-        * hi.po: Updated Hindi Translation.
+	* hi.po: Updated Hindi Translation.
 
 2008-09-11  Robert Sedak  <robert.sedak@sk.t-com.hr>
 
@@ -98,7 +327,7 @@
 
 2008-08-31  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
-	 gl.po: Updated Galician translation
+	* gl.po: Updated Galician translation
 
 2008-08-31  Yair Hershkovitz  <yairhr@gmail.com>
 
@@ -114,7 +343,7 @@
 
 2008-08-30  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
-	 gl.po: Updated Galician translation
+	* gl.po: Updated Galician translation
 
 2008-08-30  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
@@ -150,7 +379,7 @@
 
 2008-08-25  Goran Rakic  <grakic@devbase.net>
 
-        * LINGUAS, sr@latin.po, sr@Latn.po: Conversion from sr@Latn to sr@latin.
+	* LINGUAS, sr@latin.po, sr@Latn.po: Conversion from sr@Latn to sr@latin.
 
 2008-08-25  Goran Rakić  <grakic@devbase.net>
 
@@ -162,12 +391,12 @@
 
 2008-08-22  Shankar Prasad  <svenkate@redhat.com>
 
-        * kn.po: Updated Kannada translation
+	* kn.po: Updated Kannada translation
 
 2008-08-22  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
 
-        * zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
-        * zh_TW.po: Updated Traditional Chinese translation(Taiwan).
+	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
+	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
 
 2008-08-22  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
 
@@ -178,8 +407,8 @@
 	* nn.po: Updated Norwegian Nynorsk translation.
 
 2008-08-21  Jovan Naumovski  <jovan@lugola.net>
- 
- 	* mk.po: Updated Macedonian translation.
+
+	* mk.po: Updated Macedonian translation.
 
 2008-08-21  Åsmund Skjæveland  <aasmunds@ulrik.uio.no>
 
@@ -187,7 +416,7 @@
 
 2008-08-21  Shankar Prasad  <svenkate@redhat.com>
 
-        * kn.po: Updated Kannada translation
+	* kn.po: Updated Kannada translation
 
 2008-08-18  Theppitak Karoonboonyanan  <thep@linux.thai.net>
 
@@ -199,7 +428,7 @@
 
 2008-08-18  Shankar Prasad  <svenkate@redhat.com>
 
-        * kn.po: Updated Kannada translation
+	* kn.po: Updated Kannada translation
 
 2008-08-17  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
@@ -215,7 +444,7 @@
 
 2008-08-15  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
-	 gl.po: Updated Galician translation
+	* gl.po: Updated Galician translation
 
 2008-08-15  Kjartan Maraas  <kmaraas@gnome.org>
 
@@ -237,17 +466,17 @@
 
 	* kn.po: Updated Kannada Translation.
 
-2008-08-12  Jorge Gonzalez  <jorgegonz@svn.gnome.org>  
+2008-08-12  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* es.po: Updated Spanish translation
 
 2008-08-12  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
-	 gl.po: Updated Galician translation
+	* gl.po: Updated Galician translation
 
 2008-08-12  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
-	 gl.po: Updated Galician translation
+	* gl.po: Updated Galician translation
 
 2008-08-12  Ilkka Tuohela <hile@iki.fi>
 
@@ -263,8 +492,8 @@
 
 2008-08-09  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
 
-        * zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
-        * zh_TW.po: Updated Traditional Chinese translation(Taiwan).
+	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
+	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
 
 2008-08-08  Priit Laes  <plaes at svn dot gnome dot org>
 
@@ -282,7 +511,7 @@
 
 	* es.po: Updated Spanish translation
 
-2008-08-06  Djihed Afifi <djihed@gmail.com> 
+2008-08-06  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Abou Manal.
 
@@ -292,23 +521,23 @@
 
 2008-08-04  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
-	 gl.po: Updated Galician translation
+	* gl.po: Updated Galician translation
 
 2008-08-03  Leonid Kanter <leon@asplinux.ru>
 
-	 ru.po: Updated Russian translation
+	* ru.po: Updated Russian translation
 
 2008-08-02  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
-	 gl.po: Updated Galician translation
+	* gl.po: Updated Galician translation
 
 2008-08-01  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
-	 gl.po: Updated Galician translation
+	* gl.po: Updated Galician translation
 
 2008-08-01  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
-	 gl.po: Updated Galician translation
+	* gl.po: Updated Galician translation
 
 2008-07-31  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
@@ -322,7 +551,7 @@
 
 	* ko.po: Updated Korean translation.
 
-2008-07-29  Djihed Afifi <djihed@gmail.com> 
+2008-07-29  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Abou Manal.
 
@@ -379,9 +608,9 @@
 
 	** See bug #200147
 
-2008-07-20  Jorge Gonzalez  <jorgegonz@svn.gnome.org> 
+2008-07-20  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-	* es.po: Updated Spanish translation  
+	* es.po: Updated Spanish translation
 
 2008-07-19  Andre Klapper  <a9016009@gmx.de>
 
@@ -397,7 +626,7 @@
 
 2008-07-05  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-	* es.po: Updated Spanish translation 
+	* es.po: Updated Spanish translation
 
 2008-07-04  Priit Laes  <plaes at svn dot gnome dot org>
 
@@ -454,11 +683,11 @@
 
 	* ru.po: Updated Russian translation by Anatol Kamynin.
 
-2008-06-14  Jorge Gonzalez  <jorgegonz@svn.gnome.org>  
+2008-06-14  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* es.po: Updated Spanish translation
 
-2008-06-11  Djihed Afifi <djihed@gmail.com> 
+2008-06-11  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Abou Manal.
 
@@ -478,11 +707,11 @@
 
 	* he.po: Updated Hebrew translaion.
 
-2008-06-02   Clytie Siddall <clytie@riverland.net.au>
+2008-06-02  Clytie Siddall <clytie@riverland.net.au>
 
 	* vi.po: Updated Vietnamese translation.
 
-2008-06-01   Clytie Siddall <clytie@riverland.net.au>
+2008-06-01  Clytie Siddall <clytie@riverland.net.au>
 
 	* vi.po: Updated Vietnamese translation.
 
@@ -492,7 +721,7 @@
 
 2008-05-23  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation, fixes bug #535014
+	* es.po: Updated Spanish translation, fixes bug #535014
 
 2008-05-25  Philip Withnall  <pwithnall@svn.gnome.org>
 
@@ -502,7 +731,7 @@
 
 	* en_GB.po: Updated British English translation.
 
-2008-05-25   Clytie Siddall <clytie@riverland.net.au>
+2008-05-25  Clytie Siddall <clytie@riverland.net.au>
 
 	* vi.po: Updated Vietnamese translation.
 
@@ -522,7 +751,7 @@
 
 	* el.po: Fixed a typo.
 
-2008-05-23  Jorge Gonzalez  <jorgegonz@svn.gnome.org>  
+2008-05-23  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* es.po: Updated Spanish translation
 
@@ -535,7 +764,7 @@
 
 	* nl.po: Translation updated by Tino Meinen.
 
-2008-05-19  Djihed Afifi <djihed@gmail.com> 
+2008-05-19  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Abou Manal.
 
@@ -586,7 +815,7 @@
 
 2008-04-27  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-	* es.po: Updated Spanish translation 
+	* es.po: Updated Spanish translation
 
 2008-04-26  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
@@ -601,7 +830,7 @@
 
 	* en_GB.po: _Trash -> Wastebaske_t
 
-2008-04-20  Jorge Gonzalez  <jorgegonz@svn.gnome.org>     
+2008-04-20  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* es.po: Updated Spanish translation
 
@@ -640,9 +869,9 @@
 
 	* he.po: Updated Hebrew translaion by Mark Krapivner.
 
-2008-04-12  Jorge Gonzalez  <jorgegonz@svn.gnome.org>  
+2008-04-12  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-	* es.po: Updated Spanish translation 
+	* es.po: Updated Spanish translation
 
 2008-04-09  Yair Hershkovitz  <yairhr@gmail.com>
 
@@ -654,7 +883,7 @@
 
 2008-04-07  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation, fixed bug #525068
+	* es.po: Updated Spanish translation, fixed bug #525068
 
 2008-04-07  Priit Laes  <plaes at svn dot gnome dot org>
 
@@ -762,12 +991,12 @@
 
 2008-03-09  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
 
-        * zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
-        * zh_TW.po: Updated Traditional Chinese translation(Taiwan).
+	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
+	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
 
 2008-03-09 Maxim Dziumanenko <dziumanenko@gmail.com>
 
-        * uk.po: Update Ukrainian translation.
+	* uk.po: Update Ukrainian translation.
 
 2008-03-08  Kenneth Nielsen  <k.nielsen81@gmail.com>
 
@@ -778,7 +1007,7 @@
 	* el.po: Updated Greek translation
 
 2008-03-08  Guntupalli Karunakar  <karunakar@indlinux.org>
-	
+
 	* hi.po: Fix plurals.
 
 2008-03-08  Runa Bhattacharjee <runab@fedoraproject.org>
@@ -866,9 +1095,9 @@
 
 	* lt.po: Updated Lithuanian translation.
 
-2008-02-29  Jorge Gonzalez  <jorgegonz@svn.gnome.org>  
+2008-02-29  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-	* es.po: Updated Spanish translation                   
+	* es.po: Updated Spanish translation
 
 2008-02-29  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
 
@@ -907,7 +1136,7 @@
 
 	* et.po: Translation updated by Ivar Smolin
 
-2008-02-23  Djihed Afifi <djihed@gmail.com> 
+2008-02-23  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Abou Manal.
 
@@ -917,7 +1146,7 @@
 
 2008-02-21 Arangel Angov <arangel@linux.net.mk>
 
-        * mk.po: Updated Macedonian translation.
+	* mk.po: Updated Macedonian translation.
 
 2008-02-21  Changwoo Ryu  <cwryu@debian.org>
 
@@ -934,15 +1163,15 @@
 2008-02-18  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* es.po: Updated Spanish translaiton, fixed typo thanks to Ignacio
-	  Casal Quinteiro.
+	Casal Quinteiro.
 
 2008-02-19  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
 	* gl.po: Updated Galician Translation.
 
-2008-02-18  Jorge Gonzalez  <jorgegonz@svn.gnome.org>  
+2008-02-18  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-	* es.po: Updated Spanish translation 
+	* es.po: Updated Spanish translation
 
 2008-02-18  Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
 
@@ -956,14 +1185,14 @@
 
 	* nb.po: Updated Norwegian bokmål translation.
 
-2008-02-17  Djihed Afifi <djihed@gmail.com> 
+2008-02-17  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Djihed Afifi.
 
 2008-02-17  David Lodge <dave@cirt.net>
 
 	* en_GB.po: Updated British English translation
-	
+
 2008-02-16  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
 
 	* eu.po: Updated Basque translation.
@@ -1024,7 +1253,7 @@
 
 	* eu.po: Updated Basque translation.
 
-2008-02-11  Jorge Gonzalez  <jorgegonz@svn.gnome.org> 
+2008-02-11  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* es.po: Updated Spanish translation
 
@@ -1063,9 +1292,9 @@
 	* de.po: Updated German translation.
 
 2008-02-02  Yannig Marchegay <yannig@marchegay.org>
-	
+
 	* oc.po: Updated Occitan translation.
-	
+
 2008-02-02  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* nb.po: Updated Norwegian bokmål translation.
@@ -1074,7 +1303,7 @@
 
 	* kn.po: Updated Kannada Translations by Shankar Prasad.
 
-2008-01-31  Djihed Afifi <djihed@gmail.com> 
+2008-01-31  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Djihed Afifi.
 
@@ -1082,7 +1311,7 @@
 
 	* sv.po: Updated Swedish translation.
 
-2008-01-30  Jorge Gonzalez  <jorgegonz@svn.gnome.org>       
+2008-01-30  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* es.po: Updated Spanish translation
 
@@ -1100,7 +1329,7 @@
 
 2008-01-28  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-	* es.po: Updated Spanish translation 
+	* es.po: Updated Spanish translation
 
 2008-01-28  Daniel Nylander <po@danielnylander.se>
 
@@ -1112,7 +1341,7 @@
 
 2008-01-26  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
-        * gl.po: Updated Galician Translation.
+	* gl.po: Updated Galician Translation.
 
 2008-01-26  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
@@ -1229,19 +1458,19 @@
 
 	* POTFILES.in: Remove new-mail-notify's files.
 
-2008-01-09  Jorge Gonzalez  <jorgegonz@svn.gnome.org>          
+2008-01-09  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-	* es.po: Updated Spanish translation.  
+	* es.po: Updated Spanish translation.
 
 2008-01-05  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
 
-        * eu.po: Updated Basque translation.
+	* eu.po: Updated Basque translation.
 
 2008-01-04  Erdal Ronahi  <erdal.ronahi@gmail.com>
 
 	* ku.po: Updated Kurdish translation
 
-2008-01-05   Clytie Siddall <clytie@riverland.net.au>
+2008-01-05  Clytie Siddall <clytie@riverland.net.au>
 
 	* vi.po: Updated Vietnamese translation.
 
@@ -1269,7 +1498,7 @@
 
 	* ga.po: Updated Irish translation.
 
-2007-12-28  Djihed Afifi <djihed@gmail.com> 
+2007-12-28  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Djihed Afifi.
 
@@ -1291,7 +1520,7 @@
 
 2007-12-17  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-12-17  Kjartan Maraas  <kmaraas@gnome.org>
 
@@ -1307,7 +1536,7 @@
 
 2007-12-16  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-12-16  Leonardo Ferreira Fontenelle  <leonardof@svn.gnome.org>
 
@@ -1323,9 +1552,9 @@
 
 	* ga.po: Updated Irish translation.
 
-2007-12-15  Jorge Gonzalez  <jorgegonz@svn.gnome.org> 
+2007-12-15  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-12-15  Kjartan Maraas  <kmaraas@gnome.org>
 
@@ -1337,15 +1566,15 @@
 
 2007-12-11  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation.
+	* es.po: Updated Spanish translation.
 
 2007-12-10  Matej Urbančič  <mateju@svn.gnome.org>
 
 	* sl.po: Updated Slovenian Translation.
 
-2007-12-09  Jorge Gonzalez  <jorgegonz@svn.gnome.org> 
+2007-12-09  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-12-08  Andre Klapper  <a9016009@gmx.de>
 
@@ -1366,7 +1595,7 @@
 
 2007-12-06  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-12-04  Changwoo Ryu  <cwryu@debian.org>
 
@@ -1376,9 +1605,9 @@
 
 	* POTFILES.in: Add new files, remove dead ones.
 
-2007-11-28  Jorge Gonzalez <jorgegonz@svn.gnome.org>  
+2007-11-28  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation.
+	* es.po: Updated Spanish translation.
 
 2007-11-28  Priit Laes  <plaes@svn.gnome.org>
 
@@ -1388,13 +1617,13 @@
 
 	* sl.po: Updated Slovenian translation.
 
-2007-11-21  Yannig Marchegay <yannig@marchegay.org> 
+2007-11-21  Yannig Marchegay <yannig@marchegay.org>
 
 	* oc.po: Updated Occitan translation
 
 2007-11-20  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-11-20  Daniel Nylander <po@danielnylander.se>
 
@@ -1402,11 +1631,11 @@
 
 2007-11-18  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation   
+	* es.po: Updated Spanish translation
 
 2007-11-15  Marcel Telka  <marcel@telka.sk>
 
-	* sk.po: Fixed bug 422993. Thanks to Hanka Zalska. 
+	* sk.po: Fixed bug 422993. Thanks to Hanka Zalska.
 
 2007-11-14  Daniel Nylander <po@danielnylander.se>
 
@@ -1414,7 +1643,7 @@
 
 2007-11-14  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-11-14  Andre Klapper  <a9016009@gmx.de>
 
@@ -1426,7 +1655,7 @@
 
 2007-11-12  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-11-12  Matej Urbančič  <mateju@svn.gnome.org>
 
@@ -1461,7 +1690,7 @@
 
 2007-11-01  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-11-01  Gil Forcada  <gforcada@svn.gnome.org>
 
@@ -1482,17 +1711,17 @@
 
 2007-10-26  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation.
+	* es.po: Updated Spanish translation.
 
 2007-10-25  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation.                     
+	* es.po: Updated Spanish translation.
 
 2007-10-24  Matej Urbančič  <mateju@svn.gnome.org>
 
 	* sl.po: Updated Slovenian translation.
 
-2007-10-23  Djihed Afifi <djihed@gmail.com> 
+2007-10-23  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Anas Husseini.
 
@@ -1504,7 +1733,7 @@
 
 	* ca.po: Updated Catalan translation by David Planella.
 
-2007-10-21  Djihed Afifi <djihed@gmail.com> 
+2007-10-21  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Anas Husseini.
 
@@ -1512,9 +1741,9 @@
 
 	* sl.po: Updated Slovenian translation.
 
-2007-10-16  Jorge Gonzalez  <jorgegonz@svn.gnome.org> 
+2007-10-16  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-10-15  Alexander Shopov  <ash@contact.bg>
 
@@ -1579,7 +1808,7 @@
 
 2007-09-16  Yannig Marchegay <yannig@marchegay.org>
 
-        * oc/oc.po: Updated Occitan translation
+	* oc/oc.po: Updated Occitan translation
 
 2007-09-15  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 
@@ -1593,7 +1822,7 @@
 
 	* cy.po: Fix typo in date format string
 
-2007-09-13  Djihed Afifi <djihed@gmail.com> 
+2007-09-13  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Ahmad Farghal.
 
@@ -1637,12 +1866,12 @@
 2007-09-10  Ilkka Tuohela  <hile@iki.fi>
 
 	* fi.po: Updated Finnish translation: fixes for
-		 	 lots of typos (bug #475578)
+	lots of typos (bug #475578)
 
 2007-09-10  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
-        
+	* es.po: Updated Spanish translation
+
 2007-09-10  Kenneth Nielsen  <k.nielsen81@gmail.com>
 
 	* da.po: Updated Danish translation
@@ -1652,8 +1881,8 @@
 	* sv.po: Updated Swedish translation.
 
 2007-09-10  Jovan Naumovski  <jovan@lugola.net>
- 
- 	* mk.po: Updated Macedonian translation.
+
+	* mk.po: Updated Macedonian translation.
 
 2007-09-10  Ankit Patel  <ankit644@yahoo.com>
 
@@ -1665,9 +1894,9 @@
 
 2007-09-08  Inaki Larranaga Murgoitio  <dooteo@zundan.com>
 
-        * eu.po: Fixed some typos in Basque translation.
+	* eu.po: Fixed some typos in Basque translation.
 
-2007-09-07   Clytie Siddall <clytie@riverland.net.au>
+2007-09-07  Clytie Siddall <clytie@riverland.net.au>
 
 	* vi.po: Updated Vietnamese translation.
 
@@ -1684,12 +1913,12 @@
 	* de.po: Updated German translation, fix #474050.
 
 2007-09-05  Jovan Naumovski  <jovan@lugola.net>
- 
- 	 * mk.po: Updated Macedonian translation.
+
+	* mk.po: Updated Macedonian translation.
 
 2007-09-04  Jovan Naumovski  <jovan@lugola.net>
- 
- 	 * mk.po: Updated Macedonian translation.
+
+	* mk.po: Updated Macedonian translation.
 
 2007-09-04  Stéphane Raimbault  <stephane.raimbault@gmail.com>
 
@@ -1721,7 +1950,7 @@
 	* th.po: Updated Thai translation.
 	* ChangeLog: Fix newlines in Clytie's recent entry.
 
-2007-09-02   Clytie Siddall <clytie@riverland.net.au>
+2007-09-02  Clytie Siddall <clytie@riverland.net.au>
 
 	* vi.po: Updated Vietnamese translation.
 
@@ -1743,8 +1972,8 @@
 
 2007-08-30  Ilkka Tuohela  <hile@iki.fi>
 
-	* fi.po: Updated Finnish translation 
-	         (fix for bug #471749)
+	* fi.po: Updated Finnish translation
+	(fix for bug #471749)
 
 2007-08-30  Takeshi AIHANA <takeshi.aihana@gmail.com>
 
@@ -1756,7 +1985,7 @@
 	by Washington Lins <washington-lins@uol.com.br>.
 
 2007-08-29  Jovan Naumovski  <jovan@lugola.net>
- 
+
 	* mk.po: Updated Macedonian translation.
 
 2007-08-29  Ankit Patel  <ankit644@yahoo.com>
@@ -1807,7 +2036,7 @@
 
 	* sv.po: Updated Swedish translation.
 
-2007-08-24  Jorge Gonzalez <jorgegonz@svn.gnome.org> 
+2007-08-24  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
 	* es.po: Updated Spanish translation.
 
@@ -1885,7 +2114,7 @@
 2007-08-17  Hendrik Richter  <hendrikr@gnome.org>
 
 	* de.po: Updated German translation, by
-	         Andre Klapper <ak-47@gmx.net>
+	Andre Klapper <ak-47@gmx.net>
 
 2007-08-17  Ankit Patel  <ankit644@yahoo.com>
 
@@ -1946,20 +2175,20 @@
 
 2007-08-12  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-	* es.po: Updated Spanish translation 
+	* es.po: Updated Spanish translation
 
 2007-08-12  Hendrik Richter  <hendrikr@gnome.org>
 
 	* de.po: Updated German translation, by
-	         Andre Klapper <ak-47@gmx.net>
+	Andre Klapper <ak-47@gmx.net>
 
 2007-08-12  Johnny Jacob  <jjohnny@novell.com>
- 
-       * POTFILES.in : Added new file for translation.
- 
+
+	* POTFILES.in : Added new file for translation.
+
 2007-08-11  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-	* es.po: Updated Spanish translation 
+	* es.po: Updated Spanish translation
 
 2007-08-11  Daniel Nylander <po@danielnylander.se>
 
@@ -2016,7 +2245,7 @@
 2007-08-03  Danishka Navin <snavin@svn.gnome.org>
 
 	* si.po:  Sinhala Translation updated by Danishka Navin
-	
+
 
 2007-08-01  Daniel Nylander <po@danielnylander.se>
 
@@ -2036,7 +2265,7 @@
 
 2007-07-30  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-	* es.po: Updated Spanish translation 
+	* es.po: Updated Spanish translation
 
 2007-07-30  Daniel Nylander <po@danielnylander.se>
 
@@ -2052,7 +2281,7 @@
 
 2007-07-29  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-07-29  Daniel Nylander <po@danielnylander.se>
 
@@ -2064,14 +2293,14 @@
 
 2007-07-27  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-07-24  Johnny Jacob  <jjohnny@novell.com>
 
 	** Fixes 459251
-	
+
 	* POTFILES.in : Added new files with translatable strings.
-	
+
 2007-07-23  Matic Žgur  <mr.zgur@gmail.com>
 
 	* sl.po: Updated Slovenian translation.
@@ -2092,7 +2321,7 @@
 
 2007-07-21  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-07-21  Danilo Šegan  <danilo@gnome.org>
 
@@ -2108,11 +2337,11 @@
 
 2007-06-17  Raivis Dejus  <orvils@gmail.com>
 
-        * lv.po: Updated Latvian Translation.
+	* lv.po: Updated Latvian Translation.
 
 2007-06-18  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation. Fixes bug #457959.
+	* es.po: Updated Spanish translation. Fixes bug #457959.
 
 2007-07-17  Daniel Nylander <po@danielnylander.se>
 
@@ -2120,7 +2349,7 @@
 
 2007-06-17  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation.
+	* es.po: Updated Spanish translation.
 
 2007-07-16  Ilkka Tuohela  <hile@iki.fi>
 
@@ -2144,11 +2373,11 @@
 
 2007-07-10  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-07-09  Jovan Naumovski  <jovan@lugola.net>
- 
- 	 * mk.po: Updated Macedonian translation.
+
+	* mk.po: Updated Macedonian translation.
 
 2007-07-09  Chenthill Palanisamy  <pchenthill@novell.com>
 
@@ -2162,7 +2391,7 @@
 
 2007-07-07  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-07-02  Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
 
@@ -2211,7 +2440,7 @@
 
 2007-06-19  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-06-19  Daniel Nylander <po@danielnylander.se>
 
@@ -2223,7 +2452,7 @@
 
 2007-06-17  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-06-15  Matthew Barnes  <mbarnes@redhat.com>
 
@@ -2231,7 +2460,7 @@
 
 2007-06-15  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-06-13  Daniel Nylander <po@danielnylander.se>
 
@@ -2255,17 +2484,17 @@
 
 2007-06-05  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-06-03  Srinivasa Ragavan  <sragavan@novell.com>
 
-        ** Fix for version removal from Installed files from Gilles Dartiguelongue 
+	** Fix for version removal from Installed files from Gilles Dartiguelongue
 
 	* POTFILES.in:
 
-2007-06-02  Jorge Gonzalez <jorgegonz@svn.gnome.org> 
+2007-06-02  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-06-02  Theppitak Karoonboonyanan  <thep@linux.thai.net>
 
@@ -2288,7 +2517,7 @@
 
 2007-05-28  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation 
+	* es.po: Updated Spanish translation
 
 2007-05-27  Daniel Nylander <po@danielnylander.se>
 
@@ -2317,7 +2546,7 @@
 
 2007-05-22  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
-        * es.po: Updated Spanish translation
+	* es.po: Updated Spanish translation
 
 2007-05-22  Jakub Friedl  <jfriedl@suse.cz>
 
@@ -2346,7 +2575,7 @@
 
 	* en_GB.po: Updated British English translation
 
-2007-05-15  Jorge Gonzalez <jorgegonz@svn.gnome.org> 
+2007-05-15  Jorge Gonzalez <jorgegonz@svn.gnome.org>
 
 	* es.po: Updated Spanish translation
 
@@ -2420,7 +2649,7 @@
 2007-04-22  Yair Hershkovitz <yairh@gmail.com>
 
 	* he.po: Updated Hebrew translation
-	
+
 2007-04-21  Daniel Nylander <po@danielnylander.se>
 
 	* sv.po: Updated Swedish translation.
@@ -2431,7 +2660,7 @@
 	* sv.po: Updated Swedish translation.
 	* POTFILES.in: Added missing files.
 
-2007-04-14  Djihed Afifi <djihed@gmail.com> 
+2007-04-14  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Djihed Afifi.
 
@@ -2482,7 +2711,7 @@
 2007-03-12  Goran Rakić  <grakic@devbase.net>
 
 	* sr.po, sr@Latn.po: Updated Serbian translation, by
-	         Igor Nestorović <jung@one.ekof.bg.ac.yu>
+	Igor Nestorović <jung@one.ekof.bg.ac.yu>
 
 2007-03-12  Jakub Friedl  <jfriedl@suse.cz>
 
@@ -2491,7 +2720,7 @@
 2007-03-12  Hendrik Richter  <hendrikr@gnome.org>
 
 	* de.po: Updated German translation, by
-	         Christian Kintner <mail@christian-kintner.de>
+	Christian Kintner <mail@christian-kintner.de>
 
 2007-03-12  Theppitak Karoonboonyanan  <thep@linux.thai.net>
 
@@ -2573,7 +2802,7 @@
 
 2007-03-03  Jovan Naumovski  <jovan@lugola.net>
 
-	 * mk.po: Updated Macedonian translation.
+	* mk.po: Updated Macedonian translation.
 
 2007-03-02  David Lodge <dave@cirt.net>
 
@@ -2587,7 +2816,7 @@
 
 	* fr.po: Updated French translation by Jonathan Ernst.
 
-2007-02-28  Djihed Afifi <djihed@gmail.com> 
+2007-02-28  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Djihed Afifi.
 
@@ -2712,7 +2941,7 @@
 
 	* en_GB.po: Updated English (British) translation
 
-2007-02-16  Djihed Afifi <djihed@gmail.com> 
+2007-02-16  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Djihed Afifi.
 
@@ -2740,7 +2969,7 @@
 
 	* fi.po: Updated Finnish translation.
 
-2007-02-11  Djihed Afifi <djihed@gmail.com> 
+2007-02-11  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Khaled Hosny.
 
@@ -2761,7 +2990,7 @@
 
 	* de.po: Updated German translation.
 
-2007-02-9  Djihed Afifi <djihed@gmail.com> 
+2007-02-9  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Ahmad Farghal.
 
@@ -2769,7 +2998,7 @@
 
 	* en_GB.po: Updated English (British) translation
 
-2007-02-8  Djihed Afifi <djihed@gmail.com> 
+2007-02-8  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Ahmad Farghal.
 
@@ -2862,7 +3091,7 @@
 
 	* sv.po: Updated Swedish translation.
 	* POTFILES.in: Added missing files.
-	
+
 2007-01-10  Ilkka Tuohela  <hile@iki.fi>
 
 	* fi.po: Updated Finnish translation.
@@ -2870,7 +3099,7 @@
 2007-01-09  Daniel Nylander <po@danielnylander.se>
 
 	* sv.po: Updated Swedish translation.
-	
+
 2007-01-06  Priit Laes  <plaes@svn.gnome.org>
 
 	* et.po: Updated Estonian translation by Ivar Smolin.
@@ -2879,12 +3108,12 @@
 
 	* vi.po: Updated Vietnamese translation.
 
-2006-01-03  Jordi Mas <jmas@softcatala.org>, Bernat Tallaferro 
+2006-01-03  Jordi Mas <jmas@softcatala.org>, Bernat Tallaferro
 	<bernat.tallaferro@gmail.com>
 
 	* ca.po: Catalan translation fixes
 
-2007-01-3  Djihed Afifi <djihed@gmail.com> 
+2007-01-3  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation by Ahmad Farghal.
 
@@ -2900,19 +3129,19 @@
 
 	* en_GB.po: Updated English (British) translation
 
-2006-12-28  Djihed Afifi <djihed@gmail.com> 
+2006-12-28  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation.
 
-2006-12-28  Djihed Afifi <djihed@gmail.com> 
+2006-12-28  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation.
 
-2006-12-27  Djihed Afifi <djihed@gmail.com> 
+2006-12-27  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation.
 
-2006-12-26  Djihed Afifi <djihed@gmail.com> 
+2006-12-26  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation.
 
@@ -2920,11 +3149,11 @@
 
 	* sr.po, sr@Latn.po: Fix bug #355974, updated.
 
-2006-12-24  Djihed Afifi <djihed@gmail.com> 
+2006-12-24  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation.
 
-2006-12-22  Djihed Afifi <djihed@gmail.com> 
+2006-12-22  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation.
 
@@ -2932,7 +3161,7 @@
 
 	* nb.po: Updated Norwegian bokmål translation.
 
-2006-12-18  Djihed Afifi <djihed@gmail.com> 
+2006-12-18  Djihed Afifi <djihed@gmail.com>
 
 	* ar.po: Updated Arabic Translation.
 
@@ -3095,7 +3324,7 @@
 	* et.po: Translation updated by Ivar Smolin.
 
 2006-10-15  Jovan Naumovski  <jovan@lugola.net>
-	
+
 	* mk.po: Updated Macedonian translation.
 
 2006-10-15  Ilkka Tuohela  <hile@iki.fi>
@@ -3121,7 +3350,7 @@
 2006-10-14  Priit Laes  <plaes@cvs.gnome.org>
 
 	* et.po: Translation updated by Ivar Smolin.
- 
+
 2006-10-13  Alexander Shopov  <ash@contact.bg>
 
 	* bg.po: Updated Bulgarian translation by
@@ -3606,7 +3835,7 @@
 2006-08-20  Hendrik Richter  <hendrikr@gnome.org>
 
 	* de.po: Updated German translation, by
-	 Christian Kintner <mail@christian-kintner.de>
+	Christian Kintner <mail@christian-kintner.de>
 
 2006-08-20  Wouter Bolsterlee  <uws+gnome@xs4all.nl>
 
@@ -3619,7 +3848,7 @@
 2006-08-20  Hendrik Richter  <hendrikr@gnome.org>
 
 	* de.po: Updated German translation, by
-	 Christian Kintner <mail@christian-kintner.de>
+	Christian Kintner <mail@christian-kintner.de>
 
 2006-08-19  Priit Laes  <plaes@cvs.gnome.org>
 
@@ -3646,7 +3875,7 @@
 	* mk.po: Updated Macedonian translation.
 
 2006-08-18  Subhransu Behera  <arya_subhransu@yahoo.co.in>
-	
+
 	* or.po: Updated Oriya Translation.
 
 2006-08-18  Subhransu Behera  <arya_subhransu@yahoo.co.in>
@@ -3681,7 +3910,7 @@
 2006-08-16  Daniel Nylander <po@danielnylander.se>
 
 	* sv.po: Updated Swedish translation.
-	
+
 2006-08-16  Gabor Kelemen  <kelemeng@gnome.hu>
 
 	* hu.po: Translation updated.
@@ -3697,7 +3926,7 @@
 2006-08-13  Rahul Bhalerao  <b.rahul.pm@gmail.com>
 
 	* mr.po: Updated Marathi Translations
-	
+
 2006-08-12  Clytie Siddall <clytie@riverland.net.au>
 
 	* vi.po: Updated Vietnamese translation.
@@ -3718,7 +3947,7 @@
 2006-08-11  Rahul Bhalerao  <b.rahul.pm@gmail.com>
 
 	* mr.po: Updated Marathi translation
-	
+
 2006-08-11  Vincent van Adrighem  <adrighem@gnome.org>
 
 	* nl.po: Translation updated by Tino Meinen.
@@ -3764,7 +3993,7 @@
 2006-08-09  Rahul Bhalerao  <b.rahul.pm@gmail.com>
 
 	* mr.po: Updated Marathi translation.
-	
+
 2006-08-09  Funda Wang  <fundawang@linux.net.cn>
 
 	* zh_CN.po: Updated Simplified Chinese translation.
@@ -3776,15 +4005,15 @@
 2006-08-09  Rahul Bhalerao  <b.rahul.pm@gmail.com>
 
 	* mr.po: Updated Marathi translation
-	
+
 2006-08-09  Rahul Bhalerao  <b.rahul.pm@gmail.com>
 
 	* mr.po: Updated Marathi translation
-	
+
 2006-08-09  Ilkka Tuohela  <hile@iki.fi>
 
 	* fi.po: Updated Finnish translation.
-			 Includes fix for translation bug 350386
+	Includes fix for translation bug 350386
 
 2006-08-08  Kjartan Maraas  <kmaraas@gnome.org>
 
@@ -3793,7 +4022,7 @@
 2006-08-08  Rahul Bhalerao  <b.rahul.pm@gmail.com>
 
 	* mr.po: Updated Marathi translation.
-	
+
 2006-08-08  Ankit Patel  <ankit644@yahoo.com>
 
 	* gu.po: Updated Gujarati Translation.
@@ -3810,13 +4039,13 @@
 
 	* mr.po: Added a new file for Marathi
 	* LINGUAS: Added a corrosponding entry for Marathi(mr) in LINGUAS file
-	
+
 2006-08-07  Francisco Javier F. Serrador  <serrador@openshine.com>
 
 	* es.po: Updated Spanish translation.
 
 2006-08-07  Jovan Naumovski  <jovan@lugola.net>
-	
+
 	* mk.po: Updated Macedonian translation.
 
 2006-08-07  Inaki Larranaga  <dooteo@euskalgnu.org>
@@ -3833,7 +4062,7 @@
 
 2006-08-06  Funda Wang  <fundawang@linux.net.cn>
 
-	* zh_CN.po: Updated Simplified Chinese translation. 
+	* zh_CN.po: Updated Simplified Chinese translation.
 
 2006-08-05  Jovan Naumovski  <jovan@lugola.net>
 
@@ -3854,7 +4083,7 @@
 2006-08-04  Daniel Nylander <po@danielnylander.se>
 
 	* sv.po: Updated Swedish translation.
-	
+
 2006-08-04  Jordi Mas <jmas@softcatala.org>
 
 	* ca.po: Catalan translation update
@@ -4049,7 +4278,7 @@
 2006-07-16  Daniel Nylander  <po@danielnylander.se>
 
 	* sv.po: Updated Swedish translation.
-	
+
 2006-07-14  Priit Laes  <amd@store20.com>
 
 	* et.po: Translation updated by Ivar Smolin.
@@ -4072,8 +4301,8 @@
 
 2006-07-11  Ilkka Tuohela  <hile@iki.fi>
 
-	* fi.po: Revert some localized time fields to %H:%M 
-	  (it's not possible to enter %H.%M, see bug #347241)
+	* fi.po: Revert some localized time fields to %H:%M
+	(it's not possible to enter %H.%M, see bug #347241)
 
 2006-07-11  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
 
@@ -4120,7 +4349,7 @@
 2006-07-07  Ahmad Riza H Nst  <rizahnst@eriagempita.co.id>
 
 	* id.po: Updated.
-	
+
 2006-07-06  Inaki Larranaga  <dooteo@euskalgnu.org>
 
 	* eu.po: Updated Basque translation.
@@ -4408,7 +4637,7 @@
 
 2006-04-30  Lukas Novotny  <lukasnov@cvs.gnome.org>
 
- 	* cs.po: Updated Czech translation.
+	* cs.po: Updated Czech translation.
 
 2006-04-30  Kjartan Maraas <kmaraas@gnome.org>
 
@@ -4432,7 +4661,7 @@
 
 2006-04-23  Lukas Novotny  <lukasnov@cvs.gnome.org>
 
- 	* cs.po: Updated Czech translation.
+	* cs.po: Updated Czech translation.
 
 2006-04-23  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
@@ -4492,11 +4721,11 @@
 2006-04-10  Roozbeh Pournader  <roozbeh@farsiweb.info>
 
 	* fa.po: Remove "%OC" from translations, as it only works with
-	  Sharif Linux's modified glibc (patch by Elnaz Sarbar).
+	Sharif Linux's modified glibc (patch by Elnaz Sarbar).
 
 2006-04-09  Lukas Novotny  <lukasnov@cvs.gnome.org>
 
- 	* cs.po: Updated Czech translation.
+	* cs.po: Updated Czech translation.
 
 2006-04-08  Theppitak Karoonboonyanan  <thep@linux.thai.net>
 
@@ -4513,7 +4742,7 @@
 2006-04-04  Roozbeh Pournader  <roozbeh@farsiweb.info>
 
 	* fa.po: Updated Persian translation by Elnaz Sarbar and Meelad
-	  Zakaria.
+	Zakaria.
 
 2006-03-30  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -4595,8 +4824,8 @@
 
 2006-03-10  Vladimer Sichinava  <vlsichinava@gmail.com>
 
-	* ka.po: Updated Georgian translation by 
-	  Alexander Didebulidze <didebuli@in.tum.de>.
+	* ka.po: Updated Georgian translation by
+	Alexander Didebulidze <didebuli@in.tum.de>.
 
 2006-03-10  Mugurel Tudor  <mugurelu@gnome.ro>
 
@@ -4653,7 +4882,7 @@
 
 2006-03-03  Lukas Novotny  <lukasnov@cvs.gnome.org>
 
- 	* cs.po: Updated Czech translation.
+	* cs.po: Updated Czech translation.
 
 2006-03-03  Žygimantas Beručka  <zygis@gnome.org>
 
@@ -4989,7 +5218,7 @@
 
 2006-02-04  Lukas Novotny  <lukasnov@cvs.gnome.org>
 
- 	* cs.po: Updated Czech translation.
+	* cs.po: Updated Czech translation.
 
 2006-02-02  Laurent Dhima  <laurenti@alblinux.net>
 
@@ -5022,7 +5251,7 @@
 2006-01-31  Ilkka Tuohela  <hile@iki.fi>
 
 	* fi.po: Updated Finnish translation.
-	
+
 2006-01-31  Priit Laes  <plaes@cvs.gnome.org>
 
 	* et.po: Translation updated by Ivar Smolin.
@@ -5138,7 +5367,7 @@
 
 2006-01-25  Ankit Patel  <ankit644@yahoo.com>
 
-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.
 
 2006-01-25  Clytie Siddall <clytie@riverland.net.au>
 
@@ -5162,7 +5391,7 @@
 
 2006-01-24  Ankit Patel  <ankit644@yahoo.com>
 
-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.
 
 2006-01-23  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -5219,7 +5448,7 @@
 
 	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
 	* zh_HK.po: Added Traditional Chinese translation(Hong Kong).
-	
+
 2006-01-20  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
 	* gl.po: Updated Galician Translation.
@@ -5260,10 +5489,10 @@
 2006-01-18  Slobodan D. Sredojevic  <slobo@akrep.be>
 
 	* sr.po, sr@Latn.po: Updated Serbian translation
-	
+
 2006-01-17  Ankit Patel  <ankit644@yahoo.com>
 
-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.
 
 2006-01-17  Clytie Siddall <clytie@riverland.net.au>
 
@@ -5328,7 +5557,7 @@
 
 2006-01-11  Ankit Patel  <ankit644@yahoo.com>
 
-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.
 
 2006-01-11  Clytie Siddall <clytie@riverland.net.au>
 
@@ -5354,7 +5583,7 @@
 
 2005-01-09  Ankit Patel  <ankit644@yahoo.com>
 
-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.
 
 2006-01-09  Takeshi AIHANA <aihana@gnome.gr.jp>
 
@@ -5380,7 +5609,7 @@
 2005-01-06  Ilkka Tuohela  <hile@iki.fi>
 
 	* fi.po: Updated Finnish translation.
-	
+
 2005-01-06  Ankit Patel  <ankit644@yahoo.com>
 
 	* gu.po: Updated Gujarati Translation.
@@ -5413,7 +5642,7 @@
 
 2005-01-04  Ankit Patel  <ankit644@yahoo.com>
 
-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.
 
 2006-01-03  Takeshi AIHANA <aihana@gnome.gr.jp>
 
@@ -5421,7 +5650,7 @@
 
 2005-01-03  Ankit Patel  <ankit644@yahoo.com>
 
-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.
 
 2006-01-02  Adam Weinberger  <adamw@gnome.org>
 
@@ -5437,7 +5666,7 @@
 
 2006-01-01  Ankit Patel  <ankit644@yahoo.com>
 
-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.
 
 2006-01-02  Kjartan Maraas  <kmaraas@gnome.org>
 
@@ -5499,7 +5728,7 @@
 
 2005-12-26  Ankit Patel  <ankit644@yahoo.com>
 
-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.
 
 2005-12-25  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -5536,19 +5765,19 @@
 
 2005-12-21  Ankit Patel  <ankit644@yahoo.com>
 
-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.
 
 2005-12-21  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
 	* es.po: Updated Spanish translation.
 
 2005-12-20  Žygimantas Beručka  <zygis@gnome.org>
-	
+
 	* lt.po: Updated Lithuanian translation.
 
 2005-12-20  Ankit Patel  <ankit644@yahoo.com>
 
-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.
 
 2005-12-10  Ales Nyakhaychyk  <nab@mail.by>
 
@@ -5572,7 +5801,7 @@
 
 2005-12-16  Ankit Patel  <ankit644@yahoo.com>
 
-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.
 
 2005-12-15  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
@@ -5844,7 +6073,7 @@
 2005-09-13  Roozbeh Pournader  <roozbeh@farsiweb.info>
 
 	* fa.po: Updated Persian translation by Elnaz Sarbar
-	  <elnaz@farsiweb.info> and Meelad Zakaria <meelad@farsiweb.info>.
+	<elnaz@farsiweb.info> and Meelad Zakaria <meelad@farsiweb.info>.
 
 2005-09-12  Mugurel Tudor  <mugurelu@gnome.ro>
 
@@ -5957,7 +6186,7 @@
 
 2005-08-27  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-08-26  Mohammad DAMT  <mdamt@gnome.org>
 
@@ -6020,12 +6249,12 @@
 	* uk.po: Updated Ukrainian translation.
 
 2005-08-22  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
-    
+
 	* ru.po: Updated Russian translation.
 
 2005-08-22  Mohammad DAMT  <mdamt@gnome.org>
 
-	* id.po: Updated Indonesian translation 
+	* id.po: Updated Indonesian translation
 
 2005-08-22  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -6049,7 +6278,7 @@
 
 2005-08-22  Danilo Šegan  <danilo@gnome.org>
 
-	* POTFILES.in: Removed 	shell/e-shell-offline-handler.c,
+	* POTFILES.in: Removed shell/e-shell-offline-handler.c,
 	calendar/gui/calendar-offline-handler.c.
 
 2005-08-22  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
@@ -6059,7 +6288,7 @@
 2005-08-22  Mohammad DAMT  <mdamt@gnome.org>
 
 	* POTFILES.in: reverted (accidentally updated by my previous check in)
-	
+
 2005-08-22  Mohammad DAMT  <mdamt@gnome.org>
 
 	* id.po: Updated Indonesian translation.
@@ -6120,7 +6349,7 @@
 
 2005-08-17  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-08-16  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -6280,7 +6509,7 @@
 
 2005-08-09  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-08-09  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
 
@@ -6328,7 +6557,7 @@
 	* pt_BR.po: Updated Brazilian Portuguese translation.
 
 2005-08-07  Ilkka Tuohela  <hile@iki.fi>
-	
+
 	* fi.po: Updated Finnish translation.
 
 2005-08-06  Rhys Jones  <rhys@sucs.org>
@@ -6345,7 +6574,7 @@
 
 2005-08-06  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-08-06  Ankit Patel <ankit644@yahoo.com>
 
@@ -6391,7 +6620,7 @@
 2005-08-04  Ilkka Tuohela  <hile@iki.fi>
 
 	* fi.po: Updated Finnish translation.
-	
+
 2005-08-04  Vincent van Adrighem  <adrighem@gnome.org>
 
 	* nl.po: Translation updated by Tino Meinen.
@@ -6411,7 +6640,7 @@
 
 2005-08-04  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-08-04  Sunil Mohan Adapa <sunil@atc.tcs.co.in>
 
@@ -6448,7 +6677,7 @@
 2005-07-31  Ilkka Tuohela  <hile@iki.fi>
 
 	* fi.po: Bulk updates to Finnish translation
-             for new gnome.fi website.
+	for new gnome.fi website.
 
 2005-07-29  Takeshi AIHANA <aihana@gnome.gr.jp>
 
@@ -6468,7 +6697,7 @@
 
 2005-07-28  Ilkka Tuohela  <hile@iki.fi>
 
-	* fi.po: Bulk change to some Finnish translations.       
+	* fi.po: Bulk change to some Finnish translations.
 
 2005-07-28  Ankit Patel <ankit644@yahoo.com>
 
@@ -6517,7 +6746,7 @@
 
 2005-07-25  Ilkka Tuohela  <hile@iki.fi>
 
-	* fi.po: Updated Finnish translation 
+	* fi.po: Updated Finnish translation
 
 2005-07-24  Ilkka Tuohela  <hile@iki.fi>
 
@@ -6534,7 +6763,7 @@
 
 2005-07-24  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-07-23  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -6559,7 +6788,7 @@
 
 2005-07-23  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-07-23  Priit Laes  <plaes@cvs.gnome.org>
 
@@ -6577,7 +6806,7 @@
 
 2005-07-22  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-07-22  Alexander Shopov  <ash@contact.bg>
 
@@ -6610,7 +6839,7 @@
 
 2005-07-20  Sankar P <psankar@novell.com>
 
-	* POTFILES.in : Changed the path of the files that 
+	* POTFILES.in : Changed the path of the files that
 	are moved due to the consolidation of proxy features' plugins
 	into the groupwise-features plugin.
 
@@ -6631,7 +6860,7 @@
 	* et.po: Translation updated by Ivar Smolin.
 
 2005-07-19  Vivek Jain <jvivek@novell.com>
-	
+
 	* POTFILES.in : added plugins/groupwise-features/junk-mail
 	files
 
@@ -6661,7 +6890,7 @@
 
 2005-07-17  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-07-17  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -6673,7 +6902,7 @@
 
 2005-07-16  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-07-16  Sarfraaz Ahmed <asarfraaz@novell.com>
 
@@ -6683,7 +6912,7 @@
 
 	*plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml
 	: Add file for translation.
-	
+
 2005-07-14  Priit Laes  <plaes@cvs.gnome.org>
 
 	* et.po: Translation updated by Ivar Smolin.
@@ -6698,14 +6927,14 @@
 
 2005-07-13  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-07-13  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
 	* es.po: Updated Spanish translation.
 
 2005-07-12  Vivek Jain <jvivek@novell.com>
-	
+
 	(put the changelog entry here
 	2005-07-10  Shreyas Srinivasan <sshreyas@novell.com>)
 
@@ -6726,16 +6955,16 @@
 	Nestorović.
 
 2005-07-11  Vivek Jain <jvivek@novell.com>
-	
+
 	* POTFILES.in : relocated camel-gw-listener.c
 
 2005-07-11  Sankar P <psankar@novell.com>
 
 	* POTFILES.in : Added the proxy.c file to the list.
-	
+
 2005-07-10  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-07-09  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -6743,8 +6972,8 @@
 
 2005-07-09  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
 
-        * zh_TW.po: Updated Traditional Chinese translation.
-	
+	* zh_TW.po: Updated Traditional Chinese translation.
+
 2005-07-08  Adam Weinberger  <adamw@gnome.org>
 
 	* en_CA.po: Updated Canadian English translation.
@@ -6763,13 +6992,13 @@
 
 2005-07-07  Clytie Siddall <clytie@riverland.net.au>
 
-        * vi.po: Updated Vietnamese translation.
+	* vi.po: Updated Vietnamese translation.
 
 2005-07-07 Vivek Jain <jvivek@novell.com>
-	
-	* POTFILES.in : updated with the changed location of 
+
+	* POTFILES.in : updated with the changed location of
 	em-junk-filter.c
-	
+
 2005-07-07  Alexander Shopov  <ash@contact.bg>
 
 	* bg.po: Updated Bulgarian translation by
@@ -6824,7 +7053,7 @@
 2005-06-28  Kaushal Kumar  <kakumar@novell.com>
 
 	* POTFILES.in: Added the remaining relevant gal files.
-	
+
 	* POTFILES.skip: Added the gal files which need to be skipped.
 
 2005-07-06  Not Zed  <NotZed@Ximian.com>
@@ -7009,7 +7238,7 @@
 	Ivelina Karcheva <anima@mail.bg>
 
 2005-05-23  Vivek Jain  <jvivek@novell.com>
-	
+
 	* POTFILES.in: replaced shared-folder/
 	send-options/ groupwise-send-options/
 	groupwise-account-setup/ with groupwise-features/
@@ -7063,12 +7292,12 @@
 2005-05-03  Roozbeh Pournader  <roozbeh@farsiweb.info>
 
 	* fa.po: Updated Persian translation by Meelad Zakaria
-	  <meelad@farsiweb.info> and myself.
+	<meelad@farsiweb.info> and myself.
 
 2005-05-02  Roozbeh Pournader  <roozbeh@farsiweb.info>
 
 	* fa.po: Updated Persian translation by Meelad Zakaria
-	  <meelad@farsiweb.info> and myself.
+	<meelad@farsiweb.info> and myself.
 
 2005-04-30  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -7301,7 +7530,7 @@
 
 	* POTFILES.in: e-passwords moved to e-d-s
 
-2005-02-23  Jordi Mallach   <jordi@sindominio.net>
+2005-02-23  Jordi Mallach  <jordi@sindominio.net>
 
 	* ca.po: Updated Catalan translation by
 	Josep Puigdemont <josep@imatge-sintetica.com>.
@@ -7415,7 +7644,7 @@
 
 2005-02-18  Marco Ciampa <ciampix@libero.it>
 
-	* it.po: Updated italian translation by Luca 
+	* it.po: Updated italian translation by Luca
 	Ferretti <elle.uca@infinito.it>
 
 2005-02-16  Martin Willemoes Hansen  <mwh@sysrq.dk>
@@ -7622,7 +7851,7 @@
 2005-01-28  JP Rosevear  <jpr@novell.com>
 
 	Fixes #71930
-	
+
 	* POTFILES.in: add missing e-error files
 
 2005-01-28  Christian Rose  <menthos@menthos.com>
@@ -7756,7 +7985,7 @@
 2005-01-14 Marco Ciampa <ciampix@libero.it>
 
 	* it.po: updated italian translation
-	
+
 2005-01-13 Marco Ciampa <ciampix@libero.it>
 
 	* it.po: updated italian translation
@@ -7834,7 +8063,7 @@
 
 2004-12-30  Alexander Shopov  <ash@contact.bg>
 
-	 * bg.po: Updated Bulgarian translation by
+	* bg.po: Updated Bulgarian translation by
 	myself
 
 2004-12-29  Alexander Shopov  <ash@contact.bg>
@@ -7849,7 +8078,7 @@
 2004-12-18  JP Rosevear  <jpr@novell.com>
 
 	Fixes #68841
-	
+
 	* pt_BR.po: fix markup in translated message
 
 2004-12-18  Christian Rose  <menthos@menthos.com>
@@ -7899,10 +8128,10 @@
 
 2004-12-03  Martin Willemoes Hansen  <mwh@sysrq.dk>
 
-	* POTFILES.in: 
-	  Removed mail/mail-account-editor.c
-	  Removed mail/mail-config-druid.c
-	  They are no longer available.
+	* POTFILES.in:
+	Removed mail/mail-account-editor.c
+	Removed mail/mail-config-druid.c
+	They are no longer available.
 	* da.po: Updated Danish translation.
 
 2004-12-01  Dafydd Harries  <daf@muse.19inch.net>
@@ -7976,7 +8205,7 @@
 2004-11-04  Miloslav Trmac  <mitr@volny.cz>
 
 	* cs.po: Fixed Czech translation (thanks to
-	 Juraj Kubelka <Juraj.Kubelka@email.cz>).
+	Juraj Kubelka <Juraj.Kubelka@email.cz>).
 
 2004-10-26  Martin Willemoes Hansen  <mwh@sysrq.dk>
 
@@ -8097,7 +8326,7 @@
 
 2004-09-29  Marco Ciampa  <ciampix@libero.it>
 
-        * it.po: italian translation, locale and hotkey trim
+	* it.po: italian translation, locale and hotkey trim
 
 2004-09-28  Vincent van Adrighem  <adrighem@gnome.org>
 
@@ -8122,11 +8351,11 @@
 
 2004-09-24  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation.
+	* fr.po: Updated French translation.
 
 2004-09-23  Marco Ciampa  <ciampix@libero.it>
 
-        * it.po: updated italian translation.
+	* it.po: updated italian translation.
 
 2004-09-23  Adam Weinberger  <adamw@gnome.org>
 
@@ -8134,13 +8363,12 @@
 
 2004-09-22  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation from
+	* fr.po: Updated French translation from
 	Craig Jeffares <cjeffares@novell.com>.
 
 2004-09-22  Craig Jeffares  <cjeffares@novell.com>
 
-        * it.po & zh_TW.po: Updated Italian & Chinese Trad translation.
-
+	* it.po & zh_TW.po: Updated Italian & Chinese Trad translation.
 
 2004-09-21  Adam Weinberger  <adamw@gnome.org>
 
@@ -8177,7 +8405,7 @@
 
 2004-09-12  Hasbullah Bin Pit <sebol@my-penguin.org>
 
-        * ms.po: Updated Malay Translation.
+	* ms.po: Updated Malay Translation.
 
 2004-09-11  Mugurel Tudor  <mugurelu@go.ro>
 
@@ -8228,18 +8456,18 @@
 	* nl.po: Translation updated by Daniel van Eeden.
 
 2004-09-05  Åsmund Skjæveland <aasmunds@fys.uio.no>
-	
+
 	* nn.po: Updated Norwegian Nynorsk translation:
-       	         Merged translations from gnome-2-8 branch.
+	Merged translations from gnome-2-8 branch.
 
 2004-09-04  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation.
+	* fr.po: Updated French translation.
 
 2004-09-03  JP Rosevear  <jpr@novell.com>
 
 	Fixes #65030
-	
+
 	* en_GB.po: Correct typo
 
 2004-09-03  Baris Cicek <baris@teamforce.name.tr>
@@ -8262,14 +8490,14 @@
 
 	* hi.po: Updated Hindi translation by
 	Rajesh Ranjan <rranjan@redhat.com>
-		
+
 2004-08-30  Åsmund Skjæveland <aasmunds@fys.uio.no>
 
-	* nn.po: Updated Norwegian Nynorsk translation: 
-       	         Merged translations from gnome-2-8 branch.
+	* nn.po: Updated Norwegian Nynorsk translation:
+	Merged translations from gnome-2-8 branch.
 
 2004-08-28  Ales Nyakhaychyk  <nab@mail.by>
-	
+
 	* be.po: Updated Belarusian translation.
 
 2004-08-29  Funda Wang  <fundawang@linux.net.cn>
@@ -8303,12 +8531,12 @@
 
 2004-08-26  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation from
-	Sebastien Bacher <seb128@debian.org>.
+	* fr.po: Updated French translation from Sebastien
+	Bacher <seb128@debian.org>.
 
 2004-08-25  Hasbullah Bin Pit <sebol@imy-penguin.org>
-                                                                                
-        * ms.po: Updated Malay Translation.
+
+	* ms.po: Updated Malay Translation.
 
 2004-08-25  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -8477,7 +8705,7 @@
 
 2004-08-12  Leonid Kanter <leon@asplinux.ru>
 
-        * ru.po: Updated Russian translation
+	* ru.po: Updated Russian translation
 
 2004-08-12  Åsmund Skjæveland <aasmunds@fys.uio.no>
 
@@ -8489,7 +8717,7 @@
 
 2004-08-11  Leonid Kanter <leon@asplinux.ru>
 
-        * ru.po: Updated Russian translation from Dan Korostelev <dan@ats.energo.ru>
+	* ru.po: Updated Russian translation from Dan Korostelev <dan@ats.energo.ru>
 
 2004-08-11  Changwoo Ryu  <cwryu@debian.org>
 
@@ -8523,7 +8751,7 @@
 
 	* gu.po: Updated Gujarati translation.
 
-2004-08-09  Amanpreet Singh Alam   <aalam@redhat.com>
+2004-08-09  Amanpreet Singh Alam  <aalam@redhat.com>
 
 	* pa.po: Updated Panjabi translation.
 
@@ -8614,7 +8842,7 @@
 
 2004-07-29  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation from
+	* fr.po: Updated French translation from
 	Sebastien Bacher <seb128@debian.org>.
 
 2004-07-29  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
@@ -8659,7 +8887,7 @@
 
 2004-07-23  Åsmund Skjæveland  <aasmunds@fys.uio.no>
 
-	* nn.po: Updated Norwegian Nynorsk translation.	
+	* nn.po: Updated Norwegian Nynorsk translation.
 
 2004-07-23  Changwoo Ryu  <cwryu@debian.org>
 
@@ -8668,7 +8896,7 @@
 2004-07-22  Marco Ciampa  <ciampix@libero.it>
 
 	* it.po: Italian translation updated.
-	
+
 2004-07-21  Takeshi AIHANA <aihana@gnome.gr.jp>
 
 	* ja.po: Updated Japanese translation.
@@ -8698,7 +8926,7 @@
 
 	* bg.po: Updated Bulgarian translation by
 	Vladimir "Kaladan" Petkov <vpetkov@i-space.org>
-		
+
 2004-07-14  Miloslav Trmac  <mitr@volny.cz>
 
 	* cs.po: Updated Czech translation.
@@ -8717,7 +8945,7 @@
 
 2004-07-13  Leonid Kanter <leon@asplinux.ru>
 
-        * ru.po: updated Russian translation
+	* ru.po: updated Russian translation
 
 2004-07-13  Funda Wang  <fundawang@linux.net.cn>
 
@@ -8928,7 +9156,7 @@
 
 2004-06-08  Marco Ciampa  <ciampix@libero.it>
 
-        * it.po: Italian translation updated.
+	* it.po: Italian translation updated.
 
 2004-06-08  Artur Flinta  <aflinta@cvs.gnome.org>
 
@@ -8987,7 +9215,7 @@
 2004-05-25  Marco Ciampa  <ciampix@libero.it>
 
 	* it.po: Italian translation updated.
-	
+
 2004-05-25  Artur Flinta  <aflinta@cvs.gnome.org>
 
 	* pl.po: Updated Polish translation by GNOME PL Team.
@@ -9008,7 +9236,7 @@
 2004-05-23  Marco Ciampa  <ciampix@libero.it>
 
 	* it.po: Italian translation updated.
-	
+
 2004-05-23  Funda Wang  <fundawang@linux.net.cn>
 
 	* zh_CN.po: Updated Simplified Chinese translation.
@@ -9184,7 +9412,7 @@
 2004-04-30  Marco Ciampa <ciampix@libero.it>
 
 	* it.po: Italian translation updated.
-	
+
 2004-04-30  Priit Laes  <plaes@cvs.gnome.org>
 
 	* et.po: Translation updated.
@@ -9247,7 +9475,7 @@
 
 2004-04-24  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation.
+	* fr.po: Updated French translation.
 
 2004-04-24  Takeshi AIHANA <aihana@gnome.gr.jp>
 
@@ -9356,18 +9584,18 @@
 	* cs.po: Updated Czech translation.
 
 2004-07-11  Evandro Fernandes Giovanini <evandrofg@ig.com.br>
- 
-        * pt_BR.po: Updated Brazilian Portuguese translation
-        from Afonso Celso Medina <medina@maua.br>.
+
+	* pt_BR.po: Updated Brazilian Portuguese translation
+	from Afonso Celso Medina <medina@maua.br>.
 
 2004-04-10  Adam Weinberger  <adamw@gnome.org>
 
 	* en_CA.po: Updated Canadian English translation.
 
 2004-07-10  Evandro Fernandes Giovanini <evandrofg@ig.com.br>
- 
-        * pt_BR.po: Updated Brazilian Portuguese translation
-        from Afonso Celso Medina <medina@maua.br>.
+
+	* pt_BR.po: Updated Brazilian Portuguese translation
+	from Afonso Celso Medina <medina@maua.br>.
 
 2004-04-10  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -9449,7 +9677,7 @@
 
 2004-03-27  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation.
+	* fr.po: Updated French translation.
 
 2004-03-27  Priit Laes  <plaes@cvs.gnome.org>
 
@@ -9717,7 +9945,7 @@
 
 2004-02-19  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation.
+	* fr.po: Updated French translation.
 
 2004-02-19  Changwoo Ryu  <cwryu@debian.org>
 
@@ -9749,7 +9977,7 @@
 
 2004-02-13  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation.
+	* fr.po: Updated French translation.
 
 2004-02-12  Jordi Mallach  <jordi@sindominio.net>
 
@@ -9896,7 +10124,7 @@
 2004-01-28 Marco Ciampa <ciampix@libero.it>
 
 	* it.po: updated italian translation.
-	
+
 2004-01-28  Miloslav Trmac  <mitr@volny.cz>
 
 	* cs.po: Fixed Czech translation.
@@ -9904,7 +10132,7 @@
 2004-01-27  Marco Ciampa <ciampix@libero.it>
 
 	* it.po: updated italian translation.
-	
+
 2004-01-27  Åsmund Skjæveland  <aasmunds@fys.uio.no>
 
 	* nn.po: Updated Norwegian Nynorsk translation.
@@ -9928,14 +10156,14 @@
 2004-01-26  Marco Ciampa  <ciampix@libero.it>
 
 	* it.po: Updated italian translation.
-	
+
 2004-01-26  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
 	* es.po: Updated Spanish translation.
 
 2004-01-25  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation from
+	* fr.po: Updated French translation from
 	Sebastien Bacher <seb128@debian.org>.
 
 2004-01-25  Vincent van Adrighem  <adrighem@gnome.org>
@@ -9968,7 +10196,7 @@
 
 2004-01-25  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation from
+	* fr.po: Updated French translation from
 	Yannick Marchegay <yannick.marchegay@lokanova.com>.
 
 2004-01-25  Funda Wang  <fundawang@linux.net.cn>
@@ -10043,7 +10271,7 @@
 
 2004-01-19  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation.
+	* fr.po: Updated French translation.
 
 2004-01-18 Alastair McKinstry <mckinstry@computer.org>
 
@@ -10159,7 +10387,7 @@
 2004-01-07  Marco Ciampa <ciampix@libero.it>
 
 	* it.po: Updated italian translation.
-	
+
 2004-01-06  Kostas Papadimas <pkst@gnome.org>
 
 	* el.po: Updated Greek translation.
@@ -10233,7 +10461,7 @@
 2003-12-14  Marco Ciampa  <ciampix@libero.it>
 
 	* it.po: Updated italian translation.
-		
+
 2003-12-13  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* no.po: Updated Norwegian translation.
@@ -10248,7 +10476,7 @@
 
 2003-12-07 Paul Duffy <dubhthach@compsoc.nuigalway.ie>
 
-        * ga.po: Updated Irish Translation, submitted by David O'Callaghan <david.ocallaghan@cs.tcd.ie>      
+	* ga.po: Updated Irish Translation, submitted by David O'Callaghan <david.ocallaghan@cs.tcd.ie>
 
 2003-12-02  Rodney Dawes  <dobey@ixmian.com>
 
@@ -10274,13 +10502,13 @@
 
 2003-11-19  Rodney Dawes  <dobey@ximian.com>
 
-	* it.po: Fixed msgstr missing ending 
+	* it.po: Fixed msgstr missing ending
 
 
 2003-11-19  Marco Ciampa <ciampix@libero.it>
 
 	*  it.po: Updated italian translation
-	
+
 2003-11-18  Hasbullah Bin Pit <sebol@ikhlas.com>
 
 	* ms.po: Updated initial Malay Translation by
@@ -10323,7 +10551,7 @@
 	* POTFILES.in: Add some missing files, and remove files
 	that have been removed from CVS
 	* POTFILES.skip: Add data/evolution.desktop.in
-	
+
 2003-10-23  Chris Toshok  <toshok@ximian.com>
 
 	* POTFILES.in: add smime files.
@@ -10351,7 +10579,7 @@
 2003-10-02  Åsmund Skjæveland  <aasmunds@fys.uio.no>
 
 	* nn.po: Updated Norwegian (nynorsk) translation.
-	
+
 2003-10-01  Åsmund Skjæveland  <aasmunds@fys.uio.no>
 
 	* nn.po: Updated Norwegian (nynorsk) translation.
@@ -10386,7 +10614,7 @@
 	a long way to go (25% left), but every little bit helps.
 
 2003-09-15 Marco Ciampa <ciampix@libero.it>
-	
+
 	* it.po: Updated italian translation (replay date corrected...)
 
 2003-09-11  Hans Petter Jansson  <hpj@ximian.com>
@@ -10395,7 +10623,7 @@
 	programs that don't need i18n, sort.
 
 2003-09-10 Marco Ciampa <ciampix@libero.it>
-	
+
 	* it.po: Updated italian translation.
 
 2003-09-07  Wang Jian  <lark@linux.net.cn>
@@ -10403,10 +10631,10 @@
 	* zh_CN.po: Merged from evolution-1-4-branch.
 
 2003-08-20 Suresh Chandrasekharan <suresh.chandrasekharan@sun.com>
-	
+
 	* zh_CN.po: Removed illegal '-'s from strptime msgstr, this fixes
-        #43558, Appointment Editor always gives time validation error for
-        apptmnts in non UTF-8/non ASCII locales.
+	#43558, Appointment Editor always gives time validation error for
+	apptmnts in non UTF-8/non ASCII locales.
 
 2003-08-20  Hasbullah Bin Pit <sebol@ikhlas.com>
 
@@ -10424,41 +10652,41 @@
 ")
 
 2003-08-05 Marco Ciampa <ciampix@libero.it>
-	
+
 	* it.po: Updated italian translation (revision completed).
 
 2003-08-04 Marco Ciampa <ciampix@libero.it>
-	
+
 	* it.po: Updated italian translation (under revision 91% completed).
 
 2003-08-03 Marco Ciampa <ciampix@libero.it>
-	
+
 	* it.po: Updated italian translation (under revision 35% completed).
 
 2003-08-02  Christophe Merlet  <redfox@redfoxcenter.org>
 
-        * fr.po: Updated French translation by
+	* fr.po: Updated French translation by
 	Brigitte Le Grand <brigitte.le.grand@sun.com>
 
 2003-08-02 Marco Ciampa <ciampix@libero.it>
-	
+
 	* it.po: Updated italian translation (under revision 25% completed).
 
 2003-08-01  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
 
-        * es.po: Updated Spanish translation by
-                 Francisco Javier F. Serrador <serrador@arrakis.es>.
+	* es.po: Updated Spanish translation by
+	Francisco Javier F. Serrador <serrador@arrakis.es>.
 
 2003-07-26  Danilo Å egan  <dsegan@gmx.net>
 
-	* sr.po,sr@Latn.po: Updated Serbian translation by Serbian team 
+	* sr.po,sr@Latn.po: Updated Serbian translation by Serbian team
 	(Prevod.org).
 
 	* POTFILES.in: Removed "widgets/misc/e-messagebox.c" because it
 	was removed from repository on July 23, by danw.
 
 2003-07-26 Marco Ciampa <ciampix@libero.it>
-	
+
 	* it.po: Updated italian translation.
 
 2003-07-22  Christian Neumair  <chris@gnome-de.org>
@@ -10468,30 +10696,30 @@
 2003-07-21  Hasbullah Bin Pit <sebol@ikhlas.com>
 
 	* ms.po: Added initial Malay Translation by
-		MIMOS Open Source Development Group <syed@mimos.my>
+	MIMOS Open Source Development Group <syed@mimos.my>
 
 2003-07-19  Abel Cheung  <maddog@linux.org.hk>
 
 	* bg.po, ga.po, gl.po, lt.po: Convert to UTF-8 and merge with newest
-	  template.
+	template.
 
 2003-07-10  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
-        
-        * es.po: Updated Spanish translation by
-                 Francisco Javier F. Serrador <serrador@arrakis.es>.
+
+	* es.po: Updated Spanish translation by
+	Francisco Javier F. Serrador <serrador@arrakis.es>.
 
 2003-07-07 Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
 
-        * es.po: Updated Spanish translation by
-                 Francisco Javier F. Serrador <serrador@arrakis.es>.
+	* es.po: Updated Spanish translation by
+	Francisco Javier F. Serrador <serrador@arrakis.es>.
 
 2003-06-26  Kostas Papadimas <pkst@gmx.net>
 
 	* el.po: Greek translation updated by Nikos Charonitakis <charosn@her.forthnet.gr>
 
 2003-06-25  Ivan Stojmirov  <stojmir@linux.net.mk>
-                                                                                
-        * mk.po: Updated Macedonian translation.
+
+	* mk.po: Updated Macedonian translation.
 
 2003-06-25  Kang Jeong-Hee  <Keizi@mail.co.kr>
 
@@ -10507,13 +10735,13 @@
 
 2003-06-23  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
 
-        * es.po: Updated Spanish translation by
-                 Francisco Javier F. Serrador <serrador@arrakis.es>.
+	* es.po: Updated Spanish translation by
+	Francisco Javier F. Serrador <serrador@arrakis.es>.
 
 2003-06-23 Marco Ciampa <ciampix@libero.it>
-	
+
 	* it.po: Updated italian translation.
-	
+
 2003-06-22  Kostas Papadimas <pkst@gmx.net>
 
 	* el.po: Greek translation updated by Nikos Charonitakis <charosn@her.forthnet.gr>
@@ -10537,7 +10765,7 @@
 
 2003-06-18  Andras Timar <timar@gnome.hu>
 
-        * hu.po: Proofreading: 100%
+	* hu.po: Proofreading: 100%
 
 2003-06-20  Christian Rose  <menthos@menthos.com>
 
@@ -10549,9 +10777,9 @@
 	(Prevod.org).
 
 2003-06-18  Andras Timar <timar@gnome.hu>
-                                                                                                                           
-        * hu.po: Translation: 100% reached, Proofreading: 37%
-                                                                                                                           
+
+	* hu.po: Translation: 100% reached, Proofreading: 37%
+
 2003-06-19 Wang Jian  <lark@linux.net.cn>
 
 	* zh_CN.po: Updated Simplified Chinese translation by
@@ -10576,25 +10804,25 @@
 
 2003-06-18  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
 
-        * es.po: Updated Spanish translation by
-                 Francisco Javier F. Serrador <serrador@arrakis.es>.
+	* es.po: Updated Spanish translation by
+	Francisco Javier F. Serrador <serrador@arrakis.es>.
 
 2003-06-18  Andras Timar <timar@gnome.hu>
-                                                                                                                           
-        * hu.po: Updated Hungarian translation.
-                                                                                                                           
+
+	* hu.po: Updated Hungarian translation.
+
 2003-06-17  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
 
-        * es.po: Updated Spanish translation by
-                 Francisco Javier F. Serrador <serrador@arrakis.es>.
+	* es.po: Updated Spanish translation by
+	Francisco Javier F. Serrador <serrador@arrakis.es>.
 
 2003-06-16  Fatih Demir <kabalak@gtranslator.org>
 
 	* tr.po: Committed updated Turkish translation by Gorkem Cetin.
 
 2003-06-16  Andras Timar <timar@gnome.hu>
-                                                                                                                           
-        * hu.po: Updated Hungarian translation.
+
+	* hu.po: Updated Hungarian translation.
 
 2003-06-15  Vincent van Adrighem  <V.vanAdrighem@dirck.mine.nu>
 
@@ -10611,8 +10839,8 @@
 
 2003-06-09  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
 
-	* es.po: Updated Spanish translation from 
-                 Francisco Javier Fernandez <serrador@arrakis.es>.
+	* es.po: Updated Spanish translation from
+	Francisco Javier Fernandez <serrador@arrakis.es>.
 
 2003-06-04  Miloslav Trmac  <mitr@volny.cz>
 
diff --git a/po/ar.po b/po/ar.po
index 9f53b6b643..458b964618 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -2,6 +2,7 @@
 # Arabic translation of evolution.
 # This file is distributed under the same license as the evolution package.
 #
+#: ../shell/main.c:589
 # Arafat Medini <lumina@silverpen.de>, 2003.
 # Ossama Khayat <okhayat@yahoo.com>, 2003, 2004.
 # Abdulaziz Al-Arfaj <alarfaj0@yahoo.com>, 2004.
@@ -10,21 +11,21 @@
 # Ahmad Farghal <ahmad.farghal@gmail.com>, 2006, 2007.
 # Anas Husseini <linux.anas@gmail.com>, 2007.
 # Abou Manal <aboumanal@gmail.com, 2008.
-#: ../shell/main.c:589
+# Usama Akkad <uak@aya.sy>, 2008.
+# OsamaKhalid <OsamaK.WFM@gmail.com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution.HEAD\n"
+"Project-Id-Version: evolution.HEAD.ar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-26 14:43+0100\n"
-"PO-Revision-Date: 2008-02-23 05:56+0100\n"
-"Last-Translator: Abou Manal <aboumanal@gmail.com>\n"
-"Language-Team: Arabic <doc@arabeyes.org>\n"
+"POT-Creation-Date: 2008-09-17 23:48+0100\n"
+"PO-Revision-Date: 2008-09-20 02:59+0300\n"
+"Last-Translator: OsamaKhalid <OsamaK.WFM@gmail.com>\n"
+"Language-Team: Arabic <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && "
-"n<=10 ? 2 : 3\n"
+"Plural-Forms: Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : 3\n"
 "X-Poedit-Language: Arabic\n"
 "X-Poedit-Country: EGYPT\n"
 "X-Poedit-Bookmarks: 3687,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
@@ -32,16 +33,16 @@ msgstr ""
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
 #: ../a11y/addressbook/ea-minicard-view.c:178
-msgid "evolution addressbook"
+msgid "evolution address book"
 msgstr "دفتر عناوين إيفُليوشن"
 
 #: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "مراسَل جديد"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "قائمة مراسَلين جديدة"
 
@@ -70,63 +71,63 @@ msgstr "مراسَل:"
 msgid "evolution minicard"
 msgstr "بطاقة إيفُليوشِن"
 
-#: ../a11y/calendar/ea-cal-view-event.c:266
+#: ../a11y/calendar/ea-cal-view-event.c:265
 msgid "It has alarms."
 msgstr "له منبّهات."
 
-#: ../a11y/calendar/ea-cal-view-event.c:269
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "It has recurrences."
 msgstr "له إعادات."
 
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It is a meeting."
 msgstr "هو اجتماع."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:277
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "حدث تقويم: الملخّص هو %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:280
+#: ../a11y/calendar/ea-cal-view-event.c:279
 msgid "Calendar Event: It has no summary."
 msgstr "حدث تقويم: لا ملخّص له."
 
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "مشهد أحداث التقويم"
 
-#: ../a11y/calendar/ea-cal-view-event.c:528
+#: ../a11y/calendar/ea-cal-view-event.c:527
 msgid "Grab Focus"
 msgstr "أخذ تركيز"
 
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
 msgstr "موعد جديد"
 
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "حدث جديد يستغرق يومًا بأكمله"
 
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "إجتماع جديد"
 
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "اذهب إلى اليوم الحالي"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "اذهب إلى التاريخ"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:303
-#: ../a11y/calendar/ea-week-view-main-item.c:301
+#: ../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 "جدول لعرض و اختيار المدى الزمني الحالي"
 
 #. 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:151 ../a11y/calendar/ea-week-view.c:150
+#: ../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."
@@ -137,14 +138,14 @@ msgstr[3] "له %d حدث."
 
 #. 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:155 ../a11y/calendar/ea-week-view.c:152
+#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
 msgid "It has no events."
 msgstr "ليس له أحداث."
 
 #. 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:162
+#: ../a11y/calendar/ea-day-view.c:159
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "مشهد أسبوع العمل: %s. %s"
@@ -152,20 +153,20 @@ msgstr "مشهد أسبوع العمل: %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:168
+#: ../a11y/calendar/ea-day-view.c:165
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "مشهد اليوم: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
 msgstr "مشهد التقويم لاسبوع عمل"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr "مشهد التقويم ليوم أو أكثر"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
+#: ../a11y/calendar/ea-gnome-calendar.c:186
 #: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
@@ -176,26 +177,26 @@ 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:191
+#: ../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:1568
-#: ../calendar/gui/e-week-view-main-item.c:340
+#: ../calendar/gui/e-day-view-top-item.c:856 ../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:193
+#: ../a11y/calendar/ea-gnome-calendar.c:191
+#: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../a11y/calendar/ea-gnome-calendar.c:200
 #: ../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:217
-#: ../a11y/calendar/ea-gnome-calendar.c:223
+#: ../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
-#: ../a11y/calendar/ea-gnome-calendar.c:231
 #: ../calendar/gui/calendar-component.c:781
 #: ../calendar/gui/calendar-component.c:788
 #: ../calendar/gui/calendar-component.c:794
@@ -208,76 +209,76 @@ 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:221
+#: ../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:1584
-#: ../calendar/gui/e-week-view-main-item.c:354
+#: ../calendar/gui/e-day-view-top-item.c:860 ../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:247
-#: ../a11y/calendar/ea-gnome-calendar.c:255
+#: ../a11y/calendar/ea-gnome-calendar.c:245
+#: ../a11y/calendar/ea-gnome-calendar.c:253
 #: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
 msgstr "تقويم جنوم"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "شريط البحث"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "شريط البحث لتقويم إيفُليوشِن"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "زر القفز"
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "أُنقر هنا لإيجاد أحداث أخرى."
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "مشهد الشّهر: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "مشهد الأسبوع: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
 msgstr "مشهد التقويم لشهر"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
 msgstr "مشهد التقويم لأسبوع أو أكثر"
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr "نافذة منبثقة"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:125
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
 msgid "popup a child"
 msgstr "قم بإظهار تابعًا منبثقًا"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
 msgid "edit"
 msgstr "حرّر"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
 msgid "begin editing this cell"
 msgstr "ابدأ تحرير هذه الخليّة"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
 msgid "toggle"
 msgstr "بدّل"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:152
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
 msgid "toggle the cell"
 msgstr "بدّل الخليّة"
 
@@ -297,67 +298,66 @@ msgstr "قلّص"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "يقلّص الصف الذي يحتوي هذه الخلية في ETree"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "خلية جدول"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:581
+#: ../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 "انقر لتضيف"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
 msgid "click"
 msgstr "انقر"
 
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
+#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
 msgid "sort"
 msgstr "رتّب"
 
-#: ../a11y/widgets/ea-calendar-item.c:298
-#: ../a11y/widgets/ea-calendar-item.c:304
+#: ../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:306
+#: ../a11y/widgets/ea-calendar-item.c:303
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "التقويم: من %s إلى %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:341
+#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
 msgstr "عنصر تقويم إيفُليوشِن"
 
-#: ../a11y/widgets/ea-combo-button.c:39
+#: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
 msgstr "زر كومبو"
 
-#: ../a11y/widgets/ea-combo-button.c:49
+#: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
 msgstr "نشّط الإفتراض"
 
-#: ../a11y/widgets/ea-combo-button.c:51
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "قائمة منبثقة"
 
-#: ../a11y/widgets/ea-expander.c:39
+#: ../a11y/widgets/ea-expander.c:40
 msgid "Toggle Attachment Bar"
 msgstr "بدّل شريط المرفقات"
 
-#: ../a11y/widgets/ea-expander.c:49
+#: ../a11y/widgets/ea-expander.c:50
 msgid "activate"
 msgstr "نشّط"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
-#, fuzzy
 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."
 msgstr ""
-"'{0}' مصدر دفتر عناوين مقروء فقط. انتقل إلى مشهد المراسلين واختر دفتر عناوين "
-"يقبل المراسلين. ."
+"'{0}' دفتر عناوين للقراءة فقط و لا يمكن تعديله. إختر دفتر عناوين آخر من "
+"الشريط الجانبي لمشهد المراسلين."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -397,27 +397,26 @@ msgid "Could not get schema information for LDAP server."
 msgstr "لم أستطع جلب معلومات المخطط من خادوم LDAP."
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
-msgstr "لم أستطع إزالة دفتر العناوين."
+msgid "Could not remove address book."
+msgstr "تعذر إزالة دفتر العناوين."
 
 #: ../addressbook/addressbook.error.xml.h:11
-#, fuzzy
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
 "Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
-"لا يمكنك النفاذ إلا إلى دفتر عناوين نظام GroupWise حاليًا من إيفليوشن. الرجاء "
-"استخدام عميل بريد GroupWise آخر مرة واحدة، للوصول لمراسلي GroupWise "
-"المتكررين ومجلدات مراسلين GroupWise الشخصيين."
+"يمكنك النفاذ إلى دفتر عناوين نظام GroupWise واحد حاليًا من إيفليوشن. استخدم "
+"عميل بريد GroupWise آخر مرة واحدة، للوصول لمراسلي GroupWise المتكررين "
+"ومجلدات مراسلي GroupWise الشخصيين."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
 msgstr "حذف دفتر العناوين '{0}'؟"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
-msgstr "خطأ عند تحميل دفتر العناوين."
+msgid "Error loading address book."
+msgstr "خطأ تحميل دفتر العناوين."
 
 #: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
@@ -450,12 +449,11 @@ msgid "Some features may not work properly with your current server"
 msgstr "قد لا تعمل بعض المميزات جيدا مع خادومك الحالي"
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "The Evolution addressbook has quit unexpectedly."
+msgid "The Evolution address book has quit unexpectedly."
 msgstr "توقّف دفتر عناوين إيفُليوشِن بشكل لم يكن في الحسبان."
 
 #: ../addressbook/addressbook.error.xml.h:22
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
+msgid "The image you have selected is large. Do you want to resize and store it?"
 msgstr "لقد اخترت صورة كبيرة. أترغب بتحجيمها وتخزينها؟"
 
 #: ../addressbook/addressbook.error.xml.h:23
@@ -468,31 +466,31 @@ msgstr ""
 "إعدادها بشكل سيء. اطلب من مدير نظامك قواعد بحث مدعومة."
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "This address book will be removed permanently."
-msgstr "سيحذف دفتر العناوين هذا للأبد."
-
-#: ../addressbook/addressbook.error.xml.h:25
-msgid "This addressbook could not be opened."
+msgid "This address book could not be opened."
 msgstr "لا يمكن فتح دفتر العناوين هذا."
 
-#: ../addressbook/addressbook.error.xml.h:26
-msgid "This addressbook server does not have any suggested search bases."
+#: ../addressbook/addressbook.error.xml.h:25
+msgid "This address book server does not have any suggested search bases."
 msgstr "لا يملك خادوم دفتر العناوين هذا أي قواعد بحث مقترحة."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
 msgid ""
-"This addressbook server might be unreachable or the server name may be "
+"This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr ""
-"خادوم دفتر العناوين هذا قد يكون بعيد المنال أو هناك خطأ في تهجأة اسم الخادوم "
-"أو أن اتصالك الشبكي لا يعمل."
+"خادوم دفتر العناوين هذا قد يكون من غير الممكن الوصول إليه أو هناك "
+"خطأ في تهجأة اسم الخادوم أو أن اتصالك الشبكي لا يعمل."
+
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "سيحذف دفتر العناوين هذا للأبد."
 
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "لا يدعم هذا الخادوم معلومات مخطّط LDAPv3."
 
 #: ../addressbook/addressbook.error.xml.h:29
-msgid "Unable to open addressbook"
+msgid "Unable to open address book"
 msgstr "لم يمكن فتح دفتر العناوين"
 
 #: ../addressbook/addressbook.error.xml.h:30
@@ -509,11 +507,11 @@ msgstr "أترغب في حفظ تغييراتك؟"
 
 #: ../addressbook/addressbook.error.xml.h:33
 msgid ""
-"You are attempting to move a contact from one addressbook to another but it "
+"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?"
 msgstr ""
-"تحاول نقل مراسل من دفتر عناوين لآخر، لكن لا يمكن حذفه من المصدر. أترغب في "
-"حفظ نسخة منه بدلا عن هذا؟"
+"تحاول نقل مراسل من دفتر عناوين لآخر، لكن لا يمكن حذفه من "
+"المصدر. أترغب في حفظ نسخة منه بدلا عن هذا؟"
 
 #: ../addressbook/addressbook.error.xml.h:34
 msgid ""
@@ -525,9 +523,8 @@ msgstr ""
 "إيفُليوشِن. لتحصل على أفضل النتائج يفضل ترقية الخادة لنسخة مدعومة."
 
 #: ../addressbook/addressbook.error.xml.h:35
-#, fuzzy
 msgid "You do not have permission to delete contacts in this address book."
-msgstr "ليست لديك تصاريح كافية لحذف هذا البريد."
+msgstr "ليست لديك تصاريح لحذف المراسلين من دفتر العناوين هذا."
 
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
@@ -536,11 +533,10 @@ msgid ""
 msgstr "لقد قمت بتعديلات على هذا المراسل. أترغب في حفظ التعديلات؟"
 
 #: ../addressbook/addressbook.error.xml.h:37
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "اتصالاتك مع {0} لن تتوفر إلا بعد إعادة تشغيل إيفُليوشِن."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:512
+#: ../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
@@ -563,7 +559,7 @@ msgstr "_غيِّر الحجم"
 msgid "_Use as it is"
 msgstr "است_خدمه كما هو"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
+#. 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}"
@@ -580,8 +576,8 @@ msgstr "عنوان التّزامن الإفتراضي:"
 
 #: ../addressbook/conduit/address-conduit.c:1320
 #: ../addressbook/conduit/address-conduit.c:1321
-msgid "Could not load addressbook"
-msgstr "لم يمكن تحميل دفتر العناوين"
+msgid "Could not load address book"
+msgstr "تعذّر تحميل دفتر العناوين"
 
 #: ../addressbook/conduit/address-conduit.c:1398
 #: ../addressbook/conduit/address-conduit.c:1401
@@ -609,7 +605,7 @@ msgstr "إضبط التكملة التلقائية هنا"
 #: ../addressbook/gui/component/addressbook-view.c:1326
 #: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
 msgstr "المراسَلون"
 
@@ -618,9 +614,8 @@ msgid "Evolution Address Book"
 msgstr "دفتر عناوين إيفُليوشِن"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
 msgid "Evolution Address Book address popup"
-msgstr "نافذة منبثقة لعناوين دفتر عناوين إيفُليوشِن"
+msgstr "نافذة العنوان المنبثقة لدفتر عناوين إيفُليوشِن"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book address viewer"
@@ -635,9 +630,8 @@ msgid "Evolution Address Book component"
 msgstr "مكون دفتر عناوين إيفُليوشِن"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
 msgid "Evolution S/MIME Certificate Management Control"
-msgstr "تحكّم إدارة شهادة S/MIME لإيفُليوشِن"
+msgstr "التحكّم بإدارة شهادة S/MIME لإيفُليوشِن"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
@@ -649,8 +643,8 @@ msgstr "أدر شهادات S/Mime الخاصة بك هنا"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:144
-#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../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
@@ -666,8 +660,8 @@ msgstr "على هذا الحاسوب"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:152
-#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../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/widgets/eab-contact-display.c:660
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/caltypes.xml.h:29
@@ -679,29 +673,29 @@ msgid "Personal"
 msgstr "شخصي"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:163
-#: ../addressbook/gui/component/addressbook-migrate.c:517
+#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-migrate.c:518
 msgid "On LDAP Servers"
 msgstr "على خواديم LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:231
+#: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "أنشئ مراسَل جديد"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
 msgstr "أنشئ قائمة مراسَلين جديدة"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "دفتر عناوين جديد"
 
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
 msgstr "أنشئ دفتر عناوين جديد"
 
-#: ../addressbook/gui/component/addressbook-component.c:410
+#: ../addressbook/gui/component/addressbook-component.c:409
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "فشلت في ترقية إعدادات أو مجلد دفتر العناوين."
 
@@ -710,7 +704,7 @@ msgid "Base"
 msgstr "قاعدة"
 
 #: ../addressbook/gui/component/addressbook-config.c:517
-#: ../calendar/gui/dialogs/calendar-setup.c:169
+#: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "ال_نوع:"
 
@@ -718,72 +712,72 @@ msgstr "ال_نوع:"
 msgid "Copy _book content locally for offline operation"
 msgstr "انسخ محتويات الدفتر محليا للتعامل دون اتصال"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../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:366
-#: ../calendar/gui/dialogs/calendar-setup.c:377
-#: ../calendar/gui/dialogs/calendar-setup.c:388
-#: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
+#: ../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:2367
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "عام"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/component/addressbook-config.c:983
 #: ../addressbook/gui/widgets/e-addressbook-view.c:555
-#: ../mail/importers/pine-importer.c:385
+#: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "دفتر العناوين"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:987
 msgid "Server Information"
 msgstr "معلومات الخادوم"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:989
 msgid "Authentication"
 msgstr "التوثق"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../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 "تفاصيل"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../addressbook/gui/component/addressbook-config.c:993
 #: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "يجري البحث"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:995
 msgid "Downloading"
 msgstr "يجري التنزيل"
 
-#: ../addressbook/gui/component/addressbook-config.c:1204
+#: ../addressbook/gui/component/addressbook-config.c:1205
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "خصائص دفتر العناوين"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../addressbook/gui/component/addressbook-migrate.c:74
 #: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "يجري الترقية..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../addressbook/gui/component/addressbook-migrate.c:126
 #: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
-#, fuzzy, c-format
+#, c-format
 msgid "Migrating '%s':"
-msgstr "يجري ترقية `%s':"
+msgstr "النقل '%s':"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:645
+#: ../addressbook/gui/component/addressbook-migrate.c:646
 msgid "LDAP Servers"
 msgstr "خواديم LDAP"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:760
+#: ../addressbook/gui/component/addressbook-migrate.c:761
 msgid "Autocompletion Settings"
 msgstr "إعدادات التكملة التلقائية"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1136
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -794,7 +788,7 @@ msgstr ""
 "\n"
 "رجاء كن صبورا حتى يقوم إيفُليوشِن بترقية مجلّداتك..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1150
+#: ../addressbook/gui/component/addressbook-migrate.c:1151
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -804,7 +798,7 @@ msgstr ""
 "\n"
 "رجاء كن صبورا حتى يقوم إيفُليوشِن بترقية مجلّداتك..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1159
+#: ../addressbook/gui/component/addressbook-migrate.c:1160
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -814,7 +808,7 @@ msgstr ""
 "\n"
 "رجاء كن صبورا حتى يقوم إيفُليوشِن بترقية مجلّداتك..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1169
+#: ../addressbook/gui/component/addressbook-migrate.c:1170
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -825,18 +819,18 @@ msgstr ""
 "رجاءً كن صابرًا ريثما يقوم إيفُليوشن بتهجير بيانات تزامن بايلوت الخاص بك..."
 
 #: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:502
+#: ../mail/em-folder-utils.c:501
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "أعِد تسمية المجلّد \"%s\" إلى:"
 
 #: ../addressbook/gui/component/addressbook-view.c:428
-#: ../mail/em-folder-utils.c:504
+#: ../mail/em-folder-utils.c:503
 msgid "Rename Folder"
 msgstr "أعِد تسمية المجلّد"
 
 #: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:510
+#: ../mail/em-folder-utils.c:509
 msgid "Folder names cannot contain '/'"
 msgstr "لا يمكن أن يحتوي اسم المجلّد الرمز '/'."
 
@@ -851,8 +845,8 @@ msgstr "احفظ كـ 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:1596
-#: ../calendar/gui/e-calendar-view.c:1693 ../calendar/gui/e-memo-table.c:941
+#: ../calendar/gui/e-calendar-table.c:1595
+#: ../calendar/gui/e-calendar-view.c:1693 ../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
@@ -865,7 +859,7 @@ msgstr "ا_حذف"
 #: ../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:1046 ../mail/em-folder-tree.c:2120
+#: ../composer/e-msg-composer.c:1044 ../mail/em-folder-tree.c:2120
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "ال_خصائص"
@@ -879,12 +873,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "النّفاذ إلى خادوم LDAP كشخص مجهول"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
 msgid "Failed to authenticate.\n"
 msgstr "فشل التّوثيق.\n"
 
 #: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "أدخل كلمة السّر لـ %s (المستخدم %s)"
@@ -893,7 +887,7 @@ msgstr "أدخل كلمة السّر لـ %s (المستخدم %s)"
 #: ../calendar/common/authentication.c:51
 #: ../plugins/google-account-setup/google-source.c:444
 #: ../plugins/publish-calendar/publish-calendar.c:190
-#: ../smime/gui/component.c:50
+#: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "أدخل كلمة سِر"
 
@@ -923,8 +917,7 @@ msgstr "أظهر لوح المعاينة"
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
-msgstr ""
-"عدد المحارف التي يجب كتابها قبل أن يحاول إيفُليوشن إستخدام التّكملة الآليّة."
+msgstr "عدد المحارف التي يجب كتابها قبل أن يحاول إيفُليوشن إستخدام التّكملة الآليّة."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid "URI for the folder last used in the select names dialog"
@@ -984,7 +977,7 @@ msgid "Add Address Book"
 msgstr "أضف دفتر عناوين"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:760
 msgid "Always"
 msgstr "دائمًا"
 
@@ -995,7 +988,7 @@ msgstr "كشخص مجهول"
 #. 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 ""
+msgstr "است_عرض هذا الدفتر حتى بلوغ الحد"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
@@ -1010,8 +1003,7 @@ msgid "Email address"
 msgstr "عنوان البريد الإلكتروني"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
+msgid "Evolution will use this email address to authenticate you with the server."
 msgstr "سوف يستخدم إيفُليوشِن عنوان البريد الإلكتروني هذا لتوثيقك مع الخادوم."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
@@ -1023,14 +1015,14 @@ msgid "Lo_gin:"
 msgstr "سجّل _دخول:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:759
 msgid "Never"
 msgstr "أبدًا"
 
 #. 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:288
+#: ../mail/em-account-editor.c:287
 msgid "No encryption"
 msgstr "لا تشفير"
 
@@ -1042,7 +1034,7 @@ msgstr "واحد"
 #. 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:296
+#: ../mail/em-account-editor.c:295
 msgid "SSL encryption"
 msgstr "تشفير SSL "
 
@@ -1108,7 +1100,7 @@ msgstr "قواعد البحث المدعومة"
 #. 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:292
+#: ../mail/em-account-editor.c:291
 msgid "TLS encryption"
 msgstr "تشفير TLS"
 
@@ -1201,7 +1193,7 @@ msgid "_Login method:"
 msgstr "طريقة ال_ولوج:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../calendar/gui/dialogs/calendar-setup.c:227
 #: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
@@ -1295,7 +1287,7 @@ msgstr "ال_فئات..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:263
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
 #: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "المراسَل"
@@ -1316,7 +1308,7 @@ msgid "Image"
 msgstr "صورة"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 msgid "MSN Messenger"
 msgstr "مرسال إم إس إن"
 
@@ -1329,7 +1321,7 @@ msgid "Nic_kname:"
 msgstr "الاسم ال_مستعار:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
@@ -1343,7 +1335,7 @@ msgstr "الهاتف"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
@@ -1459,1057 +1451,1056 @@ msgstr "أ_ين:"
 msgid "_Zip/Postal Code:"
 msgstr "ال_رمز البريدي:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
+#: ../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 "العنوان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#: ../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-list-editor/e-contact-list-editor.c:1176
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
-#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../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:179
+#: ../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
 msgid "Editable"
 msgstr "قابل للتّحرير"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "الولايات المتحدة الأمريكية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "أفغانستان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "ألبانيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "الجزائر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
 msgstr "صامُوَا الأمريكية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Andorra"
 msgstr "أندورا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Angola"
 msgstr "أنجولا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Anguilla"
 msgstr "أنكويّا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antarctica"
 msgstr "القارة المتجمّدة الجنوبيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Antigua And Barbuda"
 msgstr "أنتيجوا و بربودا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "الأرجنتين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "أرمينيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Aruba"
 msgstr "اروبا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Australia"
 msgstr "أستراليا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "النّمسا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "أذربيجان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "البهاما"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
 msgstr "البحرين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "بنجلادش"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Barbados"
 msgstr "بربدوس"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belarus"
 msgstr "بلاروسيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "البلجيك"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Belize"
 msgstr "بيليز"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Benin"
 msgstr "بنين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bermuda"
 msgstr "برمودا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "بوتان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "بوليفيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bosnia And Herzegowina"
 msgstr "البوسنة و الهرسك"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Botswana"
 msgstr "بتسوانا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bouvet Island"
 msgstr "جزيرة بوفي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "البرازيل"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "British Indian Ocean Territory"
 msgstr "إقليم المحيط الهندي البريطاني"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Brunei Darussalam"
 msgstr "بروناي دار السّلام"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bulgaria"
 msgstr "بلغاريا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burkina Faso"
 msgstr "بوركينا فاسو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Burundi"
 msgstr "بوروندي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cambodia"
 msgstr "كمبوديا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "الكاميرون"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Canada"
 msgstr "كندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cape Verde"
 msgstr "كاب فيردا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cayman Islands"
 msgstr "جزر الكيمان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Central African Republic"
 msgstr "جمهورية إفريقيا الوسطى"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "تشاد"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chile"
 msgstr "شيلي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "الصّين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "جزيرة عيد الميلاد"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Cocos (Keeling) Islands"
 msgstr "جزر الكوكوس (كيلنك)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "كولومبيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "جزر القمر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo"
 msgstr "الكنغو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Congo, The Democratic Republic Of The"
 msgstr "جمهورية الكونغو الديمقراطية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "جزر كوك"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Costa Rica"
 msgstr "كوستا ريكا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Cote d'Ivoire"
 msgstr "ساحل العاج"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "كرواتيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cuba"
 msgstr "كوبا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cyprus"
 msgstr "قبرص"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Czech Republic"
 msgstr "الجمهورية التّشيكية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "الدّنمارك"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
 msgstr "جيبوتي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "الدّومينيكا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
 msgstr "جمهورية الدّومينيك"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "الإكوادور"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "مصر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "El Salvador"
 msgstr "السّلفادور"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "غينيا الإستوائيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Eritrea"
 msgstr "إريتريا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Estonia"
 msgstr "إستونيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "إثيوبيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "جزر الفالكلاند"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "جزر الفارو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "فيجي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "فنلندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "فرنسا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "غينيا الفرنسيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "بولونيزيا الفرنسيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "French Southern Territories"
 msgstr "الأقاليم الجنوبية الفرنسيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gabon"
 msgstr "الغابون"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Gambia"
 msgstr "جامبيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Georgia"
 msgstr "جورجيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "ألمانيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Ghana"
 msgstr "غانا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gibraltar"
 msgstr "جبل طارق"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greece"
 msgstr "اليونان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "جرينلاند"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "غرناطة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guadeloupe"
 msgstr "كوادالوب"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guam"
 msgstr "كوام"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guatemala"
 msgstr "جواتيمالا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guernsey"
 msgstr "جيرنسي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea"
 msgstr "غينيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
-#, fuzzy
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guinea-Bissau"
-msgstr "غينيا بيساو"
+msgstr "غينيا-بيساو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "غوَيانة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Haiti"
 msgstr "هايتي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Heard And McDonald Islands"
 msgstr "هيرد و جزر ماكدونالد"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Holy See"
 msgstr "البحر المقدّس"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Honduras"
 msgstr "هندوراس"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hong Kong"
 msgstr "هونج كونج"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "المجر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "إيسلاندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "India"
 msgstr "الهند"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Indonesia"
 msgstr "إندونيسيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "إيران"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "العراق"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Ireland"
 msgstr "إيرلندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Isle of Man"
 msgstr "جزيرة مان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "إسرائيل"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "إيطاليا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "جامايكا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "اليابان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jersey"
 msgstr "جيرسي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Jordan"
 msgstr "الأردن"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "كازاخستان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "كينيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Kiribati"
 msgstr "كيريباتي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "جمهورية كوريا الديمقراطية الشعبية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Korea, Republic Of"
 msgstr "جمهورية كوريا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "الكويت"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
 msgstr "كرغيزستان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Laos"
 msgstr "لاوس"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Latvia"
 msgstr "لاتفيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lebanon"
 msgstr "لبنان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Lesotho"
 msgstr "لزوتو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Liberia"
 msgstr "ليبيريا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "ليبيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "ليشتنشتاين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "لتوانيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "لكسمبورج"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macao"
 msgstr "ماكاو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "مقدونيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Madagascar"
 msgstr "مدغشقر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malawi"
 msgstr "ملاوي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Malaysia"
 msgstr "ماليزيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "المالديف"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Mali"
 msgstr "مالي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malta"
 msgstr "مالطا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Marshall Islands"
 msgstr "جزر المارشل"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
 msgstr "مارتينيك"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
 msgstr "موريتانيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "موريشيوس"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mayotte"
 msgstr "مايوتا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Mexico"
 msgstr "المكسيك"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
 msgstr "مكرونيسيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Moldova, Republic Of"
 msgstr "جمهورية مولدوفا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Monaco"
 msgstr "موناكو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mongolia"
 msgstr "منغوليا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Montserrat"
 msgstr "مونسيرات"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Morocco"
 msgstr "المغرب"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Mozambique"
 msgstr "موزمبيق"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Myanmar"
 msgstr "مينمار"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Namibia"
 msgstr "ناميبيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nauru"
 msgstr "ناورو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Nepal"
 msgstr "نيبال"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "هولندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "أنتيل هولندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "نيو قلدونيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
 msgstr "نيوزيلندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "نيكاراغوا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Niger"
 msgstr "النّيجر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Nigeria"
 msgstr "نيجيريا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Niue"
 msgstr "نيوي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Norfolk Island"
 msgstr "جزيرة نورفولك"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Northern Mariana Islands"
 msgstr "جزر ماريانا الشّمالية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "النّرويج"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "عمان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pakistan"
 msgstr "باكستان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palau"
 msgstr "بالاو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Palestinian Territory"
 msgstr "فلسطين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Panama"
 msgstr "باناما"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Papua New Guinea"
 msgstr "غينيا الجديدة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "براجواي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Peru"
 msgstr "بيرو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Philippines"
 msgstr "الفلبّين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Pitcairn"
 msgstr "بتكيرن"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Poland"
 msgstr "بولندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "البرتغال"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Puerto Rico"
 msgstr "بوارتو ريكو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
 msgstr "قطر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Reunion"
 msgstr "ريونيون"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Romania"
 msgstr "رومانيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "الإتّحاد الروسي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Rwanda"
 msgstr "روَندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Kitts And Nevis"
 msgstr "سان كتس و نيفس"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Lucia"
 msgstr "سان لوسيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Saint Vincent And The Grenadines"
 msgstr "سانت فنسينت والجرينادينز"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Samoa"
 msgstr "صاموا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "San Marino"
 msgstr "سان مارينو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Sao Tome And Principe"
 msgstr "صاو تومي و برنسيب"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saudi Arabia"
 msgstr "العربيّة السّعودية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Senegal"
 msgstr "السّينغال"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Serbia And Montenegro"
 msgstr "صربيا و مونتنجرو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "السّيشال"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sierra Leone"
 msgstr "سييرا ليون"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Singapore"
 msgstr "سنغافورة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovakia"
 msgstr "سلوفاكيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "سلوفينيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
 msgstr "جزر سليمان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "الصّومال"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
 msgstr "جنوب إفريقيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "جنوب جورجيا و جزر ساندويتش الجنوبيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "إسبانيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Sri Lanka"
 msgstr "سري لانكا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Helena"
 msgstr "سان هيلانة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "St. Pierre And Miquelon"
 msgstr "سان بيير و مِكويلون"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "السّودان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Suriname"
 msgstr "سورينام"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "سفالبارد و جزر جان مايِن"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "السّوازيلاند"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "السّويد"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "سويسرا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "سوريا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Taiwan"
 msgstr "تايوان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tajikistan"
 msgstr "طاجيكستان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tanzania, United Republic Of"
 msgstr "جمهورية تنزانيا المتّحدة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "تايلند"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Timor-Leste"
 msgstr "تيمور- ليشتي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Togo"
 msgstr "توجو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tokelau"
 msgstr "توكيلاو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tonga"
 msgstr "تونغا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Trinidad And Tobago"
 msgstr "ترنداد و توباجو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "تونس"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "تركيّا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "تركمانستان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Turks And Caicos Islands"
 msgstr "جزر تُركس و كيْكوس"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tuvalu"
 msgstr "توفالو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uganda"
 msgstr "أوغندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Ukraine"
 msgstr "أُكرانيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Arab Emirates"
 msgstr "الإمارات العربيّة المتّحدة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "المملكة المتّحدة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "United States Minor Outlying Islands"
 msgstr "جزر الولايات المتّحدة الصّغرى النّائية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "أوروجواي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Uzbekistan"
 msgstr "أوزباكستان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Vanuatu"
 msgstr "فانواتو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Venezuela"
 msgstr "فينزويلّا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Viet Nam"
 msgstr "الفيتنام"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, British"
 msgstr "جزر فيرجن البريطانيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Virgin Islands, U.S."
 msgstr "جزر فيرجن الأمريكيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Wallis And Futuna Islands"
 msgstr "جزر والس و فوتونا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Western Sahara"
 msgstr "الصّحراء الغربيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "اليمن"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zambia"
 msgstr "زامبيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Zimbabwe"
 msgstr "زيمبابوي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:466
-#: ../plugins/exchange-operations/exchange-delegates.c:952
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:709
-#: ../plugins/plugin-manager/plugin-manager.c:41
+#: ../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:350
 #: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 #: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "الاسم"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "AOL Instant Messenger"
 msgstr "مرسال أمريكا أون لاين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "جابر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Yahoo Messenger"
 msgstr "مرسال ياهو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "Gadu-Gadu Messenger"
 msgstr "مرسال جادو-جادو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "مرسال ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:111
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
 msgid "Service"
 msgstr "خدمة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:120
+#: ../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:375
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "الموقع"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "اسم المستخدم"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "المنزل"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 #: ../addressbook/gui/widgets/eab-contact-display.c:528
@@ -2622,7 +2613,7 @@ msgstr "بريد إل_كتروني"
 msgid "_Select Address Book"
 msgstr "ا_ختر دفتر عناوين"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:321
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2631,7 +2622,7 @@ msgstr ""
 "أمتأكّد أنّك تريد\n"
 "حذف قائمة المراسَلين (%s)؟"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:324
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2639,7 +2630,7 @@ msgstr ""
 "أمتأكّد أنّك تريد\n"
 "حذف قائمة المراسَلين هذه؟"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:329
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2648,7 +2639,7 @@ msgstr ""
 "أمتأكّد أنّك تريد\n"
 "حذف المراسَل (%s)؟"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:332
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2756,7 +2747,7 @@ msgstr "خدمة التراسل ال_فوري:"
 #: ../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:242
+#: ../plugins/exchange-operations/exchange-calendar.c:243
 #: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "ال_موقع:"
@@ -2766,7 +2757,7 @@ msgid "<b>Members</b>"
 msgstr "<b>أعضاء</b>"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
 msgid "Contact List Editor"
 msgstr "محرّر قائمة المراسَلين"
 
@@ -2786,25 +2777,25 @@ msgstr "اسم ال_قائمة:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "أدخِل عنوانًا بريديًا أو إسحب مراسَلًا إلى اللّائحة أدناه:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
 msgid "Contact List Members"
 msgstr "أعضاء قائمة المراسَلين"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:898
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
+#: ../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 "الأ_عضاء"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
 #: ../addressbook/gui/widgets/e-addressbook-model.c:298
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
 #: ../addressbook/gui/widgets/e-addressbook-view.c:212
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
-#: ../addressbook/gui/widgets/e-minicard-view.c:530
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
 msgstr "دفتر"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
 msgid "Is New List"
 msgstr "هي قائمة جديدة"
 
@@ -2846,15 +2837,15 @@ msgstr ""
 "في هذا المجلّد.  هل تودّ إضافته على كل حال؟"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:200
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
 msgid "_Merge"
 msgstr "ا_دمج"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:185
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
 msgid "Merge Contact"
 msgstr "ادمج المراسَل"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:253
+#: ../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
@@ -2877,9 +2868,8 @@ msgid "Email begins with"
 msgstr "يبدأ البريد الإلكتروني بـ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#, fuzzy
 msgid "Name contains"
-msgstr "يحتوي"
+msgstr "الاسم يحوي"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2895,10 +2885,10 @@ msgstr[2] "%d مراسَلين"
 msgstr[3] "%d مراسَلين"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
 #: ../addressbook/gui/widgets/e-addressbook-view.c:226
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
-#: ../addressbook/gui/widgets/e-minicard-view.c:537
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "استعلم"
 
@@ -2906,16 +2896,16 @@ msgstr "استعلم"
 msgid "Error getting book view"
 msgstr "خطأ أثناء الحصول على مشهد الدفتر"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
-#: ../widgets/table/e-table-click-to-add.c:510
-#: ../widgets/table/e-table-selection-model.c:303
+#: ../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:821 ../widgets/text/e-text.c:3551
+#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3551
 #: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "النّموذج"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "خطأ عند تعديل البطاقة"
 
@@ -2942,8 +2932,8 @@ msgstr "احفظ كـ vCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:933
 #: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/e-calendar-table.c:1574
-#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:924
+#: ../calendar/gui/e-calendar-table.c:1573
+#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:923
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "ا_فتح"
@@ -2998,9 +2988,9 @@ msgstr "_قص"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:953
 #: ../calendar/gui/dialogs/comp-editor.c:480
-#: ../calendar/gui/e-calendar-table.c:1582
-#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2057 ../mail/em-folder-tree.c:1005
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1678 ../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
 #: ../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
@@ -3019,12 +3009,6 @@ msgstr "ال_صق"
 msgid "Any Category"
 msgstr "أيّ فئة"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
-msgid "Other error"
-msgstr "خطأ آخر"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
@@ -3159,7 +3143,7 @@ msgstr "المذياع"
 #: ../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:713
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
 msgid "Role"
 msgstr "الدّور"
 
@@ -3196,13 +3180,13 @@ msgstr "موقع الويب"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
+#: ../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:524
+#: ../widgets/table/e-table-click-to-add.c:523
 #: ../widgets/table/e-table-col.c:99
-#: ../widgets/table/e-table-field-chooser-item.c:655
+#: ../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-container.c:994
 #: ../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
@@ -3212,12 +3196,12 @@ msgstr "العرض"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
+#: ../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:531
-#: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../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-container.c:987
 #: ../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
@@ -3246,12 +3230,11 @@ msgstr "نموذج النّص"
 msgid "Max field name length"
 msgstr "الطّول الأقصى لاسم الحقل"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "عرض العمود"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
-#, fuzzy
+#: ../addressbook/gui/widgets/e-minicard-view.c:178
 msgid ""
 "\n"
 "\n"
@@ -3259,9 +3242,9 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"ابحث عن المراسَل."
+"البحث عن المراسلين..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3275,7 +3258,7 @@ msgstr ""
 "\n"
 "أو انقر نقرًا مزدوجًا هنا لإنشاء مراسَل جديد."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3289,7 +3272,7 @@ msgstr ""
 "\n"
 "انقر نقرًا مزدوجًا هنا لإنشاء مراسَل جديد."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -3299,7 +3282,7 @@ msgstr ""
 "\n"
 "ابحث عن المراسَل."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3309,7 +3292,7 @@ msgstr ""
 "\n"
 "لا توجد أيّة عناصر لعرضها في هذا المشهد."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:523
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
 msgid "Adapter"
 msgstr "محوّل"
 
@@ -3387,22 +3370,22 @@ msgstr "محادثة بالفيديو"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
 #: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../calendar/gui/gnome-cal.c:2451
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:574
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
-#: ../plugins/hula-account-setup/camel-hula-listener.c:378
-#: ../plugins/hula-account-setup/camel-hula-listener.c:407
+#: ../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 "التقويم"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:113
+#: ../calendar/gui/dialogs/event-editor.c:115
 msgid "Free/Busy"
 msgstr "متفرّغ/مشغول"
 
@@ -3503,10 +3486,10 @@ msgstr "البروتوكول غير مدعوم"
 #: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:240
-#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
+#: ../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 "أُلغِيَ"
 
@@ -3517,7 +3500,7 @@ msgstr "لا يمكن الإلغاء"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:71
-#: ../calendar/gui/comp-editor-factory.c:423
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Failed"
 msgstr "فشل التّوثيق"
 
@@ -3542,6 +3525,11 @@ msgstr "لا مصدر كهذا"
 msgid "Not available in offline mode"
 msgstr "غير متوفر في نمط دون اتصال"
 
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
+msgid "Other error"
+msgstr "خطأ آخر"
+
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
 #: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
@@ -3549,38 +3537,37 @@ msgstr "نسخة خادوم غير صحيحة."
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
 #: ../addressbook/gui/widgets/eab-gui-util.c:79
-#, fuzzy
 msgid "Unsupported authentication method"
-msgstr "عمليّة غير مدعومة"
+msgstr "طريقة استيثاق غير مدعومة"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:102
+#: ../addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
-"We were unable to open this addressbook. This either means this book is not "
+"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 "
-"load the addressbook once in online mode to download its contents"
+"load the address book once in online mode to download its contents"
 msgstr ""
-"لم نتمكن من فتح دفتر العناوين هذا. هذا يعني اما ان هذا الدفتر ليس معيّنا "
-"للإستخدام دون اتصال أو لم يتم تنزيله حتّى الآن. رجاء حمّل دفتر العناوين مرة في "
-"نمط الاتصال ليتم تنزيل  محتوياته"
+"لم نتمكن من فتح دفتر العناوين هذا. هذا يعني إما أنّ هذا الدفتر ليس مُعلّما "
+"للاستخدام دون اتصال أو لم يتم تنزيله حتّى الآن. رجاء حمّل دفتر العناوين مرة في "
+"نمط الاتصال ليتم تنزيل محتوياته"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:111
+#: ../addressbook/gui/widgets/eab-gui-util.c:118
 #, c-format
 msgid ""
-"We were unable to open this addressbook.  Please check that the path %s "
+"We were unable to open this address book.  Please check that the path %s "
 "exists and that you have permission to access it."
 msgstr ""
 "لم نتمكّن من فتح دفتر العناوين هذا. رجاءً تأكّد من وجود المسار %s  و أنّك تملك "
 "التصاريح اللازمة للنفاذ إليه."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:120
+#: ../addressbook/gui/widgets/eab-gui-util.c:127
 msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
+"We were unable to open this address book.  This either means you have "
+"entered an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
-"لم نتمكّن من فتح دفتر العناوين هذا. يعني ذلك أنّك أدخلت عنوانًا خطأ، أو أنّه لا "
+"لم نتمكّن من فتح دفتر العناوين هذا. يعني ذلك أنّك أدخلت مسارًا خطأ، أو أنّه لا "
 "يمكن الوصول إلى خادوم LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:125
+#: ../addressbook/gui/widgets/eab-gui-util.c:133
 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 "
@@ -3589,82 +3576,81 @@ msgstr ""
 "لم يُجمع دعم LDAP في الإصدارة الحاليّة لإيفُليوشِن إذا كنت تريد استخدام LDAP في "
 "إيفُليوشِن يجب عليك تثبيت حزمة إيفُليوشِن فعّل فيها دعم LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:132
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
+"We were unable to open this address book.  This either means you have "
+"entered an incorrect URI, or the server is unreachable."
 msgstr ""
-"لم نتمكّن من فتح دفتر العناوين هذا. قد يعني ذلك أنّك أدخلت عنوانًا غير سليم، أو "
+"لم نتمكّن من فتح دفتر العناوين هذا. قد يعني ذلك أنّك أدخلت مسارًا غير سليم، أو "
 "أنّه لم يمكن الوصول للخادوم."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:138
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
 msgid "Detailed error:"
-msgstr "خطأ لا يمكن معالجته"
+msgstr "خطأ مفصّل:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:161
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
 "Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
+"the directory server preferences for this address book."
 msgstr ""
 "طابَق هذا الاستعلام بطاقات أكثر ممّا هو معدّ للخادوم إرجاعه\n"
 "أو لإيفُليوشِن إظهاره. رجاءً اجعل بحثك أكثر دقّة\n"
 "أو ارفع قيمة الحدّ الأقصى للنتائج في تفضيلات خادوم الدّليل\n"
 "لدفتر العناوين هذا."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
+"you have configured for this address book.  Please make your search\n"
 "more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
+"preferences for this address book."
 msgstr ""
-"لقد تخطّى وقت تنفيذ هذا الإستعلام حدّ الخادوم أو الحدّ المعدّ لدفتر\n"
+"لقد تخطّى وقت تنفيذ هذا الاستعلام حدّ الخادوم أو الحدّ المعدّ لدفتر\n"
 "العناوين هذا. الرجاءً جعل بحثك أكثر دقّة أو رفع قيمة الحدّ الأقصى لزمن "
-"الإستعلام\n"
+"الاستعلام\n"
 "في تفضيلات خادوم الدّليل لدفتر العناوين هذا."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "لم تتمكن خلفيّة دفتر العناوين هذا من تحليل هذا الإستعلام."
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
+msgid "The backend for this address book was unable to parse this query."
+msgstr "لم تتمكن خلفيّة دفتر العناوين هذا من تحليل هذا الاستعلام."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "رفضت خلفيّة دفتر العناوين تأدية هذا الإستعلام."
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
+msgid "The backend for this address book refused to perform this query."
+msgstr "رفضت خلفيّة دفتر العناوين تأدية هذا الاستعلام."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:179
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
 msgid "This query did not complete successfully."
 msgstr "لم يتمّ الإستعلام بنجاح."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:201
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid "Error adding list"
 msgstr "خطأ أثناء إضافة القائمة"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:201
-#: ../addressbook/gui/widgets/eab-gui-util.c:677
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:687
 msgid "Error adding contact"
 msgstr "خطأ أثناء إضافة المراسَل"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:212
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying list"
 msgstr "خطأ أثناء تغيير القائمة"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:212
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying contact"
 msgstr "خطأ أثناء تغيير المراسَل"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Error removing list"
 msgstr "خطأ أثناء إزالة القائمة"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:224
-#: ../addressbook/gui/widgets/eab-gui-util.c:627
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:637
 msgid "Error removing contact"
 msgstr "خطأ أثناء إزالة المراسَل"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3685,16 +3671,16 @@ msgstr[3] ""
 "فتح %d مراسَلين سيفتح أيضًا %d نوافذ جديدة.\n"
 "هل تريد فعلًا إظهار كل هؤلاء المراسَلين؟"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:314
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
 msgid "_Don't Display"
 msgstr "_لا تعرض"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:315
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Display _All Contacts"
 msgstr "اعرض _كل المراسَلين"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:341
+#: ../addressbook/gui/widgets/eab-gui-util.c:351
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3703,15 +3689,15 @@ msgstr ""
 "%s موجود\n"
 "هل تريد الكتابة فوقه؟"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:345
+#: ../addressbook/gui/widgets/eab-gui-util.c:355
 msgid "Overwrite"
 msgstr "اكتب فوقه"
 
 #. 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:386
-#: ../addressbook/gui/widgets/eab-gui-util.c:389
+#: ../addressbook/gui/widgets/eab-gui-util.c:396
+#: ../addressbook/gui/widgets/eab-gui-util.c:399
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "مراسَل واحد"
@@ -3720,55 +3706,55 @@ msgstr[2] "مراسلين"
 msgstr[3] "مراسلين"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:435
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:472
+#: ../addressbook/gui/widgets/eab-gui-util.c:482
 msgid "Select Address Book"
 msgstr "اختر دفتر عناوين"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:586
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "اسرد"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contact to"
 msgstr "انقل المراسَل إلى"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:740
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contact to"
 msgstr "انسخ المراسَل إلى"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:743
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Move contacts to"
 msgstr "انقل المراسَلين إلى"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:745
+#: ../addressbook/gui/widgets/eab-gui-util.c:755
 msgid "Copy contacts to"
 msgstr "انسخ المراسَلين إلى"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:890
+#: ../addressbook/gui/widgets/eab-gui-util.c:900
 msgid "Multiple vCards"
 msgstr "vCards عديدة"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:897
+#: ../addressbook/gui/widgets/eab-gui-util.c:907
 #, c-format
 msgid "vCard for %s"
 msgstr "بطاقة vCard لـ%s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:909
-#: ../addressbook/gui/widgets/eab-gui-util.c:935
+#: ../addressbook/gui/widgets/eab-gui-util.c:919
+#: ../addressbook/gui/widgets/eab-gui-util.c:945
 #, c-format
 msgid "Contact information"
 msgstr "معلومات المراسَل"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:937
+#: ../addressbook/gui/widgets/eab-gui-util.c:947
 #, c-format
 msgid "Contact information for %s"
 msgstr "معلومات المراسَل لـ %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:301
+#: ../addressbook/gui/widgets/eab-popup-control.c:293
 msgid "Querying Address Book..."
 msgstr "استعلام دفتر العناوين..."
 
@@ -3791,14 +3777,14 @@ msgid "Show Compact vCard"
 msgstr "أظهر vCard مدمجة"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
+msgid "Save in address book"
 msgstr "احفظ في دفتر العناوين"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "مشهد البطاقة"
 
-#: ../addressbook/importers/evolution-csv-importer.c:658
+#: ../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
@@ -3806,27 +3792,27 @@ msgstr "مشهد البطاقة"
 msgid "Importing..."
 msgstr "يجري الاستيراد..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:860
+#: ../addressbook/importers/evolution-csv-importer.c:863
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "أوتلوك  CSV أو Tab (.csv، .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:861
+#: ../addressbook/importers/evolution-csv-importer.c:864
 msgid "Outlook CSV and Tab Importer"
 msgstr "مستورد أوتلوك CSV و Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:869
+#: ../addressbook/importers/evolution-csv-importer.c:872
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "موزيلا  CSV أو Tab (.csv، .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:870
+#: ../addressbook/importers/evolution-csv-importer.c:873
 msgid "Mozilla CSV and Tab Importer"
 msgstr "مستورد موزيلا CSV و Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:878
+#: ../addressbook/importers/evolution-csv-importer.c:881
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "إيفُليوشِن  CSV أو Tab (.csv، .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:879
+#: ../addressbook/importers/evolution-csv-importer.c:882
 msgid "Evolution CSV and Tab Importer"
 msgstr "مستورد إيفُليوشِن CSV و Tab"
 
@@ -3887,12 +3873,12 @@ msgid "Format"
 msgstr "التهيئة"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:503
+#: ../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:648
-#: ../widgets/table/e-table-field-chooser.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:310
+#: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "التّرويسة"
 
@@ -3995,7 +3981,7 @@ msgstr "تظليل"
 #. 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:231
+#: ../plugins/exchange-operations/exchange-calendar.c:232
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
 msgstr "الحجم:"
@@ -4013,7 +3999,7 @@ msgid "Top:"
 msgstr "الأعلى:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:153
+#: ../calendar/gui/dialogs/calendar-setup.c:154
 msgid "Type:"
 msgstr "النّوع:"
 
@@ -4025,35 +4011,35 @@ msgstr "العرض:"
 msgid "_Font..."
 msgstr "ال_خط..."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:53
+#: ../addressbook/printing/test-contact-print-style-editor.c:54
 msgid "Contact Print Style Editor Test"
 msgstr "إختبار محرّر أسلوب طباعة المراسَل"
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-#: ../addressbook/printing/test-print.c:44
+#: ../addressbook/printing/test-contact-print-style-editor.c:55
+#: ../addressbook/printing/test-print.c:45
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "حقوق النسخ C) 2000, Ximian, Inc."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:56
+#: ../addressbook/printing/test-contact-print-style-editor.c:57
 msgid "This should test the contact print style editor widget"
 msgstr "سيختبر هذا قطعة محرّر أسلوب طباعة المراسَل"
 
-#: ../addressbook/printing/test-print.c:43
+#: ../addressbook/printing/test-print.c:44
 msgid "Contact Print Test"
 msgstr "إختبار طباعة المراسَل"
 
-#: ../addressbook/printing/test-print.c:46
+#: ../addressbook/printing/test-print.c:47
 msgid "This should test the contact print code"
 msgstr "سيختبر هذا رمز طباعة المراسَل"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:668
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
+#: ../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 "لا يمكن فتح الملف"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
+msgid "Couldn't get list of address books"
 msgstr "فشلت في الحصول على قائمة دفاتر العناوين"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
@@ -4069,7 +4055,7 @@ msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
+msgid "List local address book folders"
 msgstr "اسرد مجلّدات دفتر العناوين المحلي"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
@@ -4088,16 +4074,14 @@ msgstr "صدّر في نمط غير تزامني"
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
-msgstr ""
-"عدد البطاقات في ملف خرْج واحد في الوضع اللاتزامني، الحجم الافتراضي هو 100."
+msgstr "عدد البطاقات في ملف خرْج واحد في الوضع اللاتزامني، الحجم الافتراضي هو 100."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "NUMBER"
 msgstr "NUMBER"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:102
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "خطأ في متغيّرات سطر الأوامر، رجاء إستخدم الخيار --help لمراجعة كيفيّة "
 "الإستعمال."
@@ -4124,30 +4108,27 @@ msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar from the side bar in the Calendar view."
 msgstr ""
+"'{0}' تقويم للقراءة فقط و لا يمكن تعديله. اختر تقويما آخر من الشريط الجانبي "
+"في مشهد التقويم."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
-#, fuzzy
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
-msgstr ""
-"'{0}' مصدر تقويم للقرائة فقط. انتقل لمشهد التقويم ثم اختر تقويما يقبل "
-"المواعيد."
+msgstr "'{0}' تقويم للقراءة فقط و لا يمكن تعديله. اختر تقويما آخر يقبل المواعيد."
 
 #: ../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."
-msgstr ""
-"إضافة ملخّص ذو معنى لموعدك سيعطي المتلقي فكرة عن ما يدور حوله هذا الموعِد."
+msgstr "إضافة ملخّص ذو معنى لموعدك سيعطي المتلقي فكرة عن ما يدور حوله هذا الموعِد."
 
 #: ../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."
-msgstr ""
-"إضافة ملخّص ذي معنى لمهمتك سيعطي المتلقي فكرة عن ما يدور حوله هذه المهمة."
+msgstr "إضافة ملخّص ذي معنى لمهمتك سيعطي المتلقي فكرة عن ما يدور حوله هذه المهمة."
 
 #: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
@@ -4168,13 +4149,11 @@ msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "جميع المعلومات في هذه المهمّات ستحذف وسيتعذر إعادتها."
 
 #: ../calendar/calendar.error.xml.h:11
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
+msgid "All information on this appointment will be deleted and can not be restored."
 msgstr "جميع المعلومات في هذا الموعد ستحذف وسيتعذر إعادتها."
 
 #: ../calendar/calendar.error.xml.h:12
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this meeting will be deleted and can not be restored."
 msgstr "جميع المعلومات في هذا الاجتماع ستحذف وسيتعذر إعادتها."
 
 #: ../calendar/calendar.error.xml.h:13
@@ -4248,9 +4227,8 @@ msgid "Cannot create a new event"
 msgstr "تعذر إنشاء حدث جديد"
 
 #: ../calendar/calendar.error.xml.h:29
-#, fuzzy
 msgid "Cannot save event"
-msgstr "تعذر إنشاء حدث جديد"
+msgstr "لا يمكن حفظ الحدث"
 
 #: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
@@ -4284,12 +4262,10 @@ msgstr "لا يمكن تحميل المحرّر."
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
-msgstr ""
-"سترسل دعوات بالبريد الإلكتروني لكل المشاركين سامحةً لهم بقبول هذه المهمّة."
+msgstr "سترسل دعوات بالبريد الإلكتروني لكل المشاركين سامحةً لهم بقبول هذه المهمّة."
 
 #: ../calendar/calendar.error.xml.h:38
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
+msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr "سترسل دعوات بالبريد الإلكتروني لكل المشاركين سامحةً لهم بالرد."
 
 #: ../calendar/calendar.error.xml.h:39
@@ -4316,15 +4292,13 @@ msgstr ""
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
-msgstr ""
-"إذا لم ترسل تنبيهًا بالإلغاء، قد لا يعرف المشاركون الآخرون أن المذكرة قد حُذِفت."
+msgstr "إذا لم ترسل تنبيهًا بالإلغاء، قد لا يعرف المشاركون الآخرون أن المذكرة قد حُذِفت."
 
 #: ../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."
-msgstr ""
-"إذا لم ترسل تنبيها بالإلغاء، قد لا يعرف المشاركون الآخرون أن المهمة قد حُذِفت."
+msgstr "إذا لم ترسل تنبيها بالإلغاء، قد لا يعرف المشاركون الآخرون أن المهمة قد حُذِفت."
 
 #: ../calendar/calendar.error.xml.h:45
 msgid ""
@@ -4371,9 +4345,8 @@ msgid "The calendar is not marked for offline usage."
 msgstr "لم يحدد التقويم للإستخدام بدون اتصال."
 
 #: ../calendar/calendar.error.xml.h:54
-#, fuzzy
 msgid "The memo list is not marked for offline usage."
-msgstr "لم تحدد قائمة التذكير للإستخدام بدون اتصال."
+msgstr "قائمة المذكرات غير معلمة للإستخدام دون اتصال."
 
 #: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
@@ -4465,7 +4438,7 @@ msgstr "لو تتوفّر مهامك حتى يُعاد تشغيل إيفوليو
 msgid "_Discard Changes"
 msgstr "أ_همل التغييرات"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "ا_حفظ"
 
@@ -4577,25 +4550,25 @@ msgid "Memo_s"
 msgstr "ال_تذكيرات"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
+#: ../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:353
-#: ../calendar/gui/memos-control.c:369
+#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:354
+#: ../calendar/gui/memos-control.c:370
 msgid "Memos"
 msgstr "التذكيرات"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1642 ../calendar/gui/print.c:1982
+#: ../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:76
-#: ../plugins/exchange-operations/exchange-folder.c:586
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
+#: ../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 "المهام"
@@ -4613,7 +4586,7 @@ msgstr "_مهام"
 msgid "Evolution Calendar alarm notification service"
 msgstr "خدمة التبليغ لمنبِّه تقويم إيفُليوشِن"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "دقيقة واحدة"
@@ -4621,7 +4594,7 @@ msgstr[1] "دقيقتين"
 msgstr[2] "دقائق"
 msgstr[3] "دقائق"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../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
@@ -4636,7 +4609,7 @@ msgstr[1] "ساعتين"
 msgstr[2] "ساعات"
 msgstr[3] "ساعات"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "زمن البدء"
 
@@ -4700,7 +4673,7 @@ msgstr "لديك %d منبّهات"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1683
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1711
-#: ../mail/mail-component.c:1594
+#: ../mail/mail-component.c:1597
 msgid "Warning"
 msgstr "تحذير"
 
@@ -4737,23 +4710,23 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "لا تسألني عن هذا البرنامج ثانيةً."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:138
+#: ../calendar/gui/alarm-notify/notify-main.c:141
 msgid "Could not initialize Bonobo"
 msgstr "لم يمكن بدأ بونوبو"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:151
+#: ../calendar/gui/alarm-notify/notify-main.c:154
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
 msgstr "تعذر إنشاء مصنع خدمة تبليغ التنبيهات، ربما هو يعمل الآن أصلًا..."
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "وقت غير صالح"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:404
-#: ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4763,8 +4736,8 @@ msgstr[2] "%d ساعات"
 msgstr[3] "%d ساعة"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:410
-#: ../calendar/gui/misc.c:119
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4776,8 +4749,8 @@ msgstr[3] "%d دقيقة"
 #. 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:76 ../calendar/gui/e-alarm-list.c:416
-#: ../calendar/gui/misc.c:123
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -4807,8 +4780,7 @@ msgid "Calendars to run alarms for"
 msgstr "التقويمات التي ستشغل المنبّهات لها"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "اللون اللذي سيرسم به خط Marcus Bains في شريط الوقت (فارغ افتراضا)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
@@ -5079,8 +5051,7 @@ msgstr "المنطقة الزّمنيّة "
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
-msgstr ""
-"شفافية الأحداث في مشهد التقويم، وهي تقاس بقيمة بين ٠ (شفاف) و ١ (معتم)."
+msgstr "شفافية الأحداث في مشهد التقويم، وهي تقاس بقيمة بين ٠ (شفاف) و ١ (معتم)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Twenty four hour time format"
@@ -5091,10 +5062,8 @@ msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "الوحدات للتذكير الافتراضي، \"دقائق\" أو \"ساعات\" أو \"أيام\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"وقت إخفاء المهام، محسوبًا بـ \"الدقائق\"، أو \"الساعات\"، أو \"الأيام\"."
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr "وقت إخفاء المهام، محسوبًا بـ \"الدقائق\"، أو \"الساعات\"، أو \"الأيام\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Week start"
@@ -5129,8 +5098,7 @@ msgid "Whether to display the end time of events in the week and month views."
 msgstr "ما إذا سيعرض وقت نهاية الأحداث في مشاهد الأسبوع و الشّهر."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "ما إن كنت تريد رسم خط ماركوس باينز (خط عند التوقيت الحالي) في التقويم."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
@@ -5158,10 +5126,8 @@ msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "ما إذا سيظهر حقل الحالة في محرّر الحدث/المهمّة/الإجتماع"
 
 #: ../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 ""
-"ما إذا سيظهر الوقت بتهيئة أربع وعشرين ساعة بدلًا من استخدام صباحًا/مساءً (ص/م)."
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
+msgstr "ما إذا سيظهر الوقت بتهيئة أربع وعشرين ساعة بدلًا من استخدام صباحًا/مساءً (ص/م)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid "Whether to show timezone field in the event/meeting editor"
@@ -5365,27 +5331,26 @@ msgstr "تقويم جديد"
 msgid "Create a new calendar"
 msgstr "أنشئ تقويمًا جديدًا"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "مشهد اليوم"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "مشهد أسبوع العمل"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "مشهد الأسبوع"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "مشهد الشّهر"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#, fuzzy
 msgid "Any Field"
-msgstr "الحقل"
+msgstr "أيّة حقل"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
 #: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
@@ -5400,15 +5365,13 @@ msgstr "الحاضر"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
 #: ../calendar/gui/tasktypes.xml.h:9
-#, fuzzy
 msgid "Business"
-msgstr "فاكس العمل"
+msgstr "عمل"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:11
-#, fuzzy
 msgid "Category"
-msgstr "الفئة هي"
+msgstr "الفئة"
 
 #: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
 #: ../widgets/misc/e-send-options.glade.h:6
@@ -5417,19 +5380,18 @@ msgstr "تصنيف"
 
 #: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
 #: ../calendar/gui/tasktypes.xml.h:12
-#, fuzzy
 msgid "Competition"
-msgstr "تاريخ الإنجاز"
+msgstr "منافسة"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
-#: ../calendar/gui/e-cal-model.c:333 ../calendar/gui/e-calendar-table.c:547
+#: ../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 "خصوصي"
 
 #: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
 #: ../calendar/gui/tasktypes.xml.h:14
-#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../plugins/plugin-manager/plugin-manager.c:59
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "الوصف"
@@ -5451,65 +5413,57 @@ msgstr "موجود"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
 #: ../calendar/gui/tasktypes.xml.h:18
-#, fuzzy
 msgid "Favourites"
-msgstr "موريشيوس"
+msgstr "مفضّلة"
 
 #: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
 #: ../calendar/gui/tasktypes.xml.h:19
 msgid "Gifts"
-msgstr ""
+msgstr "هدايا"
 
 #: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
 #: ../calendar/gui/tasktypes.xml.h:20
 msgid "Goals/Objectives"
-msgstr ""
+msgstr "أهداف/أغراض"
 
 #: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
 #: ../calendar/gui/tasktypes.xml.h:22
-#, fuzzy
 msgid "Holiday"
-msgstr "اليوم"
+msgstr "عطلة"
 
 #: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:23
 msgid "Holiday Cards"
-msgstr ""
+msgstr "بطاقات معايدة"
 
 #: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
 #: ../calendar/gui/tasktypes.xml.h:24
-#, fuzzy
 msgid "Hot Contacts"
-msgstr "المراسَلون"
+msgstr "مراسلون عاجلون"
 
 #: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
 #: ../calendar/gui/tasktypes.xml.h:25
-#, fuzzy
 msgid "Ideas"
-msgstr "الأيّام"
+msgstr "أفكار"
 
 #: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
 #: ../calendar/gui/tasktypes.xml.h:27
-#, fuzzy
 msgid "International"
-msgstr "تقليدي"
+msgstr "عالمي"
 
 #: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
 #: ../calendar/gui/tasktypes.xml.h:28
-#, fuzzy
 msgid "Key Customer"
-msgstr "خصّص"
+msgstr "زبون رئيسي"
 
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
 #: ../calendar/gui/tasktypes.xml.h:30
-#, fuzzy
 msgid "Miscellaneous"
-msgstr "إعدادات متنوعة"
+msgstr "متنوعات"
 
 #: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
-#, fuzzy
 msgid "Next 7 days"
-msgstr "مهمات الأيام السبعة القادمة"
+msgstr "الأيام 7 القادمة"
 
 #: ../calendar/gui/caltypes.xml.h:28
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
@@ -5519,24 +5473,23 @@ msgstr "المنظّم"
 
 #: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
 #: ../calendar/gui/tasktypes.xml.h:36
-#, fuzzy
 msgid "Phone Calls"
-msgstr "قائمة ال_هاتف"
+msgstr "اتصالات هاتفية"
 
-#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-calendar-table.c:546
+#: ../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 "خاص"
 
-#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
-#: ../calendar/gui/e-cal-model.c:322 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:545 ../calendar/gui/memotypes.xml.h:30
+#: ../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 "عام"
 
 #: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:297
+#: ../calendar/gui/dialogs/event-editor.c:299
 msgid "Recurrence"
 msgstr "تكرار"
 
@@ -5551,16 +5504,15 @@ msgstr "الحالة"
 
 #: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
 #: ../calendar/gui/tasktypes.xml.h:39
-#, fuzzy
 msgid "Strategies"
-msgstr "الفئات"
+msgstr "إستراتيجيات"
 
 #: ../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:361
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Summary"
 msgstr "الملخّص"
 
@@ -5571,25 +5523,23 @@ msgstr "الملخّص يحتوي"
 
 #: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
 #: ../calendar/gui/tasktypes.xml.h:42
-#, fuzzy
 msgid "Suppliers"
-msgstr "الردود"
+msgstr "المورّدون"
 
 #: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
 #: ../calendar/gui/tasktypes.xml.h:43
 msgid "Time &amp; Expenses"
-msgstr ""
+msgstr "الوقت والنفقات"
 
 #: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
 #: ../calendar/gui/tasktypes.xml.h:45
 msgid "VIP"
-msgstr ""
+msgstr "شخص مهم للغاية"
 
 #: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
 #: ../calendar/gui/tasktypes.xml.h:46
-#, fuzzy
 msgid "Waiting"
-msgstr "يجري الإنتظار..."
+msgstr "إنتظار"
 
 #: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
 #: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
@@ -5611,19 +5561,19 @@ msgstr "هو"
 msgid "is not"
 msgstr "ليس"
 
-#: ../calendar/gui/comp-editor-factory.c:405
+#: ../calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "خطأ أثناء فتح التقويم"
 
-#: ../calendar/gui/comp-editor-factory.c:411
+#: ../calendar/gui/comp-editor-factory.c:415
 msgid "Method not supported when opening the calendar"
 msgstr "الطريقة غير مدعومة عند فتح التقويم"
 
-#: ../calendar/gui/comp-editor-factory.c:417
+#: ../calendar/gui/comp-editor-factory.c:421
 msgid "Permission denied to open the calendar"
 msgstr "رُفض التّصريح بفتح التقويم"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
+#: ../calendar/gui/comp-editor-factory.c:433 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "خطأ مجهول"
 
@@ -5738,7 +5688,7 @@ msgstr "دقائق"
 msgid "start of appointment"
 msgstr "بداية الموعد"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "الإجراء/المحفّز"
 
@@ -5781,8 +5731,7 @@ msgstr ""
 
 #: ../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>"
+msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr "<i>%Iu و %d ستستبدل بالمستخدم والنطاق من عنوان البريد الإلكتروني.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
@@ -6012,123 +5961,120 @@ msgstr "أ_ربعاء"
 msgid "before every appointment"
 msgstr "قبل كل موعد"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:269
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "ا_نسخ محتويات التقويم محليا للعمل دون اتصال"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:271
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "ا_نسخ محتويات قائمة المهام محليا للعمل دون اتصال"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:273
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "ا_نسخ محتويات قائمة التذكيرات محليا للعمل دون اتصال"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
-#, fuzzy
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
-msgstr "الل_ون:"
+msgstr "ال_لون:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "قائمة مهام"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "قائمة التذكيرات"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:474
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "خصائص التقويم"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:474
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "تقويم جديد"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:530
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "خصائص قائمة المهام"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:530
-#, fuzzy
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "New Task List"
-msgstr "قائمة مهام _جديدة"
+msgstr "قائمة مهام جديدة"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:586
-#, fuzzy
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "Memo List Properties"
-msgstr "خصائص قائمة المهام"
+msgstr "خصائص قائمة المذكرات"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:586
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "قائمة تذكيرات جديدة"
 
-#: ../calendar/gui/dialogs/changed-comp.c:56
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "حُذف هذا الحدث."
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "حُذفت هذه المهمّة."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:68
 msgid "This memo has been deleted."
 msgstr "حُذفت هذه المذكرة."
 
-#: ../calendar/gui/dialogs/changed-comp.c:73
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  لقد قمت بتغييرات. أتريد تجاهل هذه التّغييرات و غلق المحرّر؟"
 
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  لم تقم بأيّة تغييرات، أتريد غلق المحرّر؟"
 
-#: ../calendar/gui/dialogs/changed-comp.c:80
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "غـُيّرت هذا الحدث."
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "غـُيّرت هذه المهمّة."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:92
 msgid "This memo has been changed."
 msgstr "غـُيّرت هذه المذكرة."
 
-#: ../calendar/gui/dialogs/changed-comp.c:97
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  لقد قمت بتغييرات. أتريد تجاهل هذه التّغييرات و تحديث المحرّر؟"
 
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  لم تقم بأيّة تغييرات، أتريد تحديث المحرّر؟"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:443
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "خطأ في التّصديق: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2356
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2358
 msgid " to "
 msgstr " إلى "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2362
 msgid " (Completed "
 msgstr " (مُنجز "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2364
 msgid "Completed "
 msgstr "مُنجز "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2367
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2369
 msgid " (Due "
 msgstr " (مُستحق "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2371
 msgid "Due "
 msgstr "مُستحق "
 
@@ -6139,8 +6085,8 @@ msgstr "رسالة مُرفقة - %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:1771
-#: ../composer/e-msg-composer.c:1990
+#: ../calendar/gui/dialogs/comp-editor.c:410 ../composer/e-msg-composer.c:1769
+#: ../composer/e-msg-composer.c:1988
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -6149,20 +6095,20 @@ msgstr[1] "رسالتان مرفقتان"
 msgstr[2] "%d رسائل مرفقة"
 msgstr[3] "%d رسالة مرفقة"
 
-#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2058
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:365
+#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2056
+#: ../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 "ا_نقل"
 
-#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2060
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2058
 #: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "الغي ال_سحب"
 
 #: ../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:74
+#: ../plugins/prefer-plain/prefer-plain.c:91
 #: ../widgets/misc/e-attachment-bar.c:453
 msgid "attachment"
 msgstr "مُرفق"
@@ -6201,9 +6147,8 @@ msgid "Memo - %s"
 msgstr "المذكرة - %s"
 
 #: ../calendar/gui/dialogs/comp-editor.c:968
-#, fuzzy
 msgid "No Summary"
-msgstr "بدون ملخّص"
+msgstr "لا ملخّص"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1262
 msgid "Click here to close the current window"
@@ -6249,7 +6194,6 @@ msgid "_Help"
 msgstr "_مساعدة"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1353
-#, fuzzy
 msgid "_Insert"
 msgstr "أ_درج"
 
@@ -6265,7 +6209,7 @@ msgid "_View"
 msgstr "ا_عرض"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1377
-#: ../composer/e-composer-actions.c:472
+#: ../composer/e-composer-actions.c:471
 msgid "_Attachment..."
 msgstr "_مُرفق..."
 
@@ -6302,18 +6246,16 @@ msgid "_Private"
 msgstr "_خاص"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1415
-#, fuzzy
 msgid "Classify as private"
-msgstr "تصنيف كخاص"
+msgstr "صنّف كخاص"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1420
 msgid "_Confidential"
 msgstr "_خصوصي"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1422
-#, fuzzy
 msgid "Classify as confidential"
-msgstr "صنف كخصوصي"
+msgstr "صنّف كسرّي"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "R_ole Field"
@@ -6344,18 +6286,16 @@ msgid "_Type Field"
 msgstr "حقل ال_نوع"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1456
-#, fuzzy
 msgid "Toggles whether the Attendee Type is displayed"
-msgstr "تحديد ما إذا كان حقل نوع الحضور ظاهرًا"
+msgstr "تحديد ما إذا سيعرض نوع الحضور"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1766
-#: ../widgets/misc/e-attachment-bar.c:1381
-#, fuzzy
-msgid "Recent Docu_ments"
-msgstr "نسبة مكملة"
+#: ../composer/e-composer-private.c:65 ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent _Documents"
+msgstr "آخر ال_مستندات"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1785
-#: ../composer/e-composer-actions.c:700
+#: ../composer/e-composer-actions.c:699
 msgid "Attach"
 msgstr "إرفاق"
 
@@ -6379,7 +6319,7 @@ msgstr "اظهر _شريط المُرفقات"
 
 #: ../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:1045
+#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1043
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:21
@@ -6387,13 +6327,13 @@ msgid "_Remove"
 msgstr "أ_زل"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2037
-#: ../composer/e-msg-composer.c:1048
+#: ../composer/e-msg-composer.c:1046
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "أ_ضف مُرفق..."
 
 #: ../calendar/gui/dialogs/comp-editor.c:2245
-#: ../mail/em-format-html-display.c:2195
+#: ../mail/em-format-html-display.c:2201
 msgid "Show Attachments"
 msgstr "اظهر المُرفقات"
 
@@ -6411,15 +6351,15 @@ msgstr "قد تهمل التّغييرات التي أُجريت لهذا الع
 msgid "Unable to use current version!"
 msgstr "لم يمكن استخدام الإصدارة الحاليّة!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:60
+#: ../calendar/gui/dialogs/copy-source-dialog.c:64
 msgid "Could not open source"
 msgstr "لم يمكن فتح المصدر"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:68
+#: ../calendar/gui/dialogs/copy-source-dialog.c:72
 msgid "Could not open destination"
 msgstr "لم يمكن فتح الوِجهة"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:77
+#: ../calendar/gui/dialogs/copy-source-dialog.c:81
 msgid "Destination is read only"
 msgstr "الوِجهة قابلة للقراءة فقط."
 
@@ -6427,51 +6367,51 @@ msgstr "الوِجهة قابلة للقراءة فقط."
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_حذف هذا العنصر من كل صناديق بريد المستلمين؟"
 
-#: ../calendar/gui/dialogs/delete-error.c:52
+#: ../calendar/gui/dialogs/delete-error.c:56
 msgid "The event could not be deleted due to a corba error"
 msgstr "لم يمكن حذف الحَدث بسبب خطأ في corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:55
+#: ../calendar/gui/dialogs/delete-error.c:59
 msgid "The task could not be deleted due to a corba error"
 msgstr "لم يمكن حذف المهمّة بسبب خطأ في corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:58
+#: ../calendar/gui/dialogs/delete-error.c:62
 msgid "The memo could not be deleted due to a corba error"
 msgstr "لم يمكن حذف المذكرة بسبب خطأ في corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:61
+#: ../calendar/gui/dialogs/delete-error.c:65
 msgid "The item could not be deleted due to a corba error"
 msgstr "لم يمكن حذف العنصر بسبب خطأ في corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:68
+#: ../calendar/gui/dialogs/delete-error.c:72
 msgid "The event could not be deleted because permission was denied"
 msgstr "لم يمكن حذف الحَدث لأن التّصريح رُفض"
 
-#: ../calendar/gui/dialogs/delete-error.c:71
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The task could not be deleted because permission was denied"
 msgstr "لم يمكن حذف المهمّة لأن التّصريح رُفض"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The memo could not be deleted because permission was denied"
 msgstr "لم يمكن حذف المذكرة لأن التّصريح رُفض"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:81
 msgid "The item could not be deleted because permission was denied"
 msgstr "لم يمكن حذف العنصر لأن التّصريح رُفض"
 
-#: ../calendar/gui/dialogs/delete-error.c:84
+#: ../calendar/gui/dialogs/delete-error.c:88
 msgid "The event could not be deleted due to an error"
 msgstr "لم يمكن حذف الحَدث بسبب خطأ ما"
 
-#: ../calendar/gui/dialogs/delete-error.c:87
+#: ../calendar/gui/dialogs/delete-error.c:91
 msgid "The task could not be deleted due to an error"
 msgstr "لم يمكن حذف المهمّة بسبب خطأ ما"
 
-#: ../calendar/gui/dialogs/delete-error.c:90
+#: ../calendar/gui/dialogs/delete-error.c:94
 msgid "The memo could not be deleted due to an error"
 msgstr "لم يمكن حذف المذكرة بسبب خطأ ما"
 
-#: ../calendar/gui/dialogs/delete-error.c:93
+#: ../calendar/gui/dialogs/delete-error.c:97
 msgid "The item could not be deleted due to an error"
 msgstr "لم يمكن حذف العنصر بسبب خطأ ما"
 
@@ -6480,7 +6420,7 @@ msgid "Contacts..."
 msgstr "المراسَلون..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:415
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To:"
 msgstr "مُفًّوَض إلى:"
 
@@ -6488,59 +6428,58 @@ msgstr "مُفًّوَض إلى:"
 msgid "Enter Delegate"
 msgstr "أدخل المُفَوَّضْ"
 
-#: ../calendar/gui/dialogs/event-editor.c:194
+#: ../calendar/gui/dialogs/event-editor.c:196
 msgid "_Alarms"
 msgstr "ال_منبّهات"
 
-#: ../calendar/gui/dialogs/event-editor.c:196
+#: ../calendar/gui/dialogs/event-editor.c:198
 msgid "Click here to set or unset alarms for this event"
 msgstr "انقر هنا لتعيين أو إزالة المنبهات لهذا الحدث"
 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:203
 msgid "_Recurrence"
 msgstr "ت_كرار"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "Make this a recurring event"
 msgstr "إجعل هذا حدثًا متكررًا"
 
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../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 "خيارات الإرسال"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
-#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/task-editor.c:125
 msgid "Insert advanced send options"
 msgstr "أدرج خيارات إرسال متقدمة"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
+#: ../calendar/gui/dialogs/event-editor.c:220
 msgid "All _Day Event"
 msgstr "حدث يستغرق _يومًا بأكمله"
 
-#: ../calendar/gui/dialogs/event-editor.c:220
+#: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Toggles whether to have All Day Event"
 msgstr "تغيير ما إذا كان الحدث يستغرق يومًا بأكمله"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
-#, fuzzy
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Show Time as _Busy"
-msgstr "اعرض حالتي كمش_غول في هذا الوقت"
+msgstr "اعرض الوقت كم_شغول"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:230
 msgid "Toggles whether to show time as busy"
 msgstr "تحديد ما إذا كنت تريد تغيير حالتك إلى مشغول في هذا الوقت"
 
-#: ../calendar/gui/dialogs/event-editor.c:237
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "_Free/Busy"
 msgstr "_متفرّغ/مشغول"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:241
 msgid "Query free / busy information for the attendees"
 msgstr "الاستعلام عن معلومات متوفر/مشغول للحضور"
 
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "مو_عد"
 
@@ -6658,18 +6597,18 @@ msgstr "خصّص"
 #. an empty string is the same as 'None'
 #: ../calendar/gui/dialogs/event-page.c:2944
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:669
+#: ../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:685 ../mail/em-account-editor.c:1409
+#: ../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.glade.h:9
 #: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
+#: ../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:69
+#: ../widgets/misc/e-signature-combo-box.c:70
 msgid "None"
 msgstr "لا شيء"
 
@@ -6748,7 +6687,7 @@ msgstr "المُ_راسَلين..."
 msgid "Organizer:"
 msgstr "المنظّم:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2478
 msgid "Memo"
 msgstr "تذكير"
 
@@ -6759,7 +6698,7 @@ msgstr "لا يمكن فتح التذكير في '%s'."
 
 #: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "إلى"
@@ -6779,39 +6718,39 @@ msgstr "إ_لى:"
 msgid "_Group:"
 msgstr "م_جموعة:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:50
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "أنت بصدد تعديل حدث متكرّر، ما الذي تود تعديله؟"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "أنت بصدد تفويض حدث متكرّر، ما الذي تود تعديله؟"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "أنت بصدد تعديل مهمّة متكرّرة، ما الذي تود تعديله؟"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "أنت بصدد تعديل مذكرة متكرّرة، ما الذي تود تعديله؟"
 
-#: ../calendar/gui/dialogs/recur-comp.c:85
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This Instance Only"
 msgstr "هذه الحالة فقط"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:93
 msgid "This and Prior Instances"
 msgstr "هذه الحالة و الحالات السّابقة"
 
-#: ../calendar/gui/dialogs/recur-comp.c:95
+#: ../calendar/gui/dialogs/recur-comp.c:99
 msgid "This and Future Instances"
 msgstr "هذه الحالة و الحالات القادمة"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:104
 msgid "All Instances"
 msgstr "كل الحالات"
 
@@ -6985,12 +6924,12 @@ msgstr "أسابيع"
 msgid "year(s)"
 msgstr "سنين"
 
-#: ../calendar/gui/dialogs/task-details-page.c:373
-#: ../calendar/gui/dialogs/task-details-page.c:393
+#: ../calendar/gui/dialogs/task-details-page.c:377
+#: ../calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
 msgstr "تاريخ الإنجاز خاطئ"
 
-#: ../calendar/gui/dialogs/task-details-page.c:478
+#: ../calendar/gui/dialogs/task-details-page.c:482
 msgid "Web Page"
 msgstr "صفحة الويب"
 
@@ -7006,53 +6945,53 @@ msgstr "<span weight=\"bold\">الحالة</span>"
 #. 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:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:238
-#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/e-itip-control.c:946
+#: ../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:2552 ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/print.c:2554 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "مُنجز"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:272
-#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
+#: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/tasktypes.xml.h:21
 #: ../mail/message-list.c:1065
 msgid "High"
 msgstr "مرتفع"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:356
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
+#: ../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 "في تقدّم"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:276
-#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
+#: ../calendar/gui/e-calendar-table.c:568 ../calendar/gui/tasktypes.xml.h:29
 #: ../mail/message-list.c:1063
 msgid "Low"
 msgstr "منخفض"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-cal-model.c:970 ../calendar/gui/e-calendar-table.c:568
+#: ../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
 msgid "Normal"
 msgstr "عادي"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
 #: ../calendar/gui/e-cal-component-preview.c:260
-#: ../calendar/gui/e-cal-model-tasks.c:354
-#: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../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 "لم يبدأ"
@@ -7066,7 +7005,7 @@ msgid "Stat_us:"
 msgstr "الحا_لة:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "غير معرّف"
 
@@ -7083,25 +7022,24 @@ msgstr "الأ_ولويّة:"
 msgid "_Web Page:"
 msgstr "_صفحة الويب:"
 
-#: ../calendar/gui/dialogs/task-editor.c:111
+#: ../calendar/gui/dialogs/task-editor.c:113
 msgid "_Status Details"
 msgstr "تفاصيل ال_حالة"
 
-#: ../calendar/gui/dialogs/task-editor.c:113
-#, fuzzy
+#: ../calendar/gui/dialogs/task-editor.c:115
 msgid "Click to change or view the status details of the task"
-msgstr "انقر غيِّر / اعرض تفاصيل حالة المهمة"
+msgstr "انقر لتغير أو عرض تفاصيل حالة المهمة"
 
-#: ../calendar/gui/dialogs/task-editor.c:121
-#: ../composer/e-composer-actions.c:528
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:527
 msgid "_Send Options"
 msgstr "خيارات الإر_سال"
 
-#: ../calendar/gui/dialogs/task-editor.c:316
+#: ../calendar/gui/dialogs/task-editor.c:318
 msgid "_Task"
 msgstr "_مهمّة"
 
-#: ../calendar/gui/dialogs/task-editor.c:319
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "Task Details"
 msgstr "تفاصيل المهمّة"
 
@@ -7128,9 +7066,8 @@ msgid "Categor_ies..."
 msgstr "ال_فئات..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-#, fuzzy
 msgid "D_ue date:"
-msgstr "تاريخ الإ_ستحقاق:"
+msgstr "تاريخ الا_ستحقاق:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
@@ -7278,18 +7215,18 @@ msgstr "تاريخ الإنتهاء"
 msgid "Start Date"
 msgstr "تاريخ البدء"
 
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:618
 msgid "Free"
 msgstr "متفرّغ"
 
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:620
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../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 "مشغول"
 
-#: ../calendar/gui/e-cal-model-tasks.c:623
+#: ../calendar/gui/e-cal-model-tasks.c:627
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7299,7 +7236,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:976
+#: ../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
@@ -7307,7 +7244,7 @@ msgstr ""
 msgid "Yes"
 msgstr "نعم"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:976
+#: ../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
@@ -7315,70 +7252,69 @@ msgid "No"
 msgstr "لا"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:335 ../calendar/gui/e-cal-popup.c:105
-#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
+#: ../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:985
-#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1340
+#: ../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:73
+#: ../plugins/plugin-manager/plugin-manager.c:89
 #: ../widgets/misc/e-attachment-bar.c:821
-#: ../widgets/misc/e-charset-picker.c:55
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "مجهول"
 
-#: ../calendar/gui/e-cal-model.c:972
+#: ../calendar/gui/e-cal-model.c:987
 msgid "Recurring"
 msgstr "متكرّر"
 
-#: ../calendar/gui/e-cal-model.c:974
+#: ../calendar/gui/e-cal-model.c:989
 msgid "Assigned"
 msgstr "مُسْندة"
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
+#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "احفظ كـ..."
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2029
+#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2035
 msgid "Select folder to save selected attachments..."
 msgstr "اختر مجلّد لحِفظ المُرفق المحدّد..."
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
+#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
-#: ../calendar/gui/e-calendar-view.c:1672 ../calendar/gui/e-memo-table.c:926
+#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1575
+#: ../calendar/gui/e-calendar-view.c:1672 ../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 "ا_حفظ كـ..."
 
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:562
 #: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "اضبط ك_خلفية"
 
-#: ../calendar/gui/e-cal-popup.c:287
+#: ../calendar/gui/e-cal-popup.c:288
 msgid "_Save Selected"
 msgstr "ا_حفِظ المنتقى"
 
-#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
+#: ../calendar/gui/e-cal-popup.c:429 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "افتح في %s..."
 
-#: ../calendar/gui/e-calendar-table.c:338
-#, fuzzy
+#: ../calendar/gui/e-calendar-table.c:337
 msgid "* No Summary *"
-msgstr "بدون ملخّص"
+msgstr "* لا ملخص *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-table.c:373
 #: ../calendar/gui/e-calendar-view.c:2215
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -7386,141 +7322,139 @@ msgstr "المنظّم: %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:377
+#: ../calendar/gui/e-calendar-table.c:376
 #: ../calendar/gui/e-calendar-view.c:2219
 #, c-format
 msgid "Organizer: %s"
 msgstr "المنظّم: %s"
 
-#: ../calendar/gui/e-calendar-table.c:408
-#, fuzzy
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "Start: "
-msgstr "إبدأ"
+msgstr "يبدأ:"
 
-#: ../calendar/gui/e-calendar-table.c:420
-#, fuzzy
+#: ../calendar/gui/e-calendar-table.c:419
 msgid "Due: "
-msgstr "مُستحق "
+msgstr "يُستح: "
 
-#: ../calendar/gui/e-calendar-table.c:589
+#: ../calendar/gui/e-calendar-table.c:588
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:590
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:591
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:592
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:593
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:594
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:595
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:596
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:597
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:598
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:599
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:879
-#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:878
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:438
 msgid "Deleting selected objects"
 msgstr "يجري حذف الكائنات المنتقاة"
 
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1162
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:644
 msgid "Updating objects"
 msgstr "يجري تحديث الكائِنات"
 
-#: ../calendar/gui/e-calendar-table.c:1348
-#: ../calendar/gui/e-calendar-view.c:1221 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-composer-actions.c:278
+#: ../calendar/gui/e-calendar-table.c:1347
+#: ../calendar/gui/e-calendar-view.c:1221 ../calendar/gui/e-memo-table.c:820
+#: ../composer/e-composer-actions.c:277
 msgid "Save as..."
 msgstr "احفظ كـ..."
 
-#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-table.c:1570
 #: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "_مهمّة جديدة"
 
-#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1574 ../calendar/gui/e-memo-table.c:924
 msgid "Open _Web Page"
 msgstr "افتح _صفحة الويب"
 
-#: ../calendar/gui/e-calendar-table.c:1577
-#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1576
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:926
 msgid "P_rint..."
 msgstr "ا_طبع..."
 
-#: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1580
+#: ../calendar/gui/e-calendar-view.c:1677 ../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 "_قص"
 
-#: ../calendar/gui/e-calendar-table.c:1583
+#: ../calendar/gui/e-calendar-table.c:1582
 #: ../calendar/gui/e-calendar-view.c:1660
-#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-view.c:1679 ../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 "ا_لصق"
 
-#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1586 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_كلّف بالمهمّة"
 
-#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
+#: ../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 "_مرّر كـ iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-table.c:1588
 msgid "_Mark as Complete"
 msgstr "_علّم كمكتمل"
 
-#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_علّم المهام المنتقاة كمكتملة"
 
-#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark as Incomplete"
 msgstr "_علّم كغير مكتمل"
 
-#: ../calendar/gui/e-calendar-table.c:1592
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_علّم المهام المنتقاة كغير مكتملة"
 
-#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-table.c:1596
 msgid "_Delete Selected Tasks"
 msgstr "ا_حذف المهام المنتقاة"
 
-#: ../calendar/gui/e-calendar-table.c:1834
+#: ../calendar/gui/e-calendar-table.c:1833
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "انقر لإضافة مهمّة"
@@ -7544,7 +7478,7 @@ msgstr "تاريخ الإستحقاق"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
 #: ../calendar/gui/tasktypes.xml.h:37
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Priority"
 msgstr "الأولويّة"
 
@@ -7632,7 +7566,7 @@ msgid "Delete _All Occurrences"
 msgstr "احذف _كل الحدوثات"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
+#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2510
 #, c-format
 msgid "Location: %s"
 msgstr "الموقع: %s"
@@ -7644,16 +7578,16 @@ msgid "Time: %s %s"
 msgstr "الوقت: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:116
+#: ../calendar/gui/e-cell-date-edit-text.c:111
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:119
+#: ../calendar/gui/e-cell-date-edit-text.c:114
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:127
+#: ../calendar/gui/e-cell-date-edit-text.c:122
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7666,7 +7600,7 @@ 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:589
+#: ../calendar/gui/e-day-view-time-item.c:583
 #, c-format
 msgid "%02i minute divisions"
 msgstr "أقسام بـ %02i دقيقة"
@@ -7677,20 +7611,20 @@ msgstr "أقسام بـ %02i دقيقة"
 #. 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:1551
-#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1672
+#: ../calendar/gui/e-day-view-top-item.c:852 ../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:791 ../calendar/gui/e-week-view.c:528
-#: ../calendar/gui/print.c:829
+#: ../calendar/gui/e-day-view.c:806 ../calendar/gui/e-week-view.c:542
+#: ../calendar/gui/print.c:831
 msgid "am"
 msgstr "ص"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:794 ../calendar/gui/e-week-view.c:531
-#: ../calendar/gui/print.c:831
+#: ../calendar/gui/e-day-view.c:809 ../calendar/gui/e-week-view.c:545
+#: ../calendar/gui/print.c:833
 msgid "pm"
 msgstr "م"
 
@@ -7783,7 +7717,7 @@ msgid "Ends"
 msgstr "ينتهي"
 
 #: ../calendar/gui/e-itip-control.c:961
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "مُستحق "
 
@@ -7842,8 +7776,7 @@ msgid ""
 msgstr "تم إلغاء الإجتماع، بالرغم من هذا لا يمكن إيجاده في تقويماتك"
 
 #: ../calendar/gui/e-itip-control.c:1285
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
+msgid "The task has been canceled, however it could not be found in your task lists"
 msgstr "تم إلغاء المهمة، بالرغم من هذا لا يمكن إيجاده في تقويماتك"
 
 #: ../calendar/gui/e-itip-control.c:1363
@@ -8069,7 +8002,7 @@ msgid "Update"
 msgstr "حدّث"
 
 #: ../calendar/gui/e-itip-control.c:2355
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "تقبّل"
 
@@ -8078,7 +8011,7 @@ msgid "Tentatively accept"
 msgstr "تقبّل مبدئيًّا"
 
 #: ../calendar/gui/e-itip-control.c:2357
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "ارفض"
 
@@ -8145,49 +8078,49 @@ msgstr "الحضور"
 
 #: ../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:981
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:983
 msgid "Individual"
 msgstr "فرد"
 
 #: ../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:982 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/print.c:984 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "مجموعة"
 
 #: ../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:983
+#: ../calendar/gui/print.c:985
 msgid "Resource"
 msgstr "المورد"
 
 #: ../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:984
+#: ../calendar/gui/print.c:986
 msgid "Room"
 msgstr "الغرفة"
 
 #: ../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:998
+#: ../calendar/gui/print.c:1000
 msgid "Chair"
 msgstr "الكرسي"
 
 #: ../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:999
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:1001
 msgid "Required Participant"
 msgstr "مشارك ضروري"
 
 #: ../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:1000
+#: ../calendar/gui/print.c:1002
 msgid "Optional Participant"
 msgstr "مشارك إختياري"
 
 #: ../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:1001
+#: ../calendar/gui/print.c:1003
 msgid "Non-Participant"
 msgstr "غير مشارك"
 
@@ -8199,7 +8132,7 @@ msgstr "يتطلّب إجراء"
 
 #: ../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:397
+#: ../calendar/gui/e-meeting-time-sel.c:395
 msgid "Tentative"
 msgstr "مبدئي"
 
@@ -8227,8 +8160,8 @@ msgstr "قيد العمل"
 
 #. 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:473
-#: ../calendar/gui/e-meeting-time-sel.c:2122
+#: ../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"
 
@@ -8236,78 +8169,78 @@ 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:477
-#: ../calendar/gui/e-meeting-time-sel.c:2153
+#: ../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:481
+#: ../calendar/gui/e-meeting-time-sel-item.c:475
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Out of Office"
 msgstr "خارج المكتب"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "No Information"
 msgstr "لا معلومات"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "A_ttendees..."
 msgstr "ال_حضور..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:436
+#: ../calendar/gui/e-meeting-time-sel.c:434
 msgid "O_ptions"
 msgstr "_خيارات"
 
-#: ../calendar/gui/e-meeting-time-sel.c:453
+#: ../calendar/gui/e-meeting-time-sel.c:451
 msgid "Show _only working hours"
 msgstr "اظهر ساعات العمل _فقط"
 
-#: ../calendar/gui/e-meeting-time-sel.c:463
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _zoomed out"
 msgstr "أظهر م_صغرًا"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:476
 msgid "_Update free/busy"
 msgstr "_حدّث متفرّغ/مشغول"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:491
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:511
+#: ../calendar/gui/e-meeting-time-sel.c:509
 msgid "_Autopick"
 msgstr "ا_ختر تلقائيًا"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:524
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-time-sel.c:541
 msgid "_All people and resources"
 msgstr "_كل الأشخاص والموارد"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:550
 msgid "All _people and one resource"
 msgstr "كل الأ_شخاص و مورِد واحد"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:559
 msgid "_Required people"
 msgstr "الأشخاص ال_ضروريون"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:568
 msgid "Required people and _one resource"
 msgstr "الأشخاص الضروريون و _مورد واحد"
 
-#: ../calendar/gui/e-meeting-time-sel.c:606
+#: ../calendar/gui/e-meeting-time-sel.c:604
 msgid "_Start time:"
 msgstr "زمن ال_بدء:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:633
+#: ../calendar/gui/e-meeting-time-sel.c:631
 msgid "_End time:"
 msgstr "زمن الإ_نتهاء:"
 
@@ -8335,11 +8268,11 @@ msgstr "اللّغة"
 msgid "Member"
 msgstr "عضو"
 
-#: ../calendar/gui/e-memo-table.c:942
+#: ../calendar/gui/e-memo-table.c:941
 msgid "_Delete Selected Memos"
 msgstr "ا_حذف التذكيرات المنتقاة"
 
-#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1092 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "انقر لإضافة تذكيرة"
 
@@ -8383,14 +8316,14 @@ msgstr "يجري إتمام المهام..."
 msgid "Expunging"
 msgstr "يجري الشطب"
 
-#: ../calendar/gui/e-timezone-entry.c:129
+#: ../calendar/gui/e-timezone-entry.c:128
 msgid "Select Timezone"
 msgstr "انتقِ منطقة زمنيّة"
 
 #. 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:348 ../calendar/gui/print.c:1653
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1655
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -8603,14 +8536,13 @@ msgstr "قائمة تذكيرات جديدة"
 msgid "Create a new memo list"
 msgstr "أنشئ قائمة تذكيرات جديدة"
 
-#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
 msgstr "اطبع التذكيرات"
 
 #: ../calendar/gui/memotypes.xml.h:25
-#, fuzzy
 msgid "Next 7 Days"
-msgstr "مهمات الأيام السبعة القادمة"
+msgstr "الأيام 7 القادمة"
 
 #: ../calendar/gui/migration.c:157
 msgid ""
@@ -8653,208 +8585,208 @@ msgid "Unable to migrate tasks `%s'"
 msgstr "لم أستطع تهجير المهام `%s'"
 
 #: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:458
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:571
+#: ../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 "ملاحظات"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "1st"
 msgstr "الأوّل"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "2nd"
 msgstr "الثّاني"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "3rd"
 msgstr "الثّالث"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "4th"
 msgstr "الرّابع"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "5th"
 msgstr "الخامس"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "6th"
 msgstr "السّادس"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "7th"
 msgstr "السّابع"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "8th"
 msgstr "الثّامن"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "9th"
 msgstr "التّاسع"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "10th"
 msgstr "العاشر"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "11th"
 msgstr "الحادي عشر"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "12th"
 msgstr "الثّاني عشر"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "13th"
 msgstr "الثّالث عشر"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "14th"
 msgstr "الرّابع عشر"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "15th"
 msgstr "الخامس عشر"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "16th"
 msgstr "السّادس عشر"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "17th"
 msgstr "السّابع عشر"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "18th"
 msgstr "الثّامن عشر"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "19th"
 msgstr "التّاسع عشر"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "20th"
 msgstr "العشرين"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "21st"
 msgstr "الحادي و العشرون"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "22nd"
 msgstr "الثّاني و العشرون"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "23rd"
 msgstr "الثّالث و العشرون"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "24th"
 msgstr "الرّابع و العشرون"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "25th"
 msgstr "الخامس و العشرون"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "26th"
 msgstr "السّادس و العشرون"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "27th"
 msgstr "السّابع و العشرون"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "28th"
 msgstr "الثّامن و العشرون"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "29th"
 msgstr "التّاسع و العشرون"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "30th"
 msgstr "الثّلاثين"
 
-#: ../calendar/gui/print.c:521
+#: ../calendar/gui/print.c:523
 msgid "31st"
 msgstr "الحادي و الثّلاثون"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "Su"
 msgstr "أحد"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "Mo"
 msgstr "إثنين"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "Tu"
 msgstr "ثلاثاء"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "We"
 msgstr "أربعاء"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:599
 msgid "Th"
 msgstr "خميس"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:599
 msgid "Fr"
 msgstr "جمعة"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:599
 msgid "Sa"
 msgstr "سّبت"
 
-#: ../calendar/gui/print.c:2472
+#: ../calendar/gui/print.c:2474
 msgid "Appointment"
 msgstr "موعد"
 
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2476
 msgid "Task"
 msgstr "مهمَّة"
 
-#: ../calendar/gui/print.c:2499
+#: ../calendar/gui/print.c:2501
 #, c-format
 msgid "Summary: %s"
 msgstr "الملخّص: %s"
 
-#: ../calendar/gui/print.c:2522
+#: ../calendar/gui/print.c:2524
 msgid "Attendees: "
 msgstr "الحضور:"
 
-#: ../calendar/gui/print.c:2562
+#: ../calendar/gui/print.c:2564
 #, c-format
 msgid "Status: %s"
 msgstr "الحالة: %s"
 
-#: ../calendar/gui/print.c:2579
+#: ../calendar/gui/print.c:2581
 #, c-format
 msgid "Priority: %s"
 msgstr "الأولوية: %s"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2593
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "النّسبة المُنجزة: %i"
 
-#: ../calendar/gui/print.c:2603
+#: ../calendar/gui/print.c:2605
 #, c-format
 msgid "URL: %s"
 msgstr "العنوان: %s"
 
-#: ../calendar/gui/print.c:2616
+#: ../calendar/gui/print.c:2618
 #, c-format
 msgid "Categories: %s"
 msgstr "الفئات: %s"
 
-#: ../calendar/gui/print.c:2627
+#: ../calendar/gui/print.c:2629
 msgid "Contacts: "
 msgstr "المراسَلون: "
 
@@ -8933,19 +8865,17 @@ msgid "Print Tasks"
 msgstr "اطبع المهام"
 
 #: ../calendar/gui/tasktypes.xml.h:2
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "% Completed"
-msgstr "% منجز"
+msgstr "% مكتمل"
 
 #: ../calendar/gui/tasktypes.xml.h:10
-#, fuzzy
 msgid "Cancelled"
-msgstr "أُلغِيَ"
+msgstr "ملغى"
 
 #: ../calendar/gui/tasktypes.xml.h:26
-#, fuzzy
 msgid "In progress"
-msgstr "في تقدّم"
+msgstr "جارٍ"
 
 #: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
 msgid "is greater than"
@@ -8994,1539 +8924,1557 @@ msgid "Evolution Calendar intelligent importer"
 msgstr "مستورِد تقويم إيفُليوشِن الذّكي"
 
 #.
+#. *
+#. * 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)
+#. *
+#.
+#.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: ../calendar/zones.h:7
+#: ../calendar/zones.h:26
 msgid "Africa/Abidjan"
 msgstr "إفريقيا/أبدجان"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "إفريقيا/أكرا"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "إفريقيا/أديس أبابا"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "إفريقيا/الجزائر"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "إفريقيا/أسمرة"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "إفريقيا/باماكو"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "إفريقيا/بانكوي"
 
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
 msgstr "إفريقيا/بنجول"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "إفريقيا/بيساو"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "إفريقيا/بلنتيرا"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "إفريقيا/برازافيل"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "إفريقيا/بوجمبورا"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "إفريقيا/القاهرة"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "إفريقيا/الدّار البيضاء"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "إفريقيا/سبتة"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "إفريقيا/كونكري"
 
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
 msgid "Africa/Dakar"
 msgstr "إفريقيا/دكّار"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr "إفريقيا/دار السّلام"
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "إفريقيا/جيبوتي"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "إفريقيا/دوآلا"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "إفريقيا/العيون"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "إفريقيا/فريتاون"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "إفريقيا/غابورون"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "إفريقيا/هاراري"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "إفريقيا/جوهنسبورغ"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "إفريقيا/كمبالا"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
 msgstr "إفريقيا/الخرطوم"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "إفريقيا/قغالي"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "إفريقيا/كنشاسا"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "إفريقيا/لاغوس"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "إفريقيا/ليبرفيل"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "إفريقيا/لومي"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "إفريقيا/لواندا"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "إفريقيا/لوبمباشي"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "إفريقيا/لوساكا"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "إفريقيا/مالابو"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "إفريقيا/مابوتو"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "إفريقيا/ماسيرو"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "إفريقيا/مباباني"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
 msgstr "إفريقيا/مقديشو"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "إفريقيا/منروفيا"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "إفريقيا/نيروبي"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "إفريقيا/ندجامينا"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "إفريقيا/نيامي"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "إفريقيا/نواكشوط"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "إفريقيا/واكادوكو"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "إفريقيا/برت نوفو"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr "إفريقيا/صاو تومي"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "إفريقيا/تمبكتو"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "إفريقيا/طرابلس"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "إفريقيا/تونس"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "إفريقيا/وندهوك"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr "أمريكا/أداك"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr "أمريكا/أنكورج"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "أمريكا/أنغويلا"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "أمريكا/أنتغوا"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr "أمريكا/أرغوييانا"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "أمريكا/أروبا"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "أمريكا/أصنسيون"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "أمريكا/باربدوس"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "أمريكا/بلم"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "أمريكا/بليزا"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "أمريكا/بووا فيستا"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "أمريكا/بوغوطا"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "أمريكا/بويزي"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "أمريكا/بوينُس آيرس"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr "أمريكا/كمبردج بي"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "أمريكا/كانكون"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "أمريكا/كركاس"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr "أمريكا/كتماركا"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr "أمريكا/كيان"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr "أمريكا/كيمان"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "أمريكا/شيكاغو"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "أمريكا/تشيهواهوا"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "أمريكا/قرطبة"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "أمريكا/كوستا ريكا"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "أمريكا/كويابا"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr "أمريكا/كوراكاو"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr "أمريكا/دنماركسهافن"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "أمريكا/دوسن"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "أمريكا/دوسن كريك"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "أمريكا/دنفر"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "أمريكا/ديترويت"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "أمريكا/دومينكا"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "أمريكا/أدمنتن"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr "أمريكا/يرونيبي"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "أمريكا/السّلفادور"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "أمريكا/فورتاليزا"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "أمريكا/جليس بي"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr "أمريكا/كدثاب"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "أمريكا/كوس بي"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr "أمريكا/كراند ترك"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "أمريكا/غرناطة"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr "أمريكا/جوادالوبّي"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "أمريكا/غواتمالا"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "أمريكا/غوايقيل"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "أمريكا/غيانا"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr "أمريكا/هاليفكس"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "أمريكا/هافانا"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr "أمريكا/هِرموسيليو"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "أمريكا/إنديانا/إنديانابوليس"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "أمريكا/إنديانا/نوكس"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "أمريكا/إنديانا/مارنجو"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "أمريكا/إنديانا/فيفاي"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "أمريكا/إنديانابوليس"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "أمريكا/إنوفيك"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr "أمريكا/إقالويت"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "أمريكا/الجمائيك"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr "أمريكا/جوجويي"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr "أمريكا/جونو"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "أمريكا/كنتكي/لويفيل"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "أمريكا/كنتكي/منتيتشلو"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "أمريكا/لا باز"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "أمريكا/ليما"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
 msgstr "أمريكا/لوس أنجلس"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "أمريكا/لويفل"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
 msgstr "أمريكا/ماسيو"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "أمريكا/ماناجوا"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "أمريكا/مناؤس"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
 msgstr "أمريكا/مارتِنيك"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr "أمريكا/مازاتلان"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "أمريكا/مندوزا"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "أمريكا/مينومني"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
 msgstr "أمريكا/مِريدا"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "أمريكا/مكسيكو سيتي"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "أمريكا/مكويلُن"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "أمريكا/مونتيري"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
 msgstr "أمريكا/منتيفيدو"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "أمريكا/مونريال"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
 msgstr "أمريكا/مونسيرات"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr "أمريكا/ناساو"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:157
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "أمريكا/نيو يورك"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "أمريكا/نيبيجون"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "أمريكا/نوم"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr "أمريكا/نورونها"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "أمريكا/داكوتا الشّماليّة/سنتر"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "أمريكا/بنما"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr "أمريكا/بانغنرتونغ"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
 msgstr "أمريكا/باراماريبو"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "أمريكا/فينكس"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr "أمريكا/بورت أو برنس"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
 msgstr "أمريكا/بورت أوف سبين"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
 msgstr "أمريكا/بورتو فلهو"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
 msgstr "أمريكا/بورتو ريكو"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr "أمريكا/ريني ريفر"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
 msgstr "أمريكا/رانكن إنلت"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "أمريكا/ريسيف"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
 msgstr "أمريكا/رِجينا"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "أمريكا/ريو برانكو"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr "أمريكا/روزاريو"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "أمريكا/سنتياغو"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "أمريكا/سانتو دومنغو"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
 msgstr "أمريكا/ساو باولو"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr "أمريكا/سكورسبيزند"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr "أمريكا/شِبروك"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
 msgstr "أمريكا/سينت جونز"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
 msgstr "أمريكا/سينت كتس"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "أمريكا/سينت لوسيا"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr "أمريكا/سينت توماس"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr "أمريكا/سينت فنسنت"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr "أمريكا/سويفت كرنت"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
 msgstr "أمريكا/تغوسيغالبا"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr "أمريكا/توله"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "أمريكا/ثندر باي"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "أمريكا/تيهوانا"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr "أمريكا/تورتولا"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "أمريكا/فنكوفر"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr "أمريكا/وايتهورس"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr "أمريكا/وينيبغ"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr "أمريكا/ياكوتات"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr "أمريكا/يلونايف"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr "المتجمّدة الجنوبيّة/كيسي"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "المتجمّدة الجنوبيّة/ديفس"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "المتجمّدة الجنوبيّة/دُمون دورفِل"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "المتجمّدة الجنوبيّة/موسُن"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "المتجمّدة الجنوبيّة/مكمردو"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "المتجمّدة الجنوبيّة/بالمر"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "المتجمّدة الجنوبيّة/القطب الجنوبي"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "المتجمّدة الجنوبيّة/سيوا"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "المتجمّدة الجنوبيّة/فوستُك"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "المتجمّدة الشّمالية/لونغييرباين"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "آسيا/عدن"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "آسيا/الماطي"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "آسيا/عمّان"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "آسيا/أناضير"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "آسيا/أقطاو"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "آسيا/أقطوبة"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "آسيا/عشق أباد"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "آسيا/بغداد"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "آسيا/البحرين"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "آسيا/باكو"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "آسيا/بنكوك"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "آسيا/بيروت"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "آسيا/بشكك"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "آسيا/بروناي"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "آسيا/كلكوتا"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "آسيا/شويبلسان"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "آسيا/تشن كين"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "آسيا/كلمبو"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "آسيا/دمشق"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "آسيا/دكّا"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "آسيا/ديلي"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "آسيا/دبي"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "آسيا/دوشمبا"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "آسيا/غزّة"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "آسيا/هاربن"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "آسيا/هونغ كونغ"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "آسيا/هوفد"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "آسيا/إركتسك"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "آسيا/إسطنبول"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "آسيا/جاكرتا"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "آسيا/جايابورا"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "آسيا/القدس"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "آسيا/كابل"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "آسيا/كمتشتكا"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "آسيا/كاراتشي"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "آسيا/قشقر"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "آسيا/كتمندو"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "آسيا/كرسنويارسك"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "آسيا/كوالا لمبور"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "آسيا/كز تشن"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "آسيا/الكويت"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "آسيا/ماكاو"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "آسيا/ماكاوو"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "آسيا/مغدان"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "آسيا/ماكاسر"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "آسيا/مانيلا"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "آسيا/مسقط"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "آسيا/نيقوسيا"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "آسيا/نوفوسيبرسك"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "آسيا/أُمسك"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "آسيا/الأورال"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "آسيا/بنوم بن"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "آسيا/بونتيانك"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "آسيا/بيونغ يانغ"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "آسيا/قطر"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "آسيا/قيزيلردا"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "آسيا/رنكون"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "آسيا/الرّياض"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "آسيا/سيغن"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "آسيا/السّخالين"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "آسيا/سمرقند"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "آسيا/سؤول"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "آسيا/شنهاي"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "آسيا/سنغفورة"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "آسيا/تايبا"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "آسيا/طشقند"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "آسيا/تبيليسي"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "آسيا/طهران"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "آسيا/ثمبو"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "آسيا/طوكيو"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "آسيا/أوجون باندن"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "آسيا/أولان باطر"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "آسيا/أُرمشة"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "آسيا/فينتيان"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "آسيا/فلاديفوستك"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "آسيا/ياكتسك"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "آسيا/يكاتيرنبرغ"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "آسيا/ييرفان"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "المحيط الأطلسي/الآزور"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "المحيط الأطلسي/برمودا"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "المحيط الأطلسي/كاناري"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "المحيط الأطلسي/كاب فرد"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "المحيط الأطلسي/الفارو"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "المحيط الأطلسي/جان ماين"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "المحيط الأطلسي/ماديرا"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "المحيط الأطلسي/ريكيافك"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "المحيط الأطلسي/جنوب جورجيا"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "المحيط الأطلسي/سان هيلانة"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "المحيط الأطلسي/ستانلي"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "أستراليا/أدِليد"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "أستراليا/برزبن"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "أستراليا/بروكن هِل"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "أستراليا/داروِن"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "أستراليا/هوبارت"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "أستراليا/لندمان"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "أستراليا/لورد هاو"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "أستراليا/ملبرن"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "أستراليا/برث"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "أستراليا/سيدني"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "أوروبا/أمستردام"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "أوروبا/أندورا"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "أوروبا/أثينا"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "أوروبا/بلفاست"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "أوروبا/بلغراد"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "أوروبا/برلين"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "أوروبا/براتسلافا"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "أوروبا/بروكسل"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "أوروبا/بُخارست"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "أوروبا/بودابست"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "أوروبا/كيشناو"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "أوروبا/كوبنهاغن"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "أوروبا/دبلن"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "أوروبا/جبل طارق"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "أوروبا/هلسنكي"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "أوروبا/إسطنبول"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "أوروبا/كالينينغراد"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "أوروبا/كييف"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "أوروبا/لشبونة"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "أوروبا/لوبليانا"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "أوروبا/لندن"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "أوروبا/لوكسمبورج"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "أوروبا/مدريد"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "أوروبا/مالطة"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "أوروبا/مِنسك"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "أوروبا/موناكو"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "أوروبا/موسكو"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "أوروبا/نيقوسيا"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "أوروبا/أوسلو"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "أوروبا/باريس"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "أوروبا/براغ"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "أوروبا/ريغا"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "أوروبا/روما"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "أوروبا/سامارا"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "أوروبا/سان مارينو"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "أوروبا/سراييفو"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "أوروبا/سمفروبل"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "أوروبا/سكوبيه"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "أوروبا/صوفيا"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "أوروبا/ستوكهولم"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "أوروبا/تالن"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "أوروبا/تيرانا"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "أوروبا/أزغورود"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "أوروبا/فادُز"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "أوروبا/الفاتيكان"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "أوروبا/فيينا"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "أوروبا/فلنيوس"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "أوروبا/وارسو"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "أوروبا/زغرب"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "أوروبا/زابوروزي"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "أوروبا/زيورخ"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "المحيط الهندي/أنتاناناريفو"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "المحيط الهندي/شاغس"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "المحيط الهندي/كريسماس"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "المحيط الهندي/الكوكوس"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "المحيط الهندي/القمر"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "المحيط الهندي/كرغويلن"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "المحيط الهندي/ماهي"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "المحيط الهندي/المالديف"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "المحيط الهندي/موريشيوس"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "المحيط الهندي/مايوتا"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "المحيط الهندي/ريونيون"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "الهادي/أبيا"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "الهادي/أوكلند"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "الهادي/تشاتهم"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "الهادي/إيستر"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "الهادي/إيفات"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "الهادي/إندربري"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "الهادي/فاكاوفو"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "الهادي/فيجي"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "الهادي/فونافوتي"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "الهادي/الجالاباجوس"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "الهادي/غمبير"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "الهادي/غوادالكنال"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "الهادي/جوام"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "الهادي/هونولولو"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "الهادي/جونستون"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "الهادي/كيريتيماتي"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "الهادي/كوسراي"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "الهادي/كواجلن"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "الهادي/ماجورو"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "الهادي/مركيساس"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "الهادي/مدواي"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "الهادي/ناورو"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "الهادي/نيوي"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "الهادي/نورفولك"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "الهادي/نوميا"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "الهادي/باغو باغو"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "الهادي/بالاو"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "الهادي/بتكيرن"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "الهادي/بونابيه"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "الهادي/بورت مورزبي"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "الهادي/راروتونغا"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "الهادي/سايبان"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "الهادي/تاهيتي"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "الهادي/تاراوا"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "الهادي/تونغاتابو"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "الهادي/ترك"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "الهادي/ويك"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "الهادي/والس"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "الهادي/ياب"
 
 #: ../composer/e-composer-autosave.c:275
-#, fuzzy
 msgid "Could not open autosave file"
-msgstr "لم يمكن فتح ملف"
+msgstr "تعذر فتح ملف الحفظ الآلي"
 
 #: ../composer/e-composer-autosave.c:282
 msgid "Unable to retrieve message from editor"
@@ -10540,191 +10488,185 @@ msgstr "أدرج مُرفقًا"
 msgid "A_ttach"
 msgstr "أ_رفِق"
 
-#: ../composer/e-composer-actions.c:143
+#: ../composer/e-composer-actions.c:142
 msgid "Untitled Message"
 msgstr "رسالة بدون عنوان"
 
-#: ../composer/e-composer-actions.c:474
+#: ../composer/e-composer-actions.c:473
 msgid "Attach a file"
 msgstr "إرفاق ملف"
 
-#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "_غلق"
 
-#: ../composer/e-composer-actions.c:481
+#: ../composer/e-composer-actions.c:480
 msgid "Close the current file"
 msgstr "غلق الملف الحالي"
 
-#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1337
+#: ../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 "ا_طبع..."
 
-#: ../composer/e-composer-actions.c:493 ../ui/evolution-addressbook.xml.h:27
+#: ../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 "_معاينة قبل الطّباعة"
 
-#: ../composer/e-composer-actions.c:502
+#: ../composer/e-composer-actions.c:501
 msgid "Save the current file"
 msgstr "احفظ الملف الحالي"
 
-#: ../composer/e-composer-actions.c:507
+#: ../composer/e-composer-actions.c:506
 msgid "Save _As..."
 msgstr "احفظ _كـ..."
 
-#: ../composer/e-composer-actions.c:509
+#: ../composer/e-composer-actions.c:508
 msgid "Save the current file with a different name"
 msgstr "احفظ الملف الحالي باسم مغاير"
 
-#: ../composer/e-composer-actions.c:514
+#: ../composer/e-composer-actions.c:513
 msgid "Save _Draft"
 msgstr "احفظ _مسودّة"
 
-#: ../composer/e-composer-actions.c:516
+#: ../composer/e-composer-actions.c:515
 msgid "Save as draft"
 msgstr "احفظ _كمسودة"
 
-#: ../composer/e-composer-actions.c:521
+#: ../composer/e-composer-actions.c:520
 msgid "S_end"
 msgstr "أر_سِل"
 
-#: ../composer/e-composer-actions.c:523
+#: ../composer/e-composer-actions.c:522
 msgid "Send this message"
 msgstr "أرسِل هذه الرسالة"
 
-#: ../composer/e-composer-actions.c:530
+#: ../composer/e-composer-actions.c:529
 msgid "Insert Send options"
 msgstr "أدرج خيارات الإرسال"
 
-#: ../composer/e-composer-actions.c:535
-#, fuzzy
+#: ../composer/e-composer-actions.c:534
 msgid "New _Message"
-msgstr "_رسالة"
+msgstr "_رسالة جديدة"
 
-#: ../composer/e-composer-actions.c:537
-#, fuzzy
+#: ../composer/e-composer-actions.c:536
 msgid "Open New Message window"
-msgstr "ار_سل رسالة جديدة إلى..."
+msgstr "إفتح نافذة رسالة جديدة"
 
-#: ../composer/e-composer-actions.c:544
-#, fuzzy
+#: ../composer/e-composer-actions.c:543
 msgid "Character _Encoding"
-msgstr "ترميز المحارف"
+msgstr "ت_رميز المحارف"
 
-#: ../composer/e-composer-actions.c:551
+#: ../composer/e-composer-actions.c:550
 msgid "_Security"
 msgstr "أ_من"
 
-#: ../composer/e-composer-actions.c:561
+#: ../composer/e-composer-actions.c:560
 msgid "PGP _Encrypt"
 msgstr "_شفّر باستعمال PGP"
 
-#: ../composer/e-composer-actions.c:563
+#: ../composer/e-composer-actions.c:562
 msgid "Encrypt this message with PGP"
 msgstr "تشفير هذه الرسالة باستخدام PGP"
 
-#: ../composer/e-composer-actions.c:569
+#: ../composer/e-composer-actions.c:568
 msgid "PGP _Sign"
 msgstr "و_قّع باستعمال PGP"
 
-#: ../composer/e-composer-actions.c:571
+#: ../composer/e-composer-actions.c:570
 msgid "Sign this message with your PGP key"
 msgstr "توقيع الرسالة بمفتاح PGP الخاص بك"
 
-#: ../composer/e-composer-actions.c:577
+#: ../composer/e-composer-actions.c:576
 msgid "_Prioritize Message"
 msgstr "إعطاء أول_وية للرسالة"
 
-#: ../composer/e-composer-actions.c:579
+#: ../composer/e-composer-actions.c:578
 msgid "Set the message priority to high"
 msgstr "عين أهمية الرسالة إلى عالي"
 
-#: ../composer/e-composer-actions.c:585
-#, fuzzy
+#: ../composer/e-composer-actions.c:584
 msgid "Re_quest Read Receipt"
-msgstr "اطلب إخ_طارًا بالوصول"
+msgstr "اطلب إخ_طارا بالقراءة"
 
-#: ../composer/e-composer-actions.c:587
+#: ../composer/e-composer-actions.c:586
 msgid "Get delivery notification when your message is read"
 msgstr "استقبل إخطارًا بالوصول عندما تتم قراءة رسالتك"
 
-#: ../composer/e-composer-actions.c:593
+#: ../composer/e-composer-actions.c:592
 msgid "S/MIME En_crypt"
 msgstr "_شفّر باستعمال S/MIME"
 
-#: ../composer/e-composer-actions.c:595
+#: ../composer/e-composer-actions.c:594
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "تشفير هذه الرسالة بشهادة تشفير S/MIME الخاصة بك"
 
-#: ../composer/e-composer-actions.c:601
+#: ../composer/e-composer-actions.c:600
 msgid "S/MIME Sig_n"
 msgstr "و_قّع باستعمال S/MIME"
 
-#: ../composer/e-composer-actions.c:603
+#: ../composer/e-composer-actions.c:602
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "توقيع الرسالة بتوقيع شهادة S/MIME خاصة بك"
 
-#: ../composer/e-composer-actions.c:609
+#: ../composer/e-composer-actions.c:608
 msgid "_Bcc Field"
 msgstr "حقل النّسخة الكربونيّة ال_مخفيّة"
 
-#: ../composer/e-composer-actions.c:611
+#: ../composer/e-composer-actions.c:610
 msgid "Toggles whether the BCC field is displayed"
 msgstr "تحديد ما إذا كان حقل \"ن.ك.م\" ظاهرًا"
 
-#: ../composer/e-composer-actions.c:617
+#: ../composer/e-composer-actions.c:616
 msgid "_Cc Field"
 msgstr "حقل ال_نسخة الكربونية"
 
-#: ../composer/e-composer-actions.c:619
+#: ../composer/e-composer-actions.c:618
 msgid "Toggles whether the CC field is displayed"
 msgstr "تحديد ما إذا كان حقل \"ن.ك\" ظاهرًا"
 
-#: ../composer/e-composer-actions.c:625
+#: ../composer/e-composer-actions.c:624
 msgid "_From Field"
 msgstr "حقل _مِن"
 
-#: ../composer/e-composer-actions.c:627
+#: ../composer/e-composer-actions.c:626
 msgid "Toggles whether the From chooser is displayed"
 msgstr "تحديد ما إذا كان مختار حقل \"مِن\" ظاهرًا"
 
-#: ../composer/e-composer-actions.c:633
+#: ../composer/e-composer-actions.c:632
 msgid "_Post-To Field"
 msgstr "حقل ا_نشر إلى"
 
-#: ../composer/e-composer-actions.c:635
+#: ../composer/e-composer-actions.c:634
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "تحديد ما إذا كان حقل \"نشر إلى\" ظاهرًا"
 
-#: ../composer/e-composer-actions.c:641
+#: ../composer/e-composer-actions.c:640
 msgid "_Reply-To Field"
 msgstr "حقل ال_رّد إلى"
 
-#: ../composer/e-composer-actions.c:643
+#: ../composer/e-composer-actions.c:642
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "تحديد ما إذا كان حقل \"رد إلى\" ظاهرًا"
 
-#: ../composer/e-composer-actions.c:649
-#, fuzzy
+#: ../composer/e-composer-actions.c:648
 msgid "_Subject Field"
-msgstr "حقل ال_نسخة الكربونية"
+msgstr "حقل ال_موضوع"
 
-#: ../composer/e-composer-actions.c:651
-#, fuzzy
+#: ../composer/e-composer-actions.c:650
 msgid "Toggles whether the Subject field is displayed"
-msgstr "تحديد ما إذا كان حقل الحالة ظاهرًا"
+msgstr "تحديد ما إذا سيعرض حقل الموضوع "
 
-#: ../composer/e-composer-actions.c:657
+#: ../composer/e-composer-actions.c:656
 msgid "_To Field"
 msgstr "حقل إ_لى"
 
-#: ../composer/e-composer-actions.c:659
+#: ../composer/e-composer-actions.c:658
 msgid "Toggles whether the To field is displayed"
 msgstr "تحديد ما إذا كان حقل \"إلى\" ظاهرًا"
 
@@ -10776,62 +10718,55 @@ msgstr "المو_ضوع:"
 msgid "Si_gnature:"
 msgstr "تو_قيع:"
 
-#: ../composer/e-composer-name-header.c:114
+#: ../composer/e-composer-name-header.c:115
 msgid "Click here for the address book"
 msgstr "أُنقر هنا لدفتر العناوين"
 
-#: ../composer/e-composer-post-header.c:136
+#: ../composer/e-composer-post-header.c:137
 msgid "Posting destination"
 msgstr "وجهة النشر"
 
-#: ../composer/e-composer-post-header.c:137
+#: ../composer/e-composer-post-header.c:138
 msgid "Choose folders to post the message to."
 msgstr "اختر مجلدات لنشر الرسالة بها."
 
-#: ../composer/e-composer-post-header.c:171
+#: ../composer/e-composer-post-header.c:172
 msgid "Click here to select folders to post to"
 msgstr "انقر هنا لتختر المجلدات التي ستنشر بها"
 
-#: ../composer/e-composer-private.c:65
-#, fuzzy
-msgid "Recent _Documents"
-msgstr "نسبة مكملة"
-
-#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1558
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1556
 msgid "Show _Attachment Bar"
 msgstr "اظهر شريط ال_مرفقات"
 
-#: ../composer/e-msg-composer.c:872
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+#: ../composer/e-msg-composer.c:870
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "لا يمكن توقيع الرّسالة الخارجة: لم تعيّن شهادة توقيع لهذا الحساب"
 
-#: ../composer/e-msg-composer.c:879
+#: ../composer/e-msg-composer.c:877
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "لا يمكن تشفير الرّسالة الخارجة: لم تعيّن شهادة تشفير لهذا الحساب"
 
-#: ../composer/e-msg-composer.c:1500 ../mail/em-format-html-display.c:1913
-#: ../mail/em-format-html-display.c:2405 ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1498 ../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
-#, fuzzy
 msgid "Attachment"
 msgid_plural "Attachments"
-msgstr[0] "مُرفق"
-msgstr[1] "مُرفق"
+msgstr[0] "مرفق"
+msgstr[1] "مرفقات"
 msgstr[2] "مُرفق"
 msgstr[3] "مُرفق"
 
-#: ../composer/e-msg-composer.c:1556
+#: ../composer/e-msg-composer.c:1554
 msgid "Hide _Attachment Bar"
 msgstr "اخفي شريط ال_مرفقات"
 
-#: ../composer/e-msg-composer.c:1573 ../composer/e-msg-composer.c:2780
+#: ../composer/e-msg-composer.c:1571 ../composer/e-msg-composer.c:2778
 msgid "Compose Message"
 msgstr "اكتب رسالة"
 
-#: ../composer/e-msg-composer.c:4055
+#: ../composer/e-msg-composer.c:4053
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10857,7 +10792,7 @@ msgstr "أمتأكد من رغبتك في تجاهل الرسالة -المعن�
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr "بسبب &quot;{0}&quot;، قد تحتاج الى اختيار خيارات بريد مختلفة."
+msgstr "بسبب &quot;{0}&quot;، قد تحتاج إلى اختيار خيارات بريد مختلفة."
 
 #: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
@@ -10982,15 +10917,14 @@ msgid "_Recover"
 msgstr "ا_ستعِد"
 
 #: ../composer/mail-composer.error.xml.h:33
-#, fuzzy
 msgid "_Save Draft"
-msgstr "احفظ _مسودّة"
+msgstr "ا_حفظ المسودّة"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "بريد و تقويم إيفُليوشِن"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
 msgid "Groupware Suite"
 msgstr "حِزمة Groupware"
 
@@ -11006,85 +10940,78 @@ msgstr "بطاقة عنوان"
 msgid "calendar information"
 msgstr "معلومات التقويم"
 
-#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
+#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "خطأ إيفُليوشِن"
 
-#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
+#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
 msgid "Evolution Warning"
 msgstr "تحذير إيفُليوشِن"
 
-#: ../e-util/e-error.c:117
+#: ../e-util/e-error.c:118
 msgid "Evolution Information"
 msgstr "معلومات إيفُليوشِنة"
 
-#: ../e-util/e-error.c:119
+#: ../e-util/e-error.c:120
 msgid "Evolution Query"
 msgstr "إستفسار إيفُليوشِن"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:449
+#: ../e-util/e-error.c:450
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "خطأ داخِلي، طُلِب خطأ مجهول '%s'"
 
-#: ../e-util/e-logger.c:154
-#, fuzzy
+#: ../e-util/e-logger.c:156
 msgid "Component"
-msgstr "منجز"
+msgstr "مكوّن"
 
-#: ../e-util/e-logger.c:155
+#: ../e-util/e-logger.c:157
 msgid "Name of the component being logged"
-msgstr ""
+msgstr "اسم المكون الذي يسجل له"
 
 #: ../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:339
+#: ../plugins/plugin-manager/plugin-manager.c:355
 #: ../plugins/publish-calendar/publish-calendar.c:689
 msgid "Enabled"
 msgstr "مفعّل"
 
 #: ../e-util/e-plugin.c:309
-#, fuzzy
 msgid "Whether the plugin is enabled"
-msgstr "ما إن كان الموسع موسعًا أم لا"
+msgstr "ما إذا كان الملحق مفعلاا"
 
-#: ../e-util/e-print.c:158
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "حدث خطأ أثناء الطباعة"
 
-#: ../e-util/e-print.c:165
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "أبلغ نظام الطباعة عن تفاصيل الخطأ الآتية:"
 
-#: ../e-util/e-print.c:171
-msgid ""
-"The printing system did not report any additional details about the error."
+#: ../e-util/e-print.c:173
+msgid "The printing system did not report any additional details about the error."
 msgstr "لم يبلغ نظام الطباعة عن أي تفاصيل إضافية عن الخطأ."
 
 #: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
-#, fuzzy
 msgid "Because \"{1}\"."
-msgstr "بسبب &quot;{1}&quot;."
+msgstr "بسبب \"{1}\"."
 
 #: ../e-util/e-system.error.xml.h:2
-#, fuzzy
 msgid "Cannot open file \"{0}\"."
-msgstr "لا يمكن فتح الملف"
+msgstr "لا يمكن فتح الملف \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:3
-#, fuzzy
 msgid "Cannot save file \"{0}\"."
-msgstr "لم أستطع حفظ الملف &quot;{0}&quot;."
+msgstr "لا يمكن حفظ الملف \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
 msgstr "أترغب في الكتابة فوقه؟"
 
 #: ../e-util/e-system.error.xml.h:5
-#, fuzzy
 msgid "File exists \"{0}\"."
-msgstr "الملف &quot;{0}&quot; موجود."
+msgstr "الملف موجود \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
@@ -11095,9 +11022,8 @@ msgid "_Overwrite"
 msgstr "ا_كتب فوقه"
 
 #: ../e-util/e-util.c:97
-#, fuzzy
 msgid "Could not display help for Evolution."
-msgstr "غير قادر على تحديث تصريحات المجلد."
+msgstr "تعذر عرض مساعدة إيفُليوشِن."
 
 #: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
@@ -11140,20 +11066,19 @@ msgid "Label name cannot be empty."
 msgstr "لا يمكن أن يكون اسم اللصيقة فارغًا."
 
 #: ../e-util/e-util-labels.c:356
-#, fuzzy
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
-msgstr "توحود بالفعل لصيقة بنفس الوَسْم. رجاء أعِدْ تسمية اللصيقة."
+msgstr "لصيقة بنفس الوسم موجودة مسبقا على الخادم. أعد تسمية لصيقتك."
 
 #: ../e-util/gconf-bridge.c:1218
-#, fuzzy, c-format
+#, c-format
 msgid "GConf error: %s"
-msgstr "خطأ Camel: %s"
+msgstr "خطأ GConf: %s"
 
 #: ../e-util/gconf-bridge.c:1228
 msgid "All further errors shown only on terminal."
-msgstr ""
+msgstr "كل الأخطاء الإضافية تعرض فقط في الطرفية."
 
 #: ../filter/filter-datespec.c:80
 #, c-format
@@ -11497,8 +11422,7 @@ msgid "Composer Preferences"
 msgstr "تفضيلات المؤلّف"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+msgid "Configure mail preferences, including security and message display, here"
 msgstr "قم بإعداد تفضيلات البريد هنا، بما فيها الأمن و عرض الرّسائل"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
@@ -11510,9 +11434,8 @@ msgid "Configure your email accounts here"
 msgstr "قم بإعداد حساباتك البريديّة هنا"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
 msgid "Configure your network connection settings here"
-msgstr "قم بإعداد حساباتك البريديّة هنا"
+msgstr "اضبط اتصال الشبكة هنا"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
@@ -11539,14 +11462,13 @@ msgid "Evolution Mail preferences control"
 msgstr "تحكّم تفضيلات بريد إيفُليوشِن"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#, fuzzy
 msgid "Evolution Network configuration control"
-msgstr "تحكّم إعداد تقويم إيفُليوشِن"
+msgstr "التحكّم بتشكيل شبكة إيفُليوشِن"
 
 #: ../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:380
-#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
-#: ../mail/mail-component.c:767
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
+#: ../mail/mail-component.c:593 ../mail/mail-component.c:594
+#: ../mail/mail-component.c:763
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "البريد"
@@ -11562,20 +11484,19 @@ msgid "Mail Preferences"
 msgstr "تفضيلات البريد"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
-#, fuzzy
 msgid "Network Preferences"
-msgstr "تفضيلات المؤلّف"
+msgstr "تفضيلات الشبكة"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "_بريد"
 
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:386
 #, c-format
 msgid "%s License Agreement"
 msgstr "اتفاق ترخيص %s"
 
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:393
 #, c-format
 msgid ""
 "\n"
@@ -11588,64 +11509,64 @@ msgstr ""
 "ترخيص %s المعروض بأسفل\n"
 "وعلّم على صندوق الإختيار لقبولها\n"
 
-#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:512
+#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "انتقي مجلّدًا"
 
-#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
-#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:97
+#: ../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 "مولّد آليًّا"
 
-#: ../mail/em-account-editor.c:762
+#: ../mail/em-account-editor.c:761
 msgid "Ask for each message"
 msgstr "اسأل لكل رسالة"
 
-#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "الهويّة"
 
-#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
+#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "إستقبال بريد"
 
-#: ../mail/em-account-editor.c:2131
+#: ../mail/em-account-editor.c:2130
 msgid "Check for _new messages every"
 msgstr "تحقق من الرسائل ال_جديدة كلَّ"
 
-#: ../mail/em-account-editor.c:2139
+#: ../mail/em-account-editor.c:2138
 msgid "minu_tes"
 msgstr "دقائ_ق"
 
-#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
+#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "إرسال بريد"
 
-#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "الإفتراضيّات"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:131
 #: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "أمن"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
 msgid "Receiving Options"
 msgstr "خيارات التلقي"
 
-#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Checking for New Messages"
 msgstr "جار الفحص للبحث عن رسائل جديدة"
 
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "محرّر الحسابات"
 
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "مساعد حسابات إيفُليوشِن"
 
@@ -11679,18 +11600,18 @@ msgstr "أضِف برنامج توقيع نصي"
 msgid "Signature(s)"
 msgstr "التّوقيع (التّواقيع)"
 
-#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- رسالة ممرّرة -------- "
 
-#: ../mail/em-composer-utils.c:1960
+#: ../mail/em-composer-utils.c:1962
 msgid "an unknown sender"
 msgstr "مرسِل مجهول"
 
 #. 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:2007
+#: ../mail/em-composer-utils.c:2009
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11698,7 +11619,7 @@ msgstr ""
 "في ${AbbrevWeekdayName}، ${Day}-${Month}-${Year} عند ${24Hour}:${Minute} "
 "${TimeZone} ، كتب ${Sender}:"
 
-#: ../mail/em-composer-utils.c:2150
+#: ../mail/em-composer-utils.c:2152
 msgid "-----Original Message-----"
 msgstr "-------- الرسالة الأصلية -------- "
 
@@ -11878,7 +11799,7 @@ msgstr "اعزف صوت"
 
 #. 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:62
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "اقرأ"
 
@@ -11950,9 +11871,9 @@ msgstr "يبدء بـ"
 msgid "Stop Processing"
 msgstr "أوقِف المعالجة"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
+#: ../mail/em-filter-i18n.h:72 ../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:311
+#: ../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"
@@ -11963,11 +11884,11 @@ msgid "Unset Status"
 msgstr "ألغ ضبط الحالة"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:521
+#: ../mail/em-filter-rule.c:522
 msgid "Then"
 msgstr "ثمّ"
 
-#: ../mail/em-filter-rule.c:549
+#: ../mail/em-filter-rule.c:550
 msgid "Add Ac_tion"
 msgstr "أضِف إجراءًا"
 
@@ -12020,7 +11941,7 @@ msgid "All Account Search"
 msgstr "بحث في كل الحسابات"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:173
+#: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "الرسائل غير المقروءة:"
@@ -12030,7 +11951,7 @@ msgstr[3] "الرسائل غير المقروءة:"
 
 #. 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:177
+#: ../mail/em-folder-properties.c:178
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "مجموع الرسائل:"
@@ -12038,21 +11959,26 @@ msgstr[1] "مجموع الرسائل:"
 msgstr[2] "مجموع الرسائل:"
 msgstr[3] "مجموع الرسائل:"
 
-#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
-#, fuzzy
+#: ../mail/em-folder-properties.c:196
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "استخدام الحصة  (%s):"
+
+#: ../mail/em-folder-properties.c:198
+#, c-format
 msgid "Quota usage"
-msgstr "مجموع الرسائل:"
+msgstr "استخدام الحصة"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:355 ../mail/em-folder-tree-model.c:507
+#: ../mail/em-folder-properties.c:358 ../mail/em-folder-tree-model.c:507
 #: ../mail/em-folder-tree.c:2556 ../mail/mail-component.c:160
-#: ../mail/mail-component.c:585
+#: ../mail/mail-component.c:581
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/exchange-operations/exchange-folder.c:594
 msgid "Inbox"
 msgstr "صندوق الدّاخل"
 
-#: ../mail/em-folder-properties.c:386
+#: ../mail/em-folder-properties.c:389
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "خصائص المجلّد"
@@ -12069,9 +11995,9 @@ msgstr "أن_شئ"
 msgid "Folder _name:"
 msgstr "ا_سم المجلّد:"
 
-#. load store to mail component at the end, when everything is loaded
+#. load store to mail component
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
+#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "مجلدات البحث"
 
@@ -12132,7 +12058,7 @@ msgstr "ان_سخ للمجلّد"
 msgid "_Move to Folder"
 msgstr "ا_نقل للمجلّد"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "مسح الرسائل في \"%s\""
@@ -12166,36 +12092,36 @@ msgstr "ان_شر صندوق الصادِر"
 msgid "_Empty Trash"
 msgstr "أ_فرٍغ المهملات"
 
-#: ../mail/em-folder-utils.c:102
+#: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "نسخ `%s' إلى `%s'"
 
-#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1186
 #: ../mail/em-folder-view.c:1201
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder"
 msgstr "انتقي مجلّد"
 
-#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "ان_سخ"
 
-#: ../mail/em-folder-utils.c:586
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../mail/em-folder-utils.c:585
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "إنشاء المجلّد `%s'"
 
-#: ../mail/em-folder-utils.c:744
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "أنشئ مجلّد"
 
-#: ../mail/em-folder-utils.c:744
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "حدّد أين سيتم إنشاء المجلّد:"
 
@@ -12370,94 +12296,93 @@ msgid "Click to hide/unhide addresses"
 msgstr "انقر لإخفاء/إظهار العناوين"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:470
+#: ../mail/em-format-html-display.c:471
 #, c-format
 msgid "Matches: %d"
 msgstr "المطابقات: %d"
 
-#: ../mail/em-format-html-display.c:614
+#: ../mail/em-format-html-display.c:615
 msgid "Fin_d:"
 msgstr "ا_عثر:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:638
+#: ../mail/em-format-html-display.c:639
 msgid "_Previous"
 msgstr "ال_سابق"
 
-#: ../mail/em-format-html-display.c:643
+#: ../mail/em-format-html-display.c:644
 msgid "_Next"
 msgstr "ال_تّالي"
 
-#: ../mail/em-format-html-display.c:648
+#: ../mail/em-format-html-display.c:649
 msgid "M_atch case"
 msgstr "_طابِق حالة الأحرف"
 
-#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "غير موقّعة"
 
-#: ../mail/em-format-html-display.c:947
+#: ../mail/em-format-html-display.c:948
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "هذه الرّسالة غير موقّعة. لا ضمان بأن هذه الرسالة أصليّة."
 
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "توقيع سليم"
 
-#: ../mail/em-format-html-display.c:948
+#: ../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."
 msgstr "هذه الرّسالة موقّعة و سليمة مما يعني أنها في الغالب أصليّة."
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "توقيع غير صالح"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "لا يمكن التّحقّق من توقيع هذه الرّسالة، ربّما غُيّرت أثناء النّقل."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "توقيع صالح لكن تعذر التّحقّق من المرسِل"
 
-#: ../mail/em-format-html-display.c:950
+#: ../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."
 msgstr "هذه الرّسالة موقّعة بتوقيعٍ سليم، و لكن تعذر التّحقّق من مرسِل الرّسالة."
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "التوقيع موجود ولكنه يحتاج مفتاحًا عامًا"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:952
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "هذه الرّسالة موقّعة بتوقيع، ولكن لا مفتاح عام مرتبطًا بالتوقيع."
 
-#: ../mail/em-format-html-display.c:958 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "غير مشفّرة"
 
-#: ../mail/em-format-html-display.c:958
+#: ../mail/em-format-html-display.c:959
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
-msgstr ""
-"هذه الرّسالة ليست مشفّرة. من الممكن مشاهدة محتواها أثناء نقلها عبر الإنترنت."
+msgstr "هذه الرّسالة ليست مشفّرة. من الممكن مشاهدة محتواها أثناء نقلها عبر الإنترنت."
 
-#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "مشفّرة، ضعيفة"
 
-#: ../mail/em-format-html-display.c:959
+#: ../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 "
@@ -12466,21 +12391,21 @@ msgstr ""
 "هذه الرّسالة مشفّرة، و لكن بخوارزمية تشفير ضعيفة. سيصعب و لكن لن يستحيل على "
 "شخص خارجي مشاهدة محتوى هذه الرّسالة ضمن فترةٍ زمنيّة معقولة."
 
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "مشفّرة"
 
-#: ../mail/em-format-html-display.c:960
+#: ../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 "هذه الرّسالة مشفّرة. من الصعب على شخص خارجي مشاهدة محتواها."
 
-#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "مشفّرة، بقوّة"
 
-#: ../mail/em-format-html-display.c:961
+#: ../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 "
@@ -12489,56 +12414,56 @@ msgstr ""
 "هذه الرّسالة مشفّرة بخوارزمية تشفير قويّة. سيكون من الصّعب جدًّا على أيّ شخص خارجي "
 "أن يشاهد محتوى هذه الرّسالة ضمن فترةٍ زمنيّة معقولة."
 
-#: ../mail/em-format-html-display.c:1062 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1063 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "ا_عرض الشهادة"
 
-#: ../mail/em-format-html-display.c:1077
+#: ../mail/em-format-html-display.c:1078
 msgid "This certificate is not viewable"
 msgstr "هذه الشهادة ليست قابلة للعرض"
 
-#: ../mail/em-format-html-display.c:1371
+#: ../mail/em-format-html-display.c:1377
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "اكتمل في %B %d، %Y، %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1379
+#: ../mail/em-format-html-display.c:1385
 msgid "Overdue:"
 msgstr "_فائت موعدها:"
 
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1388
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "قبل يوم %B %d، %Y، %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1460
+#: ../mail/em-format-html-display.c:1466
 msgid "_View Inline"
 msgstr "ا_عرض ضمن السّياق"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1467
 msgid "_Hide"
 msgstr "ا_خفي"
 
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1468
 msgid "_Fit to Width"
 msgstr "_لائم العرض"
 
-#: ../mail/em-format-html-display.c:1463
+#: ../mail/em-format-html-display.c:1469
 msgid "Show _Original Size"
 msgstr "اظهر ال_حجم الأصلي"
 
-#: ../mail/em-format-html-display.c:1983
+#: ../mail/em-format-html-display.c:1989
 msgid "Save attachment as"
 msgstr "احفظ المرفق كـ"
 
-#: ../mail/em-format-html-display.c:1987
+#: ../mail/em-format-html-display.c:1993
 msgid "Select folder to save all attachments"
 msgstr "اختر مجلدًا لحفظ كل المرفقات"
 
-#: ../mail/em-format-html-display.c:2038
+#: ../mail/em-format-html-display.c:2044
 msgid "_Save Selected..."
 msgstr "ا_حفظ المنتقَى..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2105
+#: ../mail/em-format-html-display.c:2111
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
@@ -12547,38 +12472,37 @@ msgstr[1] "مُرفقان"
 msgstr[2] "%d مُرفقات"
 msgstr[3] "%d مُرفقا"
 
-#: ../mail/em-format-html-display.c:2112 ../mail/em-format-html-display.c:2201
+#: ../mail/em-format-html-display.c:2118 ../mail/em-format-html-display.c:2207
 msgid "S_ave"
 msgstr "اح_فظ"
 
-#: ../mail/em-format-html-display.c:2123
+#: ../mail/em-format-html-display.c:2129
 msgid "S_ave All"
 msgstr "اح_فظ الكل"
 
-#: ../mail/em-format-html-display.c:2197
+#: ../mail/em-format-html-display.c:2203
 msgid "No Attachment"
 msgstr "بلا مُرفق"
 
-#: ../mail/em-format-html-display.c:2338 ../mail/em-format-html-display.c:2377
+#: ../mail/em-format-html-display.c:2344 ../mail/em-format-html-display.c:2383
 msgid "View _Unformatted"
 msgstr "اعرض _غير المهيأ"
 
-#: ../mail/em-format-html-display.c:2340
+#: ../mail/em-format-html-display.c:2346
 msgid "Hide _Unformatted"
 msgstr "أخفي _غير المهيأ"
 
-#: ../mail/em-format-html-display.c:2397
+#: ../mail/em-format-html-display.c:2403
 msgid "O_pen With"
 msgstr "فت_ح باستخدام"
 
-#: ../mail/em-format-html-display.c:2468
-#, fuzzy
+#: ../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."
 msgstr ""
-"إيفُليوشن غير قادر على رسم هذه الرسالة لأنها أكبر من أن يتعامل معها. يمكنك "
-"عرضها دون تهيئة أو بمحرر نص خارجي."
+"إيفُليوشن غير قادر على تصيير هذه الرسالة لأنها أكبر من أن يعالجها. يمكنك "
+"عرضها دون تهيئة أو بمحرر نصوص خارجي."
 
 #: ../mail/em-format-html-print.c:156
 #, c-format
@@ -12632,20 +12556,20 @@ msgid "Formatting Message..."
 msgstr "يجري تهيئة الرسالة..."
 
 #: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
-#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../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 "ن.ك"
 
 #: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
-#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../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 "ن.ك.م"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
-#: ../mail/em-mailer-prefs.c:1450
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1451
 msgid "Mailer"
 msgstr "ساعي البريد"
 
@@ -12667,13 +12591,13 @@ msgstr " (%R %Z)"
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "أرسل <b>%s</b> هذه الرسالة بالنيابة عن <b>%s</b>"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
+#: ../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:307
+#: ../mail/message-tag-followup.c:308
 msgid "From"
 msgstr "من"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
 #: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "رد على"
@@ -12688,105 +12612,109 @@ msgstr "التّاريخ"
 msgid "Newsgroups"
 msgstr "مجموعات أخبار"
 
-#: ../mail/em-format.c:1157
+#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:83
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "الوجه"
+
+#: ../mail/em-format.c:1158
 #, c-format
 msgid "%s attachment"
 msgstr "مُرفق %s"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1200
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "لم يمكن تحليل رسالة S/MIME: خطأ مجهول"
 
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
+#: ../mail/em-format.c:1337 ../mail/em-format.c:1493
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "لم يمكن تحليل رسالة MIME. ستُعرض كمصدر."
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1345
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "نوع تشفير غير مدعوم لعديد الأجزاء/مشفّر"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message"
 msgstr "تعذر تحليل رسالة PGP/MIME"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "تعذر تحليل رسالة PGP/MIME: خطأ مجهول"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1512
 msgid "Unsupported signature format"
 msgstr "صيغة توقيع غير مدعومة"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1591
 msgid "Error verifying signature"
 msgstr "خطأ أثناء التّحقق من التّوقيع"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1582 ../mail/em-format.c:1591
 msgid "Unknown error verifying signature"
 msgstr "خطأ مجهول أثناء التّحقّق من التّوقيع"
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1663
 msgid "Could not parse PGP message"
 msgstr "تعذر تحليل رسالة PGP"
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1663
 msgid "Could not parse PGP message: Unknown error"
 msgstr "تعذر تحليل رسالة PGP: خطأ مجهول"
 
-#: ../mail/em-mailer-prefs.c:93
+#: ../mail/em-mailer-prefs.c:94
 msgid "Every time"
 msgstr "كل مرّة"
 
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per day"
 msgstr "مرة في اليوم"
 
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per week"
 msgstr "مرّة في الأسبوع"
 
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per month"
 msgstr "مرّة في الشهر"
 
-#: ../mail/em-mailer-prefs.c:326
+#: ../mail/em-mailer-prefs.c:327
 msgid "Add Custom Junk Header"
 msgstr "أظف ترويسة بريد نفاية مُخصصة"
 
-#: ../mail/em-mailer-prefs.c:330
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Name:"
 msgstr "إ_سم الترويسة:"
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:332
 msgid "Header Value Contains:"
 msgstr "الترويسة تحتوي على:"
 
-#: ../mail/em-mailer-prefs.c:436
+#: ../mail/em-mailer-prefs.c:437
 msgid "Contains Value"
 msgstr "تحتوي على القيمة"
 
-#: ../mail/em-mailer-prefs.c:458
+#: ../mail/em-mailer-prefs.c:459
 msgid "Color"
 msgstr "اللون"
 
-#: ../mail/em-mailer-prefs.c:461
+#: ../mail/em-mailer-prefs.c:462
 msgid "Tag"
 msgstr "الوسْم"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
+#: ../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 متاح والملف الثنائي مثبت."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
+#: ../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."
+msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "الملحق %s غير متاح. تحقق رجاءً إن كانت الجزمة مثبتة."
 
-#: ../mail/em-mailer-prefs.c:1107
+#: ../mail/em-mailer-prefs.c:1108
 msgid "No Junk plugin available"
 msgstr "لا يوجد ملحق بريد مهمل متاح."
 
@@ -12847,16 +12775,16 @@ msgid "Failed to create local mail storage `%s': %s"
 msgstr "تعذر إنشاء مخزن بريد محلّي `%s': %s"
 
 #: ../mail/em-migrate.c:2898
-#, fuzzy
 msgid ""
 "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..."
 msgstr ""
-"لقد تغيرت مواقع و هرميّة مجلّدات صندوق بريد إيفُليوشِن منذ إيفُليوشِن 1.x.\n"
+"هيئة ماللخص لمجلدات صندوق بريد إيفُليوشِن نقلت إلى سيكيولايت "
+"منذ إيفُليوشِن 2.24.\n"
 "\n"
-"رجاء كن صبورًا حتى يقوم إيفُليوشِن بترقية مجلّداتك..."
+"رجاءً كن صبورا بينما ينقل إيفُليوشِن مجلداتك..."
 
 #: ../mail/em-migrate.c:2963
 #, c-format
@@ -12885,24 +12813,24 @@ msgstr "رُد على ال_قائمة"
 msgid "_Add to Address Book"
 msgstr "أ_ضف إلى دفتر العناوين"
 
-#: ../mail/em-subscribe-editor.c:583
+#: ../mail/em-subscribe-editor.c:582
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "هذا المخزن لا يدعم الإشتراكات، أو أنّها غير مفعّلة."
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:615
 msgid "Subscribed"
 msgstr "تم الإشتراك"
 
-#: ../mail/em-subscribe-editor.c:620
+#: ../mail/em-subscribe-editor.c:619
 msgid "Folder"
 msgstr "مجلّد"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:822
+#: ../mail/em-subscribe-editor.c:821
 msgid "Please select a server."
 msgstr "رجاء اختر خادومًا."
 
-#: ../mail/em-subscribe-editor.c:843
+#: ../mail/em-subscribe-editor.c:842
 msgid "No server has been selected"
 msgstr "لم يتم اختيار أي خادوم"
 
@@ -12934,27 +12862,25 @@ msgstr "أضِف عنوان"
 msgid "Messages from %s"
 msgstr "رسائِل من %s"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "_مجلدات البحث"
 
-#: ../mail/em-vfolder-rule.c:592
+#: ../mail/em-vfolder-rule.c:593
 msgid "Search Folder source"
 msgstr "ابحث في مصدر المجلّد"
 
 #: ../mail/evolution-mail.schemas.in.h:1
-#, fuzzy
 msgid "\"Send and Receive Mail\" window height"
-msgstr "أرسِل و تلقى البريد"
+msgstr "إرتفاع نافذة \"أرسل و تلقّى البريد\""
 
 #: ../mail/evolution-mail.schemas.in.h:2
 msgid "\"Send and Receive Mail\" window maximize state"
-msgstr ""
+msgstr "الحالة القصوى لنافذة \"أرسل و تلقّى البريد\""
 
 #: ../mail/evolution-mail.schemas.in.h:3
-#, fuzzy
 msgid "\"Send and Receive Mail\" window width"
-msgstr "أرسِل و تلقى البريد"
+msgstr "عرض نافذة \"أرسل و تلقّى البريد\""
 
 #: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows evolution to display text part of limited size"
@@ -13015,19 +12941,20 @@ msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
 msgstr ""
+"يتحكم بتكرار مزامنة التغييرات المحلية مع الخادم البعيد للبريد. أقل فترة هي "
+"30 ثانية."
 
 #: ../mail/evolution-mail.schemas.in.h:18
-#, fuzzy
 msgid "Custom headers to use while checking for junk."
-msgstr "تحدد الترويسة للتأكد من البريد النفاية."
+msgstr "خصص ترويسات لإستخدامها عند التحقق عن الغثاء."
 
 #: ../mail/evolution-mail.schemas.in.h:19
-#, fuzzy
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
 msgstr ""
-"تحدد الترويسة للتأكد من البريد النفاية. النسق هو headername=value في gconf."
+"خصص ترويسات لإستخدامها عند التحقق عن الغثاء. عناصر القائمة هي مقاطع بهذه "
+"الهيئة \"headername=value\"."
 
 #: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
@@ -13082,26 +13009,25 @@ msgid "Default width of the subscribe dialog."
 msgstr "العرض الافتراضي لمربع حوار الاشتراك."
 
 #: ../mail/evolution-mail.schemas.in.h:33
-#, fuzzy
 msgid ""
-"Determines whether to look up addresses for junk filtering in local "
-"addressbook only"
-msgstr "يحدد فيما إذا سيَبحث في دفتر العناوين عن البريد الكتروني للمرسِل"
+"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 addressbook for sender email"
+msgid "Determines whether to lookup in address book for sender email"
 msgstr "يحدد فيما إذا سيَبحث في دفتر العناوين عن البريد الكتروني للمرسِل"
 
 #: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
+"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 "
-"can be slow, if remote addressbooks (like ldap) are marked for "
+"can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
 "يحدد فيما إذا سيَبحث عن البريد الكتروني للمرسِل في دفتر العناوين. إذا وُجد، فلا "
 "يجب أن يكون سخاما. سيبحث في الدفاتر المُعلَّمة للاتمام التلقائي. قد يكون بطيئا، "
-"إذا تم تعليم دفاتر العناوين البعيدة (مثل ldap) للاتمام التلقائي."
+"إذا تم تعليم دفاتر العناوين البعيدة (مثل LDAP) للاتمام التلقائي."
 
 #: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
@@ -13134,7 +13060,7 @@ msgstr "دليل حفظ ملفات محتوى البريد."
 
 #: ../mail/evolution-mail.schemas.in.h:41
 msgid "Disable or enable ellipsizing of folder names in folder tree"
-msgstr ""
+msgstr "يعطل أو يفعل قصر أسماء المجلدات في شجرة المجلدات"
 
 #: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
@@ -13227,8 +13153,7 @@ msgstr ""
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
-msgstr ""
-"عرض لوح المعاينة إذا كان مفعلا جنبًا إلى جنب مع قائمة الرسائل بدلا من تحتها."
+msgstr "عرض لوح المعاينة إذا كان مفعلا جنبًا إلى جنب مع قائمة الرسائل بدلا من تحتها."
 
 #: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
@@ -13245,6 +13170,8 @@ msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
+"الارتفاع المبدئي لنافذة \"ارسل و تلقى البريد\". تحدّث القيمة عند تغيير حجم "
+"النافذة العامودي من المستخدم."
 
 #: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
@@ -13254,12 +13181,18 @@ msgid ""
 "\" window cannot be maximized. This key exists only as an implementation "
 "detail."
 msgstr ""
+"الحالة المبدئية لتكبير نافذة  \"ارسل و تلقى البريد\". القيمة تحّدث عندما يكبر "
+"المستخدم أو يتراجع عن التكبير. لاحظ, هذه القيمة تحديدا غير مستخدمة من "
+"إيفليوشن لأن نافذة \"ارسل و تلقى البريد\" لا يمكن تكبيرها. هذا المفتاح موجود "
+"كتفصيل توظيفي فقط."
 
 #: ../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."
 msgstr ""
+"العرض المبدئي لنافذة \"Send and Receive Mail\". هذه القيمة تحدّث عند تغيير "
+"المستخدم لحجم النافذة أفقيا."
 
 #: ../mail/evolution-mail.schemas.in.h:65
 msgid "It disables/enables the prompt while marking multiple messages."
@@ -13269,8 +13202,7 @@ msgstr "لتفعيل أو تعطيل المحث أثناء وضع علامات �
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
-msgstr ""
-"يعطّل الميزة حيث تظهر محثات متكررة للسؤال إن كانت المزامنة دون اتصال مطلوبة."
+msgstr "يعطّل الميزة حيث تظهر محثات متكررة للسؤال إن كانت المزامنة دون اتصال مطلوبة."
 
 #: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
@@ -13319,7 +13251,7 @@ msgstr "قائمة بالترويسات المخصّصة وما إذا كانت
 
 #: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of dictionary language codes used for spell checking."
-msgstr ""
+msgstr "قائمة برموز لغات القاموس المستخدم للتدقيق الإملائي."
 
 #: ../mail/evolution-mail.schemas.in.h:77
 msgid ""
@@ -13342,14 +13274,14 @@ msgid "Load images for HTML messages over http"
 msgstr "حمّل صور رسائل HTML عبر http"
 
 #: ../mail/evolution-mail.schemas.in.h:81
-#, fuzzy
 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 "
 "contacts. \"2\" - Always load images off the net."
 msgstr ""
-"حمِّل الصور لرسائل HTML عبر http(s). القيم الممكنة هي: 0 - لا تحمِّل الصور عبر "
-"انترنت 1 - حمِّل الصور في البريد من المراسَلين 2 - حمِّل الصور دوما من انترنتً."
+"حمّل صورا لرسائل HTML عبر http(s). القيم المحتملة: \"0\" - لا تحمّل صورا من "
+"الشبكة أبدا. \"1\" - حمل الصور للرسائل من المراسلين. \"2\" - حمّل الصور من "
+"الشبكة دائما."
 
 #: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
@@ -13424,8 +13356,7 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "مساءلة المستخدم عندما يحاول محو مجلّد."
 
 #: ../mail/evolution-mail.schemas.in.h:100
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "مساءلة المستخدم عندما يحاول إرسال رسالةٍ دون موضوع."
 
 #: ../mail/evolution-mail.schemas.in.h:101
@@ -13487,8 +13418,8 @@ msgid "Save directory"
 msgstr "دليل الحفظ"
 
 #: ../mail/evolution-mail.schemas.in.h:114
-msgid "Search for the sender photo in local addressbooks"
-msgstr "البحث عن صورة المرسل في دفاتر العناوين المحلية"
+msgid "Search for the sender photo in local address books"
+msgstr "عالبحث عن صورة المرسل في دفاتر العناوين المحلية"
 
 #: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
@@ -13503,9 +13434,8 @@ msgid "Sender email-address column in the message list"
 msgstr "أظهر عمود عنوان بريد المرسل في قائمة الرسائل"
 
 #: ../mail/evolution-mail.schemas.in.h:118
-#, fuzzy
 msgid "Server synchronization interval"
-msgstr "خيارات ال_مزامنة..."
+msgstr "فترة المزامنة مع الخادم"
 
 #: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
@@ -13542,14 +13472,12 @@ msgid "Spell check inline"
 msgstr "فحص تهجئة ضمن السّياق"
 
 #: ../mail/evolution-mail.schemas.in.h:129
-#, fuzzy
 msgid "Spell checking color"
-msgstr "التثبت من التهجئة"
+msgstr "لون التدقيق الإملائي"
 
 #: ../mail/evolution-mail.schemas.in.h:130
-#, fuzzy
 msgid "Spell checking languages"
-msgstr "فحص تهجئة ضمن السّياق"
+msgstr "لغات التدقيق الإملائي"
 
 #: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
@@ -13573,13 +13501,11 @@ msgstr "الملحق الإضافي لموضع إضافة البريد المه�
 
 #: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
-msgstr ""
-"آخر مرة تم فيها إفراغ البريد المهمل، محسوبة بالأيام منذ تاريخ بدء الحساب."
+msgstr "آخر مرة تم فيها إفراغ البريد المهمل، محسوبة بالأيام منذ تاريخ بدء الحساب."
 
 #: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
-msgstr ""
-"آخر مرة تم فيها إفراغ سلة المهملات، محسوبة بالأيام منذ تاريخ بدء الحساب."
+msgstr "آخر مرة تم فيها إفراغ سلة المهملات، محسوبة بالأيام منذ تاريخ بدء الحساب."
 
 #: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
@@ -13590,11 +13516,10 @@ msgid "The variable width font for mail display."
 msgstr "الخط المتغيّر العرض لعرض البريد."
 
 #: ../mail/evolution-mail.schemas.in.h:140
-#, fuzzy
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
-msgstr "هناك ثلاث قيم ممكنة. 0 للأخطاء. 1 للتحذيرات. 2 لرسائل التنقيح."
+msgstr "يوجد ثلاث خيارات متاحة. \"0\" للأخطاء. \"1\" للتنبيهات. \"2\" لرسائل التنقيح."
 
 #: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
@@ -13614,13 +13539,12 @@ msgstr ""
 "الملحق المسرود افتراضيًا، فلن يتم التراجع إلى الملحقات الأخرى المتاحة."
 
 #: ../mail/evolution-mail.schemas.in.h:143
-#, fuzzy
 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 ""
@@ -13636,9 +13560,12 @@ msgstr ""
 #: ../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 addressbook only to exclude "
+"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."
@@ -13695,7 +13622,7 @@ msgstr "سلسلة هويّة المستخدم للحساب الإفتراضي."
 
 #: ../mail/evolution-mail.schemas.in.h:156
 msgid "Underline color for misspelled words when using inline spelling."
-msgstr ""
+msgstr "لون أسفل السطر للكلمات الخاطئة عند استعمال التدقيق داخل السياق."
 
 #: ../mail/evolution-mail.schemas.in.h:157
 msgid "Use SpamAssassin daemon and client"
@@ -13723,7 +13650,7 @@ msgstr "استخدام اختبارات السخام المحلية فقط (لا
 
 #: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
-msgstr "استخدم تخطيط جنبا الى جنب او التخطيط العريض"
+msgstr "استخدم تخطيط جنبا إلى جنب أو التخطيط العريض"
 
 #: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
@@ -13775,7 +13702,7 @@ msgstr "فيما إذا سَيُظاف افتراضا طلب قراءة التو
 
 #: ../mail/evolution-mail.schemas.in.h:176
 msgid "Whether disable ellipsizing feature of folder names in folder tree."
-msgstr ""
+msgstr "إذا ما سيعطل ميزة قصر أسماء المجلدات في شجرة المجلدات."
 
 #: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
@@ -13809,19 +13736,19 @@ msgstr "مستورد elm لإيفُليوشِن"
 msgid "Import mail from Elm."
 msgstr "استيراد بريد من إلم."
 
-#: ../mail/importers/evolution-mbox-importer.c:80
+#: ../mail/importers/evolution-mbox-importer.c:79
 msgid "Destination folder:"
 msgstr "المجلد الوجهة:"
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder to import into"
 msgstr "انتقاء مجلدًا للاستيراد إليه"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:219
 msgid "Berkeley Mailbox (mbox)"
 msgstr "صندوق بريد بيركلي (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:221
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "مستورد مجلدات هيئة صندوق بريد بيركلي"
 
@@ -13829,7 +13756,7 @@ msgstr "مستورد مجلدات هيئة صندوق بريد بيركلي"
 msgid "Importing mailbox"
 msgstr "يجري استيراد صندوق البريد"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:514
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "يجري استيراد `%s'"
@@ -13839,50 +13766,49 @@ msgstr "يجري استيراد `%s'"
 msgid "Scanning %s"
 msgstr "يجري مسح %s"
 
-#: ../mail/importers/pine-importer.c:227
+#: ../mail/importers/pine-importer.c:225
 msgid "Importing Pine data"
 msgstr "يجري استيراد بيانات باين"
 
-#: ../mail/importers/pine-importer.c:426
+#: ../mail/importers/pine-importer.c:424
 msgid "Evolution Pine importer"
 msgstr "مستورد pine لإيفُليوشِن"
 
-#: ../mail/importers/pine-importer.c:427
+#: ../mail/importers/pine-importer.c:425
 msgid "Import mail from Pine."
 msgstr "استيراد بريد من باين."
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
 msgstr "البريد إلى %s"
 
-#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
+#: ../mail/mail-autofilter.c:239 ../mail/mail-autofilter.c:278
 #, c-format
 msgid "Mail from %s"
 msgstr "البريد من %s"
 
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Subject is %s"
 msgstr "الموضوع هو %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:297
 #, c-format
 msgid "%s mailing list"
 msgstr "قائمة %s البريديّة"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:368
 msgid "Add Filter Rule"
 msgstr "أضِف قاعدة مرشحة"
 
-#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
-#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:519
+#: ../plugins/templates/templates.c:689 ../plugins/templates/templates.c:724
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#, fuzzy
 msgid "Templates"
-msgstr "قالب:"
+msgstr "قوالب"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:546
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -13891,7 +13817,7 @@ msgstr[1] "اثنان مُنتقيان، "
 msgstr[2] "%d منتقاة، "
 msgstr[3] "%d منتقاة، "
 
-#: ../mail/mail-component.c:554
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -13900,7 +13826,7 @@ msgstr[1] "%d حُذف"
 msgstr[2] "%d حُذف"
 msgstr[3] "%d حُذف"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:557
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -13909,7 +13835,7 @@ msgstr[1] "%d نفاية"
 msgstr[2] "%d نفاية"
 msgstr[3] "%d نفاية"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:560
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -13918,7 +13844,7 @@ msgstr[1] "%d مسوّدة"
 msgstr[2] "%d مسوّدة"
 msgstr[3] "%d مسوّدة"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -13927,7 +13853,7 @@ msgstr[1] "%d أُرسِل"
 msgstr[2] "%d أُرسِل"
 msgstr[3] "%d أُرسِل"
 
-#: ../mail/mail-component.c:568
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -13936,7 +13862,7 @@ msgstr[1] "%d غير مُرسَل"
 msgstr[2] "%d غير مُرسَل"
 msgstr[3] "%d غير مُرسَل"
 
-#: ../mail/mail-component.c:574
+#: ../mail/mail-component.c:570
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -13945,7 +13871,7 @@ msgstr[1] "%d غير مقروء"
 msgstr[2] "%d غير مقروء"
 msgstr[3] "%d غير مقروء"
 
-#: ../mail/mail-component.c:575
+#: ../mail/mail-component.c:571
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -13974,59 +13900,58 @@ msgstr "أنشئ مجلد بريد جديد"
 msgid "Failed upgrading Mail settings or folders."
 msgstr "فشل تحديث إعدادات أو مجلدات البريد"
 
-#: ../mail/mail-component.c:1593
+#: ../mail/mail-component.c:1596
 msgid "Error"
 msgstr "خطأ"
 
-#: ../mail/mail-component.c:1593
+#: ../mail/mail-component.c:1596
 msgid "Errors"
 msgstr "أخطاء"
 
-#: ../mail/mail-component.c:1594
+#: ../mail/mail-component.c:1597
 msgid "Warnings and Errors"
 msgstr "أخطاء و تنبيهات"
 
-#: ../mail/mail-component.c:1595
+#: ../mail/mail-component.c:1598
 msgid "Debug"
 msgstr "نقّح"
 
-#: ../mail/mail-component.c:1595
+#: ../mail/mail-component.c:1598
 msgid "Error, Warnings and Debug messages"
 msgstr "خطأ، تحذيرات ورسائل التنقيح"
 
-#: ../mail/mail-component.c:1722
+#: ../mail/mail-component.c:1725
 msgid "Debug Logs"
 msgstr "نقِّح السجلات"
 
-#: ../mail/mail-component.c:1736
+#: ../mail/mail-component.c:1739
 msgid "Show _errors in the status bar for"
 msgstr "أظهر الأ_خطاء في شريط المعلومات من أجل"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1752
-#, fuzzy
+#: ../mail/mail-component.c:1755
 msgid "second(s)."
-msgstr "ثوان."
+msgstr "ثانية."
 
-#: ../mail/mail-component.c:1758
+#: ../mail/mail-component.c:1761
 msgid "Log Messages:"
 msgstr "رسائل السجل:"
 
-#: ../mail/mail-component.c:1799
+#: ../mail/mail-component.c:1802
 msgid "Log Level"
 msgstr "مستوى الولوج"
 
-#: ../mail/mail-component.c:1808 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "الوقت"
 
-#: ../mail/mail-component.c:1818 ../mail/message-list.c:2454
+#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "رسائل"
 
-#: ../mail/mail-component.c:1827 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "غلق هذه النافذة"
@@ -14041,11 +13966,9 @@ msgstr "(ملاحظة: يتطلب إعادة تشغيل التطبيق)"
 
 #: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
-msgstr ""
-"<b>الاتصال الآمن بواسطة SSL ليس مدعومًا بواسطة هذه النسخة من إيفُليوشن</b>"
+msgstr "<b>الاتصال الآمن بواسطة SSL ليس مدعومًا بواسطة هذه النسخة من إيفُليوشن</b>"
 
 #: ../mail/mail-config.glade.h:5
-#, fuzzy
 msgid "<b>Sender Photograph</b>"
 msgstr "<b>صورة المرسل</b>"
 
@@ -14127,9 +14050,8 @@ msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">الخطوط المطبوعة</span>"
 
 #: ../mail/mail-config.glade.h:27
-#, fuzzy
 msgid "<span weight=\"bold\">Proxy Settings</span>"
-msgstr "<span weight=\"bold\">الحالة</span>"
+msgstr "<span weight=\"bold\">إعدادات الوسيط</span>"
 
 #: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
@@ -14216,9 +14138,8 @@ msgid "Ch_eck for Supported Types "
 msgstr "فح_ص الأنواع المدعومة"
 
 #: ../mail/mail-config.glade.h:51
-#, fuzzy
 msgid "Check cu_stom headers for junk"
-msgstr "ف_حص الترويسات المخصصة بحثًا عن النفايات"
+msgstr "تحقق عن ترويسات مخصصة للغثاء"
 
 #: ../mail/mail-config.glade.h:52
 msgid "Check incoming _messages for junk"
@@ -14281,19 +14202,16 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "توقي_ع الرسائل الصادرة رقميًا (إفتراضيًا)"
 
 #: ../mail/mail-config.glade.h:71
-#, fuzzy
 msgid "Do not format messages when text si_ze exceeds"
-msgstr "لا تهيئ محتويات النص في الرسائل إن تجاوز ح_جم النص"
+msgstr "لا تهيئ الرسائل إذا طغى _حجم النص"
 
 #: ../mail/mail-config.glade.h:72
-#, fuzzy
-msgid "Do not mar_k messages as junk if sender is in my addressbook"
-msgstr "لا تؤشر الرسائل كبريد نفاية إذا كان المُرسِل في دفتري للعناوين "
+msgid "Do not mar_k messages as junk if sender is in my address book"
+msgstr "لا ت_علّم الرسائل كغثاء إذا كان المرسل في دفتر عناويني"
 
 #: ../mail/mail-config.glade.h:73
-#, fuzzy
 msgid "Do not quote"
-msgstr "لا تحذف"
+msgstr "لا تقتبس"
 
 #: ../mail/mail-config.glade.h:74
 msgid "Done"
@@ -14356,9 +14274,8 @@ msgid "HTML Messages"
 msgstr "رسائل بتهيئة HTML"
 
 #: ../mail/mail-config.glade.h:91
-#, fuzzy
 msgid "H_TTP Proxy:"
-msgstr "_صندوق البريد:"
+msgstr "وسيط H_TTP:"
 
 #: ../mail/mail-config.glade.h:92
 msgid "Headers"
@@ -14373,9 +14290,8 @@ msgid "Inline"
 msgstr "ضمن السّياق"
 
 #: ../mail/mail-config.glade.h:96
-#, fuzzy
 msgid "Inline (Outlook style)"
-msgstr "أدرج الرسالة الأصلية (أسلوب أوتلوك)"
+msgstr "ضمن السياق (أسلوب أوتلوك)"
 
 #: ../mail/mail-config.glade.h:98
 msgid "KB"
@@ -14407,11 +14323,10 @@ msgstr "مؤلّف الرّسائل"
 
 #: ../mail/mail-config.glade.h:106
 msgid "No _Proxy for:"
-msgstr ""
+msgstr "لا و_سيط ل:"
 
 #: ../mail/mail-config.glade.h:107
-msgid ""
-"Note: Underscore in the label name is used as mnemonic identifier in menu."
+msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr "ملاحظة: التسطير السفلي في اسم اللصيقة يُستعمل كمُعَرِّف تذكيري في القائمة."
 
 #: ../mail/mail-config.glade.h:108
@@ -14421,9 +14336,8 @@ msgid ""
 msgstr "ملاحظة: لن تسأل عن كلمة السر حتى تتصل لأوّل مرّة"
 
 #: ../mail/mail-config.glade.h:109
-#, fuzzy
 msgid "Option is ignored if a match for custom junk headers is found."
-msgstr "سيُتجاوز هذا الخيار إذا ما وُجد تطابق مع ترويسات مخصصة لبريد نفاية. "
+msgstr "سيُتجاهل هذا الخيار إن وجد تطابق مع ترويسات مخصصة للغثاء. "
 
 #: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
@@ -14434,7 +14348,6 @@ msgid "PGP/GPG _Key ID:"
 msgstr "هوية _مفتاح PGP/GPG:"
 
 #: ../mail/mail-config.glade.h:112
-#, fuzzy
 msgid "Pass_word:"
 msgstr "_كلمة السر:"
 
@@ -14468,9 +14381,8 @@ msgid "Please select among the following options"
 msgstr "الرجاء الانتقاء من الخيارات التالية"
 
 #: ../mail/mail-config.glade.h:119
-#, fuzzy
 msgid "Port:"
-msgstr "ال_منْفذ:"
+msgstr "المنفذ:"
 
 #: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
@@ -14494,11 +14406,11 @@ msgstr "تذكر _كلمة السر"
 
 #: ../mail/mail-config.glade.h:126
 msgid "S_OCKS Host:"
-msgstr ""
+msgstr "مضيف S_OCKS:"
 
 #: ../mail/mail-config.glade.h:127
-msgid "S_earch for sender photograph only in local addressbooks"
-msgstr "ابح_ث عن صورة المرسل فقط في دفاتر العناوين المحلية"
+msgid "S_earch for sender photograph only in local address books"
+msgstr "ابح_ث عن صورة المرسل فقط في دفاتر العناوين المحلي"
 
 #: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
@@ -14566,7 +14478,7 @@ msgstr "التثبت من التهجئة"
 
 #: ../mail/mail-config.glade.h:146
 msgid "Start _typing at the bottom on replying"
-msgstr ""
+msgstr "ابدأ ال_كتابة من الأسفل عند الرد"
 
 #: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
@@ -14597,14 +14509,12 @@ msgstr ""
 "\"عمل\" أو \"شخصي\" مثلا"
 
 #: ../mail/mail-config.glade.h:154
-#, fuzzy
 msgid "Us_ername:"
 msgstr "ا_سم المستخدم:"
 
 #: ../mail/mail-config.glade.h:155
-#, fuzzy
 msgid "Use Authe_ntication"
-msgstr "التوثق"
+msgstr "استخدم الاستي_ثاق"
 
 #: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:284
 #: ../plugins/google-account-setup/google-source.c:625
@@ -14636,9 +14546,8 @@ msgid "_Always load images from the Internet"
 msgstr "حمل الصور من إنترنت دائمًا"
 
 #: ../mail/mail-config.glade.h:163
-#, fuzzy
 msgid "_Automatic proxy configuration URL:"
-msgstr "تعرّف آلي على الإبتسامات"
+msgstr "عنوان التشكيل الآ_لي للوسيط:"
 
 #: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
@@ -14646,7 +14555,7 @@ msgstr "ملحق البريد الم_همل الافتراضي:"
 
 #: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
-msgstr ""
+msgstr "اتصال م_باشر بالإنترنت"
 
 #: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
@@ -14665,18 +14574,16 @@ msgid "_Load images in messages from contacts"
 msgstr "_حمل الصور المضمنة في البريد من المراسَلين"
 
 #: ../mail/mail-config.glade.h:171
-#, fuzzy
-msgid "_Lookup in local addressbook only"
-msgstr "اسرد مجلّدات دفتر العناوين المحلي"
+msgid "_Lookup in local address book only"
+msgstr "ا_بحث في دفتر العناوين المحلي فقط"
 
 #: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "_جعل هذا حسابي الإفتراضي"
 
 #: ../mail/mail-config.glade.h:173
-#, fuzzy
 msgid "_Manual proxy configuration:"
-msgstr "إعدادات البريد"
+msgstr "تشكيل _يدوي للوسيط:"
 
 #: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
@@ -14691,9 +14598,8 @@ msgid "_Path:"
 msgstr "ال_مسار:"
 
 #: ../mail/mail-config.glade.h:178
-#, fuzzy
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
-msgstr "السؤال عند إرسال رسائل HTML للمراسَلين الذي لا يريدونها"
+msgstr "تمهّل قبل إرسال رسالة HTML للمراسلين الذين لا يريدونها"
 
 #: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
@@ -14709,7 +14615,7 @@ msgstr "_برنامج نصي:"
 
 #: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
-msgstr ""
+msgstr "وسيط HTTP آ_من:"
 
 #: ../mail/mail-config.glade.h:183
 msgid "_Select..."
@@ -14733,9 +14639,8 @@ msgid "_Use Secure Connection:"
 msgstr "است_خدم الاتصال الآمن:"
 
 #: ../mail/mail-config.glade.h:190
-#, fuzzy
 msgid "_Use system defaults"
-msgstr "استخدم الافترا_ضي"
+msgstr "إست_خدم إفتراضات النظام"
 
 #: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
@@ -14797,7 +14702,7 @@ msgstr "اي_جاد:"
 msgid "Find in Message"
 msgstr "أوجد في الرسالة"
 
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr "علم للمتابعة"
 
@@ -14904,82 +14809,82 @@ msgstr "أُلغِيَ."
 msgid "Complete."
 msgstr "تم."
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:871
 msgid "Saving message to folder"
 msgstr "يجري حفظ الرّسالة في المجلّد"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "يجري نقل الرسائل إلى %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Copying messages to %s"
 msgstr "يجري نسخ الرسائل إلى %s"
 
-#: ../mail/mail-ops.c:1164
+#: ../mail/mail-ops.c:1166
 msgid "Forwarded messages"
 msgstr "الرسائل الممرّرة"
 
-#: ../mail/mail-ops.c:1205
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "يجري فتح المجلّد %s"
 
-#: ../mail/mail-ops.c:1270
-#, fuzzy, c-format
+#: ../mail/mail-ops.c:1272
+#, c-format
 msgid "Retrieving quota information for folder %s"
-msgstr "معلومات المراسَل لـ %s"
+msgstr "جلب معلومات الحصة للمجلد %s"
 
-#: ../mail/mail-ops.c:1339
+#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Opening store %s"
 msgstr "يجري فتح المخزن %s"
 
-#: ../mail/mail-ops.c:1410
+#: ../mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "يجري إزالة المجلّد %s"
 
-#: ../mail/mail-ops.c:1499
+#: ../mail/mail-ops.c:1501
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "يجري تخزين المجلّد '%s'"
 
-#: ../mail/mail-ops.c:1562
+#: ../mail/mail-ops.c:1564
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "شطب وتخزين الحساب '%s'"
 
-#: ../mail/mail-ops.c:1563
+#: ../mail/mail-ops.c:1565
 #, c-format
 msgid "Storing account '%s'"
 msgstr "يجري تخزين الحساب '%s'"
 
-#: ../mail/mail-ops.c:1617
+#: ../mail/mail-ops.c:1619
 msgid "Refreshing folder"
 msgstr "يجري تحديث المجلّد"
 
-#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
 msgid "Expunging folder"
 msgstr "يجري شطب المجلّد"
 
-#: ../mail/mail-ops.c:1704
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "يجري إفراغ سلة المهملات في '%s'"
 
-#: ../mail/mail-ops.c:1705
+#: ../mail/mail-ops.c:1707
 msgid "Local Folders"
 msgstr "مجلّدات محلّيّة"
 
-#: ../mail/mail-ops.c:1786
+#: ../mail/mail-ops.c:1788
 #, c-format
 msgid "Retrieving message %s"
 msgstr "يجري سحب الرسالة %s"
 
-#: ../mail/mail-ops.c:1893
+#: ../mail/mail-ops.c:1895
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -14988,16 +14893,16 @@ msgstr[1] "يجري سحب %d رسالة"
 msgstr[2] "يجري سحب %d رسالة"
 msgstr[3] "يجري سحب %d رسالة"
 
-#: ../mail/mail-ops.c:1978
-#, fuzzy, c-format
+#: ../mail/mail-ops.c:1980
+#, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
-msgstr[0] "يجري حفظ %d رسالة"
-msgstr[1] "يجري حفظ %d رسالة"
+msgstr[0] "يحفظ رسالة %d"
+msgstr[1] "يحفظ رسائل %d"
 msgstr[2] "يجري حفظ %d رسالة"
 msgstr[3] "يجري حفظ %d رسالة"
 
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2058
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15006,11 +14911,11 @@ msgstr ""
 "حدث خطأ أثناء حفظ الرسائل إلى: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2128
+#: ../mail/mail-ops.c:2130
 msgid "Saving attachment"
 msgstr "يجري حفظ المُرفق"
 
-#: ../mail/mail-ops.c:2146 ../mail/mail-ops.c:2154
+#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15019,27 +14924,27 @@ msgstr ""
 "غير قادر عل انشاء ملف الخرج: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2169
+#: ../mail/mail-ops.c:2171
 #, c-format
 msgid "Could not write data: %s"
 msgstr "لم يمكن كتابة البيانات: %s"
 
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "يجري قطع الاتصال بـ%s"
 
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "يجري إعادة الاتصال بـ %s"
 
-#: ../mail/mail-ops.c:2411
+#: ../mail/mail-ops.c:2413
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "جارٍ تحضير حساب '%s' للعمل دون اتصال."
 
-#: ../mail/mail-ops.c:2497
+#: ../mail/mail-ops.c:2499
 msgid "Checking Service"
 msgstr "يجري فحص الخدمة"
 
@@ -15068,43 +14973,40 @@ msgstr "يجري الإنتظار..."
 msgid "Checking for new mail"
 msgstr "يجري تّفقّد وصول بريد جديد"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:207
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "أدخل جملة السر لـ%s"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 msgid "Enter Passphrase"
 msgstr "أدخل جملة السر"
 
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:212
+#: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "ادخل كلمة السر لـ %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 msgid "Enter Password"
 msgstr "أدخل كلمة السّر"
 
-#: ../mail/mail-session.c:254
+#: ../mail/mail-session.c:256
 msgid "User canceled operation."
 msgstr "عملية ألغاها المستخدم."
 
 #: ../mail/mail-signature-editor.c:201
-#, fuzzy
 msgid "_Save and Close"
-msgstr "احفظ و أغلق"
+msgstr "ا_حفظ و أغلق"
 
 #: ../mail/mail-signature-editor.c:355
-#, fuzzy
 msgid "Edit Signature"
-msgstr "تحرير التّوقيع"
+msgstr "حرر التوقيع"
 
 #: ../mail/mail-signature-editor.c:370
-#, fuzzy
 msgid "_Signature Name:"
-msgstr "جدول التوقيعات"
+msgstr "اسم الت_وقيع:"
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -15154,48 +15056,41 @@ msgid "New Search Folder"
 msgstr "مجلد بحث جديد"
 
 #: ../mail/mail.error.xml.h:1
-#, fuzzy
 msgid "A folder named \"{0}\" already exists. Please use a different name."
-msgstr "يوجد مجلد بالاسم &quot;{1}&quot; مسبقًا. رجاء حدد اسمًا مختلفًا."
+msgstr "مجلد بالاسم \"{0}\" موجود مسبقا. استخدم اسما مختلفا."
 
 #: ../mail/mail.error.xml.h:2
-#, fuzzy
 msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "يوجد مجلد بالاسم &quot;{1}&quot; مسبقًا. رجاء حدد اسمًا مختلفًا."
+msgstr "مجلد بالاسم \"{1}\" موجود مسبقا. استخدم اسما مختلفا."
 
 #: ../mail/mail.error.xml.h:3
-#, fuzzy
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
 msgstr ""
-"يوجد مجلد غير فارغ في &quot;{1}&quot; مسبقًا.\n"
+"مجلد غير فارغ موجود مسبقا في \"{1}\" .\n"
 "\n"
-"يمكنك أن تختار إما تجاهل هذا المجلد أو الكتابة فوقه أو الإلحاق إلى محتوياته "
-"أو الإنهاء."
+"يمكنك اختيار تجاهل هذا المجلد، أو الكتابة فوقه، أو الإضافة لمحتواه، أو الخروج."
 
 #: ../mail/mail.error.xml.h:6
-#, fuzzy
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
-msgstr "تم طلب إخطار الوصول لـ&quot;{1}&quot;. إرسال إخطار الوصول إلى {0}؟"
+msgstr "قد طُلب إشعار بالقراءة ل \"{1}\". أأرسل إشعارا إلى  {0}؟"
 
 #: ../mail/mail.error.xml.h:7
-#, fuzzy
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
-msgstr "توقيع بالاسم &quot;{0}&quot; موجود مسبقًا. رجاءً حدد اسمًا آخر."
+msgstr "توقيع بالاسم \"{0}\" موجود مسبقا. حدد اسما مختلفا."
 
 #: ../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."
-msgstr ""
-"إضافة سطر موضوع ذو معنى لرسائلك سيعطي مستقبل الرسالة فكرة عن هدف رسالتك."
+msgstr "إضافة سطر موضوع ذو معنى لرسائلك سيعطي مستقبل الرسالة فكرة عن هدف رسالتك."
 
 #: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
@@ -15206,8 +15101,7 @@ msgid "Are you sure you want to delete this account?"
 msgstr "هل أنت متأكد من أنك تريد حذف هذا الحساب؟"
 
 #: ../mail/mail.error.xml.h:11
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
+msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "هل أنت متأكد من أنك تريد تعطيل هذا الحساب وحذف كل وكلائه؟"
 
 #: ../mail/mail.error.xml.h:12
@@ -15218,16 +15112,13 @@ msgstr "هل أنت متأكد أنك تريد فتح {0} رسالة دفعة و
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
-msgstr ""
-"هل أنت متأكد أنك تريد إزالة جميع الرسائل المحذوفة في جميع المجلدات نهائيًا؟"
+msgstr "هل أنت متأكد أنك تريد إزالة جميع الرسائل المحذوفة في جميع المجلدات نهائيًا؟"
 
 #: ../mail/mail.error.xml.h:14
-#, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
-msgstr ""
-"هل أنت متأكد أنك تريد إزالة جميع الرسائل المحذوفة في جميع المجلدات نهائيًا؟"
+msgstr "أمتأكد من رغبتك بإزالة جميع الرسائل المحذوفة في المجلد \"{0}\" نهائيا؟"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -15235,128 +15126,107 @@ msgstr "هل أنت متأكد أنك تريد ارسال رسالة بتنسي�
 
 #: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr ""
-"هل انت متأكد أنك تريد إرسال رسالة لمستقبلي النسخة الكربونية المخفية فقط؟"
+msgstr "هل انت متأكد أنك تريد إرسال رسالة لمستقبلي النسخة الكربونية المخفية فقط؟"
 
 #: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "هل أنت متأكد أنك تريد إرسال رسالة بدون موضوع؟"
 
 #: ../mail/mail.error.xml.h:18
-#, fuzzy
 msgid "Because \"{0}\"."
-msgstr "لأن &quot;{0}&quot;."
+msgstr "لأن \"{0}\"."
 
 #: ../mail/mail.error.xml.h:20
-#, fuzzy
 msgid "Because \"{2}\"."
-msgstr "لأن &quot;{2}&quot;."
+msgstr "لأن \"{2}\"."
 
 #: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "توقيع فارغ"
 
 #: ../mail/mail.error.xml.h:22
-#, fuzzy
 msgid "Cannot add Search Folder \"{0}\"."
-msgstr "غير قادر على إضافة مجلد البحث &quot;{0}&quot;."
+msgstr "لا يمكن إضافة مجلد البحث \"{0}\"."
 
 #: ../mail/mail.error.xml.h:23
-#, fuzzy
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "غير قادر على نسخ المجلد &quot;{0}&quot; إلى &quot;{1}&quot;."
+msgstr "لا يمكن نسخ المجلد \"{0}\" إلى \"{1}\"."
 
 #: ../mail/mail.error.xml.h:24
-#, fuzzy
 msgid "Cannot create folder \"{0}\"."
-msgstr "غير قادر على إنشاء المجلد &quot;{0}&quot;."
+msgstr "لا يمكن إنشاء المجلد \"{0}\"."
 
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "غير قادر على إنشاء دليل حفظ مؤقت."
 
 #: ../mail/mail.error.xml.h:26
-#, fuzzy
 msgid "Cannot create the save directory, because \"{1}\""
-msgstr "غير قادر على إنشاء دليل الحفظ، لأن &quot;{1}&quot;"
+msgstr "لا يمكن إنشاء دليل الحفظ, لأن \"{1}\""
 
 #: ../mail/mail.error.xml.h:27
-#, fuzzy
 msgid "Cannot delete folder \"{0}\"."
-msgstr "غير قادر على حذف المجلد &quot;{0}&quot;."
+msgstr "لا يمكن حذف المجلد \"{0}\"."
 
 #: ../mail/mail.error.xml.h:28
-#, fuzzy
 msgid "Cannot delete system folder \"{0}\"."
-msgstr "غير قادر على حذف مجلد النظام &quot;{0}&quot;."
+msgstr "لا يمكن حذف مجلد النظام \"{0}\"."
 
 #: ../mail/mail.error.xml.h:29
-#, fuzzy
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
-msgstr "غير قادر على تحرير مجلد البحث &quot;{0}&quot; لأنه غير موجود."
+msgstr "لا يمكن تحرير مجلد البحث \"{0}\" لأنه غير موجود."
 
 #: ../mail/mail.error.xml.h:30
-#, fuzzy
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "غير قادر على نقل المجلد &quot;{0}&quot; إلى &quot;{1}&quot;."
+msgstr "لا يمكن نقل المجلد \"{0}\" إلى \"{1}\"."
 
 #: ../mail/mail.error.xml.h:31
-#, fuzzy
 msgid "Cannot open source \"{1}\""
-msgstr "غير قادر على فتح المصدر &quot;{1}&quot;"
+msgstr "لا يمكن فتح المصدر \"{1}\""
 
 #: ../mail/mail.error.xml.h:32
-#, fuzzy
 msgid "Cannot open source \"{2}\"."
-msgstr "غير قادر على فتح المصدر &quot;{2}&quot;."
+msgstr "لا يمكن فتح المصدر \"{2}\"."
 
 #: ../mail/mail.error.xml.h:33
-#, fuzzy
 msgid "Cannot open target \"{2}\"."
-msgstr "غير قادر على فتح الهدف &quot;{2}&quot;."
+msgstr "لا يمكن فتح الهدف \"{2}\"."
 
 #: ../mail/mail.error.xml.h:34
-#, fuzzy
 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."
 msgstr ""
-"غير قادر على قراءة ملف الترخيص &quot;{0}&quot;، نتيجة لمشكلة في التركيب. لن "
-"تستطيع استخدام هذا المزود قبل قبول ترخيصه."
+"لا يمكن قراءة ملف الترخيص \"{0}\", نتيجة لمشكلة في التثبيت. لن تستطيع "
+"استخدام هذا المزود حتى تتمكن من قبول ترخيصه."
 
 #: ../mail/mail.error.xml.h:35
-#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "غير قادر على إعادة تسمية &quot;{0}&quot; إلى &quot;{1}&quot;."
+msgstr "لا يمكن إعادة تسمية \"{0}\" إلى \"{1}\"."
 
 #: ../mail/mail.error.xml.h:36
-#, fuzzy
 msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "غير قادر على إعادة تسمية أو نقل مجلد النظام &quot;{0}&quot;."
+msgstr "لا يمكن إعادة تسمية أو نقل مجلد النظام \"{0}\"."
 
 #: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "غير قادر على حفظ التغييرات للحساب."
 
 #: ../mail/mail.error.xml.h:38
-#, fuzzy
 msgid "Cannot save to directory \"{0}\"."
-msgstr "غير قادر على الحفظ للدليل &quot;{0}&quot;."
+msgstr "لا يمكن الحفظ إلى الدليل \"{0}\"."
 
 #: ../mail/mail.error.xml.h:39
-#, fuzzy
 msgid "Cannot save to file \"{0}\"."
-msgstr "غير قادر على الحفظ للملف &quot;{0}&quot;."
+msgstr "لا يمكن الحفظ إلى ملف \"{0}\"."
 
 #: ../mail/mail.error.xml.h:40
-#, fuzzy
 msgid "Cannot set signature script \"{0}\"."
-msgstr "غير قادر على تعيين البرنامج النصي للتوقيع &quot;{0}&quot;."
+msgstr "لا يمكن تعيين نص التوقيع \"{0}\"."
 
 #: ../mail/mail.error.xml.h:41
-#, fuzzy
 msgid "Check Junk Failed"
-msgstr "فحص بحثًا عن النفاية"
+msgstr "فشل التحقق من الغثاء"
 
 #: ../mail/mail.error.xml.h:42
 msgid ""
@@ -15371,18 +15241,16 @@ msgid "Could not save signature file."
 msgstr "غير قادر على حفظ ملف التوقيع."
 
 #: ../mail/mail.error.xml.h:44
-#, fuzzy
 msgid "Delete \"{0}\"?"
-msgstr "حُذفت: "
+msgstr "حذف \"{0}\"؟"
 
 #: ../mail/mail.error.xml.h:45
 msgid "Delete account?"
 msgstr "حذف الحساب؟"
 
 #: ../mail/mail.error.xml.h:46
-#, fuzzy
 msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "حذف الرّسائل من مجلّد البحث؟"
+msgstr "حذف الرسائل في مجلد البحث \"{0}\"؟"
 
 #: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
@@ -15450,8 +15318,7 @@ msgstr "لن تستطيع استعادة هذه الرسائل إن تابعت."
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
-msgstr ""
-"إن ألغيت هذا المجلد فسيتم حذف كل محتوياته ومجلداته الفرعية بصورة دائمة."
+msgstr "إن ألغيت هذا المجلد فسيتم حذف كل محتوياته ومجلداته الفرعية بصورة دائمة."
 
 #: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
@@ -15473,8 +15340,7 @@ msgstr "إن أكملت، سيتم حذف معلومات الحساب بصورة
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
-msgstr ""
-"إن أنهيت إيفُليوشن، لن يتم إرسال هذه الرسائل إلا بعد فتح إيفُليوشن مرة أخرى."
+msgstr "إن أنهيت إيفُليوشن، لن يتم إرسال هذه الرسائل إلا بعد فتح إيفُليوشن مرة أخرى."
 
 #: ../mail/mail.error.xml.h:68
 msgid "Ignore"
@@ -15550,9 +15416,8 @@ msgid "Please wait."
 msgstr "رجاءً انتظر."
 
 #: ../mail/mail.error.xml.h:85
-#, fuzzy
 msgid "Problem migrating old mail folder \"{0}\"."
-msgstr "حدثت مشكلة أثناء تهجير مجلد البريد القديم &quot;{0}&quot;."
+msgstr "خطأ في تهجير مجلد البريد القديم \"{0}\"."
 
 #: ../mail/mail.error.xml.h:86
 msgid "Querying server"
@@ -15567,18 +15432,16 @@ msgid "Read receipt requested."
 msgstr "تم طلب إخطار قراءة."
 
 #: ../mail/mail.error.xml.h:89
-#, fuzzy
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "هل تريد فعلًا حذف المجلد &quot;{0}&quot; وكل مجلداته الفرعية؟"
+msgstr "أحقا تحذف المجلد \"{0}\" وكل مجلداته الفرعية؟"
 
 #: ../mail/mail.error.xml.h:90
-#, fuzzy
 msgid "Report Junk Failed"
-msgstr "إستيراد ملف"
+msgstr "فشل الإبلاغ عن غثاء"
 
 #: ../mail/mail.error.xml.h:91
 msgid "Report Not Junk Failed"
-msgstr ""
+msgstr "فشل الإبلاغ بأنه ليس غثاء"
 
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
@@ -15625,7 +15488,6 @@ msgstr ""
 "على الأقل في خانة إلى: أو ن.ك:."
 
 #: ../mail/mail.error.xml.h:101
-#, fuzzy
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -15633,14 +15495,13 @@ msgid ""
 "    \"{1}\"\n"
 "And have been updated."
 msgstr ""
-"مجلد/مجلدات البحث الآتية:\n"
+"مجلدات البحث التالية:\n"
 "{0}\n"
-"كانت تستخدم المجلد المُزال:\n"
-"    &quot;{1}&quot;\n"
-"وقد تم تحديثها."
+"استخدمت المجلد المحذوف الآن:\n"
+"    \"{1}\"\n"
+"و قد حدّثت."
 
 #: ../mail/mail.error.xml.h:106
-#, fuzzy
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -15648,11 +15509,11 @@ msgid ""
 "    \"{1}\"\n"
 "And have been updated."
 msgstr ""
-"قاعدة/قواعد المرشح الآتية:\n"
+"قاعدة الترشيح الحالية:\n"
 "{0}\n"
-"كانت تستخدم المجلد المُزال:\n"
-"    &quot;{1}&quot;\n"
-"وقد تم تحديثها."
+"استخدمت المجلد المحذوف الآن:\n"
+"    \"{1}\"\n"
+"وقد حدّثت."
 
 #: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
@@ -15673,8 +15534,7 @@ msgid ""
 msgstr "لا يمكن إرسال هذه الرسالة لأن الحساب الذي اخترت الإرسال به ليس مفعلًا"
 
 #: ../mail/mail.error.xml.h:115
-msgid ""
-"This message cannot be sent because you have not specified any recipients"
+msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "لا يمكن إرسال هذه الرسالة لأنك لم تحدد أي مستلمين لها"
 
 #: ../mail/mail.error.xml.h:116
@@ -15691,8 +15551,7 @@ msgstr "تم تغيير هذا التوقيع، لكن لم يتم حفظه."
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
-msgstr ""
-"هذا سيضع علامة مقروء لكل الرسائل في المجلد المنتقى وكل مجلداته الفرعية."
+msgstr "هذا سيضع علامة مقروء لكل الرسائل في المجلد المنتقى وكل مجلداته الفرعية."
 
 #: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
@@ -15759,9 +15618,8 @@ msgstr ""
 "المجلدات البعيدة، أو النوعين."
 
 #: ../mail/mail.error.xml.h:134
-#, fuzzy
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "فشل ولوجك على خادوم &quot;{0}&quot; الخاص بك بالاسم &quot;{0}&quot;."
+msgstr "فشل ولوجك للخادم \"{0}\" ك \"{0}\"."
 
 #: ../mail/mail.error.xml.h:135
 msgid "_Append"
@@ -15796,9 +15654,8 @@ msgid "Answered"
 msgstr "مجاب"
 
 #: ../mail/message-list.c:1055
-#, fuzzy
 msgid "Forwarded"
-msgstr "مرر"
+msgstr "ممررة"
 
 #: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
@@ -15852,20 +15709,19 @@ msgid "%b %d %Y"
 msgstr "%b %d %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:4373
+#: ../mail/message-list.c:3916 ../mail/message-list.c:4376
 msgid "Generating message list"
 msgstr "يجري إنشاء قائمة الرسائل"
 
-#: ../mail/message-list.c:4223
+#: ../mail/message-list.c:4224
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
-msgstr ""
+msgstr "لا رسائل توافق معايير بحثك. إما امسح البحث من عنصر قائمة بحث->مسح أو غيّره."
 
-#: ../mail/message-list.c:4225
-#, fuzzy
+#: ../mail/message-list.c:4226
 msgid "There are no messages in this folder."
-msgstr "أرسِل رد على رسالة في مجلّد عمومي"
+msgstr "لا رسائل في هذا المجلد."
 
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
@@ -15896,39 +15752,39 @@ msgstr "رسائل مرسلة"
 msgid "Size"
 msgstr "الحجم"
 
-#: ../mail/message-tag-followup.c:55
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "نداء"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "لا تمرر"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr "متابعة"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "لمعلوماتك"
 
-#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "مرر"
 
-#: ../mail/message-tag-followup.c:60
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "لا داعي للرّد"
 
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "رد"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "رد على الجميع"
 
-#: ../mail/message-tag-followup.c:65
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "مراجعة"
 
@@ -15953,9 +15809,8 @@ msgid "Subject contains"
 msgstr "الموضوع يحتوي"
 
 #: ../mail/searchtypes.xml.h:6
-#, fuzzy
 msgid "Subject or Recipients contains"
-msgstr "الموضوع أو المرسِل يحتويان على"
+msgstr "الموضوع أو المتلقون يحوي"
 
 #: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
@@ -15982,7 +15837,7 @@ msgid ""
 msgstr "قائمة الدلالات التي سيبحث عنها ملحق مُذَكِّر المرفقات في متن الرسالة."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:474
-#: ../plugins/templates/templates.c:394
+#: ../plugins/templates/templates.c:392
 msgid "Keywords"
 msgstr "الكلمات الأساسية"
 
@@ -15995,8 +15850,7 @@ msgstr "مذكّر المرفقات"
 msgid ""
 "Looks for clues in a message for mention of attachments and warns if the "
 "attachment is missing"
-msgstr ""
-"ابحث عن الدلالات في رسالة للتنبه للمرفقات والتحذير إن كان المرفق مفقودًا"
+msgstr "ابحث عن الدلالات في رسالة للتنبه للمرفقات والتحذير إن كان المرفق مفقودًا"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
@@ -16011,9 +15865,8 @@ msgid "Message has no attachments"
 msgstr "رسالة بدون مرفقات"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
-#, fuzzy
 msgid "_Edit Message"
-msgstr "_حرر رسالة"
+msgstr "_حرر الرسالة"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
@@ -16027,27 +15880,27 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "ملحق المرفقات الصوتية"
 
-#: ../plugins/backup-restore/backup-restore.c:107
+#: ../plugins/backup-restore/backup-restore.c:127
 msgid "Select name of the Evolution backup file"
 msgstr "انتق اسمًا لملف أرشيف إيفُليوشن"
 
-#: ../plugins/backup-restore/backup-restore.c:136
+#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
 msgstr "أ_عد تشغيل إيفُليوشن بعد النسخ الاحتياطي"
 
-#: ../plugins/backup-restore/backup-restore.c:159
+#: ../plugins/backup-restore/backup-restore.c:179
 msgid "Select name of the Evolution backup file to restore"
 msgstr "انتق اسمًا لملف أرشيف إيفُليوشن لاسترجاعه"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:203
 msgid "_Restart Evolution after restore"
 msgstr "أ_عد تشغيل إيفُليوشن بعد الاستعادة"
 
-#: ../plugins/backup-restore/backup-restore.c:256
+#: ../plugins/backup-restore/backup-restore.c:276
 msgid "Restore from backup"
 msgstr "استرجع من النسخة الاحتياطية"
 
-#: ../plugins/backup-restore/backup-restore.c:258
+#: ../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"
@@ -16057,122 +15910,120 @@ msgstr ""
 "والتقويمات والمهمات والمذكرات والمراسَلين. \n"
 "إنه يسترجع أيضًا إعداداتك الشخصية ومرشحات البريد، إلخ."
 
-#: ../plugins/backup-restore/backup-restore.c:264
+#: ../plugins/backup-restore/backup-restore.c:284
 msgid "_Restore Evolution from the backup file"
 msgstr "استر_جع إيفوليوشن من ملف النسخة الاحتياطية"
 
-#: ../plugins/backup-restore/backup-restore.c:271
+#: ../plugins/backup-restore/backup-restore.c:291
 msgid "Please select an Evolution Archive to restore:"
 msgstr "انتق أرشيف إيفُليوشن لاسترجاعه:"
 
-#: ../plugins/backup-restore/backup-restore.c:274
+#: ../plugins/backup-restore/backup-restore.c:294
 msgid "Choose a file to restore"
 msgstr "اختر ملفًا لاسترجاعه"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
 msgstr "انسخ دليل إيفُليوشن إحتياطيًا"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
 msgstr "استعد دليل إيفُليوشن"
 
-#: ../plugins/backup-restore/backup.c:50
+#: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
 msgstr "تحقق من نسخ إيفُليوشِن الاحتياطي"
 
-#: ../plugins/backup-restore/backup.c:52
+#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "أعد تشغيل إيفُليوشن"
 
-#: ../plugins/backup-restore/backup.c:54
+#: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
 msgstr "مع واجهة المستخدم الرسومية"
 
-#: ../plugins/backup-restore/backup.c:105
-#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
 msgid "Shutting down Evolution"
 msgstr "يجري إطفاء إيفوليوشن"
 
-#: ../plugins/backup-restore/backup.c:112
+#: ../plugins/backup-restore/backup.c:132
 msgid "Backing Evolution accounts and settings"
 msgstr "يجري النسخ الاحتياطي لحسابات وإعدادات إيفُليوشن"
 
-#: ../plugins/backup-restore/backup.c:116
+#: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "جارٍ النسخ الاحتياطي لبيانات إيفوليوشن (البريد، المراسَلون، التقويم، المهمات، "
 "المذكرات)"
 
-#: ../plugins/backup-restore/backup.c:127
+#: ../plugins/backup-restore/backup.c:147
 msgid "Backup complete"
 msgstr "اكتمل النسخ الاحتياطي"
 
-#: ../plugins/backup-restore/backup.c:132
-#: ../plugins/backup-restore/backup.c:319
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
 msgid "Restarting Evolution"
 msgstr "جارٍ إعادة تشغيل إيفُليوشن"
 
-#: ../plugins/backup-restore/backup.c:242
+#: ../plugins/backup-restore/backup.c:262
 msgid "Backup current Evolution data"
 msgstr "انسخ بيانات إيفُليوشن الحالية احتياطيًا"
 
-#: ../plugins/backup-restore/backup.c:247
+#: ../plugins/backup-restore/backup.c:267
 msgid "Extracting files from backup"
 msgstr "جارٍ استخراج الملفات من النسخة الاحتياطية"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:274
 msgid "Loading Evolution settings"
 msgstr "جارٍ تحميل إعدادات إيفُليوشِن"
 
-#: ../plugins/backup-restore/backup.c:258
+#: ../plugins/backup-restore/backup.c:278
 msgid "Removing temporary backup files"
 msgstr "جارٍ إزالة ملفات النسخ الاحتياطي المؤقتة"
 
-#: ../plugins/backup-restore/backup.c:265
+#: ../plugins/backup-restore/backup.c:285
 msgid "Ensuring local sources"
-msgstr ""
+msgstr "ضمان المصادر المحلية"
 
-#: ../plugins/backup-restore/backup.c:435
+#: ../plugins/backup-restore/backup.c:455
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "جارٍ النسخ الاحتياطي إلى المجلد %s"
 
-#: ../plugins/backup-restore/backup.c:440
+#: ../plugins/backup-restore/backup.c:460
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "يجري الاسترجاع من المجلد %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Backup"
 msgstr "نسخ إيفُليوشِن الاحتياطي"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Restore"
 msgstr "استرجاع إيفُليوشِن"
 
-#: ../plugins/backup-restore/backup.c:494
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:514
 msgid "Backing up Evolution Data"
-msgstr "انسخ بيانات إيفُليوشن الحالية احتياطيًا"
+msgstr "ينسخ بيانات إيفُليوشِن احتياطيا"
 
-#: ../plugins/backup-restore/backup.c:495
+#: ../plugins/backup-restore/backup.c:515
 msgid "Please wait while Evolution is backing up your data."
-msgstr ""
+msgstr "انتظر ريثما ينسخ إيفُليوشن بياناتك احتياطيا."
 
-#: ../plugins/backup-restore/backup.c:497
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:517
 msgid "Restoring Evolution Data"
-msgstr "جارٍ إعادة تشغيل إيفُليوشن"
+msgstr "استعادة بيانات إيفُليوشن"
 
-#: ../plugins/backup-restore/backup.c:498
+#: ../plugins/backup-restore/backup.c:518
 msgid "Please wait while Evolution is restoring your data."
-msgstr ""
+msgstr "انتظر ريثما يستعيد إيفُليوشن بياناتك."
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:536
 msgid "This may take a while depending on the amount of data in your account."
-msgstr ""
+msgstr "قد يطول هذا اعتمادا على قدر المعلومات في حسابك."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
@@ -16188,8 +16039,7 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "هل أنت متأكد من أنك تريد إغلاق إيفوليوشن؟"
 
 #: ../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?"
+msgid "Are you sure you want to restore Evolution from the selected backup file?"
 msgstr "أمتأكد أنك ترغب في استرجاع إيفوليوشن من ملف النسخ الاحتياطي المحدد؟"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
@@ -16204,9 +16054,8 @@ msgstr ""
 "إيفوليوشن أن يبدأ تلقائيًا بعد النسخ الاحتياطي، رجاءً فعّل مفتاح التبديل."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
-#, fuzzy
 msgid "Insufficient Permissions"
-msgstr "أذون المُفَوَّضْ"
+msgstr "أذون غير كافية"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
@@ -16217,9 +16066,8 @@ msgid "Please select a valid backup file to restore."
 msgstr "رجاءً انتق ملف نسخ احتياطي صالح في إيفُليوشن لاسترجاعه."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-#, fuzzy
 msgid "The selected folder is not writable."
-msgstr "نسخ المجلد المُنتقى إلى داخل مجلد آخر"
+msgstr "المجلد المحدد غير قابل للكتابة."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
@@ -16253,9 +16101,8 @@ msgstr "المراسَلون التلقائيون"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:567
-#, fuzzy
-msgid "_Auto-create addressbook entries when replying to messages"
-msgstr "أنشئ تل_قائيًا مداخل في دفتر العناوين عند الرد على الرسائل"
+msgid "_Auto-create address book entries when replying to messages"
+msgstr "آ_ليا أنشئ مدخلات في دفتر العناوين عند الرد على الرسائل"
 
 #: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
@@ -16267,9 +16114,8 @@ msgstr "مراسَلو المراسلة الفورية"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:603
-#, fuzzy
 msgid "Synchronize contact info and images from Pidgin buddy list"
-msgstr "زامِن معلومات المراسَلين وصورهم دوريًا مع قائمة أصدقاء Pidgin"
+msgstr "زامِن معلومات المراسَلين وصورهم منع قائمة أصدقء بدْجنn"
 
 #: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
@@ -16282,11 +16128,11 @@ msgstr "_زامن مع قائمة الأصدقاء الآن"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid ""
-"Automatically fills your addressbook with names and email addresses as you "
+"Automatically fills your address book with names and email addresses as you "
 "reply to messages. Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
-"لملء دفتر عناوينك بالأسماء وعناوين البريد الإلكتروني عند ردك على الرسائل. "
+"لملء دفتر عناوينك بالأسماء وعناوين البريد الإلكتروني عند ردك على الرسائل تلقائيا. "
 "ولملئه أيضًا بمعلومات الاتصال عن طريق المراسلة الفورية بمن هم في قائمة "
 "أصدقائك."
 
@@ -16296,24 +16142,24 @@ 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
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while spawning %s: %s."
-msgstr "حدث خطأ أثناء الطباعة"
+msgstr "حدث خطأ أثناء الاندفاع %s: %s."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
-msgstr ""
+msgstr "عالعملية الابن لمرشح Bogo لا تستجيب, توقف...."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
-msgstr ""
+msgstr "تمت مقاطعة انتظار العملية الابن لمرشح Bogo, الإنهاء..."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
-msgstr ""
+msgstr "فشل التمرير إلى مرشح Bogo, رمز الخطأ: %d."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
 msgid "Convert message text to _Unicode"
@@ -16333,12 +16179,11 @@ msgstr ""
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
 msgid "Bogofilter Options"
-msgstr "خيارات Bogofilter"
+msgstr "خيارات مرشح Bogo"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-#, fuzzy
 msgid "Bogofilter junk plugin"
-msgstr "خيارات Bogofilter"
+msgstr "ملحق مرشح Bogo للغثاء"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
@@ -16379,9 +16224,8 @@ msgstr "يوفر الوظائف الأساسية للتقويمات المحلي
 #: ../plugins/calendar-weather/calendar-weather.c:546
 #: ../plugins/google-account-setup/google-source.c:642
 #: ../plugins/google-account-setup/google-contacts-source.c:320
-#, fuzzy
 msgid "Re_fresh:"
-msgstr "أعِد الت_حميل"
+msgstr "إ_نعاش:"
 
 #: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
@@ -16456,8 +16300,7 @@ msgstr "تقويمات الطقس"
 msgid ""
 "A test plugin which demonstrates a popup menu plugin which lets you copy "
 "things to the clipboard."
-msgstr ""
-"ملحق اختباري يظهر مثالًا لملحق يعرض قائمة منبثقة تسمح لك بنسخ أشياء للحافظة."
+msgstr "ملحق اختباري يظهر مثالًا لملحق يعرض قائمة منبثقة تسمح لك بنسخ أشياء للحافظة."
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
@@ -16468,8 +16311,7 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "إفحص ما إذا كان إيفُليوشن هو مرسل البريد الافتراضي"
 
 #: ../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."
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr "تأكد دائمًا من أن إيفُليوشن هو عميل البريد الافتراضي عند فتحه."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
@@ -16489,25 +16331,21 @@ msgstr "هل تريد جعل إيفُليوشن عميلًا افتراضيًا
 msgid "Evolution"
 msgstr "إيفُليوشن"
 
-#: ../plugins/default-source/default-source.c:81
-#, fuzzy
+#: ../plugins/default-source/default-source.c:82
 msgid "Mark as _default address book"
-msgstr "علم كمجلد افترا_ضي"
+msgstr "علّم كدفتر العناوين الإ_فتراضي"
 
-#: ../plugins/default-source/default-source.c:102
-#, fuzzy
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default calendar"
-msgstr "علم كمجلد افترا_ضي"
+msgstr "علّم كالتقويم الإ_فتراضي"
 
-#: ../plugins/default-source/default-source.c:103
-#, fuzzy
+#: ../plugins/default-source/default-source.c:104
 msgid "Mark as _default task list"
-msgstr "علم كمجلد افترا_ضي"
+msgstr "علّم كقائمة المهام الا_فتراضية"
 
-#: ../plugins/default-source/default-source.c:104
-#, fuzzy
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default memo list"
-msgstr "علم كمجلد افترا_ضي"
+msgstr "علم كقائمة المذكرات الا_فتراضية"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
@@ -16515,26 +16353,24 @@ msgstr "المصادر الافتراضية"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
 msgid ""
-"Provides functionality for marking a calendar or an addressbook as the "
+"Provides functionality for marking a calendar or an address book as the "
 "default one."
 msgstr ""
-"يوفر امكانية وضع علامة لتقويم أو دفتر عناوين لجعله التقويم أو دفتر العناوين "
-"الافتراضي."
+"يوفر إمكانية وضع علامة لتقويم أو دفتر عناوين "
+"كافتراضي."
 
-#: ../plugins/email-custom-header/email-custom-header.c:558
-#, fuzzy
+#: ../plugins/email-custom-header/email-custom-header.c:560
 msgid "_Custom Header"
-msgstr "ترويسات مخصصة"
+msgstr "ترويسة _مخصصة"
 
-#: ../plugins/email-custom-header/email-custom-header.c:879
-#, fuzzy
+#: ../plugins/email-custom-header/email-custom-header.c:881
 msgid "Key"
-msgstr "كينيا"
+msgstr "المفتاح"
 
-#: ../plugins/email-custom-header/email-custom-header.c:890
-#: ../plugins/templates/templates.c:400
+#: ../plugins/email-custom-header/email-custom-header.c:892
+#: ../plugins/templates/templates.c:398
 msgid "Values"
-msgstr ""
+msgstr "القيم"
 
 #. 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
@@ -16542,26 +16378,25 @@ msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
 msgstr ""
+"هيئة تحديد قيمة المفتاح للترويسة المخصصة هي:\n"
+"أسماء قيم المفتاح للترويسة المخصصة مفصولةً ب \";\"."
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
-#, fuzzy
 msgid "Email Custom Header"
-msgstr "ترويسات مخصصة"
+msgstr "ترويسة بريد.إ مخصصة"
 
 #. 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 ""
+msgstr "يضيف ترويسة خاصة للرسائل الصادرة."
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
-#, fuzzy
 msgid "Custom Header"
-msgstr "ترويسات مخصصة"
+msgstr "ترويسة مخصصة"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-#, fuzzy
 msgid "List of Custom Headers"
-msgstr "ترويسات مخصصة"
+msgstr "قائمة بالترويسات المخصصة"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
 msgid ""
@@ -16569,6 +16404,9 @@ msgid ""
 "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"
@@ -16608,8 +16446,7 @@ msgstr "كلمة سر نصّيّة"
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
-msgstr ""
-"يسمح لك هذا الخيار بالاتصال بخادوم إكستشينج باستخدام توثّق كلمة سر نصّّيّّة."
+msgstr "يسمح لك هذا الخيار بالاتصال بخادوم إكستشينج باستخدام توثّق كلمة سر نصّّيّّة."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
@@ -16680,9 +16517,8 @@ msgid "A_uthenticate"
 msgstr "و_ثِّق"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:735
-#, fuzzy
 msgid "_Mailbox:"
-msgstr "_بريد"
+msgstr "_صندوق البريد:"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
@@ -16704,7 +16540,7 @@ msgstr "%s ك.بايت"
 msgid "0 KB"
 msgstr "٠ ك.بايت"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../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"
@@ -16716,7 +16552,7 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:113
+#: ../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"
@@ -16724,7 +16560,7 @@ msgstr ""
 "كلمة السر الحالية لا تتطابق مع كلمة السر الموجودة لحسابك. رجاءً أدخل كلمة "
 "السر الصحيحة"
 
-#: ../plugins/exchange-operations/exchange-change-password.c:120
+#: ../plugins/exchange-operations/exchange-change-password.c:121
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "كلمتا السر غير متطابقتين. الرجاء إعادة إدخال كلمتي السر."
 
@@ -16744,13 +16580,13 @@ msgstr "كلمة السر الجديدة:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "انتهت صلاحيّة كلمة سرك الحاليّة. الرجاء تغيير كلمة سرك الآن."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:660
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "كلمة سرك ستنتهي صلاحيتها خلال ال%d يوم التالية"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:152
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "مخصص"
 
@@ -16775,7 +16611,7 @@ msgid "Delegate Permissions"
 msgstr "أذون المُفَوَّضْ"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:251
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
 msgstr "التصاريح لـ%s"
@@ -16816,43 +16652,43 @@ msgstr "على أي حال، ليس مسموحًا لك برؤية عناصري
 msgid "You have been designated as a delegate for %s"
 msgstr "لقد عُيّنتَ كمندوب عن %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:415
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To"
 msgstr "مندوب عن"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:580
+#: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "إزالة المندوب %s؟"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:698
+#: ../plugins/exchange-operations/exchange-delegates.c:700
 msgid "Could not access Active Directory"
 msgstr "غير قادر على النفاذ لأكتيف دايركتوري"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:710
+#: ../plugins/exchange-operations/exchange-delegates.c:712
 msgid "Could not find self in Active Directory"
 msgstr "غير قادر على إيجاد نفسي في أكتيف دايركتوري"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:723
+#: ../plugins/exchange-operations/exchange-delegates.c:725
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "غير قادر على إيجاد المُفَوَّضْ %s في أكتيف دايركتوري"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:735
+#: ../plugins/exchange-operations/exchange-delegates.c:737
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "غير قادر على إزالة المُفَوَّضْ %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:795
+#: ../plugins/exchange-operations/exchange-delegates.c:797
 msgid "Could not update list of delegates."
 msgstr "غير قادر على تحديث قائمة المُفَوَّضِين."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:813
+#: ../plugins/exchange-operations/exchange-delegates.c:815
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "غير قادر على إضافة المُفَوَّضْ %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:981
+#: ../plugins/exchange-operations/exchange-delegates.c:983
 msgid "Error reading delegates list."
 msgstr "حدث خطأ أثناء قراءة قائمة المُفَوَّضِين."
 
@@ -16900,26 +16736,25 @@ msgstr "ل_خـّص الأذونات"
 msgid "_Tasks:"
 msgstr "_مهام:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:59
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "التصاريح..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "اسم المجلّد"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
 msgstr "حجم المجلّد"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
 msgid "User"
-msgstr "_مستخدم"
+msgstr "المستخدم"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
+#: ../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 "الاشتراك في مجلد مستخدم آخر"
@@ -16928,20 +16763,20 @@ msgstr "الاشتراك في مجلد مستخدم آخر"
 msgid "Exchange Folder Tree"
 msgstr "شجرة مجلّدات إكستشينج"
 
-#: ../plugins/exchange-operations/exchange-folder.c:65
-#: ../plugins/exchange-operations/exchange-folder.c:234
-#: ../plugins/exchange-operations/exchange-folder.c:244
+#: ../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 "ألغاء الإشتراك في المجلّد..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:464
-#: ../plugins/exchange-operations/exchange-folder.c:519
+#: ../plugins/exchange-operations/exchange-folder.c:466
+#: ../plugins/exchange-operations/exchange-folder.c:521
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "هل تريد فعلًا إلغاء الاشتراك في المجلد \"%s\"؟"
 
-#: ../plugins/exchange-operations/exchange-folder.c:476
-#: ../plugins/exchange-operations/exchange-folder.c:531
+#: ../plugins/exchange-operations/exchange-folder.c:478
+#: ../plugins/exchange-operations/exchange-folder.c:533
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "ألغاء الإشتراك في \"%s\""
@@ -17005,16 +16840,16 @@ msgstr "ستنتهي صلاحية كلمة السر الخاصة بك في 7 أ�
 msgid "_Change Password"
 msgstr "ت_غيير كلمة السر"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 msgid "(Permission denied.)"
 msgstr "(رُفض التّصريح.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 msgid "Add User:"
 msgstr "أضِف مستخدم:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
-#: ../plugins/exchange-operations/exchange-send-options.c:408
+#: ../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:715
 msgid "Add User"
@@ -17134,15 +16969,11 @@ msgstr "ال_حساسية:"
 msgid "_User"
 msgstr "_مستخدم"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
-msgid "button-user"
-msgstr "زر المستخدم"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:138
+#: ../plugins/exchange-operations/exchange-user-dialog.c:136
 msgid "Select User"
 msgstr "انتقاء مستخدم"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:176
+#: ../plugins/exchange-operations/exchange-user-dialog.c:174
 msgid "Address Book..."
 msgstr "دفتر عناوين..."
 
@@ -17155,11 +16986,10 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "إشترك في تقويم تابع لمستخدم آخر"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-#, fuzzy
 msgid ""
 "A plugin that manages a collection of Exchange account specific operations "
 "and features."
-msgstr "ملحق للتعامل مع مجموعة من العمليات والمزايا الخاصة بإكستشينج."
+msgstr "ملحق يدير مجموعة من العمليات والمزايا الخاصة بحسابات إكستشينج."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -17181,8 +17011,7 @@ msgstr "غير قادر على أداء العملية"
 msgid ""
 "Changes to options for Exchange account \"{0}\" will only take effect after "
 "restarting Evolution."
-msgstr ""
-"تغييرات حساب إكستشينج \"{0}\" لن يظهر مفعولها إلا بعد إعادة بدء إيفُليوشن."
+msgstr "تغييرات حساب إكستشينج \"{0}\" لن يظهر مفعولها إلا بعد إعادة بدء إيفُليوشن."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 msgid "Could not authenticate to server."
@@ -17248,7 +17077,7 @@ 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 ""
+msgstr "يطلب إيفوليوشن إعادة التشغيل لتحميل صندوق بريد المستخدم المشترك."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
@@ -17432,8 +17261,7 @@ msgstr "عمليّة غير مدعومة"
 
 #: ../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 ""
-"لقد قاربت على استخدام كل المساحة المخصصة لتخزين البريد على هذا الخادوم."
+msgstr "لقد قاربت على استخدام كل المساحة المخصصة لتخزين البريد على هذا الخادوم."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
@@ -17500,13 +17328,12 @@ msgid "Check folder permissions"
 msgstr "فحص تصريحات المجلد"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
-#, fuzzy
 msgid "Default External Editor"
-msgstr "محرّر خارجي"
+msgstr "المحرر الخارجي الافتراضي"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
 msgid "The default command that must be used as the editor."
-msgstr ""
+msgstr "الأمر الافتراضي الواجب استخدامه كمحرر."
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid ""
@@ -17520,54 +17347,56 @@ msgid "External Editor"
 msgstr "محرّر خارجي"
 
 #: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
-#, fuzzy
 msgid "Cannot create Temporary File"
-msgstr "غير قادر على إنشاء دليل حفظ مؤقت."
+msgstr "لا يمكن إنشاء ملف مؤقت"
 
 #: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
 msgid "Editor not launchable"
-msgstr ""
+msgstr "المحرر غير قابل للتشغيل"
 
 #: ../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."
-msgstr ""
+msgstr "إيفليوشن غير قادر على إنشاء ملف مؤقت لحفظ رسالتك. حاول لاحقا."
 
 #: ../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."
 msgstr ""
+"لا يمكن إطلاق المحرر الخارجي المعيّن في تفضيلاتك للملحقات. حاول تعيين محرر "
+"آخر."
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-#, fuzzy
 msgid "Compose in _External Editor"
-msgstr "اكتبْ في محرر خارجي"
+msgstr "اكتبف في محرر_ خارجي "
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
 msgstr "اكتبْ الرسائل مستخدما محررا خارجيا"
 
-#: ../plugins/external-editor/external-editor.c:91
+#: ../plugins/external-editor/external-editor.c:112
 msgid "Command to be executed to launch the editor: "
-msgstr ""
+msgstr "الأمر لينفّذ لإطلاق المحرر:"
 
-#: ../plugins/external-editor/external-editor.c:92
+#: ../plugins/external-editor/external-editor.c:113
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
 msgstr ""
+"ل Emacs استخدم \"xemacs\"\n"
+"ل VI استخدم \"gvim\""
 
-#: ../plugins/face/face.c:58
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "اختر صورة png (48*48) حجمها أقل من 700 بايت"
 
-#: ../plugins/face/face.c:68
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "ملفات PNG"
 
-#: ../plugins/face/face.c:125
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "ال_وجه"
 
@@ -17581,10 +17410,6 @@ msgstr ""
 "إعداد صورة png 48*48. ستـُرمّز بترميز base64 وتـُخزّن في ~/.evolution/faces . "
 "سيُستخدم ذلك في رسائل البريد التي ستـُرسل من الآن وصاعدًا."
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "الوجه"
-
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
@@ -17592,8 +17417,7 @@ msgstr "إلغاء الاشتراك من المجلد  \"%s\""
 
 #: ../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 ""
-"للسماح بإلغاء الاشتراك في مجلدات البريد في قائمة السياق لشجرة المجلدات."
+msgstr "للسماح بإلغاء الاشتراك في مجلدات البريد في قائمة السياق لشجرة المجلدات."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
@@ -17612,14 +17436,13 @@ msgid "Google"
 msgstr "جوجل"
 
 #: ../plugins/google-account-setup/google-source.c:439
-#, fuzzy
 msgid "Please enter user name first."
-msgstr "رجاء اختر اسما آخر."
+msgstr "أدخل اسم المستخدم أولا."
 
 #: ../plugins/google-account-setup/google-source.c:443
-#, fuzzy, c-format
+#, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr "أضِف المجلّد إلى قائمة مجلّداتك المشترك بها"
+msgstr "أدخل كلمة سر المستخدم %s للنفاذ لقائمة من التقاويم المشترَك بها."
 
 #: ../plugins/google-account-setup/google-source.c:543
 #, c-format
@@ -17627,33 +17450,31 @@ msgid ""
 "Cannot read data from Google server.\n"
 "%s"
 msgstr ""
+"لا يمكن قراءة البيانات من خادم غوغل.\n"
+"%s"
 
 #: ../plugins/google-account-setup/google-source.c:693
-#, fuzzy
 msgid "Cal_endar:"
 msgstr "ال_تقويم:"
 
 #: ../plugins/google-account-setup/google-source.c:728
-#, fuzzy
 msgid "Retrieve _list"
-msgstr "يجري سحب `%s'"
+msgstr "_قائمة الجلب"
 
 #: ../plugins/google-account-setup/google-contacts-source.c:268
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
-#, fuzzy
 msgid "<b>Server</b>"
-msgstr "<b>أعضاء</b>"
+msgstr "<b>الخادم</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-#, fuzzy
 msgid "A plugin to setup google calendar and contacts."
-msgstr "ملحق لإعداد تقويم جوجل."
+msgstr "ملحق لإعداد تقويم و مراسلي جوجل."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "مصادر جوجل"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 msgid "Checklist"
 msgstr "قائمة سرد"
 
@@ -17698,16 +17519,16 @@ msgstr "ركِّب المجلد المشترك"
 msgid "Shared Folder Installation"
 msgstr "تركيب مجلد مشترك"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:78
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
 msgstr "إعدادت النفاية"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:91
+#: ../plugins/groupwise-features/junk-mail-settings.c:93
 #: ../plugins/groupwise-features/junk-settings.glade.h:3
 msgid "Junk Mail Settings"
 msgstr "إعدادات بريد النفاية"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:115
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
 msgstr "إعدادات بريد النفاية..."
 
@@ -17733,15 +17554,14 @@ msgid "_Junk List"
 msgstr "قائمة ال_نفايات"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
-#, fuzzy
 msgid "Message Retract"
-msgstr "حالة الرسالة"
+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 ""
+msgstr "سحب رسالة قد يحذفها من صندوق بريد المستلم. أمتاكد من رغبتك بهذا؟"
 
 #: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
@@ -17764,84 +17584,71 @@ msgid "Groupwise Features"
 msgstr "ميزات جروبوايز"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
-#, fuzzy
 msgid "Message retract failed"
-msgstr "تم سحب الرسالة بنجاح"
+msgstr "فشل سحب الرسالة"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
-#, fuzzy
 msgid "The server did not allow the selected message to be retracted."
-msgstr "حول الرسالة المنتقاه إلى مهمة"
+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
-#, fuzzy
 msgid "Invalid user"
-msgstr "توقيع غير صالح"
+msgstr "مستخدم غير صالح"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
-#, fuzzy
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
-msgstr "غير قادر على الحفظ للملف &quot;{0}&quot;."
+msgstr "لا يمكن إعطاء النفاذ إلى الوسيط للمستخدم &quot;{0}&quot;"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
-#, fuzzy
 msgid "Specify User"
-msgstr "انتقاء مستخدم"
+msgstr "حدد مستخدما"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
-#, fuzzy
 msgid "You have already given proxy permissions to this user."
-msgstr "لقد أُعطيتَ الأذونات التالية على مجلداتي:"
+msgstr "سبق أن أعطيت أذون الوسيط لهذا المستخدم."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
 msgid "You have to specify a valid user name to give proxy rights."
-msgstr ""
+msgstr "عليك تحديد اسم مستخدم صالح لإعطاءه الحقوق للوسيط."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
-#, fuzzy
 msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "يوجد مجلد بالاسم &quot;{1}&quot; مسبقًا. رجاء حدد اسمًا مختلفًا."
+msgstr "الحساب &quot;{0}&quot; موجود مسبقا. تحقق من شجرة مجلداتك."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
-#, fuzzy
 msgid "Account Already Exists"
-msgstr "التوقيع موجود مسبقًا."
+msgstr "الحساب موجود مسبقا"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
-#, fuzzy
 msgid ""
 "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
 "address and try again."
-msgstr "يوجد مجلد بالاسم &quot;{1}&quot; مسبقًا. رجاء حدد اسمًا مختلفًا."
+msgstr "الولوج للوسيط ك &quot;{0}&quot; كان فاشلا. تحقق من عنوان بريدك و حاول مجددا."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
-#, fuzzy
 msgid "This is a recurring meeting"
-msgstr "إجعل هذا حدثًا متكررًا"
+msgstr "هذا لقاء متكرر"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
-#, fuzzy
 msgid "Would you like to accept it?"
-msgstr "أترغب في حفظ تغييراتك؟"
+msgstr "أترغب بقبوله؟"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
-#, fuzzy
 msgid "Would you like to decline it?"
-msgstr "أترغب في حفظ تغييراتك؟"
+msgstr "أترغب برفضه؟"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
-#, fuzzy
 msgid "You cannot share folder with specified user &quot;{0}&quot;"
-msgstr "لم أستطع الحفظ إلى ملف الحفظ الآلي &quot;{0}&quot;."
+msgstr "لا يمكنك مشاركة المجلد مع المستخدم المحدد &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"
-msgstr ""
+msgstr "عليك تحديد اسم المستخدم الذي ترغب بإضافته للقائمة"
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "إقبل بصورة غير نهائية"
 
@@ -17858,7 +17665,7 @@ msgid "Con_tacts..."
 msgstr "المراسَلون..."
 
 #: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:517
+#: ../widgets/table/e-table-click-to-add.c:516
 msgid "Message"
 msgstr "رسالة"
 
@@ -17942,7 +17749,7 @@ msgstr "الولوج عبر وكيل"
 #: ../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:83
+#: ../plugins/groupwise-features/send-options.c:85
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s أدخل كلمة السّر لـ %s (المستخدم %s)"
@@ -17962,27 +17769,26 @@ msgstr "لا يتوفر تبويب الوكيل إلا عندما يكون ال�
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "لا يتوفر تبويب الوكيل إلا عندما يكون الحساب مفعلًا."
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:321
 #: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "مستخدمون"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr "أدخل المستخدمين وعين التصاريح"
 
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
 msgstr "مجلد م_شترك جديد..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "مشاركة"
 
 #: ../plugins/groupwise-features/share-folder.c:533
-#, fuzzy
 msgid "Custom Notification"
-msgstr "المحاذاة"
+msgstr "إشعار مخصص"
 
 #: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
@@ -18111,28 +17917,28 @@ msgstr "ملحق لمزايا حسابات IMAP."
 msgid "IMAP Features"
 msgstr "ميزات IMAP"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:77
+#: ../plugins/import-ics-attachments/icsimporter.c:78
 msgid "_Import to Calendar"
 msgstr "ا_ستيراد إلى التقويم"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Tasks"
 msgstr "ا_ستيراد إلى المهام"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:200
+#: ../plugins/import-ics-attachments/icsimporter.c:201
 msgid "Import ICS"
 msgstr "استيراد ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:223
+#: ../plugins/import-ics-attachments/icsimporter.c:224
 msgid "Select Task List"
 msgstr "انتقاء قائمة مهام"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:227
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Calendar"
 msgstr "انتقاء تقويم"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:259
-#: ../shell/e-shell-importer.c:698
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "إ_ستيراد"
 
@@ -18169,22 +17975,22 @@ msgstr ""
 "إيفُليوشن غير قادر على إيجاد iPod للتزامن معه. قد يكون السبب أن iPod غير متصل "
 "بالنظام أو أنه مطفأ."
 
-#: ../plugins/ipod-sync/ical-format.c:118
-#: ../plugins/save-calendar/ical-format.c:163
+#: ../plugins/ipod-sync/ical-format.c:119
+#: ../plugins/save-calendar/ical-format.c:164
 msgid "iCalendar format (.ics)"
 msgstr "هيئة آي-كلندر (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
-msgstr "تزامن المهمة/المذكرة/التقويم/دفتر العناوين المنتقى مع آبل آيبود"
+msgid "Synchronize the selected task/memo/calendar/address book with Apple iPod"
+msgstr "تزامن المهمة/المذكرة/التقويم/دفتر العناوين المنتقى مع أبل آيبود"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
-msgstr "تزامن مع iPod "
+msgstr "تزامن مع آيبود"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
 msgid "iPod Synchronization"
-msgstr "تزامن iPod"
+msgstr "تزامن آيبود"
 
 #: ../plugins/itip-formatter/itip-formatter.c:443
 #: ../plugins/itip-formatter/itip-formatter.c:568
@@ -18369,7 +18175,7 @@ msgstr "انتق تقويمات للبحث في عن تضاربات المواع
 
 #. 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:299
+#: ../widgets/misc/e-cell-date-edit.c:298
 msgid "Today"
 msgstr "اليوم"
 
@@ -18568,8 +18374,7 @@ msgstr "<b>%s</b> عن طريق %s يرغب في استقبال آخر المع�
 
 #: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> يرغب في استقبال آخر المعلومات عن الاجتماع الآتي:"
 
 #: ../plugins/itip-formatter/itip-view.c:386
@@ -18652,8 +18457,7 @@ msgstr "<b>%s</b> يرغب في الإضافة إلى مهمة موجودة:"
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following assigned task:"
-msgstr ""
-"<b>%s</b> عن طريق %s يرغب في استقبال آخر المعلومات عن المهمة المعينة الآتية:"
+msgstr "<b>%s</b> عن طريق %s يرغب في استقبال آخر المعلومات عن المهمة المعينة الآتية:"
 
 #: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
@@ -18664,8 +18468,7 @@ msgstr "<b>%s</b> يرغب في استقبال آخر المعلومات عن ا
 
 #: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
+msgid "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> عن طريق %s قد أرسل الرد الآتي على المهمة المعينة:"
 
 #: ../plugins/itip-formatter/itip-view.c:476
@@ -18685,8 +18488,7 @@ msgstr "<b>%s</b> قد ألغى المهمة المعينة الآتية:"
 
 #: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> عن طريق %s قد اقترح التغييرات الآتية لإعدادات المهمات:"
 
 #: ../plugins/itip-formatter/itip-view.c:488
@@ -18849,8 +18651,7 @@ msgid "This meeting has been delegated"
 msgstr "تم تفويض الاجتماع"
 
 #: ../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?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "هذه الاستجابة ليست من حاضر حالي. هل تريد إضافة المرسل كحاضر للاجتماع؟"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
@@ -18886,11 +18687,10 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "توليد رسالة D-BUS عند وصول رسائل بريد جديدة."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-#, fuzzy
 msgid ""
 "If \"true\", then beep, otherwise will play sound file when new messages "
 "arrive."
-msgstr "إن كان صحيحا، فصَفِّرْ وإلاَّ فشغل ملف صوت عند وصول رسائل جديدة."
+msgstr "إن \"صحيح\", صفّر, و إلا سيشغَل ملف صوتي عند وصول رسالة جديدة."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
@@ -18932,22 +18732,20 @@ msgstr "ما إن كان على الأيقونة أن تومِض أم لا."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "فيما يجب التبليغ عن الرسائل الجديدة في مجلد الداخل فقط."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "توليد _رسالة D-BUS"
 
-#: ../plugins/mail-notification/mail-notification.c:377
-#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:378
 msgid "Evolution's Mail Notification"
-msgstr "تنبيه بريدي"
+msgstr "إشعار بريد إيفليوشن"
 
-#: ../plugins/mail-notification/mail-notification.c:398
-#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:399
 msgid "Mail Notification Properties"
-msgstr "تنبيه بريدي"
+msgstr "خصائص الإشعار البريدي"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:458
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18960,7 +18758,7 @@ msgstr[1] "لقد استلمت رسالتان (%d) في %s."
 msgstr[2] "لقد استلمت (%d) رسائل في %s."
 msgstr[3] "لقد استلمت (%d) رسالة  في %s."
 
-#: ../plugins/mail-notification/mail-notification.c:462
+#: ../plugins/mail-notification/mail-notification.c:463
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -18969,48 +18767,48 @@ msgstr[1] "لقد استلمت رسالتان جديدتان (%Id)."
 msgstr[2] "لقد استلمت %Id رسائل جديدة."
 msgstr[3] "لقد استلمت %Id رسالة جديدة."
 
-#: ../plugins/mail-notification/mail-notification.c:479
-#: ../plugins/mail-notification/mail-notification.c:484
+#: ../plugins/mail-notification/mail-notification.c:480
+#: ../plugins/mail-notification/mail-notification.c:485
 msgid "New email"
 msgstr "بريد جديد"
 
-#: ../plugins/mail-notification/mail-notification.c:541
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "Show icon in _notification area"
 msgstr "اظهر الأيقونة في م_ساحة التبليغ"
 
-#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:547
 msgid "B_link icon in notification area"
 msgstr "وم_يض الأيقونة في منطقة التبليغ"
 
-#: ../plugins/mail-notification/mail-notification.c:546
+#: ../plugins/mail-notification/mail-notification.c:549
 msgid "Popup _message together with the icon"
 msgstr "اجعل ال_رسالة تنبثق مع الأيقونة"
 
-#: ../plugins/mail-notification/mail-notification.c:727
+#: ../plugins/mail-notification/mail-notification.c:730
 msgid "_Play sound when new messages arrive"
 msgstr "إعزف الصوت عند وصول رسائل جديدة"
 
-#: ../plugins/mail-notification/mail-notification.c:733
+#: ../plugins/mail-notification/mail-notification.c:736
 msgid "_Beep"
 msgstr "_صافرة"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:737
 msgid "Play _sound file"
 msgstr "شَغِّل ملف صوت"
 
-#: ../plugins/mail-notification/mail-notification.c:745
+#: ../plugins/mail-notification/mail-notification.c:748
 msgid "Specify _filename:"
 msgstr "تحديد اسم _ملف:"
 
-#: ../plugins/mail-notification/mail-notification.c:746
+#: ../plugins/mail-notification/mail-notification.c:749
 msgid "Select sound file"
 msgstr "انتقاء ملف صوت"
 
-#: ../plugins/mail-notification/mail-notification.c:747
+#: ../plugins/mail-notification/mail-notification.c:750
 msgid "Pl_ay"
 msgstr "اق_ر ء"
 
-#: ../plugins/mail-notification/mail-notification.c:804
+#: ../plugins/mail-notification/mail-notification.c:807
 msgid "Notify new messages for _Inbox only"
 msgstr "بَلِّغ عن الرسائل الجديدة للبريد الوافد فقط"
 
@@ -19040,12 +18838,12 @@ msgstr "ح_ول إلى اجتماع"
 msgid "Mail to meeting"
 msgstr "بريد إلى اجتماع"
 
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "لا يمكن فتح التقويم. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../plugins/mail-to-task/mail-to-task.c:292
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19094,10 +18892,8 @@ msgid "Mailing _List"
 msgstr "قائمة بري_دية"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
-msgstr ""
-"يسهل إجراءات التعامل مع القوائم البريدية (اشتراك، إلغاء الاشتراك، ...إلخ)."
+msgid "Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+msgstr "يسهل إجراءات التعامل مع القوائم البريدية (اشتراك، إلغاء الاشتراك، ...إلخ)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
@@ -19153,15 +18949,14 @@ msgid "Send e-mail message to mailing list?"
 msgstr "إرسال رسالة بريد إلكتروني للقائمة البريدية؟"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
-#, fuzzy
 msgid ""
 "The action could not be performed. This means the header for this action did "
 "not contain any action we could process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
-"لم يكن من الممكن تنفيذ الإجراء. يعني هذا أن ترويسة هذا الإجراء لا تحتوي على "
-"إجراء يمكننا التعامل معه.\n"
+"تعذر أداءالإجراء. هذا يعني أن ترويسة هذا الإجراء لم تحوي أي إجراء يمكننا "
+"معالجته.\n"
 "\n"
 "الترويسة: {0}"
 
@@ -19237,28 +19032,25 @@ msgstr "إ_شترك في القائمة"
 msgid "_Unsubscribe from List"
 msgstr "أل_غي الاشتراك في القائمة"
 
-#: ../plugins/mark-all-read/mark-all-read.c:37
-#, fuzzy
+#: ../plugins/mark-all-read/mark-all-read.c:39
 msgid "Also mark messages in subfolders?"
-msgstr "نقل الرسائل إلى المجلّد %s"
+msgstr "أاعلّم الرسائل في المجلدات الفرعية أيضا؟"
 
-#: ../plugins/mark-all-read/mark-all-read.c:39
-#, fuzzy
+#: ../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?"
 msgstr ""
-"هذا سيضع علامة مقروء لكل الرسائل في المجلد المنتقى وكل مجلداته الفرعية."
+"أترغب بتعليم الرسائل كمقرؤة في المجلد الحالي فقط, أم في "
+"المجلد الحالي كما في كل المجلدات الفرعية؟"
 
-#: ../plugins/mark-all-read/mark-all-read.c:162
-#, fuzzy
+#: ../plugins/mark-all-read/mark-all-read.c:164
 msgid "Current Folder and _Subfolders"
-msgstr "على المجلد ال_حالي والمجلدات الفرعية"
+msgstr "المجلد الحالي و المجلدات ال_فرعية"
 
-#: ../plugins/mark-all-read/mark-all-read.c:174
-#, fuzzy
+#: ../plugins/mark-all-read/mark-all-read.c:176
 msgid "Current _Folder Only"
-msgstr "المجلّد الحالي"
+msgstr "ال_مجلد الحالي فقط"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
@@ -19302,7 +19094,7 @@ msgstr "ملحق لإدارة ما إذا كانت الملحقات مفعلة �
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:236
+#: ../plugins/plugin-manager/plugin-manager.c:252
 msgid "Plugin Manager"
 msgstr "مدير الملحقات"
 
@@ -19314,24 +19106,24 @@ msgstr "فعّل و عطل ملحقات"
 msgid "_Plugins"
 msgstr "ملح_قات"
 
-#: ../plugins/plugin-manager/plugin-manager.c:42
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "المؤلف(ون)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:130
+#: ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "إعدادات "
 
-#: ../plugins/plugin-manager/plugin-manager.c:249
+#: ../plugins/plugin-manager/plugin-manager.c:265
 msgid "Note: Some changes will not take effect until restart"
 msgstr "ملحوظة: بعض التغييرات لن تأخذ مجراها إلا بعد إعادة التشغيل"
 
-#: ../plugins/plugin-manager/plugin-manager.c:275
+#: ../plugins/plugin-manager/plugin-manager.c:291
 msgid "Overview"
 msgstr "نظرة عامة "
 
-#: ../plugins/plugin-manager/plugin-manager.c:346
-#: ../plugins/plugin-manager/plugin-manager.c:408
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
 msgstr "ملحق"
 
@@ -19355,19 +19147,19 @@ msgstr "نص عادي"
 msgid "Prefer plain-text"
 msgstr "افضل نصا عاديا"
 
-#: ../plugins/prefer-plain/prefer-plain.c:174
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Show HTML if present"
 msgstr "اظهر HTML إن كان موجودًا"
 
-#: ../plugins/prefer-plain/prefer-plain.c:175
+#: ../plugins/prefer-plain/prefer-plain.c:192
 msgid "Prefer PLAIN"
 msgstr "افضل نصا عاديا"
 
-#: ../plugins/prefer-plain/prefer-plain.c:176
+#: ../plugins/prefer-plain/prefer-plain.c:193
 msgid "Only ever show PLAIN"
 msgstr "اظهر نص عادي فقط"
 
-#: ../plugins/prefer-plain/prefer-plain.c:219
+#: ../plugins/prefer-plain/prefer-plain.c:236
 msgid "HTML _Mode"
 msgstr "_نمط HTML"
 
@@ -19484,77 +19276,72 @@ msgstr ""
 "متوفر/مشغول"
 
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
-#, fuzzy
 msgid "Hello Python"
-msgstr "هاتف المنزل"
+msgstr "مرحبا بايثون"
 
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
 msgid "Python Plugin Loader tests"
-msgstr ""
+msgstr "اختبارات محمل ملحقات بايثون"
 
 #: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
 msgid "Python Test Plugin"
-msgstr ""
+msgstr "ملحق اختبار بايثون"
 
 #: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
 msgid "Test Plugin for Python EPlugin loader."
-msgstr ""
+msgstr "ملحق الاختبار لمحمل ملحق.إي لبايثون."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
 msgid "A plugin which loads other plugins written using python."
-msgstr ""
+msgstr "ملحق يحمل ملحقات اخرى كتبت بإستخدام بايثون."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
-#, fuzzy
 msgid "Python Loader"
-msgstr "محمل مونو"
+msgstr "محمل بايثون"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "قاتل البريد المزعج (مضمّن)"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#, fuzzy, c-format
+#, c-format
 msgid "SpamAssassin not found, code: %d"
-msgstr "ملحق قاتل البريد المزعج للبريد المهمل"
+msgstr "لم يجد سبام-أسّاسن, الرمز: %d"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:142
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:150
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to create pipe: %s"
-msgstr "تعذر إنشاء مخزن بريد محلّي `%s': %s"
+msgstr "فشل إنشاء أنبوب: %s"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:189
-#, fuzzy, c-format
+#, c-format
 msgid "Error after fork: %s"
-msgstr ""
-"خطأ على %s:\n"
-"%s"
+msgstr "أخطاء بعد التشعّب: %s"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:244
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
-msgstr ""
+msgstr "العملية الابن ل سبام-أسّاسن لا تستجيب, الإيقاف..."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:246
 #, c-format
 msgid "Wait for Spamassassin child process interrupted, terminating..."
-msgstr ""
+msgstr "قُوطِع انتظار العملية الابن ل سبام-أسّاسن, الإنهاء..."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:255
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr ""
+msgstr "الإيصال ل سبام-أسّاسن قد فشل, رمز الخطأ: %d"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:498
-#, fuzzy, c-format
+#, c-format
 msgid "SpamAssassin is not available."
-msgstr "خيارات الإرسال غير متوفرة."
+msgstr "سبام-أسّاسن غير متوفر."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:865
-#, fuzzy
 msgid "This will make SpamAssassin more reliable, but slower"
-msgstr "هذا سيجعل قاتل البريد المزعج أكثر موثوقية، ولكن أبطأ"
+msgstr "هذا سيجعل سبام-أسّاسن أكثر كفائة، ولكن أبطأ"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:871
 msgid "I_nclude remote tests"
@@ -19610,79 +19397,79 @@ msgstr "احفظ"
 #. * 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:162
+#: ../plugins/save-calendar/csv-format.c:163
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:361
 msgid "UID"
 msgstr "هوية المستخدم (UID)"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Description List"
 msgstr "قائمة الوصف"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Categories List"
 msgstr "قائمة الفئات"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Comment List"
 msgstr "قائمة التعليقات"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Created"
 msgstr "تاريخ الإنشاء"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Contact List"
 msgstr "قائمة المراسَلين"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Start"
 msgstr "إبدأ"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "End"
 msgstr "اَنْهِ"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "percent Done"
 msgstr "نسبة مكملة"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "URL"
 msgstr "العنوان"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Attendees List"
 msgstr "قائمة الحضور"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Modified"
 msgstr "مغيَّر"
 
-#: ../plugins/save-calendar/csv-format.c:531
+#: ../plugins/save-calendar/csv-format.c:532
 msgid "Advanced options for the CSV format"
 msgstr "خيارات متقدمة لتنسيق CSV"
 
-#: ../plugins/save-calendar/csv-format.c:538
+#: ../plugins/save-calendar/csv-format.c:539
 msgid "Prepend a header"
 msgstr "ألحق ترويسة"
 
-#: ../plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:548
 msgid "Value delimiter:"
 msgstr "فاصل القيم:"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:554
 msgid "Record delimiter:"
 msgstr "فاصلة التسجيلات:"
 
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "Encapsulate values with:"
 msgstr "تغليف القيم بـ:"
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "تنسيق القيم المفصولة بفاصلة (.csv)"
 
@@ -19703,15 +19490,15 @@ msgstr "احف_ظ للقرص"
 #. * 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:149
+#: ../plugins/save-calendar/rdf-format.c:150
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:376
+#: ../plugins/save-calendar/rdf-format.c:377
 msgid "RDF format (.rdf)"
 msgstr "تنسيق RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:160
+#: ../plugins/save-calendar/save-calendar.c:161
 msgid "Select destination file"
 msgstr "انتق ملفّ الوجهة"
 
@@ -19737,12 +19524,11 @@ msgstr "لا تعرض _سوى قائمة المهام هذه"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Guides you through your initial account setup."
-msgstr ""
+msgstr "يرشدك خلال الإعداد الإبتدائي لحسابك."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-#, fuzzy
 msgid "Setup Assistant"
-msgstr "المساعد"
+msgstr "مساعد الإعداد"
 
 #: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
@@ -19769,24 +19555,24 @@ msgid "Importing files"
 msgstr "إستيراد الملفات"
 
 #: ../plugins/startup-wizard/startup-wizard.c:135
-#: ../shell/e-shell-importer.c:143
+#: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "رجاءً انتق المعلومات التي ترغب في استيرادها:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:150
-#: ../shell/e-shell-importer.c:396
+#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "من %s:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:230
-#: ../shell/e-shell-importer.c:507
+#: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "يجري استيراد البيانات."
 
 #: ../plugins/startup-wizard/startup-wizard.c:232
-#: ../shell/e-shell-importer.c:521
+#: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "الرجاء الإنتظار"
 
@@ -19803,35 +19589,31 @@ msgid "Thread messages by subject"
 msgstr "رسائل المناقشات حسب الموضوع"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:54
+#: ../plugins/subject-thread/subject-thread.c:56
 msgid "F_all back to threading messages by subject"
 msgstr "التراجع إلى رسائل المناقشة حسب المو_ضوع"
 
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
-#, fuzzy
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
 "message body."
-msgstr "قائمة الدلالات التي سيبحث عنها ملحق مُذَكِّر المرفقات في متن الرسالة."
+msgstr "قائمة من أزواج الكلمات المفتاحية/القيم لملحق القوالب ليبدلها في متن الرسالة."
 
-#: ../plugins/templates/templates.c:614
-#, fuzzy
+#: ../plugins/templates/templates.c:613
 msgid "No title"
-msgstr "المسمّى الوظيفي"
+msgstr "لا عنوان"
 
-#: ../plugins/templates/templates.c:743
-#, fuzzy
+#: ../plugins/templates/templates.c:741
 msgid "Save as _Template"
-msgstr "احفظ _كمسودة"
+msgstr "احفظ ك_قالب"
 
-#: ../plugins/templates/templates.c:745
-#, fuzzy
+#: ../plugins/templates/templates.c:743
 msgid "Save as Template"
-msgstr "احفظ _كمسودة"
+msgstr "احفظ كقالب"
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Drafts based template plugin"
-msgstr ""
+msgstr "ملحق قالب معتمد على المسودات"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
@@ -19842,29 +19624,26 @@ msgid "TNEF Attachment decoder"
 msgstr "فاكّ ترميز مرفقات TNEF"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-#, fuzzy
 msgid "A plugin to setup WebDAV contacts."
-msgstr "ملحق لإعداد تقويم جوجل."
+msgstr "ملحق لإعداد مراسلي WebDAV."
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
-#, fuzzy
 msgid "WebDAV contacts"
-msgstr "لا مراسَلين"
+msgstr "مراسلي WebDAV"
 
 #: ../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 ""
+msgstr "WebDAV"
 
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
-#, fuzzy
 msgid "URL:"
-msgstr "ع_نوان:"
+msgstr "العنوان:"
 
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
 msgid "_Avoid IfMatch (needed on apache < 2.2.8)"
-msgstr ""
+msgstr "ت_جنب IfMatch (مطلوب على أباتشي < 2.2.8)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
@@ -19884,12 +19663,11 @@ msgstr "مكوّن إختبار إيفُليوشِن"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
-msgstr ""
+msgstr "استوثق اتصالات خادم الوسيط"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
-#, fuzzy
 msgid "Automatic proxy configuration URL"
-msgstr "تعرّف آلي على الإبتسامات"
+msgstr "عنوان التشكيل الآلي للوسيط"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
@@ -19912,26 +19690,24 @@ msgid "Default window width"
 msgstr "عرض النّافذة الإفتراضي"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:8
-msgid ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr ""
+msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr "يفعّل إعدادات الوسيط عند النفاذ ل HTTP/آمن HTTP عبر الإنترنت."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
-msgstr ""
+msgstr "اسم مضيف وسيط HTTP"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:10
-#, fuzzy
 msgid "HTTP proxy password"
-msgstr "أدخل كلمة سِر"
+msgstr "كلمة سر وسيط HTTP"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy port"
-msgstr ""
+msgstr "منفذ وسيط HTTP"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy username"
-msgstr ""
+msgstr "اسم مستخدم وسيط HTTP"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "ID or alias of the component to be shown by default at start-up."
@@ -19944,46 +19720,48 @@ msgid ""
 "authentication_user\" GConf key, and the password is retrieved from either "
 "gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
+"إن كان صحيحا, عندها الاتصالات بخادم الوسيط تتطلب الاستيثاق. يجُلب اسم المستخدم "
+"من ملف مفتاح \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf , و تجلب كلمة السر إما من مفاتيح-جنوم أو من ملف "
+"كلمات السر ~/.gnome2_private/Evolution ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "آخر إصدار تشكيل تمت الترقية إليه"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:16
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "قائمة مسارات المجلدات المخطط تزامنها للقرص من أجل الاستخدام في وضع عدم "
 "الاتصال"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Non-proxy hosts"
-msgstr ""
+msgstr "مضيف بلا وسيط"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Password to pass as authentication when doing HTTP proxying."
-msgstr ""
+msgstr "كلمة السر للاستيثاق عند استخدام وسيط HTTP."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:19
-#, fuzzy
 msgid "Proxy configuration mode"
-msgstr "إعدادات "
+msgstr "وضع تشكيل الوسيط"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "SOCKS proxy host name"
-msgstr ""
+msgstr "اسم مضيف وسيط SOCKS"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy port"
-msgstr ""
+msgstr "منفذ وسيط SOCKS"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Secure HTTP proxy host name"
-msgstr ""
+msgstr "اسم مضيف وسيط HTTP الآمن"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy port"
-msgstr ""
+msgstr "منفذ وسيط HTTP الآمن"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid ""
@@ -19992,6 +19770,9 @@ msgid ""
 "configuration\" and \"use proxy configuration provided in the autoconfig url"
 "\" respectively."
 msgstr ""
+"اختر وضع تشكيل الوسيط. القيم المدعومة هي 0, 1, 2, و 3 وتمثّل تباعا \"إستخدم "
+"إعدادات النظام\", \"لا وسيط\", \"التشكيل اليدوي للوسيط\" و \"استخدم تشكيل "
+"الوسيط المقدم في عنوان التشكيل الآلي\" ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
@@ -20039,33 +19820,39 @@ msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
-msgstr ""
+msgstr "اسم الآلة لعبور وسيط HTTP."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The machine name to proxy secure HTTP through."
-msgstr ""
+msgstr "اسم الآلة لعبور وسيط HTTP الآمن منها."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy socks through."
-msgstr ""
+msgstr "اسم الآلة لعبور وسيط socks منها."
 
 #: ../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 ""
+"المنفذ على الآلة المحدد في \"/apps/evolution/shell/network_config/http_host"
+"\" و الذي تعبر للوسيط منه."
 
 #: ../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 ""
+"المنفذ على الآلة المحدد في \"/apps/evolution/shell/network_config/secure_host"
+"\" و الذي تعبر للوسيط منه."
 
 #: ../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 ""
+"المنفذ على الآلة المحدد في \"/apps/evolution/shell/network_config/socks_host"
+"\" و الذي تعبر للوسيط منه."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid ""
@@ -20084,28 +19871,30 @@ msgid ""
 "(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
+"هذا المفتاح يحوي قائمة من المضيفين المتصلين مباشرة, و ليس عبر وسيط (إن كان "
+"مفعلا). القيم يمكن ان تكون أسماء المضيفين, مجالات (مستخدما محارف عمومية مثلا "
+"*.foo.com), عناوين IP للمضيف (كل من IPv4 و IPv6) و عناوين الشبكة مع قناع "
+"الشبكة (شيء مثل 192.168.0.0/24)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "شريط الأدوات مرئي"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:43
-#, fuzzy
 msgid "URL that provides proxy configuration values."
-msgstr "آخر إصدار تشكيل تمت الترقية إليه"
+msgstr "عنوان يقدم قيم تشكيل الوسيط."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Use HTTP proxy"
-msgstr ""
+msgstr "استخدم وسيط HTTP"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "User name to pass as authentication when doing HTTP proxying."
-msgstr ""
+msgstr "اسم المستخدم للاستيثاق عند استخدام وسيط HTTP."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr ""
-"ما إن كان إيفُليوشن سيبدأ التشغيل في وضع عدم الاتصال بدلًا من وضع الاتصال."
+msgstr "ما إن كان إيفُليوشن سيبدأ التشغيل في وضع عدم الاتصال بدلًا من وضع الاتصال."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
@@ -20124,8 +19913,7 @@ msgid "Whether the toolbar should be visible."
 msgstr "ما إن كان شريط الأدوات مرئيًا."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:51
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "ما إن كان سيتم تخطي مربع حوار التحذير في إصدارات التطوير من إيفُليوشن."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:52
@@ -20159,20 +19947,16 @@ msgstr "انقر لإختيار نوع المستورد:"
 #: ../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.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+"of file it is from the list."
 msgstr ""
-"اختر الملفّ الذي تريد استيراده إلى إيفُليوشن، وانتق نوعه من القائمة.\n"
-"\n"
-"إن لم تعرف نوعه، يمكنك انتقاء \"تلقائي\" وسيقوم إيفُليوشن بمحاولة التعرف عليه."
+"اختر الملفّ الذي تريد استيراده إلى إيفُليوشن، وانتقِ نوع "
+"الملف من القائمة."
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
-msgstr "اخ"
+msgstr "اختر المقصد لهذا الاستيراد "
 
-#: ../shell/e-shell-importer.c:146
+#: ../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"
@@ -20184,27 +19968,27 @@ msgstr ""
 "إعدادات يمكن استيرادها. إن كنت ترغب في إعادة\n"
 "المحاولة، رجاء انقر زر \"خلف\".\n"
 
-#: ../shell/e-shell-importer.c:284
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "اسم ال_ملف:"
 
-#: ../shell/e-shell-importer.c:289
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "إنتقاء ملف"
 
-#: ../shell/e-shell-importer.c:298
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "_نوع الملف:"
 
-#: ../shell/e-shell-importer.c:334
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "استورد بيانات وإعدادات من برامج أ_قدم"
 
-#: ../shell/e-shell-importer.c:337
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "إستيراد ملف _وحيد"
 
-#: ../shell/e-shell-settings-dialog.c:314
+#: ../shell/e-shell-settings-dialog.c:313
 msgid "Evolution Preferences"
 msgstr "تفضيلات إيفُليوشِن"
 
@@ -20235,7 +20019,7 @@ msgstr "لم يمكن تشغيل فتى العلات."
 #. 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:729
+#: ../shell/e-shell-window-commands.c:942
 msgid "translator-credits"
 msgstr ""
 "Djihed Afifi جهاد عفيفي (djihed@gmail.com)\n"
@@ -20243,45 +20027,45 @@ msgstr ""
 "Ahmad Farghal أحمد فرغل (ahmad.farghal@gmail.com)\n"
 "Anas Husseini أنس الحسيني (linux.anas@gmail.com)"
 
-#: ../shell/e-shell-window-commands.c:740
+#: ../shell/e-shell-window-commands.c:953
 msgid "Evolution Website"
 msgstr "موقع إيفُليوشِن"
 
-#: ../shell/e-shell-window-commands.c:758
+#: ../shell/e-shell-window-commands.c:971
 msgid "Error opening the FAQ webpage."
 msgstr "حدث خطأ أثناء فتح صفحة الأسئلة الشائعة."
 
-#: ../shell/e-shell-window-commands.c:955
+#: ../shell/e-shell-window-commands.c:1168
 msgid "_Work Online"
 msgstr "ا_عمل متصلًا"
 
-#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1181 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "ا_عمل دون اتّصال"
 
-#: ../shell/e-shell-window-commands.c:981
+#: ../shell/e-shell-window-commands.c:1194
 msgid "Work Offline"
 msgstr "اعمل دون اتّصال"
 
 #: ../shell/e-shell-window.c:381
-#, fuzzy
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
 msgstr ""
-"إيفُليوشن متصل بالانترنت حاليا.  انقر هذا الزر للعمل دون اتصال بالإنترنت."
+"إيفُليوشن متصل حاليا.\n"
+"انقر هذا الزر للعمل دون اتصال."
 
 #: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "يقوم إيفُليوشن حاليًا بالتحول لوضع عدم الاتصال."
 
 #: ../shell/e-shell-window.c:395
-#, fuzzy
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
 msgstr ""
-"إيفُليوشن غير متصل بالانترنت حاليًا.  انقر هذا الزر للعمل على اتصال بالإنترنت."
+"إيفُليوشن دون اتصال حاليا.\n"
+"انقر هذا الزر للعمل مع اتصال."
 
 #: ../shell/e-shell-window.c:786
 #, c-format
@@ -20297,7 +20081,7 @@ msgstr "خطأ غير معروف بالنظام."
 msgid "%ld KB"
 msgstr "%ld ك.بايت"
 
-#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:315
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "موافق"
 
@@ -20661,27 +20445,27 @@ msgstr "عنوان البريد الالكتروني"
 msgid "All CA certificate files"
 msgstr "كل ملفات شهادات CA"
 
-#: ../smime/gui/certificate-viewer.c:339
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "عارض الشهادات: %s"
 
-#: ../smime/gui/component.c:47
+#: ../smime/gui/component.c:46
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "أدخل كلمة السر لـ`%s'"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:69
 msgid "Enter new password for certificate database"
 msgstr "أدخل كلمة السر الجديدة لقاعدة بيانات الشهادات"
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "أدخل كلمة السر الجديدة"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:115
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -20690,7 +20474,7 @@ msgstr ""
 "أصدر لـ:\n"
 "  الموضوع: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:116
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20699,7 +20483,7 @@ msgstr ""
 "صادر من طرف:\n"
 "  الموضوع: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:168
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "انتقاء شهادة"
 
@@ -20868,8 +20652,7 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "لديك شهادات تميّزك من المنظّمات التّالية:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
 msgstr "لديك شهادات مسجّلة تميز سلطات الشّهادات التّالية:"
 
 #: ../smime/gui/smime-ui.glade.h:45
@@ -21052,15 +20835,15 @@ msgstr "الهويّة الفريدة للموضوع"
 msgid "Certificate Signature Value"
 msgstr "قيمة توقيع الشّهادة"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "PKCS12 File Password"
 msgstr "كلمة سر ملف PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "Enter password for PKCS12 file:"
 msgstr "إدخال كلمة السّر لملف PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:365
+#: ../smime/lib/e-pkcs12.c:343
 msgid "Imported Certificate"
 msgstr "شهادة مستوردة"
 
@@ -21115,8 +20898,8 @@ msgid "Copy to Folder..."
 msgstr "نسخ للمجلّد..."
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
-msgstr "أنشئ دفتر عناوين جديد"
+msgid "Create a new address book folder"
+msgstr "أنشئ مجلد دفتر عناوين جديد"
 
 #: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
@@ -21330,7 +21113,7 @@ msgid "Month"
 msgstr "الشهر"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:196
+#: ../widgets/misc/e-calendar.c:195
 msgid "Next"
 msgstr "التّالي"
 
@@ -21339,7 +21122,7 @@ msgid "Previews the calendar to be printed"
 msgstr "معاينة التقويم التي ستطبع"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:172
+#: ../widgets/misc/e-calendar.c:171
 msgid "Previous"
 msgstr "السابق"
 
@@ -21569,8 +21352,7 @@ msgid "Hide _Read Messages"
 msgstr "أخفي الرّسائل المقر_وءة"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
+msgid "Hide deleted messages rather than displaying them with a line through them"
 msgstr "أخفي الرّسائل المحذوفة عوضًا عن إظهارها بخطٍّ يشطبها"
 
 #: ../ui/evolution-mail-list.xml.h:16
@@ -22337,9 +22119,8 @@ msgid "View/Hide the Status Bar"
 msgstr "اعرض/إخفِ شريط الحالة"
 
 #: ../ui/evolution.xml.h:39
-#, fuzzy
 msgid "Work _Offline"
-msgstr "اعمل دون اتّصال"
+msgstr "اعمل _دون اتصال"
 
 #: ../ui/evolution.xml.h:40
 msgid "_About"
@@ -22484,7 +22265,7 @@ msgstr "اختر منطقة زمنيّة"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Timezone drop-down combination box"
-msgstr ""
+msgstr "مربع التجميعة المنسدل للمنطقة الزمنية"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -22496,7 +22277,7 @@ msgstr ""
 "استخدم زر الفأرة الأيمن للتصغير."
 
 #: ../widgets/menus/gal-define-views-dialog.c:76
-#: ../widgets/menus/gal-define-views-model.c:186
+#: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "مجموعة"
 
@@ -22518,16 +22299,16 @@ msgstr "حدد المشاهد لـ\"%s\""
 
 #: ../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
-#: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "جدول"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
 msgid "Instance"
 msgstr "مرة"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "احفظ المشهد الحالي"
 
@@ -22541,7 +22322,7 @@ msgstr "استب_دِل المشهد الموجود"
 
 #. bonobo displays this string so it must be in locale
 #: ../widgets/menus/gal-view-instance.c:582
-#: ../widgets/menus/gal-view-menus.c:354
+#: ../widgets/menus/gal-view-menus.c:368
 msgid "Custom View"
 msgstr "مشهد مخصّص"
 
@@ -22550,32 +22331,32 @@ msgid "Save Custom View"
 msgstr "احفظ المشهد المخصّص"
 
 #: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:378
+#: ../widgets/menus/gal-view-menus.c:392
 msgid "Define Views..."
 msgstr "تعريف المشاهد..."
 
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:305
 msgid "C_urrent View"
 msgstr "الم_شهد الحالي"
 
-#: ../widgets/menus/gal-view-menus.c:315
+#: ../widgets/menus/gal-view-menus.c:329
 #, c-format
 msgid "Select View: %s"
 msgstr "انتقِ مشهدًا: %s"
 
-#: ../widgets/menus/gal-view-menus.c:359
+#: ../widgets/menus/gal-view-menus.c:373
 msgid "Current view is a customized view"
 msgstr "العرض الحالي هو عرض مخصص"
 
-#: ../widgets/menus/gal-view-menus.c:364
+#: ../widgets/menus/gal-view-menus.c:378
 msgid "Save Custom View..."
 msgstr "احفظ المشهد المخصّص..."
 
-#: ../widgets/menus/gal-view-menus.c:369
+#: ../widgets/menus/gal-view-menus.c:383
 msgid "Save current custom view"
 msgstr "احفظ المشهد المخصص الحالي"
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:397
 msgid "Create or edit views"
 msgstr "أنشئ أو حرّر مَشَاهِد"
 
@@ -22603,13 +22384,13 @@ msgstr "نوع المشهد:"
 msgid "Attachment Bar"
 msgstr "شريط المرفقات"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
+#: ../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 "لا يمكن إرفاق الملف %s: %s"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "لا يمكن إرفاق الملف %s: ليس ملفًّا اعتياديًّا"
@@ -22631,11 +22412,11 @@ msgid "Suggest automatic display of attachment"
 msgstr "إقتراح العرض التّلقائي للمُرفق"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1273
+#: ../widgets/misc/e-calendar-item.c:1267
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:221
+#: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
 msgstr "تقويم شهري"
 
@@ -22680,130 +22461,130 @@ msgstr "ص1"
 msgid "Y2"
 msgstr "ص2"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:1000
+#: ../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 "أدنى عرض"
 
-#: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:1001
+#: ../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 "أدنى عرض"
 
-#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
 #: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "مباعدة"
 
-#: ../widgets/misc/e-cell-date-edit.c:291
+#: ../widgets/misc/e-cell-date-edit.c:290
 msgid "Now"
 msgstr "الآن"
 
-#: ../widgets/misc/e-cell-date-edit.c:848
+#: ../widgets/misc/e-cell-date-edit.c:847
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "يجب أن يكون الوقت بتهيئة: %s"
 
-#: ../widgets/misc/e-cell-percent.c:79
+#: ../widgets/misc/e-cell-percent.c:78
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "يجب أن تكون القيمة المئويّة بين 0 و 100، مضمنة"
 
-#: ../widgets/misc/e-charset-picker.c:56
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Arabic"
 msgstr "عربي"
 
-#: ../widgets/misc/e-charset-picker.c:57
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "بلطيقيّ"
 
-#: ../widgets/misc/e-charset-picker.c:58
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "وسط أوروبيّ"
 
-#: ../widgets/misc/e-charset-picker.c:59
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "صّينيّ"
 
-#: ../widgets/misc/e-charset-picker.c:60
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "سّريليّ"
 
-#: ../widgets/misc/e-charset-picker.c:61
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "يونانيّ"
 
-#: ../widgets/misc/e-charset-picker.c:62
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
 msgstr "عبريّ"
 
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "يابانيّ"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "كوريّ"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Thai"
 msgstr "تايلندي"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "تركيّ"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr "يونيكود"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr "غرب أوروبي"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "غرب أوروبي، جديد"
 
-#: ../widgets/misc/e-charset-picker.c:88 ../widgets/misc/e-charset-picker.c:89
-#: ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:91
 msgid "Traditional"
 msgstr "تقليدي"
 
-#: ../widgets/misc/e-charset-picker.c:91 ../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: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 "مبسّط"
 
-#: ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
 msgstr "أكراني"
 
-#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:101
 msgid "Visual"
 msgstr "مرئي"
 
-#: ../widgets/misc/e-charset-picker.c:169
+#: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "مجموعة محارف مجهولة: %s"
 
-#: ../widgets/misc/e-charset-picker.c:214
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "ترميز المحارف"
 
-#: ../widgets/misc/e-charset-picker.c:229
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr "أدخل مجموعة المحارف للاستخدام"
 
-#: ../widgets/misc/e-charset-picker.c:336
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "أخرى..."
 
-#: ../widgets/misc/e-charset-picker.c:598
+#: ../widgets/misc/e-charset-picker.c:599
 msgid "Ch_aracter Encoding"
 msgstr "ترميز الم_حارف"
 
@@ -22820,9 +22601,8 @@ msgid "Click this button to show a calendar"
 msgstr "انقر هذا الزر لإظهار تقويم"
 
 #: ../widgets/misc/e-dateedit.c:394
-#, fuzzy
 msgid "Drop-down combination box to select time"
-msgstr "مربع تحرير وسرد لانتقاء الوقت"
+msgstr "اسدل مربع التجميعة لانتقاء الوقت"
 
 #: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
@@ -22876,11 +22656,11 @@ msgstr "قطعة التسمية"
 msgid "A widget to display in place of the usual expander label"
 msgstr "القطعة التي سيتم عرضها عوضًا عن شارة الموسع الاعتيادية"
 
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3390
 msgid "Expander Size"
 msgstr "حجم الموسّع"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3391
 msgid "Size of the expander arrow"
 msgstr "حجم سهم الموسّع"
 
@@ -22893,87 +22673,85 @@ msgid "Spacing around expander arrow"
 msgstr "المباعدة حول سهم الموسع"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:130 ../widgets/misc/e-filter-bar.c:183
-#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:753
+#: ../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 "بحث متقدّم"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:234
+#: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
 msgstr "احفظ البحث"
 
-#: ../widgets/misc/e-filter-bar.c:271
+#: ../widgets/misc/e-filter-bar.c:267
 msgid "_Searches"
 msgstr "_بحوث"
 
-#: ../widgets/misc/e-filter-bar.c:273
+#: ../widgets/misc/e-filter-bar.c:269
 msgid "Searches"
 msgstr "بحوث"
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
 msgid "_Save Search..."
 msgstr "ا_حفظ البحث..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
 msgid "_Edit Saved Searches..."
 msgstr "_حرِّر البحوث المحفوظة..."
 
-#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:114
+#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
 msgid "_Advanced Search..."
 msgstr "بحث مت_قدم..."
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "All Accounts"
 msgstr "كل الحسابات"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:108
 msgid "Current Account"
 msgstr "الحساب الحالي"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:109
 msgid "Current Folder"
 msgstr "المجلّد الحالي"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
 msgstr "الرسالة الحالية"
 
-#: ../widgets/misc/e-image-chooser.c:167
+#: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
 msgstr "اختر صورة"
 
-#: ../widgets/misc/e-map.c:625
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "خريطة العالم"
 
-#: ../widgets/misc/e-map.c:627
-#, fuzzy
+#: ../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."
 msgstr ""
 "خريطة تفاعلية تعتمد على الماوس لتحديد المنطقة الزمنية. مستخدموا لوحة "
-"المفاتيح عليهم انتقاء المنطقة الزمنية من مربع التحرير والسرد عوضًا عن هذا."
+"المفاتيح عليهم انتقاء المنطقة الزمنية من مربع التجميعة المنسدل في الأسفل.."
 
-#: ../widgets/misc/e-online-button.c:109
-#, fuzzy
+#: ../widgets/misc/e-online-button.c:106
 msgid "Online"
-msgstr "ضمن السّياق"
+msgstr "متصل"
 
-#: ../widgets/misc/e-online-button.c:110
+#: ../widgets/misc/e-online-button.c:107
 msgid "The button state is online"
-msgstr ""
+msgstr "حالة الزر متصل"
 
-#: ../widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-pilot-settings.c:102
 msgid "Sync with:"
 msgstr "زامن مع:"
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
 msgstr "زامن السّجلّات الخاصّة:"
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
 msgstr "زامن الفئات:"
 
@@ -23039,28 +22817,28 @@ msgid " i_n "
 msgstr " ف_ي"
 
 #: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:807
+#: ../widgets/table/e-tree-selection-model.c:806
 msgid "Cursor Row"
 msgstr "صف المؤشّر"
 
 #: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:814
+#: ../widgets/table/e-tree-selection-model.c:813
 msgid "Cursor Column"
 msgstr "عمود المؤشّر"
 
-#: ../widgets/misc/e-selection-model.c:210
+#: ../widgets/misc/e-selection-model.c:209
 msgid "Sorter"
 msgstr "المرتّب"
 
-#: ../widgets/misc/e-selection-model.c:217
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Selection Mode"
 msgstr "نمط الانتقاء"
 
-#: ../widgets/misc/e-selection-model.c:225
+#: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
 msgstr "نمط المؤشّر"
 
-#: ../widgets/misc/e-send-options.c:518
+#: ../widgets/misc/e-send-options.c:522
 msgid "When de_leted:"
 msgstr "عند الح_ذف:"
 
@@ -23222,7 +23000,7 @@ msgstr "الفئات المتوفر_ة:"
 msgid "categories"
 msgstr "فئات"
 
-#: ../widgets/table/e-cell-combo.c:169
+#: ../widgets/table/e-cell-combo.c:170
 msgid "popup list"
 msgstr "قائمة منبثقة"
 
@@ -23370,15 +23148,15 @@ msgid "_Sort..."
 msgstr "_رتّب..."
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:634
-#: ../widgets/table/e-table-field-chooser.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"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:641
-#: ../widgets/table/e-table-field-chooser.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 "ترويسة كاملة"
@@ -23399,7 +23177,7 @@ msgstr ""
 "لإضافة عمود إلى جدولك، اسحبه\n"
 "إلى الموقع الذي تريد أن يظهر فيه"
 
-#: ../widgets/table/e-table-group-container.c:345
+#: ../widgets/table/e-table-group-container.c:344
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
@@ -23408,7 +23186,7 @@ msgstr[1] "%s : %s (عنصرين)"
 msgstr[2] "%s : %s (%d عناصر)"
 msgstr[3] "%s : %s (%d عنصرًا)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:350
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
@@ -23417,79 +23195,79 @@ msgstr[1] "%s (عنصرين)"
 msgstr[2] "%s (%d عناصر)"
 msgstr[3] "%s (%d عنصرًا)"
 
+#: ../widgets/table/e-table-group-container.c:922
 #: ../widgets/table/e-table-group-container.c:923
-#: ../widgets/table/e-table-group-container.c:924
 #: ../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 "ألوان صفوف متناوبة"
 
+#: ../widgets/table/e-table-group-container.c:929
 #: ../widgets/table/e-table-group-container.c:930
-#: ../widgets/table/e-table-group-container.c:931
 #: ../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:3344 ../widgets/table/e-tree.c:3345
+#: ../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-container.c:938
 #: ../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:3350 ../widgets/table/e-tree.c:3351
+#: ../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-container.c:945
 #: ../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:3356 ../widgets/table/e-tree.c:3357
+#: ../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-container.c:952
 #: ../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 "نمط المؤشّر"
 
+#: ../widgets/table/e-table-group-container.c:957
 #: ../widgets/table/e-table-group-container.c:958
-#: ../widgets/table/e-table-group-container.c:959
 #: ../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 "نموذج الانتقاء"
 
+#: ../widgets/table/e-table-group-container.c:964
 #: ../widgets/table/e-table-group-container.c:965
-#: ../widgets/table/e-table-group-container.c:966
 #: ../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:3338
-#: ../widgets/table/e-tree.c:3339
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3337
+#: ../widgets/table/e-tree.c:3338
 msgid "Length Threshold"
 msgstr "عتبة الطّول"
 
+#: ../widgets/table/e-table-group-container.c:971
 #: ../widgets/table/e-table-group-container.c:972
-#: ../widgets/table/e-table-group-container.c:973
 #: ../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:3370
-#: ../widgets/table/e-tree.c:3371
+#: ../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-container.c:980
 #: ../widgets/table/e-table-group-leaf.c:651
 #: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
@@ -23557,7 +23335,7 @@ msgid "Font Description"
 msgstr "وصف الخط"
 
 #: ../widgets/table/e-table-header-item.c:1915
-#: ../widgets/table/e-table-sorter.c:173
+#: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "معلومات التّرتيب"
 
@@ -23579,8 +23357,8 @@ msgstr "طراز الجدول"
 msgid "Cursor row"
 msgstr "صف المؤشر"
 
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
-#: ../widgets/table/e-tree.c:3378
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3376
+#: ../widgets/table/e-tree.c:3377
 msgid "Always search"
 msgstr "ابحث دائمًا"
 
@@ -23588,15 +23366,15 @@ msgstr "ابحث دائمًا"
 msgid "Use click to add"
 msgstr "استخدم النّقر للإضافة"
 
-#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
+#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
 msgid "ETree table adapter"
 msgstr "محوّل جدول الشّجرة الالكترونيّة"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3383
 msgid "Retro Look"
 msgstr "مظهر ريترو"
 
-#: ../widgets/table/e-tree.c:3385
+#: ../widgets/table/e-tree.c:3384
 msgid "Draw lines and +/- expanders."
 msgstr "ارسم الخطوط و موسّعات +/-."
 
@@ -23704,925 +23482,3 @@ msgstr "سياق مراسِل فوري"
 msgid "Handle Popup"
 msgstr "معالجة القافزة"
 
-#~ msgid "Upcoming Appointments"
-#~ msgstr "المواعيد القادمة"
-
-#~ msgid "Migrating `%s':"
-#~ msgstr "يجري ترقية `%s':"
-
-#~ msgid "_Properties..."
-#~ msgstr "_خصائص..."
-
-#~ msgid "_Appointment"
-#~ msgstr "_موعد"
-
-#~ msgid "M_eeting"
-#~ msgstr "ا_جتماع"
-
-#~ msgid "All Day A_ppointment"
-#~ msgstr "_موعد يستغرق يومًا بكامله"
-
-#~ msgid "Cale_ndar"
-#~ msgstr "الت_قويم"
-
-#~ msgid "D_escription:"
-#~ msgstr "الو_صف:"
-
-#~ msgid "De_scription:"
-#~ msgstr "الو_صف:"
-
-#~ msgid "Updating query"
-#~ msgstr "تحديث الإستفسار"
-
-#, fuzzy
-#~ msgid "Username:"
-#~ msgstr "ا_سم المستخدم:"
-
-#, fuzzy
-#~ msgid "Update every"
-#~ msgstr "تحديث الإستفسار"
-
-#~ msgid "Mark all messages in this folder and subfolders as read?"
-#~ msgstr "تعليم كل الرسائل في هذا المجلد والمجلدات الفرعية كمقروءة؟"
-
-#~ msgid "Do you want the operation to be performed also in the subfolders?"
-#~ msgstr "هل تريد إجراء العملية في المجلدات الفرعية؟"
-
-#, fuzzy
-#~ msgid "Mark All Messages as Read"
-#~ msgstr "ع_لم كل الرسائل كمقروءة"
-
-#~ msgid "Decides whether the crash detection should be run or not."
-#~ msgstr "يقرر ما إن كان يجب تشغيل اكتشاف الانهيار أم لا."
-
-#~ msgid "Skip recovery warning dialog"
-#~ msgstr "تخطّي مربع حوار التحذير عند الاسترجاع"
-
-#~ msgid "Whether crash detection should be done or not"
-#~ msgstr "ما إن كان يجب القيام باكتشاف الانهيار أم لا"
-
-#~ msgid "Whether the warning dialog in recovery of Evolution is skipped."
-#~ msgstr "ما إن كان سيتم تخطي مربع حوار التحذير عند استرجاع إيفُليوشن."
-
-#~ msgid "Evolution Crash Detection"
-#~ msgstr "اكتشاف انهيار إيفُليوشِن"
-
-#~ msgid "Ig_nore"
-#~ msgstr "تج_اهل"
-
-#~ msgid ""
-#~ "Evolution appears to have exited unexpectedly the last time it was\n"
-#~ "run.  As a precautionary measure, all preview panes will be hidden.\n"
-#~ "You can restore the preview panes from the View menu.\n"
-#~ msgstr ""
-#~ "يظهر أن إفوليوشن قد اتنهى بطريقة غير متوقعة آخر مرة تم فيها\n"
-#~ "تشغيله. على سبيل الاحتياط، كل شرائط المعاينة ستُخفى. \n"
-#~ "يمكنك استرجاع شرائط المعاينة من ثائمة الاظهار. \n"
-
-#~ msgid "_Do not show this message again"
-#~ msgstr "لا تظهر هذه الرسالة مرة أخرى"
-
-#~ msgid "Show messages in the normal style"
-#~ msgstr "اظهر الرّسائل بالأسلوب العادي"
-
-#~ msgid "_Contact"
-#~ msgstr "_مراسَل"
-
-#~ msgid "Contact _List"
-#~ msgstr "_قائمة مراسَلين"
-
-#~ msgid "Address _Book"
-#~ msgstr "_دفتر العناوين"
-
-#~ msgid "Mem_o"
-#~ msgstr "ت_ذكير"
-
-#~ msgid "_Shared memo"
-#~ msgstr "تذكيرات _مشاركة"
-
-#~ msgid "Memo li_st"
-#~ msgstr "قائ_مة التذكيرات"
-
-#~ msgid "Assigne_d Task"
-#~ msgstr "مهمّة _مسندة"
-
-#~ msgid "Tas_k list"
-#~ msgstr "قائمة م_هام"
-
-#~ msgid "_Save Message"
-#~ msgstr "احف_ظ الرّسالة"
-
-#~ msgid "folder-display|%s (%u)"
-#~ msgstr "%s (%u)"
-
-#~ msgid "_Mail Message"
-#~ msgstr "_رسالة بريديّة"
-
-#~ msgid "Mail _Folder"
-#~ msgstr "م_جلد بريد"
-
-#, fuzzy
-#~ msgid ""
-#~ "The selected folder does not have enough permissions to create the file"
-#~ msgstr "ليست لديك تصاريح كافية لحذف هذا البريد."
-
-#, fuzzy
-#~ msgid "A plugin that manages the Startup wizard."
-#~ msgstr "ملحق يدير مساعد بدء التشغيل."
-
-#~ msgid "Startup wizard"
-#~ msgstr "مساعد بدء التشغيل"
-
-#~ msgid "_Test"
-#~ msgstr "اخ_تبار"
-
-#, fuzzy
-#~ msgid ""
-#~ "'{0}' is a read-only calendar source. Change Calendar to one that can "
-#~ "accept appointments."
-#~ msgstr ""
-#~ "'{0}' مصدر تقويم للقرائة فقط. انتقل لمشهد التقويم ثم اختر تقويما يقبل "
-#~ "المواعيد."
-
-#~ msgid "There is no configuration option for this plugin."
-#~ msgstr "لا يوجد خيار تشكيل لهذا الملحق."
-
-#~ msgid "A string description of the current printer settings."
-#~ msgstr "وصف مَقطعي لإعدادات الطابعة الحالية."
-
-#~ msgid "No folder name specified."
-#~ msgstr "لم يحدَّد اسم مجلّد."
-
-#~ msgid "Folder name cannot contain the Return character."
-#~ msgstr "لا يمكن أن يحتوي اسم المجلّد رمز الأرجاع."
-
-#~ msgid "Folder name cannot contain the character \"/\"."
-#~ msgstr "لا يمكن أن يحتوي اسم المجلّد الرمز \"/\"."
-
-#~ msgid "Folder name cannot contain the character \"#\"."
-#~ msgstr "لا يمكن أن يحتوي اسم المجلّد الرمز \"#\"."
-
-#~ msgid "'.' and '..' are reserved folder names."
-#~ msgstr "'.' و '..' أسماء مجلّدات محجوزة."
-
-#~ msgid "All Day Event"
-#~ msgstr "حدث يستغرق يومًا بأكمله"
-
-#~ msgid "Send _Options"
-#~ msgstr "_خيارات الإرسال"
-
-#~ msgid "Status Details"
-#~ msgstr "تفاصيل الحالة"
-
-#~ msgid "Time Zone"
-#~ msgstr "منطقة زمنية"
-
-#, fuzzy
-#~ msgid "%.1f KB"
-#~ msgstr "%s ك.بايت"
-
-#, fuzzy
-#~ msgid "%.1f MB"
-#~ msgstr "%.0fم"
-
-#, fuzzy
-#~ msgid "%.1f GB"
-#~ msgstr "%.0fج"
-
-#~ msgid "Enable attachment reminder plugin"
-#~ msgstr "فعّل ملحق مذكّر المرفقات"
-
-#~ msgid "Enable attachment reminder plugin."
-#~ msgstr "فعّل ملحق مذكّر المرفقات."
-
-#~ msgid "Remind _missing attachments"
-#~ msgstr "تذكير بالمرفقات المفقود_ة"
-
-#~ msgid "C_lose"
-#~ msgstr "أ_غلق"
-
-#~ msgid "For_mat"
-#~ msgstr "_تهيئة"
-
-#~ msgid "H_TML"
-#~ msgstr "H_TML"
-
-#~ msgid "Save and Close"
-#~ msgstr "احفظ و أغلق"
-
-#~ msgid "Save and _Close"
-#~ msgstr "احفظ و أ_غلق"
-
-#~ msgid "Save the current file and close the window"
-#~ msgstr "احفظ الملف الحالي ثم غلق النافذة"
-
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "أرسِل البريد بتهيئة HTML"
-
-#~ msgid "Refresh List"
-#~ msgstr "حدِّث القائمة"
-
-#~ msgid "Refresh List of Folders"
-#~ msgstr "حدِّث قائمة المجلّدات"
-
-#~ msgid "Remove folder from your list of subscribed folders"
-#~ msgstr "أزِل المجلّد من قائمة المجلّدات المشترِك بها"
-
-#~ msgid "Subscribe"
-#~ msgstr "إشترِك"
-
-#~ msgid "Unsubscribe"
-#~ msgstr "الغِ الإشتراك"
-
-#~ msgid "_Invert Selection"
-#~ msgstr "ا_عكس المنتقى"
-
-#~ msgid "Permission Denied."
-#~ msgstr "السماح مرفوض."
-
-#~ msgid "<b>Display</b>"
-#~ msgstr "<b>عرض</b>"
-
-#~ msgid "<b>Server Information</b>"
-#~ msgstr "<b>معلومات الخادوم</b>"
-
-#~ msgid "Unknown reason"
-#~ msgstr "سبب مجهول"
-
-#~ msgid "Open File"
-#~ msgstr "افتح ملف"
-
-#~ msgid "Cannot open file &quot;{0}&quot;."
-#~ msgstr "لم أستِطع فتح الملف &quot;{0}&quot;."
-
-#~ msgid "Attach original message"
-#~ msgstr "إرفاق الرّسالة الأصليّة"
-
-#~ msgid "Do not quote original message"
-#~ msgstr "عدم اقتباس الرّسالة الأصليّة"
-
-#~ msgid "Quote original message"
-#~ msgstr "إقتباس الرسالة الأصليّة"
-
-#~ msgid "Enter a name for this signature."
-#~ msgstr "ادخل اسما لهذا التوقيع."
-
-#~ msgid "Name:"
-#~ msgstr "الاسم:"
-
-#~ msgid ""
-#~ "Are you sure you want to permanently remove all the deleted messages in "
-#~ "folder &quot;{0}&quot;?"
-#~ msgstr ""
-#~ "هل أنت متأكد أنك تريد إزالة كل الرسائل المحذوفة في المجلد &quot;{0}&quot; "
-#~ "نهائيًا؟"
-
-#~ msgid "Delete &quot;{0}&quot;?"
-#~ msgstr "حذف &quot;{0}&quot;؟"
-
-#~ msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-#~ msgstr "هل أحذف الرسائل في مجلد البحث &quot;{0}&quot;؟"
-
-#~ msgid "Only on _Current Folder"
-#~ msgstr "فقط في الم_جلد الحالي"
-
-#~ msgid "_Refresh:"
-#~ msgstr "أ_نعِش:"
-
-#~ msgid "Gives an option to print from the composer."
-#~ msgstr "يعطي خيار الطباعة مباشرة من المؤلِّف."
-
-#~ msgid "Print Message"
-#~ msgstr "اطبع الرّسالة"
-
-#~ msgid "Prints the message"
-#~ msgstr "لطبع الرسالة"
-
-#~ msgid "Copy selection to clipboard"
-#~ msgstr "انسخ المنتقى إلى الحافظة"
-
-#~ msgid "Cut selection to clipboard"
-#~ msgstr "قص المنتقى إلى الحافطة"
-
-#~ msgid "Paste from clipboard"
-#~ msgstr "إلصق من الحافظة"
-
-#~ msgid "Delete all but signature"
-#~ msgstr "حذف الكلّ عدى التوقيع"
-
-#~ msgid "HT_ML"
-#~ msgstr "HT_ML"
-
-#~ msgid "Open a file"
-#~ msgstr "فتح ملفّ"
-
-#~ msgid "PGP Encrypt"
-#~ msgstr "تشفير باستعمال PGP"
-
-#~ msgid "PGP Sign"
-#~ msgstr "توقيع باستعمال PGP"
-
-#~ msgid "S/MIME Encrypt"
-#~ msgstr "تشفير باستعمال S/MIME"
-
-#~ msgid "S/MIME Sign"
-#~ msgstr "توقيع باستعمال S/MIME"
-
-#~ msgid "Save As"
-#~ msgstr "احفظ كـ"
-
-#~ msgid "Save in folder..."
-#~ msgstr "احفظ في المجلّد..."
-
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "احفظ الرسالة في مجلّد محدد"
-
-#~ msgid "Send"
-#~ msgstr "أرسِل"
-
-#~ msgid "_Delete all"
-#~ msgstr "ا_حذف الكل"
-
-#~ msgid "_Open..."
-#~ msgstr "ا_فتح..."
-
-#~ msgid "TimeZone Combobox"
-#~ msgstr "مربع انتقاء المنطقة الزمنية"
-
-#~ msgid "Select Drafts Folder"
-#~ msgstr "اختر مجلد المسودات"
-
-#~ msgid "Select Sent Folder"
-#~ msgstr "اختر مجلد الرسائل المرسلة"
-
-#~ msgid "_Categories..."
-#~ msgstr "ال_فئات..."
-
-#, fuzzy
-#~ msgid ""
-#~ "It disables the feature where repeated prompts to ask if delete messages "
-#~ "from search folder."
-#~ msgstr ""
-#~ "إنه يعطّل الميزة حيث تظهر محثات متكررة للسؤال إن كانت المزامنة دون اتصال "
-#~ "مطلوبة."
-
-#, fuzzy
-#~ msgid "Select color for label..."
-#~ msgstr "ا_نتقِ تاريخًا..."
-
-#~ msgid "<span weight=\"bold\">Labels and Colors</span>"
-#~ msgstr "<span weight=\"bold\">التسميات و الألوان</span>"
-
-#, fuzzy
-#~ msgid "C_olor"
-#~ msgstr "الل_ون:"
-
-#~ msgid "Colors"
-#~ msgstr "الألوان"
-
-#~ msgid "New Mail Notification"
-#~ msgstr "التنبيه بوجود بريد جديد"
-
-#~ msgid "SMTWTFS"
-#~ msgstr "أ إ ث أ خ ج س"
-
-#~ msgid "_Search name:"
-#~ msgstr "اسم ال_بحث:"
-
-#~ msgid "New Mail Notify sound file"
-#~ msgstr "ملف صوت التّبليغ ببريدٍ جديد"
-
-#~ msgid "New Mail Notify type"
-#~ msgstr "نوع التّبليغ ببريدٍ جديد"
-
-#~ msgid "Specifies the type of New Mail Notification the user wishes to use."
-#~ msgstr "لتحديد فئة إشعار البريد الجديد التي يود المستخدم استخدامها."
-
-#, fuzzy
-#~ msgid "<span weight=\"bold\">New Message Notification</span>"
-#~ msgstr "<span weight=\"bold\">الإشعار بوجود بريد جديد</span>"
-
-#~ msgid "Se_lect..."
-#~ msgstr "ا_ختر..."
-
-#, fuzzy
-#~ msgid "_Beep when new messages arrive"
-#~ msgstr "صفـّر ع_ند وصول بريد جديد"
-
-#~ msgid "Attachment Reminder Preferences"
-#~ msgstr "تفضيلات مذكّر المرفقات"
-
-#~ msgid "_Contacts..."
-#~ msgstr "الم_راسَلون..."
-
-#~ msgid "Every time a new mail arrives, pop up a libnotify notification."
-#~ msgstr "في كل مرة يصل بريد جديد فيها، أطلق تنبيه libnotify منبثق."
-
-#~ msgid "Make the status icon blink"
-#~ msgstr "اجعل أيقونة الحالة تومض"
-
-#~ msgid "When the new-mail status icon is visible, make it blink."
-#~ msgstr "عندما يتكون أيقونة حالة البريد الجديد ظاهرة، اجعلها تومض."
-
-#, fuzzy
-#~ msgid "Con_figure"
-#~ msgstr "إعداد"
-
-#~ msgid "Download messages for offline"
-#~ msgstr "مجلد الرسائل المحفوظة بدون اتصال"
-
-#~ msgid "MTWTFSS"
-#~ msgstr "إثأخجسأ"
-
-#~ msgid "\n"
-#~ msgstr "\n"
-
-#~ msgid "Add an email to the List"
-#~ msgstr "أضف بريد إلكتروني للقائمة"
-
-#~ msgid "Insert email addresses from Address Book"
-#~ msgstr "أدرج عنوان بريد إلكتروني من دفتر العناوين"
-
-#~ msgid "Members"
-#~ msgstr "الأعضاء"
-
-#~ msgid "Remove an email address from the List"
-#~ msgstr "احذف بريد إلكتروني من القائمة"
-
-#~ msgid "_Select"
-#~ msgstr "انت_قي"
-
-#~ msgid "Or_ganiser:"
-#~ msgstr "ال_منظّم:"
-
-#~ msgid "Post To:"
-#~ msgstr "انشر في:"
-
-#~ msgid "Di_sable"
-#~ msgstr "ع_طّل"
-
-#~ msgid "System error: %s"
-#~ msgstr "خطأ في النظام: %s"
-
-#~ msgid "Account cannot send e-mail"
-#~ msgstr "لا يمكن للحساب إرسال بريد إلكتروني"
-
-#~ msgid "No store available"
-#~ msgstr "لا وجود لمخزن."
-
-#~ msgid ""
-#~ "A plugin which implements a CORBA interface for accessing mail data "
-#~ "remotely."
-#~ msgstr "ملحق يقوم بطبيق واجهة CORBA للوصول لبيانات البريد عن بعد."
-
-#~ msgid "Mail Remote"
-#~ msgstr "بريد عن بعد"
-
-#~ msgid "Emulate label resize"
-#~ msgstr "حاكِ تحجيم العنوان"
-
-#~ msgid "Task sort"
-#~ msgstr "ترتيب المهام"
-
-#~ msgid "Memo sort"
-#~ msgstr "ترتيب التذكيرات"
-
-#~ msgid "The Evolution PIM and Email Client"
-#~ msgstr "عميل البريد ومدير المعلومات الشخصيّة إيفُليوشن"
-
-#~ msgid "HTML Mail"
-#~ msgstr "بريد HTML"
-
-#~ msgid "Select a (48*48) png of size < 720bytes"
-#~ msgstr "اختر صورة png (48*48) حجمها أقل من 720 بايت"
-
-#~ msgid "<- _Remove"
-#~ msgstr "<- أ_زل"
-
-#~ msgid "Sh_ow these fields in order:"
-#~ msgstr "أظهر هذه الحقول بترتيب:"
-
-#~ msgid "_Add ->"
-#~ msgstr "أ_ضِف ->"
-
-#~ msgid "A Folder with this name already exists"
-#~ msgstr "يوجد بالفعل مجلّد بهاذا الاسم"
-
-#~ msgid ""
-#~ "The changed email or name of this contact already\n"
-#~ "exists in this folder.  Would you like to add it anyway?"
-#~ msgstr ""
-#~ "العنوان البريدي أو الاسم لهذا المراسَل موجود مسبقًا\n"
-#~ "في هذا المجلّد.  هل تودّ إضافته على كل حال؟"
-
-#~ msgid "Valid signature, cannot verify sender"
-#~ msgstr "توقيع سليم، تعذر التّحقّق من المرسِل"
-
-#~ msgid "_Address: "
-#~ msgstr "ال_عنوان:"
-
-#~ msgid "Print cards"
-#~ msgstr "اطبع البطاقات"
-
-#~ msgid "Organization"
-#~ msgstr "المنظّمة"
-
-#~ msgid "GTK Tree View"
-#~ msgstr "مشهد شجرة GTK"
-
-#~ msgid "Print envelope"
-#~ msgstr "اطبع المظروف"
-
-#~ msgid "Print contacts"
-#~ msgstr "اطبع المراسَلين"
-
-#~ msgid "Print contact"
-#~ msgstr "اطبع المراسَل"
-
-#~ msgid "Error loading default addressbook."
-#~ msgstr "خطأ عند تحميل دفتر العناوين الإفتراضي."
-
-#~ msgid "Input File"
-#~ msgstr "ملف الدخْل"
-
-#~ msgid ""
-#~ "All information in these journal entries will be deleted and can not be "
-#~ "restored."
-#~ msgstr "جميع المعلومات في مدخلات السجل هذه ستحذف وسيتعذر إعادتها."
-
-#~ msgid ""
-#~ "All information on this journal entry will be deleted and can not be "
-#~ "restored."
-#~ msgstr "جميع المعلومات في مدخل السجل هذا ستحذف وسيتعذر إعادتها."
-
-#~ msgid "Are you sure you want to delete the journal entry '{0}'?"
-#~ msgstr "أمتأكد أنك ترغب في حذف مدخل السجل '{0}'؟"
-
-#~ msgid "Are you sure you want to delete these {0} journal entries?"
-#~ msgstr "أمتأكد أنك ترغب في حذف مدخلات السجل هذه '{0}'؟"
-
-#~ msgid "Are you sure you want to delete this journal entry?"
-#~ msgstr "أمتأكد أنك ترغب في حذف مدخل السجل هذا؟"
-
-#~ msgid ""
-#~ "If you do not send a cancelation notice, the other participants may not "
-#~ "know the journal has been deleted."
-#~ msgstr ""
-#~ "إذا لم ترسل تنبيها بالإلغاء، قد لا يعرف المشاركون الآخرون أن السجل قد "
-#~ "حُذِفت."
-
-#~ msgid "Add Calendar"
-#~ msgstr "أضِف تقويم"
-
-#~ msgid "Add Task List"
-#~ msgstr "أضِف قائمة مهام"
-
-#~ msgid "_Add Calendar"
-#~ msgstr "أ_ضف تقويم"
-
-#~ msgid "_Add Task List"
-#~ msgstr "أ_ضف قائمة مهام"
-
-#~ msgid "This journal entry has been deleted."
-#~ msgstr "تم حذف خانة السجل هذه."
-
-#~ msgid "This journal entry has been changed."
-#~ msgstr "تم تغيير خانة السجل هذه."
-
-#~ msgid "Journal entry - %s"
-#~ msgstr "خانة سجل - %s"
-
-#~ msgid "The journal entry could not be deleted due to a corba error"
-#~ msgstr "لم يمكن حذف خانة السجل بسبب خطأ قي corba"
-
-#~ msgid "The journal entry could not be deleted because permission was denied"
-#~ msgstr "لم يمكن حذف بند السّجل اليومي لأن التّصريح رُفض"
-
-#~ msgid "The journal entry could not be deleted due to an error"
-#~ msgstr "لم يمكن حذف بند السّجل اليومي بسبب خطأ ما"
-
-#~ msgid "Add New Calendar"
-#~ msgstr "أضِف تقويم جديد"
-
-#~ msgid "Calendar Group"
-#~ msgstr "مجموعة التقويم"
-
-#~ msgid "Calendar Location"
-#~ msgstr "موقع التقويم"
-
-#~ msgid "Calendar Name"
-#~ msgstr "اسم التقويم"
-
-#~ msgid "<b>Task List Options</b>"
-#~ msgstr "<b>خيارات قائمة المهام</b>"
-
-#~ msgid "Add New Task List"
-#~ msgstr "أضِف قائمة مهام جديدة"
-
-#~ msgid "Task List Group"
-#~ msgstr "مجموعة قائمة المهام"
-
-#~ msgid "Task List Name"
-#~ msgstr "اسم قائمة المهام"
-
-#~ msgid ""
-#~ "You are modifying a recurring journal entry. What would you like to "
-#~ "modify?"
-#~ msgstr "أنت بصدد تعديل خانة سجلّ متكرّرة، ما الذي تود تعديله؟"
-
-#~ msgid "<b>Free/Busy C_alendars</b>"
-#~ msgstr "<b>ت_قويمات متفرّغ/مشغول</b>"
-
-#~ msgid "<b>Publishing Frequency</b>"
-#~ msgstr "<b>سرعة النشر</b>"
-
-#~ msgid "<b>Publishing _Location</b>"
-#~ msgstr "<b>_موقع النشر</b>"
-
-#~ msgid "Free/Busy Publishing Settings"
-#~ msgstr "إعدادات نشر متفرّغ/مشغول"
-
-#~ msgid "_Daily"
-#~ msgstr "_يومي"
-
-#~ msgid "_Manual"
-#~ msgstr "ي_دوي"
-
-#~ msgid "_Weekly"
-#~ msgstr "أ_سبوعي"
-
-#~ msgid "Enter the password for %s"
-#~ msgstr "ادخل كلمة السر لـ %s"
-
-#~ msgid "Journal information"
-#~ msgstr "معلومات السّجل"
-
-#~ msgid "Selected day (%a %b %d %Y)"
-#~ msgstr "اليوم المنتقى (%a %b %d %Y)"
-
-#~ msgid "%a %b %d"
-#~ msgstr "%a %b %d"
-
-#~ msgid "%a %d %Y"
-#~ msgstr "%a %d %Y"
-
-#~ msgid "%a %b %d %Y"
-#~ msgstr "%a %b %d %Y"
-
-#~ msgid "Selected week (%s - %s)"
-#~ msgstr "الأسبوع المنتقى (%s - %s)"
-
-#~ msgid "Selected month (%b %Y)"
-#~ msgstr "الشّهر المنتقى (%b %Y)"
-
-#~ msgid "Selected year (%Y)"
-#~ msgstr "السّنة المنتقاة (%Y)"
-
-#~ msgid "Print Item"
-#~ msgstr "اطبع العنصر"
-
-#~ msgid "%.0fK"
-#~ msgstr "%.0fك"
-
-#~ msgid "No, Do not Change Status"
-#~ msgstr "كلّا، لا تغيّر الحالة"
-
-#~ msgid "<b>Receiving Email</b>"
-#~ msgstr "<b>يجري استلام البريد الإلكتروني</b>"
-
-#~ msgid "<b>Sending Email:</b>"
-#~ msgstr "<b>يجري إرسال البريد الإلكتروني:</b>"
-
-#~ msgid ""
-#~ "<small>This page allows you to choose if you want to be notified via a "
-#~ "read receipt when a message you\n"
-#~ "sent is read, and to specify what Evolution should do when someone "
-#~ "requests a receipt from you.</small>"
-#~ msgstr ""
-#~ "<small>تخول لك هذه الصّفحة الإختيار بين ما إذا كنت تريد أن تبلّغ بواسطة وصل "
-#~ "عن قراءة رسالة لك\n"
-#~ "و تحديد ما يفترض لإيفُليوشِن القيام به عند طلب شخص وصلا منك.</small>"
-
-#~ msgid "Ask me if I want to send back a read receipt"
-#~ msgstr "إسألني فيما إذا كنتُ أريد إرسال وصل قراءة"
-
-#~ msgid "Never send back a read receipt"
-#~ msgstr "عدم إرسال وصل قراءة أبدًا"
-
-#~ msgid "Read Receipts"
-#~ msgstr "إخطار بالقراءة"
-
-#~ msgid "Request a read receipt for all messages I send"
-#~ msgstr "طلب إخطار بالقراءة لكل الرّسائل التي أُرسلها"
-
-#~ msgid ""
-#~ "Unless the message is sent to a mailing list, and not to me personally"
-#~ msgstr "إلّا إذا كانت هذه الرّسالة مرسلةً إلى قائمة بريديّة، و ليس لي شخصيًّا"
-
-#~ msgid ""
-#~ "When you receive an email with a read receipt request, what should "
-#~ "Evolution do?"
-#~ msgstr ""
-#~ "عندما تستلم بريدًا إلكترونيًّا مع طلبٍ لوصل إفادةٍ بالقراءة، ما الذي يفترض "
-#~ "إيفُليوشِن فعله؟"
-
-#~ msgid "The orientation of the tray."
-#~ msgstr "إتجاه اللوحة."
-
-#~ msgid "Enable"
-#~ msgstr "فعّل"
-
-#~ msgid "<b>Then</b>"
-#~ msgstr "<b>ثم</b>"
-
-#, fuzzy
-#~ msgid "<b>Retrieving Message...</b>"
-#~ msgstr "يجري سحب الرسالة %s"
-
-#~ msgid "Priority Filter \"%s\""
-#~ msgstr "مرشح الأولوية \"%s\""
-
-#~ msgid ""
-#~ "Some of your Netscape email filters are based on\n"
-#~ "email priorities, which are not used in Evolution.\n"
-#~ "Instead, Evolution provides scores in the range of\n"
-#~ "-3 to 3 that can be assigned to emails and filtered\n"
-#~ "accordingly.\n"
-#~ "\n"
-#~ "As a workaround, a set of filters called \"Priority Filter\"\n"
-#~ "was added that converts Netscape's email priorities into\n"
-#~ "Evolution's scores, and the affected filters use scores instead\n"
-#~ "of priorities. Check the imported filters to make sure\n"
-#~ "everything still works as intended."
-#~ msgstr ""
-#~ "بعض مرشحات نتسكيب للبريد الإلكتروني الخاصة بك مبنية\n"
-#~ "على أولويات البريد، والتي لا يستخدمها إيفُليوشن.\n"
-#~ "عوضًا عن هذا، يوفر إيفُليوشن تقييمات في المدى\n"
-#~ "بين -٣ و ٣ يمكن تعيينها لرسائل البريد الإلكتروني\n"
-#~ "وفلترتها على هذا الأساس.\n"
-#~ "\n"
-#~ "كحل بديل، تمت إضافة مجموعة من المرشحات\n"
-#~ "تسمى \"مرشح الأولوية\" لتحويل أولويات نتسكيب للبريد الإلكتروني\n"
-#~ "إلى تقييمات إيفُليوشن، وتستخدم المرشحات المعنية التقييمات بدلًا\n"
-#~ "من الأولويات. افحص المرشحات المستوردة للتأكد من أن كل شئ\n"
-#~ "يعمل كما هو مفترض."
-
-#~ msgid ""
-#~ "Some of your Netscape email filters use\n"
-#~ "the \"Ignore Thread\" or \"Watch Thread\"\n"
-#~ "feature, which is not supported in Evolution.\n"
-#~ "These filters will be dropped."
-#~ msgstr ""
-#~ "بعض مرشحات نتسكيب للبريد الإلكتروني تستخدم\n"
-#~ "ميزة \"تجاهل الخيط\" أو \"مراقبة الخيط\"\n"
-#~ "وهي ميزة لا يدعمها إيفُليوشن.\n"
-#~ "لن يتم استيراد هذه المرشحات."
-
-#~ msgid ""
-#~ "Some of your Netscape email filters test the\n"
-#~ "body of emails for (in)equality to a given string,\n"
-#~ "which is not supported in Evolution. Those filters\n"
-#~ "were modified to test whether that string is or is not\n"
-#~ "contained in the message body."
-#~ msgstr ""
-#~ "بعض مرشحات نتسكيب للبريد الإلكتروني تفحص\n"
-#~ "متن الرسائل لمقارنة جملها بجملة محددة،\n"
-#~ "وهذه الميزة لا يدعمها إيفُليوشن. تم تعديل هذه\n"
-#~ "المرشحات لفحص المتن بحثًا عن هذه الجملة\n"
-#~ "والتأكد من وجودها أو عدم وجودها في المتن."
-
-#~ msgid "Evolution is importing your old Netscape data"
-#~ msgstr "إيفُليوشِن بصدد استيراد ملفّات نتْسكيب القديمة الخاصّة بك"
-
-#~ msgid "Importing Netscape data"
-#~ msgstr "يجري استيراد بيانات نتسكيب"
-
-#~ msgid "Settings"
-#~ msgstr "الإعدادات"
-
-#~ msgid "Mail Filters"
-#~ msgstr "مرشحات البريد"
-
-#~ msgid ""
-#~ "Evolution has found Netscape mail files.\n"
-#~ "Would you like them to be imported into Evolution?"
-#~ msgstr ""
-#~ "عثر إيفُليوشِن على ملفّات بريد نتْسكيب\n"
-#~ "هل تريد استيرادها لإيفُليوشِن؟"
-
-#~ msgid "Mark as _Read"
-#~ msgstr "علم كمقرو_ء"
-
-#~ msgid "_Do not Mark as Read"
-#~ msgstr "_لا تعلم كمقروء"
-
-#~ msgid "Check Evolution archive"
-#~ msgstr "إفحص أرشيف إيفُليوشن"
-
-#, fuzzy
-#~ msgid "With GUI"
-#~ msgstr "العرض"
-
-#~ msgid "<b>Junk Mail Settings</b>"
-#~ msgstr "<b>إعدادات البريد النفاية</b>"
-
-#~ msgid "<b>Subject</b> :"
-#~ msgstr "<b>الموضوع</b> :"
-
-#~ msgid "<b>From</b> :"
-#~ msgstr "<b>من</b> :"
-
-#~ msgid ""
-#~ "The output directory was not found on iPod! Please ensure that iPod has "
-#~ "been correctly set up and try again."
-#~ msgstr ""
-#~ "لم يتم إيجاد دليل الخرج على آيبود! رجاءً تأكد من أن آيبود تم ضبطه بصورة "
-#~ "سليمة ثم حاول مرة أخرى."
-
-#~ msgid "Could not export data!"
-#~ msgstr "غير قادر على تصدير البيانات!"
-
-#~ msgid "Exporting data failed."
-#~ msgstr "فشل تصدير البيانات."
-
-#~ msgid "Could not open addressbook!"
-#~ msgstr "غير قادر على فتح دفتر العناوين!"
-
-#~ msgid "Could not open the Evolution addressbook to export data."
-#~ msgstr "غير قادر على فتح دفتر عناوين إيفُليوشن لتصدير البيانات."
-
-#~ msgid "Could not open calendar/todo!"
-#~ msgstr "غير قادر على فتح التقويم/مهام للقيام بها"
-
-#~ msgid "Could not open the Evolution calendar/todo list to export data."
-#~ msgstr ""
-#~ "غير قادر على فتح قائمة مهام للقيام بها وتقويم إيفُليوشن لتصدير البيانات."
-
-#~ msgid "Unable to find this journal entry in any journal"
-#~ msgstr "غير قادر على إيجاد مدخل اليومية هذا في أي يومية"
-
-#~ msgid "New mail notify"
-#~ msgstr "تنبيه بوجود بريد جديد"
-
-#~ msgid "(Untitled)"
-#~ msgstr "(بدون عنوان)"
-
-#~ msgid "An attachment to add."
-#~ msgstr "مُرفق للإضافة."
-
-#~ msgid "Content type of the attachment."
-#~ msgstr "نوع محتوى المُرفق."
-
-#~ msgid "The filename to display in the mail."
-#~ msgstr "اسم الملف الذي سيُعرض في البريد."
-
-#~ msgid "Description of the attachment."
-#~ msgstr "وصف المُرفق."
-
-#~ msgid "Mark attachment to be shown inline by default."
-#~ msgstr "علّم المرفق الذي سيظهر داخليا افتراضا."
-
-#~ msgid "_Edit..."
-#~ msgstr "_حرِّر..."
-
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgid "Minicard Test"
-#~ msgstr "إختبار البطاقة المختصرة"
-
-#~ msgid "Copyright (C) 2000, Helix Code, Inc."
-#~ msgstr "حقوق النسخ (C) 2000, Helix Code, المحدودة."
-
-#~ msgid "This should test the minicard canvas item"
-#~ msgstr "يُفترض أن يختبر هذا عنصر شبكة تصميم البطاقة"
-
-#~ msgid "E-mail"
-#~ msgstr "البريد الإلكتروني"
-
-#~ msgid "<span weight=\"bold\">Filter Options</span>"
-#~ msgstr "<span weight=\"bold\">خيارات المرشح</span>"
-
-#~ msgid "<b>Recipients </b>"
-#~ msgstr "<b>المُستَقْبِلون </b>"
-
-#~ msgid "<b>Action</b>"
-#~ msgstr "<b>الإجراء</b>"
-
-#~ msgid "<b>Date and Time</b>"
-#~ msgstr "<b>الوقت والتاريخ</b>"
-
-#~ msgid "%H:%M"
-#~ msgstr "%H:%M"
-
-#~ msgid "%I:%M %p"
-#~ msgstr "%I:%M %p"
-
-#~ msgid "ebby"
-#~ msgstr "إبي"
-
-#~ msgid "range"
-#~ msgstr "المدى"
-
-#~ msgid "Printer settings"
-#~ msgstr "إعدادات الطابعة"
diff --git a/po/bg.po b/po/bg.po
index bd07aa1863..1b63bcc07a 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-10 22:03+0300\n"
-"PO-Revision-Date: 2008-09-10 21:41+0300\n"
+"POT-Creation-Date: 2008-09-30 17:31+0300\n"
+"PO-Revision-Date: 2008-09-30 08:17+0300\n"
 "Last-Translator: Yavor Doganov <yavor@gnu.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "MIME-Version: 1.0\n"
@@ -24,21 +24,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:178
+#: ../a11y/addressbook/ea-minicard-view.c:179
 msgid "evolution address book"
 msgstr "Адресник на Evolution"
 
-#: ../a11y/addressbook/ea-minicard-view.c:32
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "Нов контакт"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "Нов списък с контакти"
 
-#: ../a11y/addressbook/ea-minicard-view.c:161
+#: ../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"
@@ -167,7 +167,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:856 ../calendar/gui/e-day-view.c:1566
+#: ../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"
@@ -199,7 +199,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:860 ../calendar/gui/e-day-view.c:1582
+#: ../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"
@@ -253,11 +253,11 @@ msgstr "Група"
 msgid "popup a child"
 msgstr "изскачащ подпрозорец"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
 msgid "edit"
 msgstr "редактиране"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
 msgid "begin editing this cell"
 msgstr "стартиране редакцията на тази клетка"
 
@@ -270,19 +270,19 @@ msgstr "задаване"
 msgid "toggle the cell"
 msgstr "задаване на клетката"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
 msgid "expand"
 msgstr "разширяване"
 
-#: ../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 "разширява реда в дървото, което съдържа тази клетка"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
 msgid "collapse"
 msgstr "свиване"
 
-#: ../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 "свива реда в дървото, което съдържа тази клетка"
 
@@ -417,7 +417,7 @@ msgstr "Неуспех в идентифицирането пред LDAP сър�
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1735
 msgid "Failed to delete contact"
 msgstr "Неуспех при триенето на контакт"
 
@@ -430,6 +430,7 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP не отговори с валидни типове схеми."
 
 #: ../addressbook/addressbook.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:50
 msgid "Server Version"
 msgstr "Версия на сървъра"
 
@@ -601,9 +602,9 @@ msgstr "Конфигуриране на авт. дописване"
 
 #. 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 "Контакти"
@@ -642,15 +643,15 @@ msgstr "Управление на S/MIME сертификати"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:144
-#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../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:312 ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1457
+#: ../mail/mail-component.c:311 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1518
 msgid "On This Computer"
 msgstr "На този компютър"
 
@@ -659,9 +660,9 @@ msgstr "На този компютър"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:152
-#: ../addressbook/gui/component/addressbook-migrate.c:507
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../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
@@ -672,44 +673,44 @@ msgid "Personal"
 msgstr "Лично"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:163
-#: ../addressbook/gui/component/addressbook-migrate.c:517
+#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-migrate.c:518
 msgid "On LDAP Servers"
 msgstr "На LDAP сървъри"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Контакт"
 
-#: ../addressbook/gui/component/addressbook-component.c:231
+#: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "Създаване на нов контакт"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgctxt "New"
 msgid "Contact _List"
 msgstr "_Списък с контакти"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
 msgstr "Създаване на нов списък с контакти"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:244
 #: ../addressbook/gui/component/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "Нов адресник"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Адресник"
 
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
 msgstr "Създаване на нов адресник"
 
-#: ../addressbook/gui/component/addressbook-component.c:410
+#: ../addressbook/gui/component/addressbook-component.c:409
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Неуспех при осъвременяването на настройките или папките на адресника."
 
@@ -734,14 +735,14 @@ 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:2372
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Основни"
 
 #: ../addressbook/gui/component/addressbook-config.c:983
-#: ../addressbook/gui/widgets/e-addressbook-view.c:555
-#: ../mail/importers/pine-importer.c:385
+#: ../addressbook/gui/widgets/e-addressbook-view.c:556
+#: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Адресник"
 
@@ -773,26 +774,26 @@ msgstr "Изтегляне"
 msgid "Address Book Properties"
 msgstr "Настройки на адресника"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../addressbook/gui/component/addressbook-migrate.c:74
 #: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Мигриране…"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../addressbook/gui/component/addressbook-migrate.c:126
 #: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Мигриране на „%s“:"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:645
+#: ../addressbook/gui/component/addressbook-migrate.c:646
 msgid "LDAP Servers"
 msgstr "LDAP сървъри"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:760
+#: ../addressbook/gui/component/addressbook-migrate.c:761
 msgid "Autocompletion Settings"
 msgstr "Настройки за автоматично допълване"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1136
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -804,7 +805,7 @@ msgstr ""
 "\n"
 "Изчакайте, докато Evolution мигрира вашите папки…"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1150
+#: ../addressbook/gui/component/addressbook-migrate.c:1151
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -814,7 +815,7 @@ msgstr ""
 "\n"
 "Изчакайте, докато Evolution мигрира вашите папки…"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1159
+#: ../addressbook/gui/component/addressbook-migrate.c:1160
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -824,7 +825,7 @@ msgstr ""
 "\n"
 "Изчакайте, докато Evolution мигрира вашите папки…"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1169
+#: ../addressbook/gui/component/addressbook-migrate.c:1170
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -835,35 +836,35 @@ msgstr ""
 "\n"
 "Изчакайте, докато Evolution мигрира вашите Pilot Sync данни…"
 
-#: ../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 "Преименуване на папката „%s“ на:"
 
-#: ../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 "Преименуване на папка"
 
-#: ../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 "Името на папката не може да съдържа „/“"
 
-#: ../addressbook/gui/component/addressbook-view.c:942
+#: ../addressbook/gui/component/addressbook-view.c:941
 msgid "_New Address Book"
 msgstr "_Нов адресник"
 
-#: ../addressbook/gui/component/addressbook-view.c:943
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "Save As vCard..."
 msgstr "Запазване като vCard…"
 
-#: ../addressbook/gui/component/addressbook-view.c:946
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../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:1596
-#: ../calendar/gui/e-calendar-view.c:1693 ../calendar/gui/e-memo-table.c:941
+#: ../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
@@ -872,16 +873,16 @@ msgstr "Запазване като vCard…"
 msgid "_Delete"
 msgstr "_Изтриване"
 
-#: ../addressbook/gui/component/addressbook-view.c:949
+#: ../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:1044 ../mail/em-folder-tree.c:2120
+#: ../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 "_Настройки"
 
-#: ../addressbook/gui/component/addressbook-view.c:1337
+#: ../addressbook/gui/component/addressbook-view.c:1336
 msgid "Contact Source Selector"
 msgstr "Избиране на контакти"
 
@@ -929,10 +930,14 @@ msgstr ""
 "панела за преглед."
 
 #: ../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 "Показване на предварителния преглед на писмата"
 
-#: ../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."
@@ -940,20 +945,26 @@ msgstr ""
 "Броят знаци, които трябва да бъдат изписани, преди Evolution да се опита да "
 "допише израза автоматично."
 
-#: ../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 "Адрес на папката, последно използвана в диалога за избор на име"
 
-#: ../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 "Адрес на папката, последно използвана в диалога за избор на име."
 
-#: ../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 "Разположение на вертикалния панел"
 
-#: ../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 "Показване на панела „Предварителен преглед на писмата“."
 
@@ -998,7 +1009,7 @@ msgid "Add Address Book"
 msgstr "Добавяне на адресник"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:760
 msgid "Always"
 msgstr "Винаги"
 
@@ -1037,14 +1048,14 @@ msgid "Lo_gin:"
 msgstr "_Потребител:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:759
 msgid "Never"
 msgstr "Никога"
 
 #. 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:288
+#: ../mail/em-account-editor.c:287
 msgid "No encryption"
 msgstr "Без шифриране"
 
@@ -1056,7 +1067,7 @@ msgstr "Едно ниво"
 #. 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:296
+#: ../mail/em-account-editor.c:295
 msgid "SSL encryption"
 msgstr "Шифриране с SSL"
 
@@ -1123,7 +1134,7 @@ msgstr "Поддържани основи за търсене"
 #. 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:292
+#: ../mail/em-account-editor.c:291
 msgid "TLS encryption"
 msgstr "Шифриране с TLS"
 
@@ -1150,8 +1161,9 @@ msgstr ""
 "основата."
 
 #: ../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 "Това е пълното име на LDAP сървъра. Примерно, „ldap.company.com“."
 
@@ -1164,9 +1176,10 @@ msgstr ""
 "прекалено голяма цифра тук може да забави адресника."
 
 #: ../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 ""
 "Това е методът, който Evolution ще използва за удостоверяване. Забележете, "
@@ -1221,7 +1234,7 @@ msgstr "_Метод за идентификация в системата:"
 
 #: ../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:"
@@ -1236,7 +1249,7 @@ msgid "_Search scope:"
 msgstr "Обхват на _търсене:"
 
 #: ../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 "_Сървър:"
@@ -1301,7 +1314,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Служебен</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"
@@ -1313,16 +1326,16 @@ msgid "Ca_tegories..."
 msgstr "Ка_тегории…"
 
 #: ../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
 msgid "Contact"
 msgstr "Контакт"
 
 #: ../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 "Редактор на контакти"
 
@@ -1349,132 +1362,137 @@ msgstr "_Прякор:"
 
 #: ../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 "Лична информация"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Telephone"
 msgstr "Телефон"
 
 #. 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 "Служебен"
 
-#: ../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 "_Адрес:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Anniversary:"
 msgstr "_Годишнина:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Assistant:"
 msgstr "_Помощник:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Birthday:"
 msgstr "_Рожден ден:"
 
-#: ../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
 msgid "_Calendar:"
 msgstr "_Календар:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
 msgstr "_Град:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Company:"
 msgstr "_Компания:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
 msgstr "_Държава:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
 msgstr "_Отдел:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
 msgstr "Име в _списъка:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
 msgstr "_Свободен/зает:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
 msgstr "_Интернет страница:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
 msgstr "_Ръководител:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_Бележки:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Office:"
 msgstr "_Офис:"
 
-#: ../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 "_Пощенска кутия:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Profession:"
 msgstr "_Професия:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Spouse:"
 msgstr "_Съпруг(а):"
 
-#: ../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 "_Щат/провинция:"
 
-#: ../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 "_Титла:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Video Chat:"
 msgstr "_Видео разговор:"
 
-#: ../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 "_Иска да получава поща във формат HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
 msgstr "_Блог:"
 
-#: ../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 "_Къде:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "_Zip/Postal Code:"
 msgstr "_ZIP/пощенски код:"
 
@@ -1487,16 +1505,16 @@ msgstr "Адрес"
 #: ../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:164
+#: ../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:1836 ../widgets/text/e-text.c:3687
+#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3687
 #: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "Редактируем"
@@ -2470,13 +2488,13 @@ msgid "Zimbabwe"
 msgstr "Зимбабве"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
-#: ../mail/em-mailer-prefs.c:466
+#: ../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:350
+#: ../plugins/save-attachments/save-attachments.c:351
 #: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 #: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Име"
@@ -2486,7 +2504,7 @@ msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
 #: ../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"
@@ -2500,7 +2518,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"
@@ -2513,7 +2531,7 @@ msgstr "Услуга"
 #: ../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:375
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "Местоположение"
 
@@ -2522,77 +2540,77 @@ msgid "Username"
 msgstr "Потребителско име"
 
 #: ../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 "Домашна"
 
 #: ../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 "Друга"
 
-#: ../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 "Книга — източник"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Target Book"
 msgstr "Книга — цел"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
 msgid "Is New Contact"
 msgstr "Е нов контакт"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Writable Fields"
 msgstr "Полета за писане"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Required Fields"
 msgstr "Задължителни полета"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Променени"
 
-#: ../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 "Редактор на контакти — %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 "Изберете изображение за този контакт"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
 msgid "_No image"
 msgstr "_Няма изображение"
 
-#: ../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"
@@ -2600,47 +2618,47 @@ msgstr ""
 "Информацията на контакта е невалидна:\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“ е с невалиден формат"
 
-#: ../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“ е с невалиден формат"
 
-#: ../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“ е празен"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3138
 msgid "Invalid contact."
 msgstr "Невалиден контакт."
 
-#: ../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 "Бързо добавяне на контакт"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:328
 msgid "_Edit Full"
 msgstr "Пълно р_едактиране"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:402
 msgid "_Full name"
 msgstr "_Пълно име"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:413
 msgid "E_mail"
 msgstr "_Е-поща"
 
-#: ../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 "Избор на адрес_ник"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:321
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2649,7 +2667,7 @@ msgstr ""
 "Сигурни ли сте, че искате да\n"
 "изтриете списъка с контакти (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:324
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2657,7 +2675,7 @@ msgstr ""
 "Сигурни ли сте, че искате да\n"
 "изтриете тези списъци с контакти?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:329
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2666,7 +2684,7 @@ msgstr ""
 "Сигурни ли сте, че искате да\n"
 "изтриете контакта (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:332
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2814,9 +2832,9 @@ msgid "_Members"
 msgstr "_Членове"
 
 #: ../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"
@@ -2878,19 +2896,19 @@ msgstr "Смесване на контакт"
 #: ../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:415 ../smime/lib/e-cert.c:827
+#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Електронна поща"
 
 #: ../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 "Кое да е поле съдържа"
 
 #: ../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 "Електронната поща започва с"
 
@@ -2898,26 +2916,26 @@ msgstr "Електронната поща започва с"
 msgid "Name contains"
 msgstr "Името съдържа"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:150
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
 msgid "No contacts"
 msgstr "Няма контакти"
 
-#: ../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 контакт"
 msgstr[1] "%d контакта"
 
-#: ../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 "Заявка"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:448
+#: ../addressbook/gui/widgets/e-addressbook-model.c:461
 msgid "Error getting book view"
 msgstr "Грешка при взимането на изгледа на книгата"
 
@@ -2925,7 +2943,7 @@ msgstr "Грешка при взимането на изгледа на книг
 #: ../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:821 ../widgets/text/e-text.c:3551
+#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3551
 #: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "Модел"
@@ -2934,15 +2952,15 @@ msgstr "Модел"
 msgid "Error modifying card"
 msgstr "Грешка при промяна на карта"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Name begins with"
 msgstr "Името започва с"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:219
+#: ../addressbook/gui/widgets/e-addressbook-view.c:220
 msgid "Source"
 msgstr "Източник"
 
-#: ../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
@@ -2950,87 +2968,87 @@ msgstr "Източник"
 msgid "Type"
 msgstr "Тип"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:813
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1954
 msgid "Save as vCard..."
 msgstr "Запазване като vCard…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
 #: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/e-calendar-table.c:1574
-#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:924
+#: ../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 "_Отваряне"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "_New Contact..."
 msgstr "_Нов контакт…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "New Contact _List..."
 msgstr "Нов _списък с контакти…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Save as vCard..."
 msgstr "_Запазване като vCard…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contact"
 msgstr "_Препращане на контакт"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contacts"
 msgstr "_Препращане на контакти"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contact"
 msgstr "Изпращане на _писмо до контакт"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to List"
 msgstr "Изпращане на _писмо до списък"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Send _Message to Contacts"
 msgstr "Изпращане на _писмо до контакти"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "_Print"
 msgstr "_Печат"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Cop_y to Address Book..."
 msgstr "_Копиране в адресника…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Mo_ve to Address Book..."
 msgstr "_Преместване в адресника…"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "Cu_t"
 msgstr "_Изрязване"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 #: ../calendar/gui/dialogs/comp-editor.c:480
-#: ../calendar/gui/e-calendar-table.c:1582
-#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2055 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2044
+#: ../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: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 "_Копиране"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
 msgid "P_aste"
 msgstr "_Поставяне"
 
 #. 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
+#: ../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 "Всяка категория"
 
@@ -3203,13 +3221,13 @@ msgstr "Единица"
 msgid "Web Site"
 msgstr "Интернет страница"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
+#: ../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:99
-#: ../widgets/table/e-table-field-chooser-item.c:655
+#: ../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
@@ -3219,12 +3237,12 @@ msgstr "Интернет страница"
 msgid "Width"
 msgstr "Широчина"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../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:662
+#: ../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
@@ -3234,24 +3252,24 @@ msgstr "Широчина"
 msgid "Height"
 msgstr "Височина"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard-label.c:130
 #: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "На фокус"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
+#: ../addressbook/gui/widgets/e-minicard-label.c:137
 msgid "Field"
 msgstr "Поле"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
+#: ../addressbook/gui/widgets/e-minicard-label.c:144
 msgid "Field Name"
 msgstr "Име на поле"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
+#: ../addressbook/gui/widgets/e-minicard-label.c:151
 msgid "Text Model"
 msgstr "Текстов модел"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
+#: ../addressbook/gui/widgets/e-minicard-label.c:158
 msgid "Max field name length"
 msgstr "Макс. дължина на името на полето"
 
@@ -3397,7 +3415,7 @@ msgstr "Видео разговор"
 #: ../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: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
@@ -3432,13 +3450,13 @@ msgid "Web Log"
 msgstr "Блог"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
+#: ../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 "Рожден ден"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
+#: ../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 "Годишнина"
@@ -3456,113 +3474,113 @@ msgid "Blog"
 msgstr "Блог"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Success"
 msgstr "Успех"
 
 #. 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 "Бекендът е зает"
 
 #. 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 "Хранилището е изключено"
 
 #. 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 "Адресникът не съществува"
 
 #. 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 "Не са дефинирани собствените данни"
 
 #. 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 "Достъпът е отказан"
 
 #. 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 "Контактът не е открит"
 
 #. 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 "Контактът вече съществува"
 
 #. 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 "Протоколът не се поддържа"
 
 #. 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:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:240
-#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
+#: ../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 "Отменено"
 
 #. 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 "Не може да се прекъсне"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-#: ../calendar/gui/comp-editor-factory.c:423
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Failed"
 msgstr "Удостоверяването неуспешно"
 
 #. 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 "Изискване за удостоверяване"
 
 #. 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 не е наличен"
 
 #. 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 "Няма такъв източник"
 
 #. 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 "Неналично в режим „Изключен“"
 
 #. 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 "Друга грешка"
 
 #. 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 "Невалидна версия на сървъра"
 
 #. 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 "Неподдържан метод за удостоверяване"
 
-#: ../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 "
@@ -3572,7 +3590,7 @@ msgstr ""
 "обозначен за употреба в режим „Изключен“ или все още не е изтеглен. Заредете "
 "адресника, когато сте в режим „Включен“, за да изтеглите съдържанието му."
 
-#: ../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 "
@@ -3581,7 +3599,7 @@ msgstr ""
 "Този адресник не може да бъде отворен. Проверете дали местоположението %s "
 "съществува и дали имате права за достъп."
 
-#: ../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."
@@ -3589,7 +3607,7 @@ msgstr ""
 "Тази адресник не може бъде отворен. Или сте въвели грешен адрес, или LDAP "
 "сървърът е недостъпен."
 
-#: ../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 "
@@ -3599,7 +3617,7 @@ msgstr ""
 "ползвате LDAP в Evolution, трябва да инсталирате пакет на Evolution с "
 "включена LDAP поддръжка."
 
-#: ../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."
@@ -3607,11 +3625,11 @@ msgstr ""
 "Този адресник не може да бъде отворен. Въвели сте грешен адрес или сървърът "
 "е недостъпен."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:149
 msgid "Detailed error:"
 msgstr "Подробна грешка:"
 
-#: ../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"
@@ -3623,7 +3641,7 @@ msgstr ""
 "Уточнете търсенето или увеличете ограничението в\n"
 "настройките на адресника."
 
-#: ../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"
@@ -3634,45 +3652,45 @@ msgstr ""
 "настроили\n"
 "за този адресник. Направете търсенето по-точно или увеличете времето."
 
-#: ../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 "Двигателят на този адресник не успя да анализира заявката."
 
-#: ../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 "Двигателят на този адресник отказа да изпълни заявката."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:189
+#: ../addressbook/gui/widgets/eab-gui-util.c:190
 msgid "This query did not complete successfully."
 msgstr "Заявката не завърши успешно."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:212
 msgid "Error adding list"
 msgstr "Грешка при добавяне на списък"
 
-#: ../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 "Грешка при добавяне на контакт"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
 msgid "Error modifying list"
 msgstr "Грешка при промяна на списък"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
 msgid "Error modifying contact"
 msgstr "Грешка при промяна на контакт"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
 msgid "Error removing list"
 msgstr "Грешка при премахване на списък"
 
-#: ../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 "Грешка при премахване на контакт"
 
-#: ../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"
@@ -3687,16 +3705,16 @@ msgstr[1] ""
 "Отварянето на %d контакта ще отвори %d нови прозореца.\n"
 "Наистина ли искате показването на всички тези контакти?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "_Don't Display"
 msgstr "Да _не се показват"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
+#: ../addressbook/gui/widgets/eab-gui-util.c:326
 msgid "Display _All Contacts"
 msgstr "Показване на _всички контакти"
 
 #. 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"
@@ -3705,65 +3723,65 @@ msgstr ""
 "%s вече съществува\n"
 "Искате ли да го презапишете?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:355
+#: ../addressbook/gui/widgets/eab-gui-util.c:356
 msgid "Overwrite"
 msgstr "Презаписване"
 
 #. 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] "контакт"
 msgstr[1] "контакта"
 
 #. 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 "Избор на адресник"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
+#: ../addressbook/gui/widgets/eab-gui-util.c:597
 msgid "list"
 msgstr "списък"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:749
 msgid "Move contact to"
 msgstr "Преместване на контакт в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Copy contact to"
 msgstr "Копиране на контакт в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:754
 msgid "Move contacts to"
 msgstr "Преместване на контакти в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Copy contacts to"
 msgstr "Копиране на контакти в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:900
+#: ../addressbook/gui/widgets/eab-gui-util.c:902
 msgid "Multiple vCards"
 msgstr "Множество 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 за %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 "Информация за контакта"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:947
+#: ../addressbook/gui/widgets/eab-gui-util.c:949
 #, c-format
 msgid "Contact information for %s"
 msgstr "Информация за %s"
@@ -3772,23 +3790,23 @@ msgstr "Информация за %s"
 msgid "Querying Address Book..."
 msgstr "Запитване до адресника…"
 
-#: ../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] "Има още един контакт."
 msgstr[1] "Има още %d други контакта."
 
-#: ../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 "Показване на пълен vCard"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+#: ../addressbook/gui/widgets/eab-vcard-control.c:230
 msgid "Show Compact vCard"
 msgstr "Показване на компактен vCard"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:284
+#: ../addressbook/gui/widgets/eab-vcard-control.c:282
 msgid "Save in address book"
 msgstr "Запазване в адресника"
 
@@ -3800,7 +3818,7 @@ msgstr "Преглед на карта"
 #: ../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
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "Внасяне…"
 
@@ -3887,10 +3905,10 @@ msgstr "Формат"
 # Това е грешка, която трябва да се докладва.  Header е както горен
 # колонтитул, така и заглавна част.
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:502
+#: ../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:648
-#: ../widgets/table/e-table-field-chooser.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"
@@ -4062,31 +4080,31 @@ msgstr "Неуспех при извличането на списъка с ад
 msgid "failed to open book"
 msgstr "неуспех при отваряне на книга"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:48
 msgid "Specify the output file instead of standard output"
 msgstr "Укажете изходния файл вместо стандартния изход"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:50
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "OUTPUTFILE"
 msgstr "ИЗХОДЕН_ФАЙЛ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "List local address book folders"
 msgstr "Показване на папките на локалния адресник"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "Show cards as vcard or csv file"
 msgstr "Показване на картичките като vcard или cvs файл"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Export in asynchronous mode"
 msgstr "Изнасяне в асинхронен режим"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
@@ -4094,30 +4112,30 @@ msgstr ""
 "Броят на картичките в един изходен файл в асинхронен режим, стандартният "
 "размер е 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "NUMBER"
 msgstr "БРОЙ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:102
+#: ../addressbook/tools/evolution-addressbook-export.c:101
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Грешка при аргументите на командния ред. Използвайте опцията --help, за да "
 "разберете начина на употреба."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:116
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr "Поддържа само форматите csv и vcard."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:125
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
 msgstr "В асинхронен режим изходът трябва да е файл."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr "В нормален режим няма нужда от опцията за размер."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:164
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "Необработена грешка"
 
@@ -4236,19 +4254,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Сигурни ли сте, че искате да изтриете тази среща?"
 
 #: ../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 "Сигурни ли сте, че искате да прекъснете и изтриете това събрание?"
 
 #: ../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 "Сигурни ли сте, че искате да изтриете тази бележка?"
 
 #: ../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 "Сигурни ли сте, че искате да изтриете тази задача?"
@@ -4352,6 +4370,21 @@ msgstr ""
 "че задачата е изтрита."
 
 #: ../calendar/calendar.error.xml.h:45
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Нова среща"
+
+#: ../calendar/calendar.error.xml.h:46
+#, fuzzy
+msgid "Save Memo"
+msgstr "Спо_делена бележка"
+
+#: ../calendar/calendar.error.xml.h:47
+#, fuzzy
+msgid "Save Task"
+msgstr "Запазване като…"
+
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4359,7 +4392,7 @@ msgstr ""
 "Изпращането на обновена информация позволява на участниците да поддържат "
 "своите календари осъвременени."
 
-#: ../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."
@@ -4367,7 +4400,7 @@ msgstr ""
 "Изпращането на обновена информация позволява на участниците да поддържат "
 "актуални списъците си със задачи."
 
-#: ../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."
@@ -4375,7 +4408,7 @@ msgstr ""
 "В момента се изтеглят няколко прикрепени обекта. Ако запазите срещата, то тя "
 "ще бъде без тези прикрепени обекти."
 
-#: ../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."
@@ -4383,87 +4416,87 @@ msgstr ""
 "В момента се изтеглят няколко прикрепени обекта. Ако запазите задачата, то "
 "тя ще бъде без тези прикрепени обекти."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:53
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Възможно е някои функции на програмата да не работят правилно с тази версия "
 "на сървъра"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Календарът на Evolution спря неочаквано."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Програмата за бележки Evolution спря неочаквано."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Програмата за задачи спря неочаквано."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:57
 msgid "The calendar is not marked for offline usage."
 msgstr "Календарът не е избран за работа в режим „Изключен“"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:58
 msgid "The memo list is not marked for offline usage."
 msgstr "Списъкът с бележки не е избран за работа в режим „Изключен“."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:59
 msgid "The task list is not marked for offline usage."
 msgstr "Списъкът със задачи не е избран за работа в режим „Изключен“."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:60
 msgid "This calendar will be removed permanently."
 msgstr "Този календар ще бъде премахнат завинаги."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:61
 msgid "This memo list will be removed permanently."
 msgstr "Този списък с бележки ще бъде премахнат завинаги."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:62
 msgid "This task list will be removed permanently."
 msgstr "Този списък със задачи ще бъде премахнат завинаги."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Искате ли да запазите промените по тази среща?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this memo?"
 msgstr "Искате ли да запазите промените по тази бележка?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this task?"
 msgstr "Искате ли да запазите промените по тази задача?"
 
-#: ../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 "Искате ли да изпратите известие за отмяна на тази бележка?"
 
-#: ../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 "Искате ли да известите всички участници за отмяната?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Искате ли да изпратите покани до участниците в събранието?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send this task to participants?"
 msgstr "Искате ли да изпратите тази задача на участниците?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated meeting information to participants?"
 msgstr ""
 "Искате ли да изпратите обновената информация за събранието на участниците?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send updated task information to participants?"
 msgstr ""
 "Искате ли да изпратите обновената информация за задачите на участниците?"
 
-#: ../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 "
@@ -4473,55 +4506,55 @@ msgstr ""
 "възникнат проблеми при работата на Evolution. За най-добри резултати "
 "сървърът трябва да бъде обновен до поддържана версия."
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Направили сте промени по тази среща, но още не сте ги запазили."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this task, but not yet saved it."
 msgstr "Направили сте промени по тази задача, но още не сте ги запазили."
 
-#: ../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 "Направили сте промени по тази бележка, но още не сте ги запазили."
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:76
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Календарите ви няма да бъдат налични, докато не рестартирате Evolution."
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Бележките ви няма да бъдат налични, докато не рестартирате Evolution."
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Задачите ви няма да бъдат налични, докато не рестартирате Evolution."
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:79
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "_Игнориране на промените"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
+#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "_Запазване"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:81
 msgid "_Save Changes"
 msgstr "_Запазване на промените"
 
-#: ../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 "Изпра_щане"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:83
 msgid "_Send Notice"
 msgstr "Изпращане на _известие"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:84
 msgid "{0}."
 msgstr "{0}."
 
@@ -4568,7 +4601,7 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Списъкът със задачи на pilot не може да се запише"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2358
+#: ../plugins/itip-formatter/itip-formatter.c:2363
 msgid "Calendar and Tasks"
 msgstr "Календар и задачи"
 
@@ -4616,7 +4649,7 @@ msgid "Memo_s"
 msgstr "Беле_жки"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
+#: ../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
@@ -4624,14 +4657,14 @@ msgid "Memos"
 msgstr "Бележки"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1642 ../calendar/gui/print.c:1982
+#: ../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:76
+#: ../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
@@ -4682,8 +4715,8 @@ msgstr "Срещи"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../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:"
@@ -4696,7 +4729,7 @@ msgstr "Време за _отлагане:"
 #: ../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: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
@@ -4714,32 +4747,32 @@ msgstr "_Отлагане"
 msgid "location of appointment"
 msgstr "място на среща"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1461
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1586
 msgid "No summary available."
 msgstr "Няма обобщение."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1472
 msgid "No description available."
 msgstr "Няма описание."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1480
 msgid "No location information available."
 msgstr "Няма информация за местоположението."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1525
 #, c-format
 msgid "You have %d alarms"
 msgstr "Имате %d аларми."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
-#: ../mail/mail-component.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1715
+#: ../mail/mail-component.c:1596
 msgid "Warning"
 msgstr "Внимание"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
+#: ../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"
@@ -4751,7 +4784,7 @@ msgstr ""
 "конфигурирано да изпраща поща. Вместо това, Evolution\n"
 "ще покаже стандартен прозорец за напомняне."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1721
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4768,15 +4801,15 @@ msgstr ""
 "\n"
 "Сигурни ли сте, че искате да стартирате тази програма?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1735
 msgid "Do not ask me about this program again."
 msgstr "Без запитвания за тази програма отново."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:138
+#: ../calendar/gui/alarm-notify/notify-main.c:141
 msgid "Could not initialize Bonobo"
 msgstr "Не може да се инициализира Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:151
+#: ../calendar/gui/alarm-notify/notify-main.c:154
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -4789,7 +4822,7 @@ msgid "invalid time"
 msgstr "грешно време"
 
 #. 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"
@@ -4798,7 +4831,7 @@ msgstr[0] "%d час"
 msgstr[1] "%d часа"
 
 #. 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"
@@ -4809,7 +4842,7 @@ msgstr[1] "%d минути"
 #. 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"
@@ -5112,7 +5145,7 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "Времето на последната аларма, в time_t."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:107
+#: ../plugins/startup-wizard/startup-wizard.c:109
 msgid "Timezone"
 msgstr "Часови пояс"
 
@@ -5253,56 +5286,56 @@ msgstr "Минута, в която започва работния ден"
 msgid "daylight savings time"
 msgstr "лятно време"
 
-#: ../calendar/gui/cal-search-bar.c:71
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Summary contains"
 msgstr "Обобщението съдържа"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Description contains"
 msgstr "Описанието съдържа"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Category is"
 msgstr "Категорията е"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Comment contains"
 msgstr "Коментарът съдържа"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:79
 msgid "Location contains"
 msgstr "Местонахождението съдържа"
 
-#: ../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:633 ../calendar/gui/cal-search-bar.c:676
+#: ../calendar/gui/cal-search-bar.c:695
 msgid "Unmatched"
 msgstr "Несъвпадащ"
 
-#: ../calendar/gui/cal-search-bar.c:637
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Next 7 Days' Tasks"
 msgstr "Задачи през следващите 7 дни"
 
-#: ../calendar/gui/cal-search-bar.c:641
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Active Tasks"
 msgstr "Активни задачи"
 
-#: ../calendar/gui/cal-search-bar.c:645
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Overdue Tasks"
 msgstr "Просрочени задачи"
 
-#: ../calendar/gui/cal-search-bar.c:649
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Completed Tasks"
 msgstr "Завършени задачи"
 
-#: ../calendar/gui/cal-search-bar.c:653
+#: ../calendar/gui/cal-search-bar.c:657
 msgid "Tasks with Attachments"
 msgstr "Задачи с прикрепени файлове"
 
-#: ../calendar/gui/cal-search-bar.c:699
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Active Appointments"
 msgstr "Активни срещи"
 
-#: ../calendar/gui/cal-search-bar.c:703
+#: ../calendar/gui/cal-search-bar.c:707
 msgid "Next 7 Days' Appointments"
 msgstr "Срещи през следващите 7 дни"
 
@@ -5458,7 +5491,7 @@ 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:5
+#: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:21
 msgid "Attachments"
 msgstr "Прикрепени файлове"
 
@@ -5489,7 +5522,7 @@ 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:547
+#: ../calendar/gui/e-cal-model.c:348 ../calendar/gui/e-calendar-table.c:546
 #: ../calendar/gui/memotypes.xml.h:10
 msgid "Confidential"
 msgstr "Поверително"
@@ -5507,12 +5540,12 @@ msgid "Description Contains"
 msgstr "Описанието съдържа"
 
 #: ../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 "Не съществува"
 
 #: ../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 "Съществува"
 
@@ -5582,14 +5615,14 @@ msgid "Phone Calls"
 msgstr "Телефонни обаждания"
 
 #: ../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:546
+#: ../calendar/gui/e-cal-model.c:346 ../calendar/gui/e-calendar-table.c:545
 #: ../calendar/gui/memotypes.xml.h:29
 msgid "Private"
 msgstr "Частен"
 
 #: ../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:545 ../calendar/gui/memotypes.xml.h:30
+#: ../calendar/gui/e-calendar-table.c:544 ../calendar/gui/memotypes.xml.h:30
 msgid "Public"
 msgstr "Публичен"
 
@@ -5603,7 +5636,7 @@ msgstr "Повторение"
 #: ../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 "Състояние"
 
@@ -5617,7 +5650,7 @@ msgstr "Стратегии"
 #: ../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:361
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Summary"
 msgstr "Обобщение"
 
@@ -5647,38 +5680,38 @@ msgid "Waiting"
 msgstr "Чакащи"
 
 #: ../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 "съдържа"
 
 #: ../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 "не съдържа"
 
 #: ../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 "е"
 
 #: ../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 "не е"
 
-#: ../calendar/gui/comp-editor-factory.c:405
+#: ../calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Грешка при отваряне на календара"
 
-#: ../calendar/gui/comp-editor-factory.c:411
+#: ../calendar/gui/comp-editor-factory.c:415
 msgid "Method not supported when opening the calendar"
 msgstr "Методът не е поддържан при отварянето на календара"
 
-#: ../calendar/gui/comp-editor-factory.c:417
+#: ../calendar/gui/comp-editor-factory.c:421
 msgid "Permission denied to open the calendar"
 msgstr "Не беше разрешено да се отвори календара"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
+#: ../calendar/gui/comp-editor-factory.c:433 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "Неизвестна грешка"
 
@@ -5715,17 +5748,17 @@ msgid "Mes_sage:"
 msgstr "_Писмо:"
 
 #: ../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 "Изпълнение на звук"
 
 #: ../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 "Показване на сигнал"
 
 #: ../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 "Стартиране на програма"
 
@@ -5738,7 +5771,7 @@ msgid "Send To:"
 msgstr "Изпращане до:"
 
 #: ../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 "Изпращане на е-писмо"
 
@@ -5816,7 +5849,7 @@ msgstr "Предлагане на _автоматично показване н�
 msgid "Attach file(s)"
 msgstr "Прикрепяне на файл(ове)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:484
 msgid "Selected Calendars for Alarms"
 msgstr "Избрани календари за аларми"
 
@@ -6121,48 +6154,48 @@ msgstr "Настройки на списък с бележки"
 msgid "New Memo List"
 msgstr "Нов списък с бележки"
 
-#: ../calendar/gui/dialogs/changed-comp.c:56
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Това събитие е било изтрито."
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Тази задача е била изтрита."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:68
 msgid "This memo has been deleted."
 msgstr "Тази бележка е била изтрита."
 
-#: ../calendar/gui/dialogs/changed-comp.c:73
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s Направихте промени. Да бъдат ли игнорирани и да се затвори редактора?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Няма направени промени, да бъде ли затворен редактора?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:80
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Това събитие е било променено."
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Тази задача е била променена."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:92
 msgid "This memo has been changed."
 msgstr "Тази бележка е била променена."
 
-#: ../calendar/gui/dialogs/changed-comp.c:97
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s Има направени промени. Да бъдат ли игнорирани и да се обнови редактора?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Няма направени промени, да се обнови ли редактора?"
@@ -6172,23 +6205,23 @@ msgstr "%s Няма направени промени, да се обнови л
 msgid "Validation error: %s"
 msgstr "Грешка при проверка: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2356
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2358
 msgid " to "
 msgstr " до "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2362
 msgid " (Completed "
 msgstr " (Приключено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2364
 msgid "Completed "
 msgstr "Приключено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2367
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2369
 msgid " (Due "
 msgstr " (Краен срок "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2371
 msgid "Due "
 msgstr "Краен срок "
 
@@ -6199,22 +6232,22 @@ msgstr "Прикрепено писмо — %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: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] "Прикрепено писмо"
 msgstr[1] "%d прикрепени писма"
 
-#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2056
+#: ../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:2045
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2107
 msgid "_Move"
 msgstr "Пре_местване"
 
-#: ../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:483 ../composer/e-msg-composer.c:2055
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2109
 msgid "Cancel _Drag"
 msgstr "Отказване на _извлачването"
 
@@ -6430,8 +6463,8 @@ msgid "Show Attachment _Bar"
 msgstr "_Показване на лентата за прикрепени файлове"
 
 #: ../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/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
@@ -6439,7 +6472,7 @@ msgid "_Remove"
 msgstr "Пре_махване"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2037
-#: ../composer/e-msg-composer.c:1046
+#: ../composer/e-msg-composer.c:1043
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Прикрепяне на файл…."
@@ -6465,67 +6498,67 @@ msgstr ""
 msgid "Unable to use current version!"
 msgstr "Не може да се използва текущата версия!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:60
+#: ../calendar/gui/dialogs/copy-source-dialog.c:64
 msgid "Could not open source"
 msgstr "Не може да се отвори източник"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:68
+#: ../calendar/gui/dialogs/copy-source-dialog.c:72
 msgid "Could not open destination"
 msgstr "Местоположението не може да бъде отворено"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:77
+#: ../calendar/gui/dialogs/copy-source-dialog.c:81
 msgid "Destination is read only"
 msgstr "Имате права само за четене"
 
-#: ../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 "_Изтриване на този обект от пощенските кутии на всички получатели?"
 
-#: ../calendar/gui/dialogs/delete-error.c:52
+#: ../calendar/gui/dialogs/delete-error.c:56
 msgid "The event could not be deleted due to a corba error"
 msgstr "Събитието не може да бъде изтрито, заради грешка в corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:55
+#: ../calendar/gui/dialogs/delete-error.c:59
 msgid "The task could not be deleted due to a corba error"
 msgstr "Задачата не може да бъде изтрита, заради грешка в corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:58
+#: ../calendar/gui/dialogs/delete-error.c:62
 msgid "The memo could not be deleted due to a corba error"
 msgstr "Тази бележка не можа да бъде изтрита, заради грешка в corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:61
+#: ../calendar/gui/dialogs/delete-error.c:65
 msgid "The item could not be deleted due to a corba error"
 msgstr "Този обект не може да бъде изтрит, заради грешка в corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:68
+#: ../calendar/gui/dialogs/delete-error.c:72
 msgid "The event could not be deleted because permission was denied"
 msgstr "Събитието не може да бъде изтрито, защото нямате права за това"
 
-#: ../calendar/gui/dialogs/delete-error.c:71
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The task could not be deleted because permission was denied"
 msgstr "Задачата не може да бъде изтрита, защото нямате права за това"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Бележката не може да бъде изтрита, защото нямате права за това"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:81
 msgid "The item could not be deleted because permission was denied"
 msgstr "Обектът не може да бъде изтрит, защото нямате права за това"
 
-#: ../calendar/gui/dialogs/delete-error.c:84
+#: ../calendar/gui/dialogs/delete-error.c:88
 msgid "The event could not be deleted due to an error"
 msgstr "Това събитие не може да бъде изтрито заради грешка"
 
-#: ../calendar/gui/dialogs/delete-error.c:87
+#: ../calendar/gui/dialogs/delete-error.c:91
 msgid "The task could not be deleted due to an error"
 msgstr "Задачата не може да бъде изтрита заради грешка"
 
-#: ../calendar/gui/dialogs/delete-error.c:90
+#: ../calendar/gui/dialogs/delete-error.c:94
 msgid "The memo could not be deleted due to an error"
 msgstr "Бележката не може да бъде изтрита заради грешка"
 
-#: ../calendar/gui/dialogs/delete-error.c:93
+#: ../calendar/gui/dialogs/delete-error.c:97
 msgid "The item could not be deleted due to an error"
 msgstr "Обектът не може да бъде изтрит заради грешка"
 
@@ -6597,121 +6630,121 @@ msgstr "Запитване за информацията „свободен/з�
 msgid "Appoint_ment"
 msgstr "_Среща"
 
-#: ../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 "Това събитие има аларми"
 
-#: ../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 "О_рганизатор:"
 
-#: ../calendar/gui/dialogs/event-page.c:840
+#: ../calendar/gui/dialogs/event-page.c:844
 msgid "_Delegatees"
 msgstr "_Делегати"
 
-#: ../calendar/gui/dialogs/event-page.c:842
+#: ../calendar/gui/dialogs/event-page.c:846
 msgid "Atte_ndees"
 msgstr "_Присъстващи"
 
-#: ../calendar/gui/dialogs/event-page.c:1026
+#: ../calendar/gui/dialogs/event-page.c:1030
 msgid "Event with no start date"
 msgstr "Събитие без начална дата"
 
-#: ../calendar/gui/dialogs/event-page.c:1029
+#: ../calendar/gui/dialogs/event-page.c:1033
 msgid "Event with no end date"
 msgstr "Събитие без крайна дата"
 
-#: ../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 "Началната дата е грешна"
 
-#: ../calendar/gui/dialogs/event-page.c:1208
+#: ../calendar/gui/dialogs/event-page.c:1212
 msgid "End date is wrong"
 msgstr "Крайната дата е грешна"
 
-#: ../calendar/gui/dialogs/event-page.c:1231
+#: ../calendar/gui/dialogs/event-page.c:1235
 msgid "Start time is wrong"
 msgstr "Началният час е грешен"
 
-#: ../calendar/gui/dialogs/event-page.c:1238
+#: ../calendar/gui/dialogs/event-page.c:1242
 msgid "End time is wrong"
 msgstr "Крайният час е грешен"
 
-#: ../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 "Избраният организатор вече няма абонамент."
 
-#: ../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 "Необходим е организатор."
 
-#: ../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 "Необходим е поне един участник."
 
-#: ../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 "Доб_авяне "
 
-#: ../calendar/gui/dialogs/event-page.c:2590
+#: ../calendar/gui/dialogs/event-page.c:2594
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Не може да се отвори календара „%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 "Действате от името на %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 ден преди среща"
 msgstr[1] "%d дни преди среща"
 
-#: ../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 час преди среща"
 msgstr[1] "%d часа преди среща"
 
-#: ../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 минута преди среща"
 msgstr[1] "%d минути преди среща"
 
-#: ../calendar/gui/dialogs/event-page.c:2939
+#: ../calendar/gui/dialogs/event-page.c:2943
 msgid "Customize"
 msgstr "Персонализиране"
 
 #. 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:669
+#: ../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:685 ../mail/em-account-editor.c:1409
+#: ../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
@@ -6795,19 +6828,19 @@ msgstr "Конт_акти…"
 msgid "Organizer:"
 msgstr "Организатор:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2478
 msgid "Memo"
 msgstr "Бележка"
 
-#: ../calendar/gui/dialogs/memo-page.c:847
+#: ../calendar/gui/dialogs/memo-page.c:851
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Не може да се отворят бележките в „%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 "До"
 
@@ -6821,44 +6854,44 @@ msgid "T_o:"
 msgstr "_До:"
 
 #: ../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 "_Група:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:50
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Променяте повтарящо се събитие. Какво искате да промените?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Делегирате повтарящо се събитие. Какво искате да делегирате?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Променяте повтаряща се задача. Какво искате да промените?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Променяте повтаряща се бележка. Какво искате да промените?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:85
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This Instance Only"
 msgstr "Само в този случай"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:93
 msgid "This and Prior Instances"
 msgstr "В този и предишните случаи"
 
-#: ../calendar/gui/dialogs/recur-comp.c:95
+#: ../calendar/gui/dialogs/recur-comp.c:99
 msgid "This and Future Instances"
 msgstr "В този и бъдещите случаи"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:104
 msgid "All Instances"
 msgstr "Всички случаи"
 
@@ -7053,53 +7086,53 @@ msgstr "<span weight=\"bold\">Състояние</span>"
 #. 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:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:238
-#: ../calendar/gui/e-calendar-table.c:642 ../calendar/gui/e-itip-control.c:946
+#: ../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:2552 ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/print.c:2554 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "Завършено"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:272
-#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1065
+#: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1066
 msgid "High"
 msgstr "Високо"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:356
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
+#: ../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 "В прогрес"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:276
-#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1063
+#: ../calendar/gui/e-calendar-table.c:568 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1064
 msgid "Low"
 msgstr "Ниско"
 
 #: ../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:568
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1064
+#: ../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 "Нормално"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
 #: ../calendar/gui/e-cal-component-preview.c:260
-#: ../calendar/gui/e-cal-model-tasks.c:354
-#: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../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 "Не е стартиран"
@@ -7113,7 +7146,7 @@ msgid "Stat_us:"
 msgstr "Състо_яние:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Неопределено"
 
@@ -7151,16 +7184,16 @@ msgstr "_Задача"
 msgid "Task Details"
 msgstr "Подробности на задачата"
 
-#: ../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 "Органи_затор:"
 
-#: ../calendar/gui/dialogs/task-page.c:781
+#: ../calendar/gui/dialogs/task-page.c:785
 msgid "Due date is wrong"
 msgstr "Крайният срок е невалиден"
 
-#: ../calendar/gui/dialogs/task-page.c:1750
+#: ../calendar/gui/dialogs/task-page.c:1754
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Не може да се отворят задачите в „%s“."
@@ -7182,7 +7215,7 @@ msgid "Time zone:"
 msgstr "Часови пояс:"
 
 #. 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"
@@ -7190,69 +7223,69 @@ msgstr[0] "%d ден"
 msgstr[1] "%d дни"
 
 #. 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 седмица"
 msgstr[1] "%d седмици"
 
-#: ../calendar/gui/e-alarm-list.c:460
+#: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Неизвестно действие за изпълнение"
 
 #. 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 преди започване на среща"
 
 #. 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 след започване на среща"
 
 #. 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 в началото на срещата"
 
 #. 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 преди края на срещата"
 
 #. 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 след края на срещата"
 
 #. 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 в края на срещата"
 
 #. 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 в %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 е неизвестен тип за превключване"
@@ -7320,17 +7353,17 @@ msgid "Start Date"
 msgstr "Начална дата"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-calendar-table.c:618
 msgid "Free"
 msgstr "Свободно"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:620
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-meeting-time-sel.c:396
 msgid "Busy"
 msgstr "Заето"
 
-#: ../calendar/gui/e-cal-model-tasks.c:623
+#: ../calendar/gui/e-cal-model-tasks.c:627
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7340,7 +7373,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:991
+#: ../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
@@ -7348,7 +7381,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Да"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:991
+#: ../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
@@ -7356,14 +7389,14 @@ msgid "No"
 msgstr "Не"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-cal-popup.c:105
-#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
+#: ../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:985
-#: ../calendar/gui/print.c:1002 ../mail/em-utils.c:1340
+#: ../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
@@ -7380,185 +7413,185 @@ msgstr "Повтарящ се"
 msgid "Assigned"
 msgstr "Назначен"
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
+#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "Запазване като…"
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2035
+#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2035
 msgid "Select folder to save selected attachments..."
 msgstr "Изберете папка, където да се запазят избраните прикрепени файлове…"
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
+#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "неозаглавено_изображение.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
-#: ../calendar/gui/e-calendar-view.c:1672 ../calendar/gui/e-memo-table.c:926
+#: ../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 "_Запазване като…"
 
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:562
 #: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "Използване за _фон"
 
-#: ../calendar/gui/e-cal-popup.c:287
+#: ../calendar/gui/e-cal-popup.c:288
 msgid "_Save Selected"
 msgstr "_Запазване на избраните"
 
-#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
+#: ../calendar/gui/e-cal-popup.c:429 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "Отваряне в %s…"
 
-#: ../calendar/gui/e-calendar-table.c:338
+#: ../calendar/gui/e-calendar-table.c:337
 msgid "* No Summary *"
 msgstr "* Няма обобщение *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2215
+#: ../calendar/gui/e-calendar-table.c:373
+#: ../calendar/gui/e-calendar-view.c:2214
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Организатор: %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:377
-#: ../calendar/gui/e-calendar-view.c:2219
+#: ../calendar/gui/e-calendar-table.c:376
+#: ../calendar/gui/e-calendar-view.c:2218
 #, c-format
 msgid "Organizer: %s"
 msgstr "Организатор: %s"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "Start: "
 msgstr "Начало: "
 
-#: ../calendar/gui/e-calendar-table.c:420
+#: ../calendar/gui/e-calendar-table.c:419
 msgid "Due: "
 msgstr "Краен срок: "
 
-#: ../calendar/gui/e-calendar-table.c:589
+#: ../calendar/gui/e-calendar-table.c:588
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:590
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:591
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:592
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:593
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:594
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:595
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:596
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:597
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:598
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:599
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:879
-#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
+#: ../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 "Изтриване на избраните обекти"
 
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
+#: ../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 "Обновяване на обектите"
 
-#: ../calendar/gui/e-calendar-table.c:1348
-#: ../calendar/gui/e-calendar-view.c:1221 ../calendar/gui/e-memo-table.c:821
+#: ../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 "Запазване като…"
 
-#: ../calendar/gui/e-calendar-table.c:1571
-#: ../calendar/gui/e-calendar-view.c:1654
+#: ../calendar/gui/e-calendar-table.c:1570
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Task"
 msgstr "Нова _задача"
 
-#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1574 ../calendar/gui/e-memo-table.c:924
 msgid "Open _Web Page"
 msgstr "Отваряне на страница в _Интернет"
 
-#: ../calendar/gui/e-calendar-table.c:1577
-#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
+#: ../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 "_Разпечатване…"
 
-#: ../calendar/gui/e-calendar-table.c:1581
-#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
+#: ../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 "Из_рязване"
 
-#: ../calendar/gui/e-calendar-table.c:1583
-#: ../calendar/gui/e-calendar-view.c:1660
-#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:933
+#: ../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 "_Поставяне"
 
-#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1586 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Задаване на задача"
 
-#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
+#: ../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 "_Препращане като iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-table.c:1588
 msgid "_Mark as Complete"
 msgstr "_Отбелязване като приключено"
 
-#: ../calendar/gui/e-calendar-table.c:1590
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Отбелязване на избраните задачи като приключено"
 
-#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark as Incomplete"
 msgstr "Отбелязване като _неприключено"
 
-#: ../calendar/gui/e-calendar-table.c:1592
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "Отбелязване на избраните задачи като _неприключено"
 
-#: ../calendar/gui/e-calendar-table.c:1597
+#: ../calendar/gui/e-calendar-table.c:1596
 msgid "_Delete Selected Tasks"
 msgstr "_Изтриване на избраните задачи"
 
-#: ../calendar/gui/e-calendar-table.c:1834
+#: ../calendar/gui/e-calendar-table.c:1833
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Натиснете, за да добавите задача"
@@ -7582,7 +7615,7 @@ msgstr "Краен срок"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
 #: ../calendar/gui/tasktypes.xml.h:37
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Priority"
 msgstr "Приоритет"
 
@@ -7590,93 +7623,93 @@ msgstr "Приоритет"
 msgid "Start date"
 msgstr "Начална дата"
 
-#: ../calendar/gui/e-calendar-view.c:1340
+#: ../calendar/gui/e-calendar-view.c:1339
 msgid "Moving items"
 msgstr "Преместване на обекти"
 
-#: ../calendar/gui/e-calendar-view.c:1342
+#: ../calendar/gui/e-calendar-view.c:1341
 msgid "Copying items"
 msgstr "Копиране на обекти"
 
-#: ../calendar/gui/e-calendar-view.c:1651
+#: ../calendar/gui/e-calendar-view.c:1650
 msgid "New _Appointment..."
 msgstr "Нова _среща…"
 
-#: ../calendar/gui/e-calendar-view.c:1652
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New All Day _Event"
 msgstr "Всички нови _събития за деня"
 
-#: ../calendar/gui/e-calendar-view.c:1653
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New _Meeting"
 msgstr "Ново _събрание"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1663
 msgid "_Current View"
 msgstr "_Текущ изглед"
 
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1665
 msgid "Select T_oday"
 msgstr "Избиране на _днешна дата"
 
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "_Select Date..."
 msgstr "Избор на д_ата…"
 
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1672
 msgid "Pri_nt..."
 msgstr "_Разпечатване…"
 
-#: ../calendar/gui/e-calendar-view.c:1683
+#: ../calendar/gui/e-calendar-view.c:1682
 msgid "Cop_y to Calendar..."
 msgstr "Копиране в _календар…"
 
-#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Mo_ve to Calendar..."
 msgstr "Преме_стване в календар…"
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "_Delegate Meeting..."
 msgstr "_Делегиране на събрание…"
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Schedule Meeting..."
 msgstr "Насрочване на с_ъбрание…"
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Forward as iCalendar..."
 msgstr "Препра_ща като iCalendar…"
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Reply"
 msgstr "Отгово_р"
 
-#: ../calendar/gui/e-calendar-view.c:1689 ../mail/em-folder-view.c:1330
+#: ../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 "Отговор до _всички"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "Make this Occurrence _Movable"
 msgstr "Прави това събитие пр_еместваемо"
 
-#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1694 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Изтриване на това с_ъбитие"
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1695
 msgid "Delete _All Occurrences"
 msgstr "Изтриване на всички _събития"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
+#: ../calendar/gui/e-calendar-view.c:2234 ../calendar/gui/print.c:2510
 #, c-format
 msgid "Location: %s"
 msgstr "Местоположение: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2269
+#: ../calendar/gui/e-calendar-view.c:2268
 #, c-format
 msgid "Time: %s %s"
 msgstr "Време: %s %s"
@@ -7715,20 +7748,20 @@ msgstr "Разделения от по %02i минути"
 #. 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:1549
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1672
+#: ../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:789 ../calendar/gui/e-week-view.c:524
-#: ../calendar/gui/print.c:829
+#: ../calendar/gui/e-day-view.c:806 ../calendar/gui/e-week-view.c:542
+#: ../calendar/gui/print.c:831
 msgid "am"
 msgstr "сутрин"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:792 ../calendar/gui/e-week-view.c:527
-#: ../calendar/gui/print.c:831
+#: ../calendar/gui/e-day-view.c:809 ../calendar/gui/e-week-view.c:545
+#: ../calendar/gui/print.c:833
 msgid "pm"
 msgstr "следобед"
 
@@ -7809,7 +7842,7 @@ msgid "Ends"
 msgstr "Край"
 
 #: ../calendar/gui/e-itip-control.c:961
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "Краен срок"
 
@@ -8180,49 +8213,49 @@ msgstr "Присъстващи"
 
 #: ../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:981
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:983
 msgid "Individual"
 msgstr "Индивидуално"
 
 #: ../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:982 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/print.c:984 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Група"
 
 #: ../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:983
+#: ../calendar/gui/print.c:985
 msgid "Resource"
 msgstr "Ресурс"
 
 #: ../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:984
+#: ../calendar/gui/print.c:986
 msgid "Room"
 msgstr "Помещение"
 
 #: ../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:998
+#: ../calendar/gui/print.c:1000
 msgid "Chair"
 msgstr "Председател"
 
 #: ../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:999
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:1001
 msgid "Required Participant"
 msgstr "Заявен участник"
 
 #: ../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:1000
+#: ../calendar/gui/print.c:1002
 msgid "Optional Participant"
 msgstr "Възможен участник"
 
 #: ../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:1001
+#: ../calendar/gui/print.c:1003
 msgid "Non-Participant"
 msgstr "Не е участник"
 
@@ -8234,7 +8267,7 @@ msgstr "Необходими действия"
 
 #: ../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:397
+#: ../calendar/gui/e-meeting-time-sel.c:395
 msgid "Tentative"
 msgstr "Пробен"
 
@@ -8263,7 +8296,7 @@ msgstr "В прогрес"
 #. 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:2122
+#: ../calendar/gui/e-meeting-time-sel.c:2120
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -8272,7 +8305,7 @@ msgstr "%A, %B %d, %Y"
 #. 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:2153
+#: ../calendar/gui/e-meeting-time-sel.c:2151
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
@@ -8282,67 +8315,67 @@ msgstr "%a %m/%d/%Y"
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Out of Office"
 msgstr "Извън офиса"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "No Information"
 msgstr "Няма информация"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "A_ttendees..."
 msgstr "_Присъстващи…"
 
-#: ../calendar/gui/e-meeting-time-sel.c:436
+#: ../calendar/gui/e-meeting-time-sel.c:434
 msgid "O_ptions"
 msgstr "Оп_ции"
 
-#: ../calendar/gui/e-meeting-time-sel.c:453
+#: ../calendar/gui/e-meeting-time-sel.c:451
 msgid "Show _only working hours"
 msgstr "Показване _само на работните часове"
 
-#: ../calendar/gui/e-meeting-time-sel.c:463
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _zoomed out"
 msgstr "Показване като _умалено"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:476
 msgid "_Update free/busy"
 msgstr "_Обновяване на „свободен/зает“"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:491
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:511
+#: ../calendar/gui/e-meeting-time-sel.c:509
 msgid "_Autopick"
 msgstr "_Авт. избиране"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:524
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-time-sel.c:541
 msgid "_All people and resources"
 msgstr "_Всички хора и ресурси"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:550
 msgid "All _people and one resource"
 msgstr "Вси_чки хора и един ресурс"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:559
 msgid "_Required people"
 msgstr "Ну_жни хора"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:568
 msgid "Required people and _one resource"
 msgstr "Нужни хора и _един ресурс"
 
-#: ../calendar/gui/e-meeting-time-sel.c:606
+#: ../calendar/gui/e-meeting-time-sel.c:604
 msgid "_Start time:"
 msgstr "_Начало:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:633
+#: ../calendar/gui/e-meeting-time-sel.c:631
 msgid "_End time:"
 msgstr "_Край:"
 
@@ -8370,11 +8403,11 @@ msgstr "Език"
 msgid "Member"
 msgstr "Член"
 
-#: ../calendar/gui/e-memo-table.c:942
+#: ../calendar/gui/e-memo-table.c:941
 msgid "_Delete Selected Memos"
 msgstr "_Изтриване на избраните бележки"
 
-#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1092 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Натиснете, за да добавите бележка"
 
@@ -8418,14 +8451,14 @@ msgstr "Завършване на задачи…"
 msgid "Expunging"
 msgstr "Изчистване на изтритите писма"
 
-#: ../calendar/gui/e-timezone-entry.c:129
+#: ../calendar/gui/e-timezone-entry.c:128
 msgid "Select Timezone"
 msgstr "Избор на часови пояс"
 
 #. 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:1653
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1655
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -8459,7 +8492,7 @@ msgstr "Зареждане на бележки от %s"
 #: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
-msgstr "Отваряне на %s..."
+msgstr "Отваряне на %s"
 
 #: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
@@ -8708,202 +8741,202 @@ msgstr "Неуспех при мигрирането на задачите „%s
 msgid "Notes"
 msgstr "Бележки"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "1st"
 msgstr "1ви"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "2nd"
 msgstr "2ри"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "3rd"
 msgstr "3ти"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "4th"
 msgstr "4ти"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "5th"
 msgstr "5ти"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "6th"
 msgstr "6ти"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "7th"
 msgstr "7ми"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "8th"
 msgstr "8ми"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "9th"
 msgstr "9ти"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "10th"
 msgstr "10ти"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "11th"
 msgstr "11ти"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "12th"
 msgstr "12ти"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "13th"
 msgstr "13ти"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "14th"
 msgstr "14ти"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "15th"
 msgstr "15ти"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "16th"
 msgstr "16ти"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "17th"
 msgstr "17ти"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "18th"
 msgstr "18ти"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "19th"
 msgstr "19ти"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "20th"
 msgstr "20ти"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "21st"
 msgstr "21ви"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "22nd"
 msgstr "22ри"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "23rd"
 msgstr "23ти"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "24th"
 msgstr "24ти"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "25th"
 msgstr "25ти"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "26th"
 msgstr "26ти"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "27th"
 msgstr "27ми"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "28th"
 msgstr "28ми"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "29th"
 msgstr "29ти"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "30th"
 msgstr "30ти"
 
-#: ../calendar/gui/print.c:521
+#: ../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:596
+#: ../calendar/gui/print.c:598
 msgid "Su"
 msgstr "Нд"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "Mo"
 msgstr "Пн"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "Tu"
 msgstr "Вт"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "We"
 msgstr "Ср"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:599
 msgid "Th"
 msgstr "Чт"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:599
 msgid "Fr"
 msgstr "Пт"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:599
 msgid "Sa"
 msgstr "Сб"
 
-#: ../calendar/gui/print.c:2472
+#: ../calendar/gui/print.c:2474
 msgid "Appointment"
 msgstr "Среща"
 
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:2476
 msgid "Task"
 msgstr "Задача"
 
-#: ../calendar/gui/print.c:2499
+#: ../calendar/gui/print.c:2501
 #, c-format
 msgid "Summary: %s"
 msgstr "Обобщено: %s"
 
-#: ../calendar/gui/print.c:2522
+#: ../calendar/gui/print.c:2524
 msgid "Attendees: "
 msgstr "Присъстващи: "
 
-#: ../calendar/gui/print.c:2562
+#: ../calendar/gui/print.c:2564
 #, c-format
 msgid "Status: %s"
 msgstr "Състояние: %s"
 
-#: ../calendar/gui/print.c:2579
+#: ../calendar/gui/print.c:2581
 #, c-format
 msgid "Priority: %s"
 msgstr "Приоритет: %s"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2593
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Приключено в проценти: %i"
 
-#: ../calendar/gui/print.c:2603
+#: ../calendar/gui/print.c:2605
 #, c-format
 msgid "URL: %s"
 msgstr "Адрес: %s"
 
-#: ../calendar/gui/print.c:2616
+#: ../calendar/gui/print.c:2618
 #, c-format
 msgid "Categories: %s"
 msgstr "Категории: %s"
 
-#: ../calendar/gui/print.c:2627
+#: ../calendar/gui/print.c:2629
 msgid "Contacts: "
 msgstr "Контакти:"
 
@@ -9009,11 +9042,11 @@ msgstr "Отменено"
 msgid "In progress"
 msgstr "В прогрес"
 
-#: ../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 "е по-голямо от"
 
-#: ../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 "е по малко от"
 
@@ -10870,18 +10903,18 @@ msgstr "Избор на папки, в които да бъде копирано
 msgid "Click here to select folders to post to"
 msgstr "Натиснете тук, за да въведете папки, в които да бъде копирано писмото"
 
-#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1556
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1553
 msgid "Show _Attachment Bar"
 msgstr "Показв_ане на лентата за прикрепени файлове"
 
-#: ../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 ""
 "Заминаващото писмо не може да бъде подписано: за този абонамент няма зададен "
 "сертификат за подписване"
 
-#: ../composer/e-msg-composer.c:877
+#: ../composer/e-msg-composer.c:874
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10889,7 +10922,7 @@ msgstr ""
 "Изпращащото се писмо не може да бъде шифрирано: няма зададен сертификат за "
 "шифриране към този абонамент"
 
-#: ../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"
@@ -10897,15 +10930,15 @@ msgid_plural "Attachments"
 msgstr[0] "Прикрепен файл"
 msgstr[1] "Прикрепени файлове"
 
-#: ../composer/e-msg-composer.c:1554
+#: ../composer/e-msg-composer.c:1551
 msgid "Hide _Attachment Bar"
 msgstr "Скрив_ане на лентата за прикрепени файлове"
 
-#: ../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 "Писане на писмо"
 
-#: ../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>"
@@ -10996,8 +11029,9 @@ msgstr ""
 "писмото ще позволи да продължите от там, до където бяхте стигнали."
 
 #: ../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 ""
 "Настройките за изпращане са налични само за абонаменти към Novell Groupwise "
@@ -11070,7 +11104,7 @@ msgstr "Запазване на _чернова"
 msgid "Evolution Mail and Calendar"
 msgstr "Пощенски клиент и календар (Evolution)"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
 msgid "Groupware Suite"
 msgstr "Програма за работа в група"
 
@@ -11086,33 +11120,33 @@ msgstr "адресна карта"
 msgid "calendar information"
 msgstr "календарна информация"
 
-#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
+#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "Грешка в Evolution"
 
-#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
+#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
 msgid "Evolution Warning"
 msgstr "Предупреждение на Evolution"
 
-#: ../e-util/e-error.c:117
+#: ../e-util/e-error.c:118
 msgid "Evolution Information"
 msgstr "Информация за Evolution"
 
-#: ../e-util/e-error.c:119
+#: ../e-util/e-error.c:120
 msgid "Evolution Query"
 msgstr "Заявка на Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:449
+#: ../e-util/e-error.c:450
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Вътрешна грешка, изисква се непозната грешка „%s“"
 
-#: ../e-util/e-logger.c:156
+#: ../e-util/e-logger.c:161
 msgid "Component"
 msgstr "Компонент"
 
-#: ../e-util/e-logger.c:157
+#: ../e-util/e-logger.c:162
 msgid "Name of the component being logged"
 msgstr "Име на компонента, за който ще се запазват данни в журнала"
 
@@ -11170,7 +11204,7 @@ msgstr "Презаписване на файла?"
 msgid "_Overwrite"
 msgstr "Пре_записване"
 
-#: ../e-util/e-util.c:97
+#: ../e-util/e-util.c:96
 msgid "Could not display help for Evolution."
 msgstr "Неуспех при показването на ръководството на Evolution."
 
@@ -11230,119 +11264,119 @@ msgstr "Грешка на GConf: %s"
 msgid "All further errors shown only on terminal."
 msgstr "Всички следващи грешки ще се показват само в терминал."
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "преди 1 секунда"
 msgstr[1] "преди %d секунди"
 
-#: ../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 секунда"
 msgstr[1] "след %d секунди"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "преди 1 минута"
 msgstr[1] "преди %d минути"
 
-#: ../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] "след една минута"
 msgstr[1] "след %d минути"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "преди 1 час"
 msgstr[1] "преди %d часа"
 
-#: ../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 час"
 msgstr[1] "след %d часа"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "преди 1 ден"
 msgstr[1] "преди %d дена"
 
-#: ../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 ден"
 msgstr[1] "след %d дни"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "преди 1 седмица"
 msgstr[1] "преди %d седмици"
 
-#: ../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 седмица"
 msgstr[1] "след %d седмици"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "преди 1 месец"
 msgstr[1] "преди %d месеца"
 
-#: ../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 месец"
 msgstr[1] "след %d месеца"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:87
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "преди 1 година"
 msgstr[1] "преди %d години"
 
-#: ../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 година"
 msgstr[1] "след %d години"
 
-#: ../filter/filter-datespec.c:287
+#: ../filter/filter-datespec.c:288
 msgid "<click here to select a date>"
 msgstr "<натиснете тук, за да изберете дата>"
 
-#: ../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 "сега"
 
 #. 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 "Изберете време, за да го сравните с"
 
@@ -11504,7 +11538,7 @@ msgstr "в бъдещето"
 msgid "months"
 msgstr "месеци"
 
-#: ../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 "секунди"
 
@@ -11591,9 +11625,9 @@ msgid "Evolution Network configuration control"
 msgstr "Контрол на мрежовите настройки на Evolution"
 
 #: ../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:380
-#: ../mail/mail-component.c:593 ../mail/mail-component.c:594
-#: ../mail/mail-component.c:763
+#: ../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 "Поща"
@@ -11616,12 +11650,12 @@ msgstr "Настройки на мрежата"
 msgid "_Mail"
 msgstr "_Поща"
 
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:386
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s лицензно споразумение"
 
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:393
 #, c-format
 msgid ""
 "\n"
@@ -11634,64 +11668,64 @@ msgstr ""
 "за %s.\n"
 "След което декларирайте, че го приемате\n"
 
-#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:239
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Избор на папка"
 
-#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
-#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:98
+#: ../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 "Автоматично генериран"
 
-#: ../mail/em-account-editor.c:762
+#: ../mail/em-account-editor.c:761
 msgid "Ask for each message"
 msgstr "Питане за всяко писмо"
 
-#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "Потребител"
 
-#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
+#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Получаване на пощата"
 
-#: ../mail/em-account-editor.c:2131
+#: ../mail/em-account-editor.c:2130
 msgid "Check for _new messages every"
 msgstr "Проверка за _нова поща всеки"
 
-#: ../mail/em-account-editor.c:2139
+#: ../mail/em-account-editor.c:2138
 msgid "minu_tes"
 msgstr "_минути"
 
-#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
+#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "Изпращане на писмо"
 
-#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Стандартни"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:131
 #: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Сигурност"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
 msgid "Receiving Options"
 msgstr "Получаване на настройки"
 
-#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Checking for New Messages"
 msgstr "Проверка за нови писма"
 
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Редактор на абонаменти"
 
-#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Помощник на Evolution за абонаментите"
 
@@ -11752,251 +11786,267 @@ msgstr "-----Оригинално писмо-----"
 msgid "_Filter Rules"
 msgstr "Правила за _филтриране"
 
+#.
+#. * 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 "Нагласяване на обхват"
 
-#: ../mail/em-filter-i18n.h:3
+#: ../mail/em-filter-i18n.h:19
 msgid "Assign Color"
 msgstr "Определяне на цвят"
 
-#: ../mail/em-filter-i18n.h:4
+#: ../mail/em-filter-i18n.h:20
 msgid "Assign Score"
 msgstr "Определяне на обхват"
 
-#: ../mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:22
 msgid "BCC"
 msgstr "Скрито копие до"
 
-#: ../mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:23
 msgid "Beep"
 msgstr "Издаване на звук"
 
-#: ../mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:24
 msgid "CC"
 msgstr "Копие до"
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:25
 msgid "Completed On"
 msgstr "Приключено на"
 
-#: ../mail/em-filter-i18n.h:11
+#: ../mail/em-filter-i18n.h:27
 msgid "Copy to Folder"
 msgstr "Копиране в папка"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:28
 msgid "Date received"
 msgstr "Получено на дата"
 
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:29
 msgid "Date sent"
 msgstr "Изпратено на дата"
 
-#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:767
+#: ../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 "Изтриване"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:31
 msgid "Deleted"
 msgstr "Изтрито"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:33
 msgid "does not end with"
 msgstr "не завършва с"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:34
 msgid "does not exist"
 msgstr "не съществува"
 
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:35
 msgid "does not return"
 msgstr "не връща"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:36
 msgid "does not sound like"
 msgstr "не звучи като"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:37
 msgid "does not start with"
 msgstr "не започва с"
 
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:39
 msgid "Draft"
 msgstr "Чернова"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:40
 msgid "ends with"
 msgstr "завършва с"
 
-#: ../mail/em-filter-i18n.h:26
+#: ../mail/em-filter-i18n.h:42
 msgid "exists"
 msgstr "съществува"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:43
 msgid "Expression"
 msgstr "Израз"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:44
 msgid "Follow Up"
 msgstr "Следващо писмо в разговор"
 
-#: ../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 "Важно"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:47
 msgid "is after"
 msgstr "е след"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:48
 msgid "is before"
 msgstr "е преди"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:49
 msgid "is Flagged"
 msgstr "отбелязано е"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:53
 msgid "is not Flagged"
 msgstr "не е отбелязано"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:54
 msgid "is not set"
 msgstr "не е зададена"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:55
 msgid "is set"
 msgstr "е зададена"
 
-#: ../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 "Спам"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:57
 msgid "Junk Test"
 msgstr "Тест за спам"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
+#: ../mail/em-filter-i18n.h:58 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "Етикет"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:59
 msgid "Mailing list"
 msgstr "Пощенски списък"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:60
 msgid "Match All"
 msgstr "Съвпадане по всички"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:61
 msgid "Message Body"
 msgstr "Тяло на писмото"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:62
 msgid "Message Header"
 msgstr "Заглавна част на писмото"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:63
 msgid "Message is Junk"
 msgstr "Писмото е спам"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:64
 msgid "Message is not Junk"
 msgstr "Писмото не е спам"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:65
 msgid "Move to Folder"
 msgstr "Преместване в папка"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:66
 msgid "Pipe to Program"
 msgstr "Пренасочване към програма"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:67
 msgid "Play Sound"
 msgstr "Изпълнение на звук"
 
 #. 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 "Прочитане"
 
-#: ../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 "Получатели"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:71
 msgid "Regex Match"
 msgstr "Съвпадение на регулярен израз"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:72
 msgid "Replied to"
 msgstr "Отговорено до"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:73
 msgid "returns"
 msgstr "връщане"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:74
 msgid "returns greater than"
 msgstr "връщане на по-голямо от"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:75
 msgid "returns less than"
 msgstr "връщане на по-малко от"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:76
 msgid "Run Program"
 msgstr "Стартиране на програма"
 
-#: ../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 "Резултат"
 
-#: ../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 "Подател"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:79
 msgid "Set Label"
 msgstr "Задаване на етикет"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:80
 msgid "Set Status"
 msgstr "Настройване на състояние"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:81
 msgid "Size (kB)"
 msgstr "Размер (кб)"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:82
 msgid "sounds like"
 msgstr "звучи като"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:83
 msgid "Source Account"
 msgstr "Изходен абонамент"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:84
 msgid "Specific header"
 msgstr "Определена заглавна част"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:85
 msgid "starts with"
 msgstr "започва с"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:87
 msgid "Stop Processing"
 msgstr "Спиране на обработването"
 
-#: ../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
@@ -12004,7 +12054,7 @@ msgstr "Спиране на обработването"
 msgid "Subject"
 msgstr "Тема"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:89
 msgid "Unset Status"
 msgstr "Неопределено състояние"
 
@@ -12092,9 +12142,9 @@ msgstr "Използвана квота"
 
 #. 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:160
-#: ../mail/mail-component.c:581
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../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 "Пощенска кутия"
@@ -12116,9 +12166,9 @@ msgstr "_Създаване"
 msgid "Folder _name:"
 msgstr "Име на _папка:"
 
-#. load store to mail component at the end, when everything is loaded
+#. load store to mail component
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
+#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "Папки за търсене"
 
@@ -12127,15 +12177,15 @@ msgstr "Папки за търсене"
 msgid "UNMATCHED"
 msgstr "НЯМА СЪВПАДЕНИЕ"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:160
 msgid "Drafts"
 msgstr "Чернови"
 
-#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:161
 msgid "Outbox"
 msgstr "За изпращане"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:162
 msgid "Sent"
 msgstr "Изпратени"
 
@@ -12178,12 +12228,12 @@ msgstr "Преместване на папка %s"
 msgid "Copying folder %s"
 msgstr "Копиране на папка %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 "Преместване на писма в папка %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 "Копиране на писма в папка %s"
@@ -12241,7 +12291,7 @@ msgstr "Копиране на „%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:83
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder"
 msgstr "Избор на папка"
 
@@ -12249,20 +12299,20 @@ msgstr "Избор на папка"
 msgid "C_opy"
 msgstr "_Копиране"
 
-#: ../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 "Създаване на папка „%s“"
 
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../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 "Създаване на папка"
 
-#: ../mail/em-folder-utils.c:743
-#: ../plugins/groupwise-features/install-shared.c:168
+#: ../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 "Указване къде да бъде създадена папката:"
@@ -12720,7 +12770,7 @@ msgstr "Скрито копие"
 
 #. pseudo-header
 #: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1450
+#: ../mail/em-mailer-prefs.c:1451
 msgid "Mailer"
 msgstr "Пощенска програма"
 
@@ -12763,109 +12813,114 @@ msgstr "Дата"
 msgid "Newsgroups"
 msgstr "Групи за новини"
 
-#: ../mail/em-format.c:1157
+#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:83
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "Лице"
+
+#: ../mail/em-format.c:1158
 #, c-format
 msgid "%s attachment"
 msgstr "%s прикрепен файл"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1200
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 "Неуспех при анализирането на писмото във формат S/MIME: неизвестна грешка"
 
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
+#: ../mail/em-format.c:1337 ../mail/em-format.c:1493
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Неуспех при анализирането на писмото във формат MIME. Показва се в изходен "
 "код."
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1345
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Неподдържан метод за шифриране за multipart/encrypted"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message"
 msgstr "Неуспех при анализирането на писмото във формат PGP/MIME"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr ""
 "Неуспех при анализирането на писмото във формат PGP/MIME: неизвестна грешка"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1512
 msgid "Unsupported signature format"
 msgstr "Неподдържан формат на подписа"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1591
 msgid "Error verifying signature"
 msgstr "Грешка при проверката на подписа"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1582 ../mail/em-format.c:1591
 msgid "Unknown error verifying signature"
 msgstr "Неизвестна грешка при проверката на подписа"
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1663
 msgid "Could not parse PGP message"
 msgstr "Неуспех при анализирането на писмото във формат PGP"
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1663
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Неуспех при анализирането на писмото във формат PGP: неизвестна грешка"
 
-#: ../mail/em-mailer-prefs.c:93
+#: ../mail/em-mailer-prefs.c:94
 msgid "Every time"
 msgstr "Всеки път"
 
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per day"
 msgstr "Един път дневно"
 
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per week"
 msgstr "Един път седмично"
 
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per month"
 msgstr "Един път месечно"
 
-#: ../mail/em-mailer-prefs.c:326
+#: ../mail/em-mailer-prefs.c:327
 msgid "Add Custom Junk Header"
 msgstr "Добавяне на специална заглавна част за спам"
 
-#: ../mail/em-mailer-prefs.c:330
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Name:"
 msgstr "Име на заглавната част:"
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:332
 msgid "Header Value Contains:"
 msgstr "Съдържание:"
 
-#: ../mail/em-mailer-prefs.c:436
+#: ../mail/em-mailer-prefs.c:437
 msgid "Contains Value"
 msgstr "Стойността съдържа"
 
-#: ../mail/em-mailer-prefs.c:458
+#: ../mail/em-mailer-prefs.c:459
 msgid "Color"
 msgstr "Цвят"
 
-#: ../mail/em-mailer-prefs.c:461
+#: ../mail/em-mailer-prefs.c:462
 msgid "Tag"
 msgstr "Етикет"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
+#: ../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“ е налична и двоичния файл е инсталиран."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
+#: ../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“ не е налична. Проверете дали пакета е инсталиран."
 
-#: ../mail/em-mailer-prefs.c:1107
+#: ../mail/em-mailer-prefs.c:1108
 msgid "No Junk plugin available"
 msgstr "Липсва приставка за спам"
 
@@ -12928,8 +12983,9 @@ msgid "Failed to create local mail storage `%s': %s"
 msgstr "Неуспех при създаването на локалното хранилище за пощата „%s“: %s"
 
 #: ../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..."
@@ -12966,30 +13022,30 @@ msgstr "Отговор до _списъка"
 msgid "_Add to Address Book"
 msgstr "Доб_авяне към адресника"
 
-#: ../mail/em-subscribe-editor.c:583
+#: ../mail/em-subscribe-editor.c:582
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Хранилището не поддържа записвания, или те не са включени."
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:615
 msgid "Subscribed"
 msgstr "Абониран"
 
-#: ../mail/em-subscribe-editor.c:620
+#: ../mail/em-subscribe-editor.c:619
 msgid "Folder"
 msgstr "Папка"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:822
+#: ../mail/em-subscribe-editor.c:821
 msgid "Please select a server."
 msgstr "Изберете сървър."
 
-#: ../mail/em-subscribe-editor.c:843
+#: ../mail/em-subscribe-editor.c:842
 msgid "No server has been selected"
 msgstr "Не е избран сървър"
 
 #. Check buttons
 #: ../mail/em-utils.c:120
-#: ../plugins/attachment-reminder/attachment-reminder.c:127
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "_Това съобщение да не се показва отново."
 
@@ -13036,7 +13092,8 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "Широчина на прозореца „Изпращане и получаване на поща“"
 
 #: ../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 "Позволява на Evolution да изобрази откъс от текста с ограничен размер"
 
 #: ../mail/evolution-mail.schemas.in.h:5
@@ -13320,10 +13377,11 @@ msgid ""
 msgstr "Ако панелът за преглед е включен, той се появява до, а не под другия."
 
 #: ../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 ""
 "Ако в Evolution няма вградена система за преглед на даден MIME-тип, всякакви "
 "MIME-типове, които се появяват в този списък и отговарят на Bonobo "
@@ -13399,14 +13457,21 @@ msgid "List of Labels and their associated colors"
 msgstr "Списък с етикети и техните асоциирани цветове"
 
 #: ../mail/evolution-mail.schemas.in.h:72
+#, fuzzy
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr ""
+"Списък от MIME-типове, за които да се проверява за съществуваща система за "
+"преглед чрез Bonobo компоненти"
+
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accepted licenses"
 msgstr "Списък с приетите лицензи"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of accounts"
 msgstr "Списък на абонаментите"
 
-#: ../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."
@@ -13414,16 +13479,16 @@ msgstr ""
 "Списък с пощенските абонаменти в Evolution. Съдържа имена, които се "
 "използват и за подпапките на /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 "Списък на специфични заглавни части и дали са активирани."
 
-#: ../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 ""
 "Списък с кодове на езици, които да се използват за проверка на правописа."
 
-#: ../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."
@@ -13431,23 +13496,19 @@ msgstr ""
 "Списък с цветови етикети в Evolution. Съдържа двойки „име:цвят“, където "
 "цветът е в шестнадесетичен HTML формат."
 
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid "List of mime types to check for bonobo component viewers"
-msgstr ""
-"Списък от MIME-типове, за които да се проверява за съществуваща система за "
-"преглед чрез Bonobo компоненти"
-
 #: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "Списък с протоколни имена, чиито лицензи са били приети."
 
 #: ../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 "Зареждане на изображенията в писмата, форматирани в HTML"
 
 #: ../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 ""
@@ -13709,9 +13770,10 @@ msgstr ""
 "съобщения за изчистване на грешки."
 
 #: ../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 ""
 "Това определя максималния размер на текстовата част, която може да се покаже "
 "форматирана от Evolution. По подразбиране е 4MB/4096KB. Размерът се указва в "
@@ -13933,45 +13995,45 @@ msgstr "Elm"
 msgid "Import mail from Elm."
 msgstr "Внася се поща от Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:80
+#: ../mail/importers/evolution-mbox-importer.c:79
 msgid "Destination folder:"
 msgstr "Целева папка:"
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder to import into"
 msgstr "Избор в коя папка да се внесе"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:219
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Пощенска кутия Berkley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:221
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Внасяне на пощенски папки формат Berkley"
 
-#: ../mail/importers/mail-importer.c:148
+#: ../mail/importers/mail-importer.c:147
 msgid "Importing mailbox"
 msgstr "Внася се пощенска кутия"
 
-#: ../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 "Внасяне на „%s“"
 
-#: ../mail/importers/mail-importer.c:372
+#: ../mail/importers/mail-importer.c:371
 #, c-format
 msgid "Scanning %s"
 msgstr "Сканиране на „%s“"
 
-#: ../mail/importers/pine-importer.c:227
+#: ../mail/importers/pine-importer.c:225
 msgid "Importing Pine data"
 msgstr "Внасяне на данни от Pine"
 
-#: ../mail/importers/pine-importer.c:426
+#: ../mail/importers/pine-importer.c:424
 msgid "Evolution Pine importer"
 msgstr "Вносител от Pine"
 
-#: ../mail/importers/pine-importer.c:427
+#: ../mail/importers/pine-importer.c:425
 msgid "Import mail from Pine."
 msgstr "Внасяне на поща от Pine."
 
@@ -13999,150 +14061,150 @@ msgstr "%s пощенски списък"
 msgid "Add Filter Rule"
 msgstr "Добавяне на правило за филтър"
 
-#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
-#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../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 "Шаблони"
 
-#: ../mail/mail-component.c:546
+#: ../mail/mail-component.c:545
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d избрано, "
 msgstr[1] "%d избрани, "
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:549
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d изтрито"
 msgstr[1] "%d изтрити"
 
-#: ../mail/mail-component.c:557
+#: ../mail/mail-component.c:556
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d спам"
 msgstr[1] "%d спам"
 
-#: ../mail/mail-component.c:560
+#: ../mail/mail-component.c:559
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d чернова"
 msgstr[1] "%d чернови"
 
-#: ../mail/mail-component.c:562
+#: ../mail/mail-component.c:561
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] " %d изпратено"
 msgstr[1] " %d изпратени"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:563
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] " %d неизпратено"
 msgstr[1] " %d неизпратени"
 
-#: ../mail/mail-component.c:570
+#: ../mail/mail-component.c:569
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d непрочетено, "
 msgstr[1] "%d непрочетени, "
 
-#: ../mail/mail-component.c:571
+#: ../mail/mail-component.c:570
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "общо %d"
 msgstr[1] "общо %d"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:922
 msgid "New Mail Message"
 msgstr "Ново _писмо"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:923
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "Ново _писмо"
 
-#: ../mail/mail-component.c:925
+#: ../mail/mail-component.c:924
 msgid "Compose a new mail message"
 msgstr "Създаване на ново писмо"
 
-#: ../mail/mail-component.c:931
+#: ../mail/mail-component.c:930
 msgid "New Mail Folder"
 msgstr "Нова пощенска папка"
 
-#: ../mail/mail-component.c:932
+#: ../mail/mail-component.c:931
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Нова пап_ка"
 
-#: ../mail/mail-component.c:933
+#: ../mail/mail-component.c:932
 msgid "Create a new mail folder"
 msgstr "Създаване на нова пощенска папка"
 
-#: ../mail/mail-component.c:1080
+#: ../mail/mail-component.c:1079
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Неуспех при обновяването на пощенските настройки или папки."
 
-#: ../mail/mail-component.c:1596
+#: ../mail/mail-component.c:1595
 msgid "Error"
 msgstr "Грешка"
 
-#: ../mail/mail-component.c:1596
+#: ../mail/mail-component.c:1595
 msgid "Errors"
 msgstr "Грешки"
 
-#: ../mail/mail-component.c:1597
+#: ../mail/mail-component.c:1596
 msgid "Warnings and Errors"
 msgstr "Предупреждения и грешки"
 
-#: ../mail/mail-component.c:1598
+#: ../mail/mail-component.c:1597
 msgid "Debug"
 msgstr "Информация за изчистване на грешки"
 
-#: ../mail/mail-component.c:1598
+#: ../mail/mail-component.c:1597
 msgid "Error, Warnings and Debug messages"
 msgstr "Съобщения за грешки, предупреждения и специална информация"
 
-#: ../mail/mail-component.c:1725
+#: ../mail/mail-component.c:1724
 msgid "Debug Logs"
 msgstr "Журнали за изчистване на грешки"
 
-#: ../mail/mail-component.c:1739
+#: ../mail/mail-component.c:1738
 msgid "Show _errors in the status bar for"
 msgstr "Показване на _грешките в лентата за състояние за"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1755
+#: ../mail/mail-component.c:1754
 msgid "second(s)."
 msgstr "секунда/и."
 
-#: ../mail/mail-component.c:1761
+#: ../mail/mail-component.c:1760
 msgid "Log Messages:"
 msgstr "Журнали за:"
 
-#: ../mail/mail-component.c:1802
+#: ../mail/mail-component.c:1801
 msgid "Log Level"
 msgstr "Ниво"
 
-#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1810 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Време"
 
-#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
+#: ../mail/mail-component.c:1820 ../mail/message-list.c:2516
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Писма"
 
-#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1829 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Затваряне на този прозорец"
@@ -14629,73 +14691,83 @@ msgid "S_tandard Font:"
 msgstr "_Стандартен шрифт:"
 
 #: ../mail/mail-config.glade.h:132
+#, fuzzy
+msgid "Select Drafts Folder"
+msgstr "Избор на папка"
+
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font"
 msgstr "Избор на равноширок шрифт за HTML"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font for printing"
 msgstr "Избор на равноширок шрифт за HTML за разпечатване"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font"
 msgstr "Избор на пропорционален шрифт за HTML"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Select HTML variable width font for printing"
 msgstr "Избор на пропорционален шрифт за HTML за разпечатване"
 
 #: ../mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Select Sent Folder"
+msgstr "Избор на папка"
+
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr "Изпраща се поща"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
 msgstr "Папка за изп_ратените писма:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr "Сървърът изисква _удостоверяване"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:142
 msgid "Server _Type: "
 msgstr "Тип с_ървър:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
 msgstr "Се_ртификат за подписи:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
 msgstr "По_дпис:"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:145
 msgid "Signatures"
 msgstr "Подписи"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
 msgstr "Таблица за подписите"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
 msgstr "Проверка на правописа"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:148
 msgid "Start _typing at the bottom on replying"
 msgstr "Започване на _писане от края на писмото при отговор"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:149
 msgid "T_ype: "
 msgstr "Т_ип:"
 
-#: ../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 ""
 "Списъкът на езиците отразява само езиците, за които има инсталиран речник."
 
-#: ../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"
@@ -14705,7 +14777,7 @@ msgstr ""
 "подпис на писмата ви. Името ще се използва\n"
 "само за отличаване. "
 
-#: ../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\""
@@ -14713,26 +14785,26 @@ msgstr ""
 "Напишете името, чрез което искате да отличавате този абонамент.\n"
 "Например: „Служебен“ или „Личен“"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:156
 msgid "Us_ername:"
 msgstr "Потребителско _име:"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:157
 msgid "Use Authe_ntication"
 msgstr "Използване на _удостоверяване"
 
-#: ../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 "Потребителско _име:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:159
 msgid "V_ariable-width:"
 msgstr "_Пропорционален:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:160
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14742,125 +14814,125 @@ msgstr ""
 "\n"
 "Натиснете „Напред“, за да започнете. "
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:163
 msgid "_Add Signature"
 msgstr "_Добавяне на подпис"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:164
 msgid "_Always load images from the Internet"
 msgstr "Винаги да се зареждат изобра_жения от Интернет"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:165
 msgid "_Automatic proxy configuration URL:"
 msgstr "_Адрес за автоматична конфигурация на сървър-посредник:"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:166
 msgid "_Default junk plugin:"
 msgstr "_Стандартна приставка за спам-филтър:"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:167
 msgid "_Direct connection to the Internet"
 msgstr "_Директна връзка с Интернет"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:168
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Да не се подписват заявки за събрания (за съвместимост с Outlook)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:170
 msgid "_Forward style:"
 msgstr "_Препращане в стил:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:171
 msgid "_Keep Signature above the original message on replying"
 msgstr "Поставяне на п_одписа над оригиналното писмо при отговор"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:172
 msgid "_Load images in messages from contacts"
 msgstr "_Зареждане на изображенията от адреси в адресника"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:173
 msgid "_Lookup in local address book only"
 msgstr "_Търсене само в локалния адресник"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:174
 msgid "_Make this my default account"
 msgstr "_Избиране на този абонамент за основен"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:175
 msgid "_Manual proxy configuration:"
 msgstr "_Ръчна настройка на сървър-посредник:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:176
 msgid "_Mark messages as read after"
 msgstr "_Отбелязване на писмата като прочетени след"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:178
 msgid "_Never load images from the Internet"
 msgstr "_Никога да не се зареждат изображения от Интернет"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:179
 msgid "_Path:"
 msgstr "_Път:"
 
-#: ../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 ""
 "Запит_ване при изпращане на писма с HTML до контакти, които не ги желаят"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:181
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Запитва_не при изпращане на писма с празно поле „Тема“"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:182
 msgid "_Reply style:"
 msgstr "Сти_л на отговор:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:183
 msgid "_Script:"
 msgstr "_Скрипт:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:184
 msgid "_Secure HTTP Proxy:"
 msgstr "_Сигурен сървър-посредник по HTTP:"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:185
 msgid "_Select..."
 msgstr "_Избор…"
 
 #. 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 "_Показване на анимации"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:189
 msgid "_Show the photograph of sender in the message preview"
 msgstr "Показване на _снимка на подателя при преглед на писмото"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:190
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "Вме_стване на „До/Копие/Скрито копие“"
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:191
 msgid "_Use Secure Connection:"
 msgstr "_Използване на сигурна връзка (SSL):"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:192
 msgid "_Use system defaults"
 msgstr "Използване на _стандартни"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:193
 msgid "_Use the same fonts as other applications"
 msgstr "_Използване на същите шрифтове като останалите програми"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:194
 msgid "addresses"
 msgstr "адреси"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr "цвят"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "описание"
 
@@ -14962,7 +15034,7 @@ msgstr "_Отбелязване:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Сложете отметка тук, за да се съгласите с лицензното споразумение"
 
-#: ../mail/mail-folder-cache.c:845
+#: ../mail/mail-folder-cache.c:833
 #, c-format
 msgid "Pinging %s"
 msgstr "Проверяване на %s"
@@ -15055,58 +15127,58 @@ msgstr "Отваряне на хранилище %s"
 msgid "Removing folder %s"
 msgstr "Изтриване на папка %s"
 
-#: ../mail/mail-ops.c:1501
+#: ../mail/mail-ops.c:1530
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Запазване на папка „%s“"
 
-#: ../mail/mail-ops.c:1564
+#: ../mail/mail-ops.c:1593
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Зачеркване и запазване на абонамент „%s“"
 
-#: ../mail/mail-ops.c:1565
+#: ../mail/mail-ops.c:1594
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Запазване на абонамент „%s“"
 
-#: ../mail/mail-ops.c:1619
+#: ../mail/mail-ops.c:1648
 msgid "Refreshing folder"
 msgstr "Освежаване на папка"
 
-#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
+#: ../mail/mail-ops.c:1688 ../mail/mail-ops.c:1738
 msgid "Expunging folder"
 msgstr "Изтриване на папка"
 
-#: ../mail/mail-ops.c:1706
+#: ../mail/mail-ops.c:1735
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Изчистване на кошчето в „%s“"
 
-#: ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1736
 msgid "Local Folders"
 msgstr "Локални папки"
 
-#: ../mail/mail-ops.c:1788
+#: ../mail/mail-ops.c:1817
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Получаване на писмо %s"
 
-#: ../mail/mail-ops.c:1895
+#: ../mail/mail-ops.c:1924
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Получаване на %d писмо"
 msgstr[1] "Получаване на %d писма"
 
-#: ../mail/mail-ops.c:1980
+#: ../mail/mail-ops.c:2009
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Запазване на %d писмо"
 msgstr[1] "Запазване на %d писма"
 
-#: ../mail/mail-ops.c:2058
+#: ../mail/mail-ops.c:2087
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15115,11 +15187,11 @@ msgstr ""
 "Грешка при запазване на писма в: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2130
+#: ../mail/mail-ops.c:2159
 msgid "Saving attachment"
 msgstr "Запазване на прикрепен файл"
 
-#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
+#: ../mail/mail-ops.c:2177 ../mail/mail-ops.c:2185
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15128,27 +15200,27 @@ msgstr ""
 "Неуспех при създаването на изходен файл: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2171
+#: ../mail/mail-ops.c:2200
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Неуспех при записването на данните: %s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2346
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Изключване от %s"
 
-#: ../mail/mail-ops.c:2317
+#: ../mail/mail-ops.c:2346
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Повторно свързване с %s"
 
-#: ../mail/mail-ops.c:2413
+#: ../mail/mail-ops.c:2442
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Подготовка на абонамент „%s“ за режим „Изключен“"
 
-#: ../mail/mail-ops.c:2499
+#: ../mail/mail-ops.c:2528
 msgid "Checking Service"
 msgstr "Проверка на услугата"
 
@@ -15885,87 +15957,87 @@ msgstr "_Изчистване"
 msgid "_Open Messages"
 msgstr "Отваряне на _писма"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Unseen"
 msgstr "Непрегледано"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 msgid "Seen"
 msgstr "Прегледано"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1055
 msgid "Answered"
 msgstr "Отговорено"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Forwarded"
 msgstr "Препратено"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1057
 msgid "Multiple Unseen Messages"
 msgstr "Множество непрегледани писма"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1058
 msgid "Multiple Messages"
 msgstr "Множество писма"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1062
 msgid "Lowest"
 msgstr "Най-ниска"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1063
 msgid "Lower"
 msgstr "Ниска"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1067
 msgid "Higher"
 msgstr "Висока"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1068
 msgid "Highest"
 msgstr "Най-висока"
 
-#: ../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 "Днес %l:%M %p"
 
-#: ../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 "Вчера %l:%M %p"
 
-#: ../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 %l:%M %p"
 
-#: ../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 "%b %d %l:%M %p"
 
-#: ../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 "%b %d %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:3978 ../mail/message-list.c:4438
 msgid "Generating message list"
 msgstr "Генериране на списък на писмата"
 
-#: ../mail/message-list.c:4224
+#: ../mail/message-list.c:4286
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
 "Нито едно писмо не съвпада с критериите ви за търсене. Променете ги или "
-"изчистете търсенето с „Търсене“->„Изчистване“."
+"изчистете търсенето с „Търсене“ → „Изчистване“."
 
-#: ../mail/message-list.c:4226
+#: ../mail/message-list.c:4288
 msgid "There are no messages in this folder."
 msgstr "В тази папка няма писма."
 
@@ -15998,6 +16070,11 @@ msgstr "Изпратени съобщения"
 msgid "Size"
 msgstr "Размер"
 
+#: ../mail/message-list.etspec.h:19
+#, fuzzy
+msgid "Subject - Trimmed"
+msgstr "Поле „_Тема“"
+
 #: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "Обаждане"
@@ -16086,8 +16163,8 @@ msgstr ""
 "Списък с подсказки на приставката за напомняне за прикрепени файлове. Тялото "
 "на писмото се претърсва за тях."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:474
-#: ../plugins/templates/templates.c:394
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/templates/templates.c:392
 msgid "Keywords"
 msgstr "Ключови думи"
 
@@ -16121,9 +16198,10 @@ msgid "_Edit Message"
 msgstr "_Редактиране на писмото"
 
 #: ../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 ""
 "Приставка, която показва прикрепени звукови файлове и позволява изпълнението "
 "им директно от Evolution."
@@ -16357,36 +16435,36 @@ msgstr "_Възстановяване на настройките…"
 msgid "_Backup Settings..."
 msgstr "_Създаване на резервно копие на настройките…"
 
-#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
+#: ../plugins/bbdb/bbdb.c:530 ../plugins/bbdb/bbdb.c:539
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Автоматични контакти"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:567
+#: ../plugins/bbdb/bbdb.c:554
 msgid "_Auto-create address book entries when replying to messages"
 msgstr ""
 "_Автоматично добавяне на контакти в адресника, при отговор на писмо от тях"
 
-#: ../plugins/bbdb/bbdb.c:573
+#: ../plugins/bbdb/bbdb.c:560
 msgid "Select Address book for Automatic Contacts"
 msgstr "Избор на адресник за автоматични контакти"
 
-#: ../plugins/bbdb/bbdb.c:588
+#: ../plugins/bbdb/bbdb.c:575
 msgid "Instant Messaging Contacts"
 msgstr "Контакти с възможност за мигновени съобщения"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:603
+#: ../plugins/bbdb/bbdb.c:590
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "Синхронизиране на контактите и изображенията с Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:609
+#: ../plugins/bbdb/bbdb.c:596
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Избор на адресник за списъка с приятели на Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:620
+#: ../plugins/bbdb/bbdb.c:607
 msgid "Synchronize with _buddy list now"
 msgstr "Синхронизиране със _списъка с приятели"
 
@@ -16631,16 +16709,16 @@ msgstr ""
 "Предоставя функционалност за отбелязване на календар или адресник като "
 "стандартен."
 
-#: ../plugins/email-custom-header/email-custom-header.c:558
+#: ../plugins/email-custom-header/email-custom-header.c:560
 msgid "_Custom Header"
 msgstr "_Потребителски заглавни части"
 
-#: ../plugins/email-custom-header/email-custom-header.c:879
+#: ../plugins/email-custom-header/email-custom-header.c:881
 msgid "Key"
 msgstr "Ключ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:890
-#: ../plugins/templates/templates.c:400
+#: ../plugins/email-custom-header/email-custom-header.c:892
+#: ../plugins/templates/templates.c:398
 msgid "Values"
 msgstr "Стойности"
 
@@ -16858,32 +16936,32 @@ msgstr "Текущата ви парола е с изтекъл срок. Про
 msgid "Your password will expire in the next %d days"
 msgstr "Паролата ви ще изтече в следващите %d дни"
 
-#: ../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 "Личен"
 
-#: ../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 "Редактор (четене, създаване, редактиране)"
 
-#: ../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 "Автор (четене, създаване)"
 
-#: ../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 "Преглеждащ (само четене)"
 
-#: ../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 "Правомощия на делегата"
 
-#: ../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"
@@ -16892,7 +16970,7 @@ msgstr "Права за %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."
@@ -16902,25 +16980,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 "Дадени са ви следните права върху моите папки:"
 
 #. 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 "Позволено ви е да виждате личните ми обекти."
 
 #. 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 "Не ви е позволено да виждате личните ми обекти."
 
-#: ../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 "Назначени сте за делегат на %s"
@@ -17125,7 +17203,7 @@ msgstr "Потребителско име:"
 #: ../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:715
+#: ../plugins/groupwise-features/share-folder.c:716
 msgid "Add User"
 msgstr "Добавяне на потребител"
 
@@ -17243,11 +17321,11 @@ msgstr "_Поверителност"
 msgid "_User"
 msgstr "_Потребител:"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:138
+#: ../plugins/exchange-operations/exchange-user-dialog.c:136
 msgid "Select User"
 msgstr "Избор на потребител"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:176
+#: ../plugins/exchange-operations/exchange-user-dialog.c:174
 msgid "Address Book..."
 msgstr "Адресник…"
 
@@ -17705,10 +17783,6 @@ msgstr ""
 "в base64 и се запазва в ~/.evolution/faces, ще бъде използвано в изходящите "
 "писма."
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "Лице"
-
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
@@ -17767,7 +17841,8 @@ msgid "<b>Server</b>"
 msgstr "<b>Сървър</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 "Приставка за настройване на календар и контакти на Google."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
@@ -17779,15 +17854,17 @@ msgid "Checklist"
 msgstr "Списък с отметки"
 
 #: ../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 ""
 "Приставка за настройване на календара на Groupwise и източниците за контакти."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "Groupwise Account Setup"
+#, fuzzy
+msgid "GroupWise Account Setup"
 msgstr "Настройка на Groupwise абонамент"
 
-#: ../plugins/groupwise-features/install-shared.c:219
+#: ../plugins/groupwise-features/install-shared.c:220
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17812,11 +17889,11 @@ msgstr ""
 "Натиснете „Напред“, за да инсталирате споделената папка\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:224
+#: ../plugins/groupwise-features/install-shared.c:225
 msgid "Install the shared folder"
 msgstr "Инсталиране на споделената папка"
 
-#: ../plugins/groupwise-features/install-shared.c:226
+#: ../plugins/groupwise-features/install-shared.c:227
 msgid "Shared Folder Installation"
 msgstr "Инсталиране на споделената папка"
 
@@ -17875,15 +17952,18 @@ msgid "Retract Mail"
 msgstr "Оттегляне на пощата"
 
 #: ../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 "Добавяне на опции за изпращане в писмото тип groupwise"
 
 #: ../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 "Приставка за абонаменти за работа в група."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "Groupwise Features"
+#, fuzzy
+msgid "GroupWise Features"
 msgstr "Възможности за работа в група"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
@@ -17942,20 +18022,24 @@ msgstr ""
 msgid "This is a recurring meeting"
 msgstr "Това е повтаряща се среща"
 
-#: ../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 "Искате ли да я приемете?"
 
-#: ../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 "Искате ли да я отхвърлите?"
 
-#: ../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 "Не може да споделяте папка със зададения потребител „{0}“."
 
-#: ../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 ""
 "Трябва да зададете потребителско име, което искате да добавите към списъка"
 
@@ -18060,7 +18144,7 @@ msgstr "Влизане в сървъра-посредник"
 #: ../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:83
+#: ../plugins/groupwise-features/send-options.c:85
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sВъведете парола за %s (потребител %s)"
@@ -18083,7 +18167,7 @@ msgstr ""
 "Разделът „Сървър-посредник“ ще е наличен, само когато абонаментът е включен."
 
 #: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:750
+#: ../plugins/groupwise-features/share-folder.c:751
 msgid "Users"
 msgstr "Потребители"
 
@@ -18099,68 +18183,68 @@ msgstr "Нова _споделена папка…"
 msgid "Sharing"
 msgstr "Споделяне"
 
-#: ../plugins/groupwise-features/share-folder.c:533
+#: ../plugins/groupwise-features/share-folder.c:534
 msgid "Custom Notification"
 msgstr "Специфично уведомление"
 
-#: ../plugins/groupwise-features/share-folder.c:755
+#: ../plugins/groupwise-features/share-folder.c:756
 msgid "Add   "
 msgstr "Добавяне"
 
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder.c:762
 msgid "Modify"
 msgstr "Промяна"
 
-#: ../plugins/groupwise-features/status-track.c:105
+#: ../plugins/groupwise-features/status-track.c:107
 msgid "Message Status"
 msgstr "Състояние на писмо"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:119
+#: ../plugins/groupwise-features/status-track.c:121
 msgid "Subject:"
 msgstr "Тема:"
 
-#: ../plugins/groupwise-features/status-track.c:133
+#: ../plugins/groupwise-features/status-track.c:135
 msgid "From:"
 msgstr "От:"
 
-#: ../plugins/groupwise-features/status-track.c:148
+#: ../plugins/groupwise-features/status-track.c:150
 msgid "Creation date:"
 msgstr "Дата на създаване:"
 
-#: ../plugins/groupwise-features/status-track.c:187
+#: ../plugins/groupwise-features/status-track.c:189
 msgid "Recipient: "
 msgstr "Получател: "
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:196
 msgid "Delivered: "
 msgstr "Доставено: "
 
-#: ../plugins/groupwise-features/status-track.c:200
+#: ../plugins/groupwise-features/status-track.c:202
 msgid "Opened: "
 msgstr "Отворено: "
 
-#: ../plugins/groupwise-features/status-track.c:205
+#: ../plugins/groupwise-features/status-track.c:207
 msgid "Accepted: "
 msgstr "Прието: "
 
-#: ../plugins/groupwise-features/status-track.c:210
+#: ../plugins/groupwise-features/status-track.c:212
 msgid "Deleted: "
 msgstr "Изтрито: "
 
-#: ../plugins/groupwise-features/status-track.c:215
+#: ../plugins/groupwise-features/status-track.c:217
 msgid "Declined: "
 msgstr "Отказано: "
 
-#: ../plugins/groupwise-features/status-track.c:220
+#: ../plugins/groupwise-features/status-track.c:222
 msgid "Completed: "
 msgstr "Приключено: "
 
-#: ../plugins/groupwise-features/status-track.c:225
+#: ../plugins/groupwise-features/status-track.c:227
 msgid "Undelivered: "
 msgstr "Недоставено: "
 
-#: ../plugins/groupwise-features/status-track.c:249
+#: ../plugins/groupwise-features/status-track.c:251
 msgid "Track Message Status..."
 msgstr "Следене на състоянието на писмото…"
 
@@ -18265,11 +18349,11 @@ msgstr "Внасяне в календара"
 msgid "Imports ICS attachments to calendar."
 msgstr "Внася прикрепените файлове ICS в календара"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "Слоят за абстракция на хардуера (HAL) не е зареден"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
+#: ../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."
@@ -18278,11 +18362,11 @@ msgstr ""
 "услугата и рестартирайте програмата, или се свържете със системния ви "
 "администратор."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
 msgid "Search for an iPod failed"
 msgstr "Неуспех при търсенето за iPod"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+#: ../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."
@@ -18290,8 +18374,8 @@ msgstr ""
 "Evolution не успя да открие iPod, с който да се синхронизира. Устройството "
 "не е свързано към системата или не е включено."
 
-#: ../plugins/ipod-sync/ical-format.c:118
-#: ../plugins/save-calendar/ical-format.c:163
+#: ../plugins/ipod-sync/ical-format.c:119
+#: ../plugins/save-calendar/ical-format.c:164
 msgid "iCalendar format (.ics)"
 msgstr "файлов формат на iCalendar (.ics)"
 
@@ -18485,17 +18569,17 @@ msgstr "Тази бележка е повтаряща се"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2383
+#: ../plugins/itip-formatter/itip-formatter.c:2388
 msgid "_Delete message after acting"
 msgstr "_Изтриване на писмото след действието"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2393
-#: ../plugins/itip-formatter/itip-formatter.c:2425
+#: ../plugins/itip-formatter/itip-formatter.c:2398
+#: ../plugins/itip-formatter/itip-formatter.c:2430
 msgid "Conflict Search"
 msgstr "Търсене на застъпвания"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2408
+#: ../plugins/itip-formatter/itip-formatter.c:2413
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Избор на календари за проверка за застъпвания в събранията"
 
@@ -19070,20 +19154,20 @@ msgstr "Дали иконата да мига или не."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Дали уведомлението да е за нови писма само в папката „Пощенска кутия“."
 
-#: ../plugins/mail-notification/mail-notification.c:254
+#: ../plugins/mail-notification/mail-notification.c:255
 msgid "Generate a _D-Bus message"
 msgstr "Генериране на съобщение за _D-Bus"
 
-#: ../plugins/mail-notification/mail-notification.c:377
+#: ../plugins/mail-notification/mail-notification.c:378
 msgid "Evolution's Mail Notification"
 msgstr "Уведомяване за поща"
 
-#: ../plugins/mail-notification/mail-notification.c:398
+#: ../plugins/mail-notification/mail-notification.c:399
 msgid "Mail Notification Properties"
 msgstr "Настройки за уведомяване за поща"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:458
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19098,55 +19182,55 @@ msgstr[1] ""
 "Получихте %d нови писма\n"
 "в %s."
 
-#: ../plugins/mail-notification/mail-notification.c:462
+#: ../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] "Получихте %d ново писмо."
 msgstr[1] "Получихте %d нови писма."
 
-#: ../plugins/mail-notification/mail-notification.c:479
-#: ../plugins/mail-notification/mail-notification.c:484
+#: ../plugins/mail-notification/mail-notification.c:480
+#: ../plugins/mail-notification/mail-notification.c:485
 msgid "New email"
 msgstr "Нова поща"
 
-#: ../plugins/mail-notification/mail-notification.c:541
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "Show icon in _notification area"
 msgstr "Показване на икона в _областта за уведомяване"
 
-#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:547
 msgid "B_link icon in notification area"
 msgstr "_Мигаща икона в областта за уведомяване"
 
-#: ../plugins/mail-notification/mail-notification.c:546
+#: ../plugins/mail-notification/mail-notification.c:549
 msgid "Popup _message together with the icon"
 msgstr "Показване на _съобщение с иконата"
 
-#: ../plugins/mail-notification/mail-notification.c:727
+#: ../plugins/mail-notification/mail-notification.c:730
 msgid "_Play sound when new messages arrive"
 msgstr "Издаване на _звук при пристигане на нова поща"
 
-#: ../plugins/mail-notification/mail-notification.c:733
+#: ../plugins/mail-notification/mail-notification.c:736
 msgid "_Beep"
 msgstr "_Издаване на звук"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:737
 msgid "Play _sound file"
 msgstr "Изпълнение на зву_ков файл"
 
-#: ../plugins/mail-notification/mail-notification.c:745
+#: ../plugins/mail-notification/mail-notification.c:748
 msgid "Specify _filename:"
 msgstr "Задаване на име на _файла:"
 
-#: ../plugins/mail-notification/mail-notification.c:746
+#: ../plugins/mail-notification/mail-notification.c:749
 msgid "Select sound file"
 msgstr "Избор на звуков файл"
 
-#: ../plugins/mail-notification/mail-notification.c:747
+#: ../plugins/mail-notification/mail-notification.c:750
 msgid "Pl_ay"
 msgstr "_Изпълнение"
 
-#: ../plugins/mail-notification/mail-notification.c:804
+#: ../plugins/mail-notification/mail-notification.c:807
 msgid "Notify new messages for _Inbox only"
 msgstr "Уведомяване за нови писма само в „_Пощенска кутия“"
 
@@ -19536,7 +19620,8 @@ msgid "_Publish Calendar Information"
 msgstr "_Информация за публикуването на календар"
 
 #: ../plugins/publish-calendar/publish-calendar.c:595
-msgid "Are you sure you want to remove this URL?"
+#, fuzzy
+msgid "Are you sure you want to remove this location?"
 msgstr "Сигурни ли сте, че искате да премахнете този адрес?"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
@@ -19574,8 +19659,9 @@ msgid "Publishing _Frequency:"
 msgstr "_Честота на публикуване"
 
 #: ../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"
@@ -19640,61 +19726,62 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Тестова приставка за приставката за зареждане на приставки на Питон."
 
 #: ../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 "Приставка, която зарежда други приставки писани на Питон."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
 msgid "Python Loader"
 msgstr "Зареждаща програма за Питон"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (вграден)"
 
-#: ../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, код за грешка: %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 "Неуспех при създаването на програмен канал: %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 "Грешка след разклоняване на процес: %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 не отговаря, прекратяване…"
 
-#: ../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 ""
 "Изчакването за дъщерния процес на SpamAssassin е прекъснато, прекратяване…"
 
-#: ../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 ""
 "Неуспех при изграждането на програмен канал към SpamAssassin, код за грешка: "
 "%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 не е наличен."
 
-#: ../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 "Това ще направи SpamAssassin по-надежден, но по-бавен"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
 msgid "I_nclude remote tests"
 msgstr "_Използване на правила за филтриране, намиращи се на отдалечен сървър"
 
@@ -19707,12 +19794,13 @@ msgstr ""
 "изисква Spamassassin да е инсталиран на системата."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin junk plugin"
-msgstr "Приставка за спам-филтър SpamAssassin"
+#, fuzzy
+msgid "SpamAssassin Options"
+msgstr "Опции на SpamAssassin"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "Spamassassin Options"
-msgstr "Опции на SpamAssassin"
+msgid "SpamAssassin junk plugin"
+msgstr "Приставка за спам-филтър SpamAssassin"
 
 #: ../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."
@@ -19722,7 +19810,7 @@ msgstr ""
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:314
+#: ../plugins/save-attachments/save-attachments.c:315
 msgid "Save attachments"
 msgstr "Запазване на прикрепените файлове"
 
@@ -19734,15 +19822,15 @@ msgstr "Запазване на прикрепените файлове…"
 msgid "Save all attachments"
 msgstr "Запазване на всички прикрепени файлове"
 
-#: ../plugins/save-attachments/save-attachments.c:320
+#: ../plugins/save-attachments/save-attachments.c:321
 msgid "Select save base name"
 msgstr "Избор на основното име за запис"
 
-#: ../plugins/save-attachments/save-attachments.c:339
+#: ../plugins/save-attachments/save-attachments.c:340
 msgid "MIME Type"
 msgstr "MIME тип"
 
-#: ../plugins/save-attachments/save-attachments.c:347
+#: ../plugins/save-attachments/save-attachments.c:348
 msgid "Save"
 msgstr "Запазване"
 
@@ -19750,79 +19838,79 @@ msgstr "Запазване"
 #. * 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:162
+#: ../plugins/save-calendar/csv-format.c:163
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:361
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Description List"
 msgstr "Списък с описания"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Categories List"
 msgstr "Списък с категории"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Comment List"
 msgstr "Списък с коментари"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Created"
 msgstr "Създадено"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Contact List"
 msgstr "Списък с контакти"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Start"
 msgstr "Начало"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "End"
 msgstr "Край"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "percent Done"
 msgstr "приключено в проценти"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "URL"
 msgstr "Адрес"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Attendees List"
 msgstr "Списък на присъстващите"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Modified"
 msgstr "Променено"
 
-#: ../plugins/save-calendar/csv-format.c:531
+#: ../plugins/save-calendar/csv-format.c:532
 msgid "Advanced options for the CSV format"
 msgstr "Допълнителни опции за формата CSV"
 
-#: ../plugins/save-calendar/csv-format.c:538
+#: ../plugins/save-calendar/csv-format.c:539
 msgid "Prepend a header"
 msgstr "Добавяне на заглавна част"
 
-#: ../plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:548
 msgid "Value delimiter:"
 msgstr "Разделител на стойност:"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:554
 msgid "Record delimiter:"
 msgstr "Разделител на записите:"
 
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "Encapsulate values with:"
 msgstr "Заграждане на стойностите с:"
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "Текстов файл с разделители (.csv)"
 
@@ -19843,15 +19931,15 @@ msgstr "Запазване на _диска"
 #. * 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:149
+#: ../plugins/save-calendar/rdf-format.c:150
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:376
+#: ../plugins/save-calendar/rdf-format.c:377
 msgid "RDF format (.rdf)"
 msgstr "Формат RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:160
+#: ../plugins/save-calendar/save-calendar.c:161
 msgid "Select destination file"
 msgstr "Избор на целеви файл"
 
@@ -19883,15 +19971,15 @@ msgstr "Помага ви при първоначалните настройки
 msgid "Setup Assistant"
 msgstr "Помощник за настройки"
 
-#: ../plugins/startup-wizard/startup-wizard.c:83
+#: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
 msgstr "Помощник за настройка на Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:86
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid "Welcome"
 msgstr "Добре дошли"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../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"
@@ -19903,28 +19991,28 @@ msgstr ""
 "\n"
 "Натиснете бутона „Напред“. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:133
+#: ../plugins/startup-wizard/startup-wizard.c:135
 msgid "Importing files"
 msgstr "Внасяне на файлове"
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../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 "Изберете информацията, която искате да внесете:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../plugins/startup-wizard/startup-wizard.c:152
 #: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "От %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../plugins/startup-wizard/startup-wizard.c:232
 #: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "Внасяне на данни."
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../plugins/startup-wizard/startup-wizard.c:234
 #: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "Изчакайте"
@@ -19956,15 +20044,15 @@ msgstr ""
 "Списък с двойки от ключови думи и стойности, които да се заменят в тялото на "
 "писмото чрез приставката за шаблони."
 
-#: ../plugins/templates/templates.c:615
+#: ../plugins/templates/templates.c:613
 msgid "No title"
 msgstr "Без заглавие"
 
-#: ../plugins/templates/templates.c:743
+#: ../plugins/templates/templates.c:741
 msgid "Save as _Template"
 msgstr "Запазване като _шаблон"
 
-#: ../plugins/templates/templates.c:745
+#: ../plugins/templates/templates.c:743
 msgid "Save as Template"
 msgstr "Запазване като шаблон"
 
@@ -19973,7 +20061,8 @@ msgid "Drafts based template plugin"
 msgstr "Приставка за шаблони за чернови"
 
 #: ../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 ""
 "Опростена приставка, която ползва „ytnef“ за декодиране на прикрепени "
 "файлове тип TNEF."
@@ -20001,7 +20090,8 @@ msgid "URL:"
 msgstr "Адрес:"
 
 #: ../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 "_Избягване на IfMatch (необходимо за Apache < 2.2.8)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
@@ -20391,7 +20481,7 @@ msgstr "Bug buddy не може да бъде стартиран."
 #. 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:729
+#: ../shell/e-shell-window-commands.c:942
 msgid "translator-credits"
 msgstr ""
 "Владимир „Kaladan“ Петков <vpetkov@i-space,org>\n"
@@ -20404,23 +20494,23 @@ msgstr ""
 "Научете повече за нас на http://gnome.cult.bg\n"
 "Докладвайте за грешки на http://gnome.cult.bg/bugs"
 
-#: ../shell/e-shell-window-commands.c:740
+#: ../shell/e-shell-window-commands.c:953
 msgid "Evolution Website"
 msgstr "Уебсайт на Evolution"
 
-#: ../shell/e-shell-window-commands.c:758
+#: ../shell/e-shell-window-commands.c:971
 msgid "Error opening the FAQ webpage."
 msgstr "Грешка при отваряне на уеб-страницата за често задавани въпроси."
 
-#: ../shell/e-shell-window-commands.c:955
+#: ../shell/e-shell-window-commands.c:1168
 msgid "_Work Online"
 msgstr "Работа в режим „_Включен“"
 
-#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1181 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Работа в режим „_Изключен“"
 
-#: ../shell/e-shell-window-commands.c:981
+#: ../shell/e-shell-window-commands.c:1194
 msgid "Work Offline"
 msgstr "Работа в режим „Изключен“"
 
@@ -20634,18 +20724,23 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Сигурни ли сте, че искате да бъдат забравени всички запомнени пароли?"
 
 #: ../shell/shell.error.xml.h:2
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Рестартиране на Evolution"
+
+#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "Продължение"
 
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
 msgid "Delete old data from version {0}?"
 msgstr "Изтриване на старата информация от версия {0}?"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
 msgid "Evolution can not start."
 msgstr "Evolution не може да стартира."
 
-#: ../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."
@@ -20653,15 +20748,15 @@ msgstr ""
 "Забравянето на паролите ще изчисти всички запомнени пароли. Ще бъдете "
 "запитани следващия път, когато трябва да бъдат въведени."
 
-#: ../shell/shell.error.xml.h:7
+#: ../shell/shell.error.xml.h:8
 msgid "Insufficient disk space for upgrade."
 msgstr "Недостатъчно дисково пространство за обновяване."
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:9
 msgid "Really delete old data?"
 msgstr "Наистина ли искате да се изтрие старата информация?"
 
-#: ../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"
@@ -20682,9 +20777,10 @@ msgstr ""
 "След изтриването не може да се върнете назад към предишната версия на "
 "Evolution без ръчна намеса.\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 "
@@ -20698,11 +20794,11 @@ msgstr ""
 "„evolution“ ще бъде окончателно изтрито. Ако изберете да запазите данните, "
 "може ръчно да премахнете съдържанието на „evolution“, когато пожелаете.\n"
 
-#: ../shell/shell.error.xml.h:19
+#: ../shell/shell.error.xml.h:20
 msgid "Upgrade from previous version failed: {0}"
 msgstr "Обновяването от предишната версия е неуспешно: {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"
@@ -20715,7 +20811,7 @@ msgstr ""
 "\n"
 "Трябва да освободите повече място в домашната си папка преди да продължите."
 
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:24
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
@@ -20725,7 +20821,7 @@ msgstr ""
 "\n"
 "Прегледайте ръководството за повече информация."
 
-#: ../shell/shell.error.xml.h:26
+#: ../shell/shell.error.xml.h:27
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -20739,19 +20835,19 @@ msgstr ""
 "\n"
 "Прегледайте ръководството за повече информация."
 
-#: ../shell/shell.error.xml.h:31
+#: ../shell/shell.error.xml.h:32
 msgid "_Forget"
 msgstr "Забрав_яне"
 
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:33
 msgid "_Keep Data"
 msgstr "_Запазване на данните"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:34
 msgid "_Remind Me Later"
 msgstr "_Напомняне по-късно"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:35
 msgid ""
 "{1}\n"
 "\n"
@@ -21516,7 +21612,7 @@ msgid "Month"
 msgstr "Месец"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:196
+#: ../widgets/misc/e-calendar.c:195
 msgid "Next"
 msgstr "Следващ"
 
@@ -21525,7 +21621,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Преглед на календар за печат"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:172
+#: ../widgets/misc/e-calendar.c:171
 msgid "Previous"
 msgstr "Предишен"
 
@@ -22705,16 +22801,16 @@ msgstr "Определяне на изгледите за „%s“"
 
 #: ../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
-#: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "Таблица"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
 msgid "Instance"
 msgstr "Пример"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "Запазване на текущия изглед"
 
@@ -22822,7 +22918,7 @@ msgstr "Предлагане на автоматично показване на
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:221
+#: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
 msgstr "Месечен календар"
 
@@ -22895,7 +22991,7 @@ msgstr "Сега"
 msgid "The time must be in the format: %s"
 msgstr "Датата трябва да е въведена в следния формат: %s"
 
-#: ../widgets/misc/e-cell-percent.c:79
+#: ../widgets/misc/e-cell-percent.c:78
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Стойността на процентите трябва да е между 0 и 100 включително"
 
@@ -23063,11 +23159,11 @@ msgid "A widget to display in place of the usual expander label"
 msgstr ""
 "Графичен обект за показване на място на обичайния етикет на разширителя"
 
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3390
 msgid "Expander Size"
 msgstr "Размер на разширителя"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3391
 msgid "Size of the expander arrow"
 msgstr "Размер на стрелката на разширителя"
 
@@ -23142,11 +23238,11 @@ msgstr ""
 "Интерактивна карта за избор на часови пояс с мишката. Потребителите на "
 "клавиатури трябва да изберат часовия пояс от падащото меню по-долу."
 
-#: ../widgets/misc/e-online-button.c:109
+#: ../widgets/misc/e-online-button.c:106
 msgid "Online"
 msgstr "Режим „Включен“"
 
-#: ../widgets/misc/e-online-button.c:110
+#: ../widgets/misc/e-online-button.c:107
 msgid "The button state is online"
 msgstr "Състоянието на бутона е „Включен“"
 
@@ -23174,62 +23270,62 @@ msgstr "Модел на изливане на текста"
 msgid "Column width"
 msgstr "Широчина на колоната"
 
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
+#: ../widgets/misc/e-search-bar.c:472
 msgid "Search"
 msgstr "Търсене"
 
-#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
-#: ../widgets/misc/e-search-bar.c:475
+#: ../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 "Натиснете тук, за да промените типа търсене"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Search"
 msgstr "_Търсене"
 
-#: ../widgets/misc/e-search-bar.c:612
+#: ../widgets/misc/e-search-bar.c:609
 msgid "_Find Now"
 msgstr "_Намиране сега"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:610
 msgid "_Clear"
 msgstr "Изчиств_ане"
 
-#: ../widgets/misc/e-search-bar.c:868
+#: ../widgets/misc/e-search-bar.c:865
 msgid "Item ID"
 msgstr "Идентификатор на елемента"
 
-#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Текст"
 
 #. 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:1006
+#: ../widgets/misc/e-search-bar.c:1003
 msgid "Sho_w: "
 msgstr "_Показване на: "
 
 #. 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:1023
+#: ../widgets/misc/e-search-bar.c:1020
 msgid "Sear_ch: "
 msgstr "_Търсене: "
 
 #. 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:1035
+#: ../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:807
+#: ../widgets/table/e-tree-selection-model.c:806
 msgid "Cursor Row"
 msgstr "Ред на показалец"
 
 #: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:814
+#: ../widgets/table/e-tree-selection-model.c:813
 msgid "Cursor Column"
 msgstr "Колона на показалец"
 
@@ -23427,23 +23523,23 @@ msgstr "Фокусирана колона"
 msgid "Unselected Column"
 msgstr "Неизбрана колона"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1807
 msgid "Strikeout Column"
 msgstr "Зачертана колона"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1814
 msgid "Underline Column"
 msgstr "Подчертана колона"
 
-#: ../widgets/table/e-cell-text.c:1822
+#: ../widgets/table/e-cell-text.c:1821
 msgid "Bold Column"
 msgstr "Получерна колона"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1828
 msgid "Color Column"
 msgstr "Оцветена колона"
 
-#: ../widgets/table/e-cell-text.c:1843
+#: ../widgets/table/e-cell-text.c:1842
 msgid "BG Color Column"
 msgstr "Фонов цвят на колона"
 
@@ -23555,15 +23651,15 @@ msgid "_Sort..."
 msgstr "_Подреждане…"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:634
-#: ../widgets/table/e-table-field-chooser.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 "ИиП код"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:641
-#: ../widgets/table/e-table-field-chooser.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 "Пълна заглавна част"
@@ -23611,7 +23707,7 @@ msgstr "Сменящи се цветове на редовете"
 #: ../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:3344 ../widgets/table/e-tree.c:3345
+#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
 msgid "Horizontal Draw Grid"
 msgstr "Хоризонтална решетка"
 
@@ -23620,7 +23716,7 @@ msgstr "Хоризонтална решетка"
 #: ../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:3350 ../widgets/table/e-tree.c:3351
+#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
 msgid "Vertical Draw Grid"
 msgstr "Вертикална решетка"
 
@@ -23629,7 +23725,7 @@ msgstr "Вертикална решетка"
 #: ../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:3356 ../widgets/table/e-tree.c:3357
+#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
 msgid "Draw focus"
 msgstr "Рисуване на фокус"
 
@@ -23654,8 +23750,8 @@ msgstr "Модел на избиране"
 #: ../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:3338
-#: ../widgets/table/e-tree.c:3339
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3337
+#: ../widgets/table/e-tree.c:3338
 msgid "Length Threshold"
 msgstr "Праг по дължина"
 
@@ -23664,8 +23760,8 @@ msgstr "Праг по дължина"
 #: ../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:3370
-#: ../widgets/table/e-tree.c:3371
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3369
+#: ../widgets/table/e-tree.c:3370
 msgid "Uniform row height"
 msgstr "Стандартна височина на колона"
 
@@ -23760,8 +23856,8 @@ msgstr "Модел на таблицата"
 msgid "Cursor row"
 msgstr "Ред на показалеца"
 
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
-#: ../widgets/table/e-tree.c:3378
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3376
+#: ../widgets/table/e-tree.c:3377
 msgid "Always search"
 msgstr "Винаги да се търси"
 
@@ -23769,15 +23865,15 @@ msgstr "Винаги да се търси"
 msgid "Use click to add"
 msgstr "Натискане за добавяне"
 
-#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
+#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
 msgid "ETree table adapter"
 msgstr "Адаптер за таблица ETree"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3383
 msgid "Retro Look"
 msgstr "Ретро изглед"
 
-#: ../widgets/table/e-tree.c:3385
+#: ../widgets/table/e-tree.c:3384
 msgid "Draw lines and +/- expanders."
 msgstr "Изчертаване на линиите и знаците за разширяване „+“ и „-“"
 
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 6e685bc3af..948a005dae 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -6,52 +6,54 @@
 # Semati Ghosh <semanti_84@yahoo.co.in> 2004.
 # Sampat Kundu <skk_84@rediffmail.com> 2004.
 #
+#: ../shell/main.c:589
 # Deepayan Sarkar <deepayan@bengalinux.org>, 2004.
 # Progga <progga@bengalinux.org>, 2004.
 # Sayamindu Dasgupta <sayamindu@bengalinux.org>, 2004.
 # Runa Bhattacharjee <runabh@gmail.com>, 2006, 2007.
 # Runa Bhattacharjee <runab@fedoraproject.org>, 2008.
+# Runa Bhattacharjee <runab@redhat.com>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: bn_IN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-08 07:48+0000\n"
-"PO-Revision-Date: 2008-03-10 16:06+0530\n"
-"Last-Translator: Runa Bhattacharjee <runab@fedoraproject.org>\n"
-"Language-Team: Bengali INDIA <discuss@ankur.co.in>\n"
+"POT-Creation-Date: 2008-09-11 15:33+0000\n"
+"PO-Revision-Date: 2008-09-22 10:50+0530\n"
+"Last-Translator: Runa Bhattacharjee <runab@redhat.com>\n"
+"Language-Team: Bengali INDIA <fedora-trans-bn_IN@redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "\n"
 "\n"
 "\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
-msgid "evolution addressbook"
+#: ../a11y/addressbook/ea-minicard-view.c:178
+msgid "evolution address book"
 msgstr "Evolution ঠিকানাবই"
 
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../a11y/addressbook/ea-minicard-view.c:32
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "New Contact"
 msgstr "নতুন পরিচিতি"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "New Contact List"
 msgstr "নতুন পরিচিতি তালিকা"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "বর্তমান ঠিকানাবইয়ের ফোল্ডার %s'র মধ্যে %d-টি কার্ড উপস্থিত রয়েছে"
+msgstr[1] "বর্তমান ঠিকানাবইয়ের ফোল্ডার %s'র মধ্যে %d-টি কার্ড উপস্থিত রয়েছে"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "খুলুন"
 
@@ -67,78 +69,79 @@ msgstr "পরিচিতি: "
 msgid "evolution minicard"
 msgstr "Evolution মিনিকার্ড"
 
-#: ../a11y/calendar/ea-cal-view-event.c:266
+#: ../a11y/calendar/ea-cal-view-event.c:265
 msgid "It has alarms."
 msgstr "চেতাবনীসহ"
 
-#: ../a11y/calendar/ea-cal-view-event.c:269
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "It has recurrences."
 msgstr "পুনরাবৃত্তি ব্যবস্থা সহ।"
 
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It is a meeting."
 msgstr "এটি একটি সভা।"
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:277
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "বর্ষপঞ্জির অনুষ্ঠান: সংক্ষিপ্তসার %s।"
 
-#: ../a11y/calendar/ea-cal-view-event.c:280
+#: ../a11y/calendar/ea-cal-view-event.c:279
 msgid "Calendar Event: It has no summary."
 msgstr "বর্ষপঞ্জির অনুষ্ঠান: সংক্ষিপ্তসার উপস্থিত নেই।"
 
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "বর্ষপঞ্জি অনুযায়ী প্রদর্শনের ঘটনা"
 
-#: ../a11y/calendar/ea-cal-view-event.c:528
+#: ../a11y/calendar/ea-cal-view-event.c:527
 msgid "Grab Focus"
 msgstr ""
 
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
 msgstr "নতুন সাক্ষাৎকার"
 
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "সারাদনব্যাপী নতুন অনুষ্ঠান"
 
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "নতুন সভা"
 
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "আজকের তারিখ প্রদর্শন করা হবে"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "নির্দিষ্ট তারিখ প্রদর্শন করা হবে"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:303
-#: ../a11y/calendar/ea-week-view-main-item.c:301
+#: ../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 "বর্তমান সময়সীমা প্রদর্শন ও নির্বাচনের উদ্দেশ্যে একটি টেবিল"
 
 #. 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:151 ../a11y/calendar/ea-week-view.c:150
+#: ../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."
 msgstr[0] "%d-টি অনুষ্ঠান উপস্থিত রয়েছে।"
+msgstr[1] "%d-টি অনুষ্ঠান উপস্থিত রয়েছে।"
 
 #. 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:155 ../a11y/calendar/ea-week-view.c:152
+#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
 msgid "It has no events."
 msgstr "কোনো অনুষ্ঠান উপস্থিত নেই।"
 
 #. 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:162
+#: ../a11y/calendar/ea-day-view.c:159
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "সাপ্তাহিক কর্মের দিন অনুসারে প্রদর্শন: %s. %s"
@@ -146,21 +149,21 @@ msgstr "সাপ্তাহিক কর্মের দিন অনুসা
 #. 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:168
+#: ../a11y/calendar/ea-day-view.c:165
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "দিন অনুসারে প্রদর্শন: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
 msgstr "সাপ্তাহিক কর্মের দিন অনুযায়ী বর্ষপঞ্জি প্রদর্শন"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
 msgstr "এক অথবা অধিক সংখ্যক দিন অনুসারে বর্ষপঞ্জির প্রদর্শন"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:747
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
@@ -170,32 +173,30 @@ 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:191
-#: ../calendar/gui/calendar-component.c:750
-#: ../calendar/gui/e-day-view-top-item.c:1363
-#: ../calendar/gui/e-day-view.c:2162
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../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:1566
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:193
+#: ../a11y/calendar/ea-gnome-calendar.c:191
+#: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:752
-#: ../calendar/gui/calendar-component.c:757
-#: ../calendar/gui/calendar-component.c:759
+#: ../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:217
-#: ../a11y/calendar/ea-gnome-calendar.c:223
+#: ../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
-#: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:778
-#: ../calendar/gui/calendar-component.c:784
-#: ../calendar/gui/calendar-component.c:786
+#: ../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"
 
@@ -204,62 +205,60 @@ 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:221
-#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/e-day-view-top-item.c:1367
-#: ../calendar/gui/e-day-view.c:2178
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../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:1582
+#: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:247
-#: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:772
+#: ../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 Calendar"
 
 # FIXME: 'ভিত্তি' শব্দটার ব্যবহার ঠিক ভাল লাগতেছে না :-(
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "অনুসন্ধানের স্থান"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "Evolution বর্ষপঞ্জি ও অনুসন্ধানের স্থান"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "জাম্প বাটন"
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "অতিরিক্ত অনুষ্ঠান অনুসন্ধানের উদ্দেশ্যে এই স্থানে ক্লিক করুন।"
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "মাস অনুসারে প্রদর্শন: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "সপ্তাহ অনুসারে প্রদর্শন: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
 msgstr "মাস অনুযায়ী বর্ষপঞ্জি প্রদর্শন"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
 msgstr "এক অথবা অধিক সপ্তাহ অনুযায়ী বর্ষপঞ্জি প্রদর্শন"
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr "পপ-আপ"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:125
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
 msgid "popup a child"
 msgstr "একটি চাইল্ড পপ-আপ করা হবে"
 
@@ -271,12 +270,12 @@ msgstr "সম্পাদনা"
 msgid "begin editing this cell"
 msgstr "বর্তমান সেল সম্পাদন করুন"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
 msgid "toggle"
 msgstr "অদলবদল"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:152
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
 msgid "toggle the cell"
 msgstr "সেল অদলবদল করুন"
 
@@ -296,47 +295,47 @@ msgstr "সঙ্কুচন"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "ETree-র মধ্যে বর্তমান সেল ধারণকারী সারি সঙ্কুচিত করে"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "টেবিলের সেল"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:581
+#: ../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 "ক্লিক করে যোগ করুন"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
 msgid "click"
 msgstr "ক্লিক করুন"
 
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
+#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
 msgid "sort"
 msgstr "ক্রমবিন্যাস"
 
-#: ../a11y/widgets/ea-calendar-item.c:298
-#: ../a11y/widgets/ea-calendar-item.c:304
+#: ../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:306
+#: ../a11y/widgets/ea-calendar-item.c:303
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "বর্ষপঞ্জি: %s থেকে %s অবধি"
 
-#: ../a11y/widgets/ea-calendar-item.c:341
+#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
 msgstr "Evolution বর্ষপঞ্জির বিষয়বস্তু"
 
-#: ../a11y/widgets/ea-combo-button.c:40
+#: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
 msgstr "কম্বো বাটন"
 
-#: ../a11y/widgets/ea-combo-button.c:50
+#: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
 msgstr "ডিফল্ট মান সক্রিয় করুন"
 
-#: ../a11y/widgets/ea-combo-button.c:52
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "পপ-আপ মেনু"
 
@@ -351,9 +350,9 @@ msgstr "সক্রিয় করুন"
 #. 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 source. Switch to Contacts View and "
-"highlight an address book that can accept contacts."
-msgstr ""
+"'{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."
+msgstr "ঠিকানাবই '{0}' শুধুমাত্র পাঠযোগ্য। অনুগ্রহ করে পরিচিতি তালিকা প্রদর্শন ক্ষেত্রের সাইড-বারে উপস্থিত ভিন্ন ঠিকানা বই নির্বাচন করুন।"
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -395,14 +394,14 @@ msgid "Could not get schema information for LDAP server."
 msgstr "LDAP সার্ভার সংক্রান্ত স্কীমার তথ্য আহরণ করা যায়নি।"
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
+msgid "Could not remove address book."
 msgstr "ঠিকানাবই মুছে ফেলা যায়নি।"
 
 #: ../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 "
-"Frequent Contacts and Groupwise Personal Contacts folders."
+"Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:12
@@ -410,7 +409,7 @@ msgid "Delete address book '{0}'?"
 msgstr "ঠিকানা বই '{0}' মুছে ফেলা হবে কি?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
+msgid "Error loading address book."
 msgstr "ঠিকানাবই লোড করতে সমস্যা।"
 
 #: ../addressbook/addressbook.error.xml.h:14
@@ -423,7 +422,7 @@ msgstr "LDAP সার্ভারে পরিচয়-প্রমাণ কর�
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "নির্বাচিত পরিচিতি মুছে ফেলতে ব্যর্থ"
 
@@ -437,30 +436,26 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP সার্ভারের প্রত্যুত্তরের মধ্যে বৈধ স্কীমার তথ্য উপস্থিত নেই।"
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid "Permission Denied."
-msgstr "অনুমতি পাওয়া যায়নি।"
-
-#: ../addressbook/addressbook.error.xml.h:20
 msgid "Server Version"
 msgstr "সার্ভারের সংস্করণ"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "Some features may not work properly with your current server"
 msgstr ""
 "আপনার দ্বারা বর্তমানে ব্যবহৃত সার্ভারের মধ্যে কয়েকটি বৈশিষ্ট্য সঠিকরূপে চলতে না পারার "
 "সম্ভাবনা রয়েছে"
 
-#: ../addressbook/addressbook.error.xml.h:22
-msgid "The Evolution addressbook has quit unexpectedly."
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "The Evolution address book has quit unexpectedly."
 msgstr "Evolution ঠিকানাবই অপ্রত্যাশিতরূপে প্রস্থান করেছে।"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "আপনার নির্বাচিত ছবিটি অত্যাধিক বড়। আপনি কি এটি মাপ পরিবর্তন করে এটি সংরক্ষণ করতে "
 "ইচ্ছুক?"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../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 "
@@ -470,56 +465,56 @@ msgstr ""
 "বৈশিষ্ট্য সমর্থিত হয় না অথবা সার্ভারটি সঠিকররূপে কনফিগার করা হয়নি। সমর্থিত "
 "অনুসন্ধানের স্থান সম্পর্কে জানতে আপনার অ্যাডমিনিস্ট্রেটরের সাথে যোগাযোগ করুন।"
 
-#: ../addressbook/addressbook.error.xml.h:25
-msgid "This address book will be removed permanently."
-msgstr "ঠিকানাবইটি স্থায়ীরূপে মুছে ফেলা হবে।"
-
-#: ../addressbook/addressbook.error.xml.h:26
-msgid "This addressbook could not be opened."
+#: ../addressbook/addressbook.error.xml.h:24
+msgid "This address book could not be opened."
 msgstr "এই ঠিকানাবই খোলা যায়নি।"
 
-#: ../addressbook/addressbook.error.xml.h:27
-msgid "This addressbook server does not have any suggested search bases."
+#: ../addressbook/addressbook.error.xml.h:25
+msgid "This address book server does not have any suggested search bases."
 msgstr "এই ঠিকানাবইয়ের সার্ভারের জন্য কোনো প্রস্তাবিত অনুসন্ধানের স্থান উল্লিখিত নেই।"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:26
 msgid ""
-"This addressbook server might be unreachable or the server name may be "
+"This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr ""
 "সম্ভবত এই ঠিকানাবইয়ের সার্ভারটির সাথে সম্পর্ক স্থাপন করা যাচ্ছে না অথবা সার্ভারের "
 "নাম সঠিকভাবে লেখা হয়নি অথবা আপনার নেটওয়ার্ক সংযোগ ব্যবস্থা সক্রিয় নেই।"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "ঠিকানাবইটি স্থায়ীরূপে মুছে ফেলা হবে।"
+
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "এই সার্ভারে LDAPv3 স্কিমা তথ্য সমর্থন করে হয় না।"
 
-#: ../addressbook/addressbook.error.xml.h:30
-msgid "Unable to open addressbook"
+#: ../addressbook/addressbook.error.xml.h:29
+msgid "Unable to open address book"
 msgstr "ঠিকানাবই খোলা যায়নি"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "অনুসন্ধান প্রক্রিয়া চালানো সম্ভব হয়নি।"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "{0} সংরক্ষণ করতে ব্যর্থ।"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "পরিবর্তনগুলি কি আপনি সংরক্ষণ করতে ইচ্ছুক?"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
-"You are attempting to move a contact from one addressbook to another but it "
+"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?"
 msgstr ""
 "আপনি কোনো পরিচিতির তথ্য এক ঠিকানাবই থেকে অন্য একটি বইয়ে স্থানান্তর করার চেষ্টা "
-"করছেন, কিন্তু উত্স থেকে তা সরানো সম্ভব নয়। বিকল্প হিসাবে আপনি কি অনুলিপি সংরক্ষণ "
+"করছেন, কিন্তু উৎস থেকে তা সরানো সম্ভব নয়। বিকল্প হিসাবে আপনি কি অনুলিপি সংরক্ষণ "
 "করতে ইচ্ছুক?"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../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 "
@@ -529,6 +524,10 @@ msgstr ""
 "দরুণ Evolution ব্যবহারের সময় সমস্যা দেখা দিতে পারে। সঠিক কার্যকারিতার জন্য "
 "সার্ভারে কোনো সমর্থিত সংস্করণ ব্যবহার করুন।"
 
+#: ../addressbook/addressbook.error.xml.h:35
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "এই ঠিকানাবইয়ের পরিচিতিদের তথ্য মুছে ফেলার জন্য পর্যাপ্ত অনুমতি আপনার নেই।"
+
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
@@ -541,7 +540,7 @@ msgstr ""
 msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "Evolution পুনরায় আরম্ভ না করা হলে আপনার {0} সংখ্যক পরিচিতির তথ্য উপলব্ধ হবে না।"
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:512
+#: ../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
@@ -564,9 +563,9 @@ msgstr "মাপ পরিবর্তন (_R)"
 msgid "_Use as it is"
 msgstr "এই অবস্থায় ব্যবহার করুন (_U)"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#. 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}"
 
@@ -575,17 +574,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:299
 msgid "Default Sync Address:"
 msgstr "ডিফল্ট সিঙ্ক (Sync) ঠিকানা:"
 
-#: ../addressbook/conduit/address-conduit.c:1319
 #: ../addressbook/conduit/address-conduit.c:1320
-msgid "Could not load addressbook"
+#: ../addressbook/conduit/address-conduit.c:1321
+msgid "Could not load address book"
 msgstr "ঠিকানাবই লোড করা যায়নি"
 
-#: ../addressbook/conduit/address-conduit.c:1397
-#: ../addressbook/conduit/address-conduit.c:1400
+#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1401
 msgid "Could not read pilot's Address application block"
 msgstr "পাইলটের ঠিকানা অ্যাপ্লিকেশন ব্লক পড়া যায়নি"
 
@@ -607,10 +606,10 @@ msgstr "স্বয়ংক্রিয়ভাবে সম্পূর্ণ ক�
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:403
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
 msgstr "পরিচিতি"
 
@@ -619,7 +618,7 @@ msgid "Evolution Address Book"
 msgstr "Evolution ঠিকানাবই"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address pop-up"
+msgid "Evolution Address Book address popup"
 msgstr "Evolution ঠিকানাবইয়ের ঠিকানা পপ-আপ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
@@ -636,8 +635,8 @@ msgid "Evolution Address Book component"
 msgstr "Evolution ঠিকানাবইয়ের বিষয়বস্তু"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime সার্টিফিকেট ব্যবস্থা নিয়ন্ত্রণ"
+msgid "Evolution S/MIME Certificate Management Control"
+msgstr "Evolution S/Mime সার্টিফিকেট পরিচালনা নিয়ন্ত্রণ ব্যবস্থা"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
@@ -651,12 +650,13 @@ msgstr "আপনার S/MIME সার্টিফিকেটগুলি এ
 #. On This Computer is always first and Search Folders is always last
 #: ../addressbook/gui/component/addressbook-component.c:144
 #: ../addressbook/gui/component/addressbook-migrate.c:499
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:482
-#: ../calendar/gui/migration.c:583 ../calendar/gui/migration.c:1096
-#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:307
-#: ../mail/mail-vfolder.c:216
+#: ../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:312 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1457
 msgid "On This Computer"
 msgstr "ব্যবহৃত কম্পিউটারের মধ্যে"
 
@@ -669,122 +669,126 @@ msgstr "ব্যবহৃত কম্পিউটারের মধ্যে"
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:492
-#: ../calendar/gui/migration.c:591 ../calendar/gui/migration.c:1104
-#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
+#: ../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 "ব্যক্তিগত"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-component.c:163
 #: ../addressbook/gui/component/addressbook-migrate.c:517
 msgid "On LDAP Servers"
 msgstr "LDAP সার্ভারের মধ্যে"
 
-#: ../addressbook/gui/component/addressbook-component.c:229
+#: ../addressbook/gui/component/addressbook-component.c:230
+msgctxt "New"
 msgid "_Contact"
 msgstr "পরিচিতি (_C)"
 
-#: ../addressbook/gui/component/addressbook-component.c:230
+#: ../addressbook/gui/component/addressbook-component.c:231
 msgid "Create a new contact"
 msgstr "নতুন পরিচিতি নির্মাণ"
 
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:238
+msgctxt "New"
 msgid "Contact _List"
 msgstr "পরিচিতি তালিকা (_L)"
 
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:239
 msgid "Create a new contact list"
 msgstr "নতুন পরিচিতি তালিকা নির্মাণ"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "নতুন ঠিকানাবই"
 
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:246
+msgctxt "New"
 msgid "Address _Book"
 msgstr "ঠিকানাবই (_B)"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:247
 msgid "Create a new address book"
 msgstr "নতুন ঠিকানা বই নির্মাণ"
 
-#: ../addressbook/gui/component/addressbook-component.c:409
+#: ../addressbook/gui/component/addressbook-component.c:410
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "ঠিকানাবইয়ের বৈশিষ্ট্যাবলী অথবা ফোল্ডার আপগ্রেড করতে ব্যর্থ।"
 
-#: ../addressbook/gui/component/addressbook-config.c:329
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "ভিত্তি"
 
-#: ../addressbook/gui/component/addressbook-config.c:530
-#: ../calendar/gui/dialogs/calendar-setup.c:172
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "ধরন: (_T)"
 
-#: ../addressbook/gui/component/addressbook-config.c:632
+#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
 msgstr "অফলাইন কর্মের জন্য বইয়ের বিষয়বস্তু স্থানীয় অবস্থানে কপি করুন (_b)"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../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:369
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2353
+#: ../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:2367
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "সাধারণ"
 
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../addressbook/gui/widgets/e-addressbook-view.c:557
-#: ../mail/importers/pine-importer.c:387
+#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../mail/importers/pine-importer.c:385
 msgid "Address Book"
 msgstr "ঠিকানা-বই"
 
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:987
 msgid "Server Information"
 msgstr "সার্ভার সংক্রান্ত তথ্য"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:989
 msgid "Authentication"
 msgstr "অনুমোদন ব্যবস্থা"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:992
 #: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "বিবরণ"
 
-#: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:935
+#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "অনুসন্ধান"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:995
 msgid "Downloading"
 msgstr "ডাউনলোড ব্যবস্থা"
 
 # FIXME
-#: ../addressbook/gui/component/addressbook-config.c:1204
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "ঠিকানাবইয়ের বৈশিষ্ট্যাবলী"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "মাইগ্রেট প্রণালী..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
-msgid "Migrating `%s':"
-msgstr "`%s' মাইগ্রেট করা হচ্ছে:"
+msgid "Migrating '%s':"
+msgstr "'%s' মাইগ্রেট করা হচ্ছে:"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
@@ -837,70 +841,76 @@ msgstr ""
 "Evolution-র দ্বারা আপনার পাইলট সিঙ্ক তথ্য মাইগ্রেট করা হচ্ছে, অনুগ্রহ করে অপেক্ষা "
 "করুন..."
 
-#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:501
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" ফোল্ডারের নাম পরিবর্তিত করে করা হবে:"
 
-#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:503
 msgid "Rename Folder"
 msgstr "ফোল্ডারের নাম পরিবর্তন করুন"
 
-#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:509
 msgid "Folder names cannot contain '/'"
 msgstr "ফোল্ডারের নামের মাঝে / লেখা যাবে না।"
 
-#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "নতুন ঠিকানাবই (_N)"
 
-#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
 msgstr "vCard হিসাবে সংরক্ষণ করা হবে..."
 
-#: ../addressbook/gui/component/addressbook-view.c:958
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:609
-#: ../calendar/gui/e-calendar-table.c:1387
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:941
+#: ../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:1596
+#: ../calendar/gui/e-calendar-view.c:1693 ../calendar/gui/e-memo-table.c:941
 #: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
-#: ../mail/em-folder-tree.c:2090 ../mail/em-folder-view.c:1346
+#: ../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 "মুছে ফেলুন (_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
-msgid "_Properties..."
-msgstr "বৈশিষ্ট্যাবলী...(_P)"
+#: ../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
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "বৈশিষ্ট্যাবলী (_P)"
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "পরিচিতির উৎ‌স নির্বাচক"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP সার্ভারের সাথে বেনামীভাবে সংযোগ স্থাপন করা হচ্ছে"
 
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
 msgid "Failed to authenticate.\n"
 msgstr "পরিচয় প্রমাণে ব্যর্থ।\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
+#: ../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 "%s-র(ব্যবহারকারী %s) জন্য পাসওয়ার্ড লিখুন"
 
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/publish-calendar/publish-calendar.c:93
-#: ../smime/gui/component.c:50
+#: ../plugins/google-account-setup/google-source.c:444
+#: ../plugins/publish-calendar/publish-calendar.c:190
+#: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "পাসওয়ার্ড লিখুন"
 
@@ -978,38 +988,35 @@ msgid "<b>Authentication</b>"
 msgstr "<b>অনুমোদন ব্যবস্থা</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Display</b>"
-msgstr "<b>প্রদর্শন</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>ডাউনলোড ব্যবস্থা</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Searching</b>"
 msgstr "<b>অনুসন্ধান ব্যবস্থা</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "<b>Server Information</b>"
-msgstr "<b>সার্ভার সংক্রান্ত তথ্য</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Type:</b>"
 msgstr "<b>ধরন:</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "Add Address Book"
 msgstr "ঠিকানাবই যোগ করুন"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
-#: ../mail/em-account-editor.c:777
+#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../mail/em-account-editor.c:761
 msgid "Always"
 msgstr "সর্বদা"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Anonymously"
 msgstr "বেনামীভাবে"
 
+#. 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 "নির্ধারিত সীমা অতিক্রান্ত না অবধি এই ঠিকানা বই ব্রাউজ করুন (_r)"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "মৌলিক"
@@ -1037,14 +1044,14 @@ msgid "Lo_gin:"
 msgstr "লগ-ইন: (_g)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:776
+#: ../mail/em-account-editor.c:760
 msgid "Never"
 msgstr "কখনো নয়"
 
 #. 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:304
+#: ../mail/em-account-editor.c:288
 msgid "No encryption"
 msgstr "এনক্রিপশনবিহীন"
 
@@ -1056,7 +1063,7 @@ msgstr "এক"
 #. 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:312
+#: ../mail/em-account-editor.c:296
 msgid "SSL encryption"
 msgstr "SSL এনক্রিপশন"
 
@@ -1120,7 +1127,7 @@ msgstr "সমর্থিত অনুসন্ধানের স্থান"
 #. 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:308
+#: ../mail/em-account-editor.c:292
 msgid "TLS encryption"
 msgstr "TLS এনক্রিপশন"
 
@@ -1218,8 +1225,8 @@ msgid "_Login method:"
 msgstr "লগ-ইন প্রক্রিয়া (_L):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:164
+#: ../calendar/gui/dialogs/calendar-setup.c:227
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
@@ -1234,7 +1241,7 @@ msgid "_Search scope:"
 msgstr "অনুসন্ধানের ক্ষেত্র: (_S)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "সার্ভার: (_S)"
@@ -1255,9 +1262,10 @@ msgstr "কার্ড"
 #: ../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:288
+#: ../plugins/calendar-http/calendar-http.c:279
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:395
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "মিনিট"
 
@@ -1298,7 +1306,7 @@ msgid "<b>Work</b>"
 msgstr "<b>কর্ম</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1310,16 +1318,16 @@ msgid "Ca_tegories..."
 msgstr "শ্রেণীবিভাগ (_t)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
-#: ../addressbook/gui/widgets/e-minicard.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "পরিচিতি"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:565
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2430
+#: ../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
 msgid "Contact Editor"
 msgstr "পরিচিতি সম্পাদক"
 
@@ -1332,7 +1340,7 @@ msgid "Image"
 msgstr "চিত্র"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
 msgid "MSN Messenger"
 msgstr "MSN মেসেঞ্জার"
 
@@ -1345,7 +1353,7 @@ msgid "Nic_kname:"
 msgstr "ডাকনাম: (_k)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
 msgid "Novell Groupwise"
 msgstr "Novell গ্রুপওয়াইস"
 
@@ -1359,11 +1367,11 @@ msgstr "টেলিফোন"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1057
 msgid "Work"
 msgstr "কর্ম"
 
@@ -1385,8 +1393,8 @@ msgid "_Birthday:"
 msgstr "জন্মদিন:(_B)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:899
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "বর্ষপঞ্জি:(_C)"
@@ -1476,1143 +1484,1145 @@ msgstr "কোথায় (_W):"
 msgid "_Zip/Postal Code:"
 msgstr "জিপ/পোস্টাল কোড(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../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 "ঠিকানা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
+#: ../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-list-editor/e-contact-list-editor.c:1178
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:187
-#: ../widgets/menus/gal-define-views-model.c:179
-#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3686
-#: ../widgets/text/e-text.c:3687
+#: ../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:1836 ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "সম্পাদনযোগ্য"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
 msgid "United States"
 msgstr "মার্কিন যুক্তরাষ্ট্র"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
 msgid "Afghanistan"
 msgstr "আফগানিস্তান"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
 msgid "Albania"
 msgstr "আলবেনিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
 msgid "Algeria"
 msgstr "আলজেরিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "American Samoa"
 msgstr "আমেরিকান সামোয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Andorra"
 msgstr "এনডোরা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Angola"
 msgstr "অ্যাঙ্গোলা"
 
 # FIXME
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Anguilla"
 msgstr "অ্যাঙ্গুইল্লা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Antarctica"
 msgstr "আন্টার্কটিকা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Antigua And Barbuda"
 msgstr "অ্যান্টিগুয়া ও বার্বুডা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Argentina"
 msgstr "আর্জেন্টিনা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Armenia"
 msgstr "আর্মেনিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Aruba"
 msgstr "আরুবা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Australia"
 msgstr "অস্ট্রেলিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Austria"
 msgstr "অস্ট্রিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Azerbaijan"
 msgstr "আজারবাইজান"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Bahamas"
 msgstr "বাহামা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Bahrain"
 msgstr "বাহরেইন"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Bangladesh"
 msgstr "বাংলাদেশ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Barbados"
 msgstr "বার্বাডোস"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Belarus"
 msgstr "বেলারুশ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Belgium"
 msgstr "বেলজিয়াম"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Belize"
 msgstr "বেলিজে"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Benin"
 msgstr "বেনিন"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Bermuda"
 msgstr "বার্মুদা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Bhutan"
 msgstr "ভুটান"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Bolivia"
 msgstr "বলিভিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bosnia And Herzegowina"
 msgstr "বসনিয়া ও হার্জেগোভিনিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Botswana"
 msgstr "বোতসোয়ানা"
 
 # FIXME
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bouvet Island"
 msgstr "বুভে দ্বীপ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Brazil"
 msgstr "ব্রাজিল"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "British Indian Ocean Territory"
 msgstr "ব্রিটিশ ভারত মহাসাগর অঞ্চল"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Brunei Darussalam"
 msgstr "ব্রুনেই দারুস্‌সালাম"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bulgaria"
 msgstr "বুলগেরিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Burkina Faso"
 msgstr "বার্কিনা ফাসো"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Burundi"
 msgstr "বুরুন্ডি"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Cambodia"
 msgstr "কাম্বোডিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Cameroon"
 msgstr "ক্যামেরুন"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Canada"
 msgstr "কানাডা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cape Verde"
 msgstr "কেপ ভার্ডি"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cayman Islands"
 msgstr "কেয়ম্যান দ্বীপপুঞ্জ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Central African Republic"
 msgstr "মধ্য আফ্রিকান প্রজাতন্ত্র"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Chad"
 msgstr "চাড"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Chile"
 msgstr "চিলি"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "China"
 msgstr "চীন"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Christmas Island"
 msgstr "ক্রিসমাস দ্বীপ"
 
 # FIXME
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Cocos (Keeling) Islands"
 msgstr "কোকোস (কিলিং) দ্বীপপুঞ্জ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
 msgstr "কোলোম্বিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Comoros"
 msgstr "কোমোরোস"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Congo"
 msgstr "কঙ্গো"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Congo, The Democratic Republic Of The"
 msgstr "গণ প্রজাতন্ত্রী কঙ্গো"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cook Islands"
 msgstr "কুক দ্বীপপুঞ্জ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Costa Rica"
 msgstr "কোস্টা রিকা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Cote d'Ivoire"
 msgstr "আইভরি কোস্ট"
 
 # FIXME: Is it ক্রোশিয়া or ক্রোয়েশিয়া?
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Croatia"
 msgstr "ক্রোয়েশিয়া"
 
 # ক্রোয়েশিয়া
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cuba"
 msgstr "কিউবা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cyprus"
 msgstr "সাইপ্রাস"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Czech Republic"
 msgstr "চেক প্রজাতন্ত্র"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Denmark"
 msgstr "ডেনমার্ক"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Djibouti"
 msgstr "জিবুতি"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Dominica"
 msgstr "ডোমিনিকা"
 
 # FIXME
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Dominican Republic"
 msgstr "ডোমিনিকান প্রজাতন্ত্র"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Ecuador"
 msgstr "ইকুয়েডর"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Egypt"
 msgstr "মিশর"
 
 # FIXME
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "El Salvador"
 msgstr "এল সালভাডোর"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Equatorial Guinea"
 msgstr "ইকুয়েটরিয়াল গিনি"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Eritrea"
 msgstr "ইরিত্রিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Estonia"
 msgstr "এস্তোনিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Ethiopia"
 msgstr "ইথিওপিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Falkland Islands"
 msgstr "ফকল্যান্ড দ্বীপপুঞ্জ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Faroe Islands"
 msgstr "ফারাও দ্বীপপুঞ্জ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Fiji"
 msgstr "ফিজি"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Finland"
 msgstr "ফিনল্যান্ড"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "France"
 msgstr "ফ্রান্স"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "French Guiana"
 msgstr "ফ্রেঞ্চ গায়ানা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "French Polynesia"
 msgstr "ফ্রেঞ্চ পলিনেশিয়া"
 
 # FIXME
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "French Southern Territories"
 msgstr "ফরাসি দক্ষিণ অঞ্চল"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Gabon"
 msgstr "গ্যাবন"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "Gambia"
 msgstr "গাম্বিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "Georgia"
 msgstr "জর্জিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "Germany"
 msgstr "জার্মানি"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Ghana"
 msgstr "ঘানা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gibraltar"
 msgstr "জিব্রাল্টার"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Greece"
 msgstr "গ্রীস"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Greenland"
 msgstr "গ্রিনল্যান্ড"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Grenada"
 msgstr "গ্রানাডা"
 
 # FIXME: এই দেশের নাম জীবনে শুনি নাই।
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Guadeloupe"
 msgstr "গুয়েদুলুপ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Guam"
 msgstr "গুয়াম"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Guatemala"
 msgstr "গুয়াতেমালা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Guernsey"
 msgstr "গুয়ের্নসে"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guinea"
 msgstr "গিনি"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Guinea-bissau"
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+msgid "Guinea-Bissau"
 msgstr "গিনি-বিসাউ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guyana"
 msgstr "গায়ানা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Haiti"
 msgstr "হাইতি"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Heard And McDonald Islands"
 msgstr "হার্ড ও ম্যাকডোনাল্ড দ্বীপপুঞ্জ"
 
 # FIXME
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Holy See"
 msgstr "হোলি সি"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Honduras"
 msgstr "হন্ডুরাস"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hong Kong"
 msgstr "হংকং"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
 msgstr "হাঙ্গেরি"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Iceland"
 msgstr "আইসল্যান্ড"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "India"
 msgstr "ভারত"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Indonesia"
 msgstr "ইন্দোনেশিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Iran"
 msgstr "ইরান"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iraq"
 msgstr "ইরাক"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Ireland"
 msgstr "আয়ারল্যান্ড"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Isle of Man"
 msgstr "আইল অফ ম্যান"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "ইজরায়েল"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Italy"
 msgstr "ইটালি"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Jamaica"
 msgstr "জামাইকা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Japan"
 msgstr "জাপান"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Jersey"
 msgstr "জার্সি"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Jordan"
 msgstr "জর্ডান"
 
 # FIXME
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "কাজাখস্তান"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "কেনিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Kiribati"
 msgstr "কিরিবাস"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Democratic People's Republic Of"
 msgstr "গণপ্রজাতন্ত্রী কোরিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Korea, Republic Of"
 msgstr "কোরিয়ান প্রজাতন্ত্র"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kuwait"
 msgstr "কুয়েত"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kyrgyzstan"
 msgstr "কির্গিজস্তান"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Laos"
 msgstr "লাওস"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Latvia"
 msgstr "লাটভিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lebanon"
 msgstr "লেবানন"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Lesotho"
 msgstr "লেসোথো"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Liberia"
 msgstr "লাইবেরিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Libya"
 msgstr "লিবিয়া"
 
 # FIXME
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Liechtenstein"
 msgstr "লিখেনস্টাইন"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lithuania"
 msgstr "লিথুনিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Luxembourg"
 msgstr "লুক্সেমবার্গ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Macao"
 msgstr "ম্যাকাও"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Macedonia"
 msgstr "মেসিডোনিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Madagascar"
 msgstr "মাদাগাস্কার"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Malawi"
 msgstr "মালাউয়ি"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Malaysia"
 msgstr "মালয়েশিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Maldives"
 msgstr "মালদ্বীপ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Mali"
 msgstr "মালি"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malta"
 msgstr "মাল্টা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Marshall Islands"
 msgstr "মার্শাল দ্বীপপুঞ্জ"
 
 # FIXME
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Martinique"
 msgstr "মার্টিনিক"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mauritania"
 msgstr "মৌরিটানিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mauritius"
 msgstr "মরিশাস"
 
 # FIXME
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Mayotte"
 msgstr "মায়োতি"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Mexico"
 msgstr "মেক্সিকো"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Micronesia"
 msgstr "মাইক্রোনেশিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Moldova, Republic Of"
 msgstr "মলদোভা প্রজাতন্ত্র"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Monaco"
 msgstr "মোনাকো"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mongolia"
 msgstr "মঙ্গোলিয়া"
 
 # FIXME
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Montserrat"
 msgstr "মনসেরাত"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Morocco"
 msgstr "মরোক্কো"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Mozambique"
 msgstr "মোজাম্বিক"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Myanmar"
 msgstr "মায়ানমার"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Namibia"
 msgstr "নামিবিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Nauru"
 msgstr "নাউরু"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Nepal"
 msgstr "নেপাল"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Netherlands"
 msgstr "নেদারল্যান্ড্‌স"
 
 # FIXME
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Netherlands Antilles"
 msgstr "নেদারল্যান্ড্‌স অ্যান্টিল্লা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "New Caledonia"
 msgstr "নিউ ক্যালিডোনিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "New Zealand"
 msgstr "নিউজিল্যান্ড"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nicaragua"
 msgstr "নিকারাগুয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Niger"
 msgstr "নাইজার"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Nigeria"
 msgstr "নাইজেরিয়া"
 
 # FIXME
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Niue"
 msgstr "নিউ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Norfolk Island"
 msgstr "নরফোক দ্বীপ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Northern Mariana Islands"
 msgstr "উত্তর মারিয়ানা দ্বীপপুঞ্জ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Norway"
 msgstr "নরওয়ে"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Oman"
 msgstr "ওমান"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Pakistan"
 msgstr "পাকিস্তান"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Palau"
 msgstr "পালাউ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Palestinian Territory"
 msgstr "ফিলিস্তিন ভূখন্ড"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Panama"
 msgstr "পানামা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Papua New Guinea"
 msgstr "পাপুয়া নিউ গিনি"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Paraguay"
 msgstr "প্যারাগুয়ে"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Peru"
 msgstr "পেরু"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Philippines"
 msgstr "ফিলিপাইন"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Pitcairn"
 msgstr "পিটকেয়ার্ন"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Poland"
 msgstr "পোল্যান্ড"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Portugal"
 msgstr "পর্তুগাল"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Puerto Rico"
 msgstr "পুয়ের্তো রিকো"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Qatar"
 msgstr "কাতার"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Reunion"
 msgstr "রিইউনিয়ন"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Romania"
 msgstr "রুমানিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Russian Federation"
 msgstr "রুশ ফেডারেশন"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Rwanda"
 msgstr "রুয়ান্ডা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Kitts And Nevis"
 msgstr "সেন্ট কিট্‌স ও নেভিস"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Lucia"
 msgstr "সেন্ট লুসিয়া"
 
 # FIXME
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Saint Vincent And The Grenadines"
 msgstr "সেন্ট ভিনসেন্ট ও গ্রেনাডাইন্স"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Samoa"
 msgstr "সামোয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "San Marino"
 msgstr "সান মারিনো"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Sao Tome And Principe"
 msgstr "সাওতোমা ও প্রিন্সিপি"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saudi Arabia"
 msgstr "সৌদি আরব"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Senegal"
 msgstr "সেনেগাল"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Serbia And Montenegro"
 msgstr "সার্বিয়া এবং মন্টেনিগ্রো"
 
 # FIXME
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Seychelles"
 msgstr "সেশিল্স"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sierra Leone"
 msgstr "সিয়ারা লিওন"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Singapore"
 msgstr "সিঙ্গাপুর"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Slovakia"
 msgstr "স্লোভাকিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Slovenia"
 msgstr "স্লোভেনিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Solomon Islands"
 msgstr "সলোমন দ্বীপপুঞ্জ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Somalia"
 msgstr "সোমালিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "South Africa"
 msgstr "দক্ষিণ আফ্রিকা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "দক্ষিণ জর্জিয়া ও দক্ষিণ স্যান্ডউইচ দ্বীপপুঞ্জ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Spain"
 msgstr "স্পেন"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Sri Lanka"
 msgstr "শ্রীলঙ্কা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "St. Helena"
 msgstr "সেন্ট হেলেনা"
 
 # FIXME
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "St. Pierre And Miquelon"
 msgstr "সেন্ট পিয়ের ও মিকুয়েলন"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Sudan"
 msgstr "সুদান"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Suriname"
 msgstr "সুরিনাম"
 
 # FIXME
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "স্‌ভালবার্ড ও জাঁ মায়েন দ্বীপপুঞ্জ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
 msgstr "সোয়াজিল্যান্ড"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sweden"
 msgstr "সুইডেন"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Switzerland"
 msgstr "সুইজারল্যান্ড"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Syria"
 msgstr "সিরিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Taiwan"
 msgstr "তাইওয়ান"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tajikistan"
 msgstr "তাজাখস্তান"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tanzania, United Republic Of"
 msgstr "সংযুক্ত তানজানিয়া প্রজাতন্ত্র"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Thailand"
 msgstr "থাইল্যান্ড"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Timor-Leste"
 msgstr "টিমুর-লেস্তে"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Togo"
 msgstr "টোগো"
 
 # FIXME
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tokelau"
 msgstr "টোকেলাউ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tonga"
 msgstr "টোঙ্গা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Trinidad And Tobago"
 msgstr "ত্রিনিদাদ ও টোবাগো"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Tunisia"
 msgstr "তিউনিসিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Turkey"
 msgstr "তুরস্ক"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Turkmenistan"
 msgstr "তুর্কমেনিস্তান"
 
 # FIXME
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Turks And Caicos Islands"
 msgstr "তুর্কি ও কায়কোস দ্বীপপুঞ্জ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tuvalu"
 msgstr "টুভালু"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uganda"
 msgstr "উগান্ডা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Ukraine"
 msgstr "ইউক্রেইন"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "United Arab Emirates"
 msgstr "সংযুক্ত আরব আমিশাহী"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "United Kingdom"
 msgstr "যুক্তরাজ্য"
 
 # FIXME
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "United States Minor Outlying Islands"
 msgstr "ক্ষুদ্র বহিঃস্থ দ্বীপপুঞ্জ যুক্তরাষ্ট্র"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uruguay"
 msgstr "উরুগুয়ে"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Uzbekistan"
 msgstr "উজবেকিস্তান"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Vanuatu"
 msgstr "ভানুয়াটু"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Venezuela"
 msgstr "ভেনিজুয়েলা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Viet Nam"
 msgstr "ভিয়েতনাম"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Virgin Islands, British"
 msgstr "ব্রিটিশ ভার্জিন দ্বীপপুঞ্জ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Virgin Islands, U.S."
 msgstr "মার্কিন ভার্জিন দ্বীপপুঞ্জ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Wallis And Futuna Islands"
 msgstr "ওয়ালিস ও ফুতুনা দ্বীপপুঞ্জ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Western Sahara"
 msgstr "পশ্চিম সাহারা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Yemen"
 msgstr "ইয়েমেন"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Zambia"
 msgstr "জাম্বিয়া"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Zimbabwe"
 msgstr "জিম্বাবুয়ে"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../mail/em-mailer-prefs.c:481
-#: ../plugins/exchange-operations/exchange-delegates.c:958
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:348
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
-#: ../widgets/menus/gal-view-new-dialog.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
+#: ../mail/em-mailer-prefs.c:466
+#: ../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:350
+#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "নাম"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
 msgid "AOL Instant Messenger"
 msgstr "AOL ইনস্ট্যান্ট মেসেঞ্জার"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "জ্যাবার"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
 msgid "Yahoo Messenger"
 msgstr "Yahoo মেসেঞ্জার"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
 msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu মেসেঞ্জার"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:112
 msgid "Service"
 msgstr "পরিসেবা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../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:514
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/publish-calendar/publish-calendar.c:693
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Location"
 msgstr "অবস্থান"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 msgid "Username"
 msgstr "ব্যবহারকারীর নাম"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "গৃহ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "অন্যান্য"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "গ্রুপওযাইস"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
 msgid "Source Book"
 msgstr "উৎস বই"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "গন্তব্যর বই"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "নতুন পরিচিতি হল"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "লিখনযোগ্য ক্ষেত্র"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "আবশ্যক মান"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "পরিবর্তিত"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "পরিচিতি সম্পাদক - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "অনুগ্রহ করে এই পরিচিতির জন্য একটি চিত্র নির্বাচন করুন"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "কোনো ছবি উপস্থিত নেই(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2620,47 +2630,47 @@ msgstr ""
 "পরিচিতি সংক্রান্ত ডাটা অবৈধ:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s'-র বিন্যাস বৈধ নয়"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s'-র বিন্যাস বৈধ নয়"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' ফাঁকা"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "অবৈধ পরিচিতি।"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:329
 msgid "Contact Quick-Add"
 msgstr "ঝটপট পরিচিতি সংযোজন"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:332
 msgid "_Edit Full"
 msgstr "সম্পূর্ণ সম্পাদন করুন (_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:406
 msgid "_Full name"
 msgstr "সম্পূর্ণ নাম (_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:417
 msgid "E_mail"
 msgstr "ই-মেইল(_m)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:428
 msgid "_Select Address Book"
 msgstr "ঠিকানাবই নির্বাচন করুন (_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#: ../addressbook/gui/contact-editor/eab-editor.c:321
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2669,7 +2679,7 @@ msgstr ""
 "আপনি কি নিশ্চিতরূপে এই পরিচিতিদের\n"
 "তালিকা (%s) মুছে ফেলতে ইচ্ছুক?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:325
+#: ../addressbook/gui/contact-editor/eab-editor.c:324
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2677,7 +2687,7 @@ msgstr ""
 "আপনি কি নিশ্চিতরূপে এই সমস্ত পরিচিতিদের\n"
 "তালিকা মুছে ফেলতে ইচ্ছুক?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#: ../addressbook/gui/contact-editor/eab-editor.c:329
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2686,7 +2696,7 @@ msgstr ""
 "আপনি কি নিশ্চিতরূপে এই পরিচিতির\n"
 "তথ্য (%s) মুছে ফেলতে ইচ্ছুক?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:333
+#: ../addressbook/gui/contact-editor/eab-editor.c:332
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2795,7 +2805,7 @@ msgstr "IM পরিসেবা (_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:242
+#: ../plugins/exchange-operations/exchange-calendar.c:243
 #: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "অবস্থান(_L):"
@@ -2805,7 +2815,7 @@ msgid "<b>Members</b>"
 msgstr "<b>সদস্য</b>"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
 msgid "Contact List Editor"
 msgstr "পরিচিতি তালিকা সম্পাদক"
 
@@ -2825,27 +2835,28 @@ msgstr "লিস্টের নাম (_L):"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "একটি ই-মেইল ঠিকানা লিখুন অথবা কোনো পরিচিতি টেনে এনে নীচের তালিকায় ফেলুন: (_T)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
 msgid "Contact List Members"
 msgstr "পরিচিতি তালিকার সদস্য"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
+#: ../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 "সদস্য(_M)"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
 #: ../addressbook/gui/widgets/e-addressbook-model.c:298
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:217
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:508
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
 msgstr "বই"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
 msgid "Is New List"
 msgstr "হল নতুন লিস্ট"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-msgid "_Members"
-msgstr "সদস্য(_M)"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "পরিবর্তিত পরিচিতি:"
@@ -2884,41 +2895,41 @@ msgstr ""
 "এই ফোল্ডারে এই পরিচিতির নাম বা ই-মেইল ঠিকানা ইতিমধ্যেই বিদ্যমান।\n"
 " আপনি কি তারপরও এটি যোগ করতে চান?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:190
-msgid "Merge Contact"
-msgstr "পরিচিতি একত্রিত করুন"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:205
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
 msgid "_Merge"
 msgstr "একত্রিত করুন (_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../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:860
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../plugins/groupwise-features/junk-settings.c:415 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "ই-মেইল"
 
 # FIXME
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:165
-#: ../calendar/gui/cal-search-bar.c:78 ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "যেকোনো ক্ষেত্র ধারণ করে"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:164
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "ই-মেইলের প্রথমাংশে আছে"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "নামের প্রথমাংশে আছে"
+msgid "Name contains"
+msgstr "নামের মধ্যে রয়েছে"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2930,12 +2941,13 @@ msgstr "কোনো পরিচিতি নেই"
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d-টি পরিচিতি"
+msgstr[1] "%d-টি পরিচিতি"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:515
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "অনুসন্ধান"
 
@@ -2944,125 +2956,121 @@ msgstr "অনুসন্ধান"
 msgid "Error getting book view"
 msgstr "বইয়ের ভিউ পেতে সমস্যা"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
-#: ../widgets/table/e-table-click-to-add.c:510
-#: ../widgets/table/e-table-selection-model.c:303
-#: ../widgets/table/e-table.c:3335
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3550
-#: ../widgets/text/e-text.c:3551
+#: ../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:821 ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "মডেল"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "কার্ড পরিবর্তন করতে সমস্যা"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+msgid "Name begins with"
+msgstr "নামের প্রথমাংশে আছে"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "উৎস"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:501
+#: ../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 "ধরন"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:814
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "vCard হিসাবে সংরক্ষণ করা হবে..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../calendar/gui/e-calendar-table.c:1365
-#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/e-calendar-table.c:1574
+#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:924
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "খোলো (_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "নতুন পরিচিতি...(_N)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "নতুন পরিচিতি তালিকা...(_L)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "vCard হিসাবে সংরক্ষণ করুন...(_S)"
 
 # FIXME
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "পরিচিতি অনুবর্তন করুন (_F)"
 
 # FIXME
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "পরিচিতি অনুবর্তন করুন (_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "পরিচিতকে বার্তা প্রেরণ করুন (_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "তালিকায় বার্তা প্রেরণ করুন (_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "পরিচিতদের বার্তা প্রেরণ করুন (_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "প্রিন্ট করুন(_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "ঠিকানা-বইয়ে কপি করুন...(_y)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "ঠিকানা-বইয়ে সরিয়ে নিন...(_v)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Cu_t"
 msgstr "কাট করুন (_t)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/dialogs/comp-editor.c:457
-#: ../calendar/gui/e-calendar-table.c:1373
-#: ../calendar/gui/e-calendar-view.c:1690 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:3100 ../mail/em-folder-tree.c:996
-#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2065
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:480
+#: ../calendar/gui/e-calendar-table.c:1582
+#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:932
+#: ../composer/e-msg-composer.c:2055 ../mail/em-folder-tree.c:1005
+#: ../mail/em-folder-view.c:1325 ../mail/message-list.c:2044
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "কপি করুন (_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "পেস্ট করুন(_a)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1511
-#: ../calendar/gui/cal-search-bar.c:619 ../calendar/gui/cal-search-bar.c:662
-#: ../calendar/gui/cal-search-bar.c:681
+#: ../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
 msgid "Any Category"
 msgstr "যেকোনো শ্রেণী"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
-msgid "Other error"
-msgstr "অন্য কোনো সমস্যা"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
@@ -3094,7 +3102,7 @@ msgstr "গাড়ির ফোন"
 
 #: ../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:169
+#: ../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
@@ -3196,9 +3204,9 @@ msgid "Radio"
 msgstr "রেডিও"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
 msgid "Role"
 msgstr "ভূমিকা"
 
@@ -3234,38 +3242,38 @@ msgid "Web Site"
 msgstr "ওয়েব সাইট"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:150
-#: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
+#: ../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:524
+#: ../widgets/table/e-table-click-to-add.c:523
 #: ../widgets/table/e-table-col.c:99
 #: ../widgets/table/e-table-field-chooser-item.c:655
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
-#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
+#: ../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 "প্রস্থ"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:157
-#: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
+#: ../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:531
+#: ../widgets/table/e-table-click-to-add.c:530
 #: ../widgets/table/e-table-field-chooser-item.c:662
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../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 "উচ্চতা"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "ফোকাসকৃত অবস্থায় আছে"
 
@@ -3285,11 +3293,21 @@ msgstr "টেক্সট মডেল"
 msgid "Max field name length"
 msgstr "ক্ষেত্রের নামের সর্বোচ্চ দৈর্ঘ্য"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "কলামের প্রস্থ"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:178
+msgid ""
+"\n"
+"\n"
+"Searching for the Contacts..."
+msgstr ""
+"\n"
+"\n"
+"পরিচিতি অনুসন্ধান..."
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3303,7 +3321,7 @@ msgstr ""
 "\n"
 "নতুন পরিচিতি নির্মাণ করতে এই স্থানে দুবার ক্লিক করুন।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3317,7 +3335,7 @@ msgstr ""
 "\n"
 "একটি নতুন পরিচিতি তৈরি করার জন্য এখানে দুইবার ক্লিক করুন।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -3327,7 +3345,7 @@ msgstr ""
 "\n"
 "পরিচিতি অনুসন্ধান।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3337,40 +3355,41 @@ msgstr ""
 "\n"
 "এই ভিউতে প্রদর্শন করার মত কিছু নেই।"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:501
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
 msgid "Adapter"
 msgstr "অ্যাডাপ্টার"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "কর্মস্থলের ই-মেইল"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "গৃহের ই-মেইল"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:830
 msgid "Other Email"
 msgstr "অন্যান্য ই-মেইল"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "নির্বাচিত"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "কার্সার আছে"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "লিঙ্কটি ব্রাউজারে প্রদর্শন করুন (_O)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2808
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "লিঙ্কের স্থান কপি করুন (_C)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "নতুন বার্তা প্রাপক (_S)..."
 
@@ -3392,7 +3411,7 @@ msgid "map"
 msgstr "ম্যাপ"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:487
-#: ../addressbook/gui/widgets/eab-contact-display.c:827
+#: ../addressbook/gui/widgets/eab-contact-display.c:846
 msgid "List Members"
 msgstr "লিস্টের সদস্যবৃন্দ"
 
@@ -3413,25 +3432,23 @@ msgid "Video Chat"
 msgstr "ভিডিও চ্যাট"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
-#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2383
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:575
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:544
-#: ../plugins/hula-account-setup/camel-hula-listener.c:378
-#: ../plugins/hula-account-setup/camel-hula-listener.c:407
+#: ../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:76
+#: ../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 "বর্ষপঞ্জি"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:369
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../calendar/gui/dialogs/event-editor.c:115
 msgid "Free/Busy"
 msgstr "মুক্ত/ব্যস্ত"
 
@@ -3453,153 +3470,165 @@ msgid "Web Log"
 msgstr "ওয়েব লগ"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/e-calendar-view.c:2335
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
+#: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "জন্মদিন"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/e-calendar-view.c:2336
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "বার্ষিকী"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:845
+#: ../addressbook/gui/widgets/eab-contact-display.c:864
 msgid "Job Title"
 msgstr "কাজের শিরোনাম"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:881
+#: ../addressbook/gui/widgets/eab-contact-display.c:900
 msgid "Home page"
 msgstr "হোম পেজ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:908
 msgid "Blog"
 msgstr "ব্লগ"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Success"
 msgstr "সাফল্য"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Backend busy"
 msgstr "ব্যাকএন্ডটি ব্যস্ত"
 
 # FIXME
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Repository offline"
 msgstr "রিপোসিটরি অফলাইন আছে"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Address Book does not exist"
 msgstr "ঠিকানা-বই উপস্থিত নেই"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "No Self Contact defined"
 msgstr "নিজের জন্য কোনো পরিচিত উল্লেখ করা হয়নি"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
 msgid "Permission denied"
 msgstr "অনুমতি পাওয়া যায়নি"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Contact not found"
 msgstr "পরিচিতি পাওয়া যায়নি"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Contact ID already exists"
 msgstr "পরিচিতির আইডি ইতিমধ্যেই বিদ্যমান"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Protocol not supported"
 msgstr "অসমর্থিত প্রোটোকল"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:256
 #: ../calendar/gui/e-cal-model-tasks.c:360
 #: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
+#: ../calendar/gui/e-calendar-table.c:240
+#: ../calendar/gui/e-calendar-table.c:643 ../calendar/gui/print.c:2555
 msgid "Canceled"
 msgstr "বাতিল করা হয়েছে"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Could not cancel"
 msgstr "বাতিল করা সম্ভব হয়নি"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 #: ../calendar/gui/comp-editor-factory.c:423
 msgid "Authentication Failed"
 msgstr "পরিচয় প্রমাণ প্রক্রিয়া ব্যর্থ"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Authentication Required"
 msgstr "পরিচয় প্রমাণ করা আবশ্যক"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "TLS not Available"
 msgstr "টিএলএস (TLS) উপলব্ধ নেই"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "No such source"
 msgstr "এরকম কোনো উত্স নেই"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Not available in offline mode"
 msgstr "অফলাইন মোডে উপলব্ধ নয়"
 
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
+msgid "Other error"
+msgstr "অন্য কোনো সমস্যা"
+
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "সার্ভারের সংস্করণ বৈধ নয়"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:99
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "অসমর্থিত অনুমোদন প্রণালী"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
-"We were unable to open this addressbook. This either means this book is not "
+"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 "
-"load the addressbook once in online mode to download its contents"
+"load the address book once in online mode to download its contents"
 msgstr ""
 "উল্লিখিত ঠিকানাবই পড়া সম্ভব হয়নি। সম্ভবত এই বইটি অফলাইন ব্যবহারের উদ্দেশ্যে চিহ্নিত "
 "হয়নি অথবা ডাউনলোড করা হয়নি। এর মধ্যে উপস্থিত বিষয়বস্তু ডাউনলোড করার জন্য অনলাইন "
 "অবস্থায় এই ঠিকানাবইটি অনুগ্রহ করে লোড করুন।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:108
+#: ../addressbook/gui/widgets/eab-gui-util.c:118
 #, c-format
 msgid ""
-"We were unable to open this addressbook.  Please check that the path %s "
+"We were unable to open this address book.  Please check that the path %s "
 "exists and that you have permission to access it."
 msgstr ""
 "উল্লিখিত ঠিকানাবই পড়া সম্ভব হয়নি।  অনুগ্রহ করে পরীক্ষা করুন %s পাথটি উপস্থিত রয়েছে "
 "কিনা এবং আপনি তা পড়তে অনুমোদিত কিনা।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:127
 msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
+"We were unable to open this address book.  This either means you have "
+"entered an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
-"উল্লিখিত ঠিকানাবই পড়া সম্ভব হয়নি।  সম্ভবত আপার উল্লিখিত URI-টি সঠিক নয় অথবা LDAP "
+"উল্লিখিত ঠিকানাবই পড়া সম্ভব হয়নি।  সম্ভবত উল্লিখিত URI-টি সঠিক নয় অথবা LDAP "
 "সার্ভারের সাথে বর্তমানে সংযোগ স্থাপন করা সম্ভব হয়নি।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:133
 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 "
@@ -3608,80 +3637,74 @@ msgstr ""
 "Evolution-র এই সংস্করণের মধ্যে LDAP সমর্থনব্যবস্থা কম্পাইল করা হয়নি। Evolution-র "
 "সাথে LDAP ব্যবহারের জন্য LDAP-সক্রিয় Evolution প্যাকেজ ইনস্টল করা আবশ্যক।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:129
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
+"We were unable to open this address book.  This either means you have "
+"entered an incorrect URI, or the server is unreachable."
 msgstr ""
-"আমরা এই ঠিকানা-বইটি পড়তে ব্যর্থ হয়েছি। এর অর্থ হল, হয় আপনি একটি ভুল ইউআরআই "
-"লিখেছেন অথবা সার্ভারটির সাথে সংযোগ স্থাপন করা সম্ভব নয়।"
+"উল্লিখিত ঠিকানাবই পড়া সম্ভব হয়নি।  সম্ভবত উল্লিখিত URI-টি সঠিক নয় অথবা সার্ভারের "
+"সাথে বর্তমানে সংযোগ স্থাপন করা সম্ভব হয়নি।"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+msgid "Detailed error:"
+msgstr "বিবরণ সহ ত্রুটি:"
 
 # FIXME: ভাল শোনাচ্ছে না :-(
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
 "Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
+"the directory server preferences for this address book."
 msgstr ""
-"সার্ভার কিংবা Evolutionকে যে সংখ্যক ফলাফলের জন্য কনফিগার করা \n"
-" হয়েছে, এক্ষেত্রে ফলাফল স্বরূপ তা অপেক্ষাও বেশি\n"
-"সংখ্যক কার্ড পাওয়া গিয়েছে। এ অবস্থায় অনুগ্রহপূর্বক আপনার অনুসন্ধানকে আরো সুনির্দিষ্ট করুন "
-"অথবা এই ঠিকানা-বইয়ের\n"
-"জন্য ডিরেক্টরি সার্ভার সংক্রান্ত পছন্দ থেকে ফলাফলের সংখ্যা-সীমা বৃদ্ধি করুন।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
+"you have configured for this address book.  Please make your search\n"
 "more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
+"preferences for this address book."
 msgstr ""
-"সার্ভার কিংবা Evolutionকে যে সংখ্যক সময়ের জন্য কনফিগার করা হয়েছে, এ অনুসন্ধানের \n"
-"ক্ষেত্রে তা অপেক্ষাও বেশি সময় ব্যয় হয়েছে। এ অবস্থায় অনুগ্রহপূর্বক আপনার অনুসন্ধানকে আরো "
-"সুনির্দিষ্ট করুন অথবা এই \n"
-"ঠিকানা-বইয়ের জন্য ডিরেক্টরি সার্ভার সংক্রান্ত পছন্দ থেকে অনুসন্ধানের \n"
-" সময়সীমা বৃদ্ধি করুন।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "এই ঠিকানা-বইয়ের ব্যাক-এন্ড'টি অনুসন্ধানটি বুঝতে সক্ষম হয়নি।"
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
+msgid "The backend for this address book was unable to parse this query."
+msgstr "এই ঠিকানা-বইয়ের ব্যাক-এন্ড দ্বারা অনুসন্ধান সংক্রান্ত তথ্য পার্স করতে সমস্যা।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "ঠিকানা-বইয়ের ব্যাক-এন্ড'টি এই অনুসন্ধান চালাতে অস্বীকার করেছে।"
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
+msgid "The backend for this address book refused to perform this query."
+msgstr "ঠিকানা-বইয়ের ব্যাক-এন্ড দ্বারা এই অনুসন্ধান করতে অস্বীকার করা হয়েছে।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
 msgid "This query did not complete successfully."
 msgstr "এই অনুসন্ধানটি সফলভাবে সম্পন্ন হয়নি।"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid "Error adding list"
 msgstr "লিস্ট যোগ করতে সমস্যা হয়েছে"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:192
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:687
 msgid "Error adding contact"
 msgstr "পরিচিতি যোগ করতে সমস্যা হয়েছে"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying list"
 msgstr "লিস্ট পরিবর্তন করতে সমস্যা হয়েছে"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:203
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying contact"
 msgstr "পরিচিতি পরিবর্তন করতে সমস্যা হয়েছে"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Error removing list"
 msgstr "লিস্ট মুছে ফেলতে সমস্যা হয়েছে"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:637
 msgid "Error removing contact"
 msgstr "পরিচিতি মুছে ফেলতে সমস্যা হয়েছে"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:297
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3692,17 +3715,20 @@ msgid_plural ""
 msgstr[0] ""
 "%d সংখ্যক নতুন পরিচিতি খুললে %d সংখ্যক নতুন উইন্ডোও খুলবে।\n"
 "আপনি কি নিশ্চিতরূপে এই সমস্ত পরিচিতি প্রদর্শন করতে ইচ্ছুক?"
+msgstr[1] ""
+"%d সংখ্যক নতুন পরিচিতি খুললে %d সংখ্যক নতুন উইন্ডোও খুলবে।\n"
+"আপনি কি নিশ্চিতরূপে এই সমস্ত পরিচিতি প্রদর্শন করতে ইচ্ছুক?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
 msgid "_Don't Display"
 msgstr "প্রদর্শন করা হবে না (_D)"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Display _All Contacts"
 msgstr "সমস্ত পরিচিতি প্রদর্শন করা হবে (_A)"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:351
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3711,69 +3737,70 @@ msgstr ""
 "%s ইতিমধ্যেই বিদ্যমান\n"
 "আপনি কি এটি মুছে ফেলে নতুন করে লিখতে ইচ্ছুক?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:336
+#: ../addressbook/gui/widgets/eab-gui-util.c:355
 msgid "Overwrite"
 msgstr "মুছে নতুন করে লেখা"
 
 #. 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:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:396
+#: ../addressbook/gui/widgets/eab-gui-util.c:399
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "পরিচিতি"
+msgstr[1] "পরিচিতি"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:482
 msgid "Select Address Book"
 msgstr "ঠিকানাবই নির্বাচন করুন"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "তালিকা"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contact to"
 msgstr "পরিচিতিটিকে এখানে স্থানান্তর করুন"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contact to"
 msgstr "পরিচিতিটিকে এখানে কপি করুন"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Move contacts to"
 msgstr "পরিচিতি এখানে স্থানান্তর করুন"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:755
 msgid "Copy contacts to"
 msgstr "পরিচিতি এখানে কপি করুন"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:983
+#: ../addressbook/gui/widgets/eab-gui-util.c:900
 msgid "Multiple vCards"
 msgstr "একাধিক vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:986
+#: ../addressbook/gui/widgets/eab-gui-util.c:907
 #, c-format
 msgid "vCard for %s"
 msgstr "%s -র জন্য vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1027
-#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#: ../addressbook/gui/widgets/eab-gui-util.c:919
+#: ../addressbook/gui/widgets/eab-gui-util.c:945
 #, c-format
 msgid "Contact information"
 msgstr "পরিচিতির তথ্য"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1054
+#: ../addressbook/gui/widgets/eab-gui-util.c:947
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s'র পরিচিতির তথ্য"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:289
+#: ../addressbook/gui/widgets/eab-popup-control.c:293
 msgid "Querying Address Book..."
 msgstr "ঠিকানা-বইয়ে অনুসন্ধান করা হচ্ছে..."
 
@@ -3781,7 +3808,8 @@ msgstr "ঠিকানা-বইয়ে অনুসন্ধান করা �
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
-msgstr[0] "%d -টি অন্য  পরিচিতি।"
+msgstr[0] "একটি অন্য  পরিচিতি।"
+msgstr[1] "%d-টি অন্য  পরিচিতি।"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:228
 #: ../addressbook/gui/widgets/eab-vcard-control.c:279
@@ -3793,51 +3821,51 @@ msgid "Show Compact vCard"
 msgstr "সংক্ষিপ্ত vCard প্রদর্শন করুন"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
+msgid "Save in address book"
 msgstr "ঠিকানাবইয়ে সংরক্ষণ করুন"
 
 # FIXME
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "কার্ড ভিউ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:499
+#: ../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:312
-#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:306
+#: ../calendar/importers/icalendar-importer.c:671 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "ইম্পোর্ট করা হচ্ছে..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:826
+#: ../addressbook/importers/evolution-csv-importer.c:863
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV অথবা Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:827
+#: ../addressbook/importers/evolution-csv-importer.c:864
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV ও Tab ইম্পোর্ট ব্যবস্থা"
 
-#: ../addressbook/importers/evolution-csv-importer.c:835
+#: ../addressbook/importers/evolution-csv-importer.c:872
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV অথবা Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:836
+#: ../addressbook/importers/evolution-csv-importer.c:873
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV ও Tab ইম্পোর্ট ব্যবস্থা"
 
-#: ../addressbook/importers/evolution-csv-importer.c:844
+#: ../addressbook/importers/evolution-csv-importer.c:881
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV অথবা Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:845
+#: ../addressbook/importers/evolution-csv-importer.c:882
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV ও Tab ইম্পোর্ট ব্যবস্থা"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:666
+#: ../addressbook/importers/evolution-ldif-importer.c:665
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "এলড্যাপ-এর তথ্য বিনিময় রীতি (Format) (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:667
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "Evolution LDIF importer"
 msgstr "Evolution এলডিআইএফ ইম্পোর্টার"
 
@@ -3892,12 +3920,12 @@ msgid "Format"
 msgstr "ফরমা"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../mail/em-mailer-prefs.c:432 ../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:648
 #: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1907
-#: ../widgets/table/e-table-selection-model.c:310
+#: ../widgets/table/e-table-header-item.c:1908
+#: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "হেডার"
 
@@ -4003,8 +4031,8 @@ msgstr "ছায়া"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:987
-#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../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 "মাপ:"
@@ -4022,7 +4050,7 @@ msgid "Top:"
 msgstr "উপর:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:156
+#: ../calendar/gui/dialogs/calendar-setup.c:154
 msgid "Type:"
 msgstr "ধরন:"
 
@@ -4034,35 +4062,35 @@ msgstr "প্রস্থ:"
 msgid "_Font..."
 msgstr "ফন্ট (_F)..."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:53
+#: ../addressbook/printing/test-contact-print-style-editor.c:54
 msgid "Contact Print Style Editor Test"
 msgstr "কনটেক্ট প্রিন্ট বিন্যাস সম্পাদন ব্যবস্থা পরীক্ষণ"
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-#: ../addressbook/printing/test-print.c:44
+#: ../addressbook/printing/test-contact-print-style-editor.c:55
+#: ../addressbook/printing/test-print.c:45
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "কপিরাইট (C) ২০০০, Ximian, Inc."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:56
+#: ../addressbook/printing/test-contact-print-style-editor.c:57
 msgid "This should test the contact print style editor widget"
 msgstr "এর সাহায্যে কনটেক্ট প্রিন্ট বিন্যাস সম্পাদনার উইজেট পরীক্ষা করা সম্ভব"
 
-#: ../addressbook/printing/test-print.c:43
+#: ../addressbook/printing/test-print.c:44
 msgid "Contact Print Test"
 msgstr "কনটেক্ট প্রিন্ট পরীক্ষণ"
 
-#: ../addressbook/printing/test-print.c:46
+#: ../addressbook/printing/test-print.c:47
 msgid "This should test the contact print code"
 msgstr "এর সাহায্যে কনটেক্ট প্রিন্ট ব্যবস্থার কোড পরীক্ষা করা সম্ভব"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:668
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
+#: ../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 "ফাইলটি খোলা যাচ্ছে না"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
+msgid "Couldn't get list of address books"
 msgstr "ঠিকানা-বইয়ের তালিকা পাওয়া যায়নি"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
@@ -4078,8 +4106,8 @@ msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
-msgstr "ঠিকানাবইয়ের স্থানীয় ফোল্ডারগুলিকে তালিকাভুক্ত করা হবে"
+msgid "List local address book folders"
+msgstr "ঠিকানাবইয়ের স্থানীয় ফোল্ডারগুলির তালিকা প্রদর্শন করা হবে"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Show cards as vcard or csv file"
@@ -4128,11 +4156,18 @@ msgstr "অজানা ত্রুটি"
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
-"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
-"a calendar that can accept appointments."
-msgstr ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
+msgstr "'{0}' বর্ষপঞ্জি শুধুমাত্র পাঠযোগ্য ও পরিবর্তন করা সম্ভব নয়। অনুগ্রহ করে বর্ষপঞ্জি প্রদর্শন ক্ষেত্রের সাইড-বারে উপস্থিত ভিন্ন বর্ষপঞ্জি নির্বাচন করুন।"
 
-#: ../calendar/calendar.error.xml.h:3
+#. 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."
+msgstr "'{0}' বর্ষপঞ্জি শুধুমাত্র পাঠযোগ্য ও পরিবর্তন করা সম্ভব নয়। অনুগ্রহ করে একটি ভিন্ন বর্ষপঞ্জি নির্বাচন করুন যার মধ্যে সাক্ষাৎকার অন্তর্ভুক্ত করা যাবে।"
+
+#: ../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."
@@ -4140,7 +4175,7 @@ msgstr ""
 "আপনার সাক্ষাৎ‌কারের বোধগম্য সারসংক্ষেপ উল্লেখ করা থাকলে অন্তর্ভুক্ত বস্তু সম্পর্কে "
 "প্রাপকরা জানতে সক্ষম হবেন।"
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../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."
@@ -4148,131 +4183,135 @@ msgstr ""
 "আপনার কর্মের বোধগম্য সারসংক্ষেপ উল্লেখ করা থাকলে অন্তর্ভুক্ত বস্তু সম্পর্কে প্রাপকরা "
 "জানতে সক্ষম হবেন।"
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr "এই মেমোগুলির মধ্যে সকল তথ্য মুছে ফেলা হবে এবং তা উদ্ধার করা যাবে না।"
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
 msgstr "এই মেমোর মধ্যে উপস্থিত সব তথ্য মুছে ফেলা হবে এবং তা পুনরায় উদ্ধার করা সম্ভব হবে না।"
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
 msgstr "এই সাক্ষাত্কারগুলি সংক্রান্ত সকল তথ্য মুছে ফেলা হবে এবং তা উদ্ধার করা যাবে না।"
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "এই কর্ম-গুলি সংক্রান্ত সকল তথ্য মুছে ফেলা হবে এবং তা উদ্ধার করা যাবে না।"
 
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:11
 msgid "All information on this appointment will be deleted and can not be restored."
 msgstr "এই সাক্ষাত্কারটি সংক্রান্ত সকল তথ্য মুছে ফেলা হবে এবং তা উদ্ধার করা যাবে না।"
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:12
 msgid "All information on this meeting will be deleted and can not be restored."
 msgstr "এই সভা সংক্রান্ত সকল তথ্য মুছে ফেলা হবে এবং তা উদ্ধার করা যাবে না।"
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:13
 msgid "All information on this memo will be deleted and can not be restored."
 msgstr "এই মেমোর মধ্যে উপস্থিত সব তথ্য মুছে ফেলা হবে এবং তা পুনরায় উদ্ধার করা সম্ভব হবে না।"
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
 msgstr "এই কর্ম সংক্রান্ত সকল তথ্য মুছে ফেলা হবে এবং তা উদ্ধার করা যাবে না।"
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "আপনি কি '{0}' কর্ম-টি নিশ্চিতরূপে মুছে ফেলতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "আপনি কি '{0}' দ্বারা উল্লিখিত সাক্ষাৎকারটি নিশ্চিতরূপে মুছে ফেলতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "আপনি কি '{0}' মেমো-টি নিশ্চিতরূপে মুছে ফেলতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "আপনি কি {0} সাক্ষাৎকারগুলি নিশ্চিতরূপে মুছে ফেলতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "আপনি কি এই {0} মেমোগুলি নিশ্চিতরূপে মুছে ফেলতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "আপনি কি এই {0} কাজগুলি নিশ্চিতরূপে মুছে ফেলতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete this appointment?"
 msgstr "আপনি কি নিশ্চিতরূপে এই সাক্ষাৎকারটি মুছে ফেলতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:183
+#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/gui/dialogs/delete-comp.c:178
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "আপনি কি নিশ্চিতরূপে এই সভাটি মুছে ফেলতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:21
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:184
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "আপনি কি নিশ্চিতরূপে এই মেমোটি মুছে ফেলতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:186
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:181
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "আপনি কি নিশ্চিতরূপে এই কর্মটি মুছে ফেলতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:25
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "আপনি কি নিশ্চিতরূপে সারসংক্ষেপ বিনা মেমোটি সংরক্ষণ করতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "আপনি কি নিশ্চিতরূপে সারসংক্ষেপ বিনা সাক্ষাৎ‌কার প্রেরণ করতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "আপনি কি নিশ্চিতরূপে সারসংক্ষেপ বিনা কর্ম সংক্রান্ত তথ্য প্রেরণ করতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:28
 msgid "Cannot create a new event"
 msgstr "নতুন অনুষ্ঠান নির্মাণ করতে ব্যর্থ"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:29
+msgid "Cannot save event"
+msgstr "অনুষ্ঠান সংক্রান্ত তথ্য সংরক্ষণ করতে ব্যর্থ"
+
+#: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
 msgstr "'{0}' বর্ষপঞ্জি মুছে ফেলা হবে কি?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete memo list '{0}'?"
 msgstr "'{0}' কর্মসূচী মুছে ফেলা হবে কি?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete task list '{0}'?"
 msgstr "'{0}' কর্মসূচী মুছে ফেলা হবে কি?"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:33
 msgid "Do _not Send"
 msgstr "প্রেরণ করা হবে না (_n)"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:34
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "ডাউনলোড কর্ম বর্তমানে চলমান। আপনি কি সাক্ষাৎ‌কার সংরক্ষণ করতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the task?"
 msgstr "ডাউনলোড কর্ম বর্তমানে চলমান। আপনি কি কর্ম সংরক্ষণ করতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
 msgid "Editor could not be loaded."
 msgstr "এডিটর লোড করা যায়নি।"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4280,25 +4319,25 @@ msgstr ""
 "সকল অংশগ্রহণকারীদেরকে ই-মেইলে আমন্ত্রনপত্র প্রেরণ করা হবে এবং তারা ঐ কর্মটি গ্রহণ "
 "করতে পারবেন।"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:38
 msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "সকল অংশগ্রহণকারীদেরকে ই-মেইলে আমন্ত্রনপত্র প্রেরণ করা হবে এবং তারা তাদের উত্তর "
 "পাঠাতে পারবেন।"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:39
 msgid "Error loading calendar"
 msgstr "বর্ষপঞ্জি লোড করতে সমস্যা"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading memo list"
 msgstr "কর্মের তালিকা লোড করতে সমস্যা"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading task list"
 msgstr "কর্মের তালিকা লোড করতে সমস্যা"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../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."
@@ -4306,7 +4345,7 @@ msgstr ""
 "অন্যান্য অংশগ্রহণকারীদের কাছে বিলোপনের কোনো সূচনা আপনি প্রেরণ না করলে সভা বাতিল "
 "হওয়ার খবর অাজানা থাকবে।"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../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."
@@ -4314,7 +4353,7 @@ msgstr ""
 "অন্যান্য অংশগ্রহণকারীদের কাছে বিলোপনের কোনো সূচনা আপনি প্রেরণ না করলে এই মেমোটি "
 "মুছে ফেলার খবর অজানা থাকবে।"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../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."
@@ -4322,7 +4361,7 @@ msgstr ""
 "অন্যান্য অংশগ্রহণকারীদের কাছে বিলোপনের কোনো সূচনা আপনি প্রেরণ না করলে এই কর্মটি "
 "মুছে ফেলার খবর অজানা থাকবে।"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4330,7 +4369,7 @@ msgstr ""
 "অংশগ্রণকারীদেরকে আপডেট করা তথ্য প্রেরণ করা হলে তারা তাদের বর্ষপঞ্জিটি আপডেট করে "
 "রাখতে পারেন।"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4338,7 +4377,7 @@ msgstr ""
 "অংশগ্রহণকারীদেরকে আপডেট করা তথ্য প্রেরণ করা হলে তারা তাদের কর্মতালিকাটি আপডেট "
 "করে রাখতে পারেন।"
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4346,7 +4385,7 @@ msgstr ""
 "সংযুক্ত কয়েকটি বস্তু ডাউনলোড করা হচ্ছে। সাক্ষাৎ‌কার সংরক্ষণ করা হলে অসমাপ্ত ডাউনলোড "
 "হওয়া বস্তুগুলি সাক্ষাৎ‌কারের সাথে সংরক্ষিত হবে না।"
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4354,85 +4393,85 @@ msgstr ""
 "সংযুক্ত কয়েকটি বস্তু ডাউনলোড করা হচ্ছে। কর্ম সংরক্ষণ করা হলে অসমাপ্ত ডাউনলোড হওয়া "
 "বস্তুগুলি কর্মের সাথে সংরক্ষিত হবে না।"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "আপনার দ্বারা বর্তমানে ব্যবহৃত সার্ভারের মধ্যে কয়েকটি বৈশিষ্ট্য সঠিকরূপে চলতে না পারার "
 "সম্ভাবনা রয়েছে।"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution বর্ষপঞ্জিকাটি অপ্রত্যাশিতভাবে বন্ধ হয়ে গেছে।"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution'র কর্মসূচী অপ্রত্যাশিতভাবে বন্ধ হয়ে গেছে।"
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution-র কর্মগুলি অপ্রত্যাশিতভাবে বন্ধ হয়ে গেছে।"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid "The calendar is not marked for offline usage."
 msgstr "বর্ষপঞ্জিটি অফ-লাইন ব্যবহারের উদ্দেশ্যে চিহ্নিত করা হয়নি।"
 
-#: ../calendar/calendar.error.xml.h:51
-msgid "The memo list is not marked for offline usage"
-msgstr "কর্মসূচী অফ-লাইন ব্যবহারের উদ্দেশ্যে চিহ্নিত করা হয়নি"
+#: ../calendar/calendar.error.xml.h:54
+msgid "The memo list is not marked for offline usage."
+msgstr "মেমোর তালিকা, অফ-লাইন ব্যবহারের জন্য চিহ্নিত নয়।"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
 msgstr "কর্মতালিকা অফ-লাইন ব্যবহারের উদ্দেশ্যে চিহ্নিত করা হয়নি।"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "This calendar will be removed permanently."
 msgstr "বর্ষপঞ্জিটি স্থায়ীরূপে মুছে ফেলা হবে।"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "This memo list will be removed permanently."
 msgstr "কর্মসূচী স্থায়ীরূপে মুছে ফেলা হবে।"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "This task list will be removed permanently."
 msgstr "কর্মতালিকা স্থায়ীরূপে মুছে ফেলা হবে।"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to save your changes to this appointment?"
 msgstr "আপনি কি এই সাক্ষাৎকারে করা পরিবর্তনগুলি সংরক্ষণ করতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to save your changes to this memo?"
 msgstr "আপনি কি এই কর্মসূচীতে করা পরিবর্তনগুলি সংরক্ষণ করতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this task?"
 msgstr "আপনি কি এই কর্মের জন্য করা পরিবর্তনগুলি সংরক্ষণ করতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "এই মেমো বিলোপন সংক্রান্ত কোনো সূচনা কি আপনি প্রেরণ করতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "বিলোপনের সূচনা কি আপনি সমস্ত অংশগ্রহণকারীকে প্রেরণ করতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "আপনি কি অংশগ্রহণকারীদেরকে সভার আমন্ত্রনপত্র প্রেরণ করতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send this task to participants?"
 msgstr "আপনি কি এই কর্মটি অংশগ্রহণকারীদেরকে প্রেরণ করতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "আপনি কি সভা সংক্রান্ত তথ্য আপডেট করে অংশগ্রহনকারীদেরকে প্রেরণ করতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send updated task information to participants?"
 msgstr "আপনি কি কার্য সংক্রান্ত তথ্য আপডেট করে অংশগ্রহণকারীদেরকে প্রেরণ করতে ইচ্ছুক?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4442,107 +4481,107 @@ msgstr ""
 "দরুণ Evolution ব্যবহারের সময় সমস্যা দেখা দিতে পারে। সঠিক কার্যকারিতার জন্য "
 "সার্ভারে কোনো সমর্থিত সংস্করণ ব্যবহার করুন।"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "আপনি এই সাক্ষাৎকারে কিছু পরিবর্তন করেছেন, কিন্তু সেগুলি সংরক্ষণ করেননি।"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 msgid "You have changed this task, but not yet saved it."
 msgstr "আপনি এই কর্মতে কিছু পরিবর্তন করেছেন, কিন্তু তা এখনো সংরক্ষণ করননি।"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "আপনি এই কর্মসূচীতে কিছু পরিবর্তন করেছেন, কিন্তু তা এখনো সংরক্ষণ করননি।"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Evolution পুনরায় আরম্ভ না করা হলে আপনার বর্ষপঞ্জিগুলি উপলব্ধ হবে না।"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Evolution পুনরায় আরম্ভ না করা হলে আপনার কর্মসূচী উপলব্ধ হবে না।"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Evolution পুনরায় আরম্ভ না করা হলে আপনার কর্মগুলি উপলব্ধ হবে না।"
 
-#: ../calendar/calendar.error.xml.h:72
-#: ../composer/mail-composer.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:75
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "পরিবর্তন পরিত্যাগ করুন (_D)"
 
-#: ../calendar/calendar.error.xml.h:73 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:59
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "সংরক্ষণ করুন (_S)"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "_Save Changes"
 msgstr "পরিবর্তন সংরক্ষণ করুন (_S)"
 
-#: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:78
+#: ../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 "প্রেরণ করুন (_S)"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "_Send Notice"
 msgstr "সূচনা প্রদান করুন(_S)"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:254
+#: ../calendar/conduits/calendar/calendar-conduit.c:256
 msgid "Split Multi-Day Events:"
 msgstr "একাধিক-দিনব্যাপী অনুষ্ঠানগুলিকে ভাগ করা হবে:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
-#: ../calendar/conduits/memo/memo-conduit.c:818
-#: ../calendar/conduits/memo/memo-conduit.c:819
-#: ../calendar/conduits/todo/todo-conduit.c:1016
-#: ../calendar/conduits/todo/todo-conduit.c:1017
+#: ../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 "Evolution-data-server আরম্ভ করা সম্ভব হয়নি"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1629
+#: ../calendar/conduits/calendar/calendar-conduit.c:1632
 msgid "Could not read pilot's Calendar application block"
 msgstr "পাইলটের বর্ষপঞ্জি অ্যাপলিকেশন ব্লক পড়া যায়নি"
 
-#: ../calendar/conduits/memo/memo-conduit.c:912
-#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:914
+#: ../calendar/conduits/memo/memo-conduit.c:917
 msgid "Could not read pilot's Memo application block"
 msgstr "পাইলটের কর্মসূচী অ্যাপলিকেশন ব্লক পড়া যায়নি"
 
-#: ../calendar/conduits/memo/memo-conduit.c:959
-#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:961
+#: ../calendar/conduits/memo/memo-conduit.c:964
 msgid "Could not write pilot's Memo application block"
 msgstr "পাইলটের কর্মসূচী অ্যাপলিকেশন ব্লক লেখা যায়নি"
 
-#: ../calendar/conduits/todo/todo-conduit.c:238
+#: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
 msgstr "ডিফল্ট অগ্রাধিকার:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1100
-#: ../calendar/conduits/todo/todo-conduit.c:1103
+#: ../calendar/conduits/todo/todo-conduit.c:1102
+#: ../calendar/conduits/todo/todo-conduit.c:1105
 msgid "Could not read pilot's ToDo application block"
 msgstr "পাইলটের কার্যতালিকা অ্যাপলিকেশন ব্লক পড়া যায়নি"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1145
-#: ../calendar/conduits/todo/todo-conduit.c:1148
+#: ../calendar/conduits/todo/todo-conduit.c:1147
+#: ../calendar/conduits/todo/todo-conduit.c:1150
 msgid "Could not write pilot's ToDo application block"
 msgstr "পাইলটের করণীয়কর্মের অ্যাপলিকেশন ব্লক পড়া যায়নি"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2344
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "বর্ষপঞ্জি ও কার্যতালিকা"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1392
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "বর্ষপঞ্জি"
 
@@ -4584,25 +4623,25 @@ msgid "Memo_s"
 msgstr "কর্মসূচী (_s)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1152
-#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
-#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
-#: ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/e-memo-table.c:280 ../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 "কর্মসূচী"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1442
-#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
+#: ../calendar/gui/e-calendar-table.c:704 ../calendar/gui/e-tasks.c:1429
+#: ../calendar/gui/gnome-cal.c:1642 ../calendar/gui/print.c:1982
 #: ../calendar/gui/tasks-component.c:539
-#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:495
-#: ../calendar/gui/tasks-control.c:511
-#: ../calendar/importers/icalendar-importer.c:80
-#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:587
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
+#: ../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:76
+#: ../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 "কর্ম"
@@ -4621,23 +4660,26 @@ msgstr "কর্ম (_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution বর্ষপঞ্জির সতর্কধ্বনি প্রদানকারী সার্ভিস"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "মিনিট"
+msgstr[1] "মিনিট"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:127
+#: ../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:289
+#: ../plugins/calendar-http/calendar-http.c:280
 #: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:396
+#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "ঘন্টা"
+msgstr[1] "ঘন্টা"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
 msgid "Start time"
 msgstr "আরম্ভের সময়"
 
@@ -4648,9 +4690,9 @@ msgstr "সাক্ষাৎকার"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
-#: ../calendar/gui/e-itip-control.c:1155
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "অবস্থান:"
@@ -4660,17 +4702,15 @@ msgid "Snooze _time:"
 msgstr "ঘুমের সময়কাল: (_t)"
 
 #: ../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:158
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../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-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:52
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
+#: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "সম্পাদনা (_E)"
 
@@ -4682,32 +4722,32 @@ msgstr "ঘুম (_S)"
 msgid "location of appointment"
 msgstr "সাক্ষাৎকারের স্থান"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "সারসংক্ষেপবিহীন।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "বিবরণহীন।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "স্থান সম্পর্কে কোনো তথ্য উপলব্ধ নেই।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "%d চেতাবনী উপস্থিত"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
-#: ../mail/mail-component.c:1523
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1597
 msgid "Warning"
 msgstr "সতর্কবাণী"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4720,7 +4760,7 @@ msgstr ""
 "সাধারণ ডায়লগ বাক্স প্রদর্শন\n"
 "করবে।"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4737,50 +4777,53 @@ msgstr ""
 "\n"
 "আপনি কি এই প্রোগ্রামটি নিশ্চিতরূপে চালাতে ইচ্ছুক?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "আমাকে এই প্রোগ্রামটির ব্যাপারে আর জিজ্ঞাসা করবে না।"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:140
+#: ../calendar/gui/alarm-notify/notify-main.c:138
 msgid "Could not initialize Bonobo"
 msgstr "বোনোবো চালু করা যায়নি"
 
 # FIXME
-#: ../calendar/gui/alarm-notify/notify-main.c:153
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
 msgstr "সতর্কধ্বনি প্রদানকারী সার্ভিস ফ্যাক্টরি তৈরি করা যায়নি, সম্ভবত এটি বর্তমানে চলছে..."
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "অবৈধ সময়"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
-#: ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ঘন্টা"
+msgstr[1] "%d ঘন্টা"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
-#: ../calendar/gui/misc.c:119
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d মিনিট"
+msgstr[1] "%d মিনিট"
 
 #. 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:76 ../calendar/gui/e-alarm-list.c:420
-#: ../calendar/gui/misc.c:123
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d সেকেন্ড"
+msgstr[1] "%d সেকেন্ড"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 msgid "Alarm programs"
@@ -4842,11 +4885,11 @@ msgstr "সতর্কবাণীর জন্য ব্যবহৃত অড
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Event Gradient"
-msgstr ""
+msgstr "অনুষ্ঠানের তথ্য প্রদর্শনে ব্যবহৃত রঙের তারতম্য"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Event Transparency"
-msgstr ""
+msgstr "অনুষ্ঠানের তথ্য প্রদর্শনে ব্যবহৃত স্বচ্ছতা"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Free/busy server URLs"
@@ -4858,7 +4901,7 @@ msgstr "মুক্ত/ব্যস্ত টেমপ্লেট URL"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Gradient of the events in calendar views."
-msgstr ""
+msgstr "বর্ষপঞ্জি অনুযায়ী প্রদর্শনস্থলে অনুষ্ঠানের তথ্যে ব্যবহৃত রঙের তারতম্য"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
@@ -5017,12 +5060,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "অনুষ্ঠান/কর্ম/সাক্ষাৎকার সম্পাদকের মধ্যে অবস্থা শীর্ষক ক্ষেত্র প্রদর্শন করা হবে"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "\"পূর্বপ্রদর্শন\" পেইন প্রদর্শন করা হবে"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "\"পূর্বপ্রদর্শন\" পেইন প্রদর্শন করা হবে।"
 
@@ -5070,7 +5113,7 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "সর্তকীকরণ চালনার সর্বশেষ সময়, time_t-এ ব্যক্ত।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "সময়-অঞ্চল"
 
@@ -5196,66 +5239,66 @@ msgstr "কার্যদিবস আরম্ভের মিনিট"
 msgid "daylight savings time"
 msgstr ""
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "সারাংশে রয়েছে"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "বিবরণে রয়েছে"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "শ্রেণীবিভাগ হল"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "মন্তব্যে রয়েছে"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "অবস্থানে রয়েছে"
 
-#: ../calendar/gui/cal-search-bar.c:623 ../calendar/gui/cal-search-bar.c:666
-#: ../calendar/gui/cal-search-bar.c:685
+#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "গরমিল"
 
-#: ../calendar/gui/cal-search-bar.c:631
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "পরবর্তী ৭ দিনের কর্ম"
 
-#: ../calendar/gui/cal-search-bar.c:635
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "সক্রিয় কর্ম"
 
-#: ../calendar/gui/cal-search-bar.c:639
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "সময়োত্তীর্ণ কাজ"
 
-#: ../calendar/gui/cal-search-bar.c:643
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "সম্পন্ন কর্ম"
 
-#: ../calendar/gui/cal-search-bar.c:647
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "সংযুক্ত বস্তুসহ কর্ম"
 
-#: ../calendar/gui/cal-search-bar.c:693
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "সক্রিয় সাক্ষাৎকার"
 
-#: ../calendar/gui/cal-search-bar.c:697
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "পরবর্তী ৭ দিনের সাক্ষাৎকার"
 
-#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../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 "প্রিন্ট করুন"
 
-#: ../calendar/gui/calendar-commands.c:324
+#: ../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 "
@@ -5264,16 +5307,17 @@ msgstr ""
 "এই অপারেশনটি নির্বাচিত সময়সীমার পূর্ববর্তী সমস্ত অনুষ্ঠানগুলিকে একেবারে মুছে দেবে। "
 "যদি আপনি অগ্রসর হন, আপনি এই অনুষ্ঠানগুলি পুনরুদ্ধার করতে পারবেন না।"
 
-#: ../calendar/gui/calendar-commands.c:330
+#: ../calendar/gui/calendar-commands.c:323
 msgid "Purge events older than"
 msgstr "এর পূর্ববর্তী অনুষ্ঠান মুছে ফেলুন"
 
-#: ../calendar/gui/calendar-commands.c:335
+#: ../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:290
+#: ../plugins/calendar-http/calendar-http.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:397
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../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 "দিন"
 
@@ -5282,131 +5326,331 @@ msgstr "দিন"
 #. 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:512
-#: ../calendar/gui/migration.c:610 ../calendar/gui/migration.c:1123
+#: ../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 "ওয়েবে"
 
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:406
+#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "জন্মদিন এবং বার্ষিকী"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:308
+#: ../calendar/gui/calendar-component.c:323
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "আবহাওয়া"
 
-#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "নতুন বর্ষপঞ্জি (_N)"
 
-#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/calendar-component.c:616
 #: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2085
+#: ../mail/em-folder-tree.c:2106
 msgid "_Copy..."
 msgstr "কপি করুন (_C)..."
 
-#: ../calendar/gui/calendar-component.c:612
-#: ../calendar/gui/dialogs/comp-editor.c:1130
-#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
-#: ../composer/e-msg-composer.c:3631 ../mail/em-folder-tree.c:2099
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "বৈশিষ্ট্যাবলী (_P)"
-
-#: ../calendar/gui/calendar-component.c:939
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "বর্ষপঞ্জি আপগ্রেড করতে ব্যর্থ।"
 
-#: ../calendar/gui/calendar-component.c:1238
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "অনুষ্ঠান এবং সভা তৈরি করার জন্য '%s' বর্ষপঞ্জি খুলতে ব্যর্থ"
 
-#: ../calendar/gui/calendar-component.c:1254
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "অনুষ্ঠান এবং সভা তৈরি করার জন্য কোনো বর্ষপঞ্জি উপলব্ধ নেই"
 
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "বর্ষপঞ্জির উৎ‌স নির্বাচক"
 
-#: ../calendar/gui/calendar-component.c:1585
+#: ../calendar/gui/calendar-component.c:1596
 msgid "New appointment"
 msgstr "নতুন সাক্ষাৎকার"
 
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1597
+msgctxt "New"
 msgid "_Appointment"
 msgstr "সাক্ষাৎকার (_A)"
 
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1598
 msgid "Create a new appointment"
 msgstr "একটি নতুন সাক্ষাৎকার তৈরি করুন"
 
-#: ../calendar/gui/calendar-component.c:1593
+#: ../calendar/gui/calendar-component.c:1604
 msgid "New meeting"
 msgstr "নতুন সভা"
 
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1605
+msgctxt "New"
 msgid "M_eeting"
 msgstr "সভা (_e)"
 
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1606
 msgid "Create a new meeting request"
 msgstr "একটি নতুন সভার আবেদন তৈরি করুন"
 
-#: ../calendar/gui/calendar-component.c:1601
+#: ../calendar/gui/calendar-component.c:1612
 msgid "New all day appointment"
 msgstr "নতুন সারাদিনব্যাপী সাক্ষাৎকার"
 
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1613
+msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "সারাদিনব্যাপী সাক্ষাৎকার (_p)"
 
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1614
 msgid "Create a new all-day appointment"
 msgstr "একটি নতুন সারাদিনব্যাপী সাক্ষাৎকার তৈরি করুন"
 
-#: ../calendar/gui/calendar-component.c:1609
+#: ../calendar/gui/calendar-component.c:1620
 msgid "New calendar"
 msgstr "নতুন বর্ষপঞ্জি"
 
-#: ../calendar/gui/calendar-component.c:1610
+#: ../calendar/gui/calendar-component.c:1621
+msgctxt "New"
 msgid "Cale_ndar"
 msgstr "বর্ষপঞ্জি (_n)"
 
-#: ../calendar/gui/calendar-component.c:1611
+#: ../calendar/gui/calendar-component.c:1622
 msgid "Create a new calendar"
 msgstr "একটি নতুন বর্ষপঞ্জি তৈরি করুন"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "দিন ভিউ"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "কার্যসপ্তাহ ভিউ"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "সপ্তাহ ভিউ"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "মাস ভিউ"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.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:5
+msgid "Attachments"
+msgstr "সংযুক্ত বস্তু"
+
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Attendee"
+msgstr "অংশগ্রহণকারী"
+
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:9
+msgid "Business"
+msgstr "প্রসঙ্গ"
+
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:11
+msgid "Category"
+msgstr "শ্রেণীবিভাগ"
+
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "Classification"
+msgstr "শ্রেণীবিভাগ"
+
+#: ../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:547
+#: ../calendar/gui/memotypes.xml.h:10
+msgid "Confidential"
+msgstr "গোপনীয়"
+
+#: ../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 "বিবরণ"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/tasktypes.xml.h:15
 msgid "Description Contains"
 msgstr "বিবরণে রয়েছে"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "অনুপস্থিত"
+
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "উপস্থিত"
+
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Favourites"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:19
+msgid "Gifts"
+msgstr "উপহার"
+
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:20
+msgid "Goals/Objectives"
+msgstr "উদ্দেশ্য"
+
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:22
+msgid "Holiday"
+msgstr "ছুটি"
+
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Holiday Cards"
+msgstr "ছুটির শুভেচ্ছাপত্র"
+
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:24
+msgid "Hot Contacts"
+msgstr "গুরুত্বপূর্ণ পরিচিতি"
+
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
+#: ../calendar/gui/tasktypes.xml.h:25
+msgid "Ideas"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
+#: ../calendar/gui/tasktypes.xml.h:27
+msgid "International"
+msgstr "আন্তর্জাতিক"
+
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Key Customer"
+msgstr "গুরুত্বপূর্ণ গ্রাহক"
+
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
+#: ../calendar/gui/tasktypes.xml.h:30
+msgid "Miscellaneous"
+msgstr "বিবিধ"
+
+#: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
+msgid "Next 7 days"
+msgstr "পরবর্তী ৭ দিন"
+
+#: ../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 "সংগঠক"
+
+#: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
+#: ../calendar/gui/tasktypes.xml.h:36
+msgid "Phone Calls"
+msgstr "ফোন কল"
+
+#: ../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:546
+#: ../calendar/gui/memotypes.xml.h:29
+msgid "Private"
+msgstr "ব্যক্তিগত"
+
+#: ../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:545 ../calendar/gui/memotypes.xml.h:30
+msgid "Public"
+msgstr "পাবলিক"
+
+#: ../calendar/gui/caltypes.xml.h:33
+#: ../calendar/gui/dialogs/event-editor.c:299
+msgid "Recurrence"
+msgstr "পুনরাবৃত্তি"
+
+#: ../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:70 ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "অবস্থা"
+
+#: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
+#: ../calendar/gui/tasktypes.xml.h:39
+msgid "Strategies"
+msgstr "নীতি"
+
+#: ../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:361
+msgid "Summary"
+msgstr "সারাংশ"
+
+#: ../calendar/gui/caltypes.xml.h:37 ../calendar/gui/memotypes.xml.h:34
+#: ../calendar/gui/tasktypes.xml.h:41
 msgid "Summary Contains"
 msgstr "সারাংশে রয়েছে"
 
+#: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
+#: ../calendar/gui/tasktypes.xml.h:42
+msgid "Suppliers"
+msgstr "উপলব্ধকারী"
+
+#: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
+#: ../calendar/gui/tasktypes.xml.h:43
+msgid "Time &amp; Expenses"
+msgstr "সময় &amp; ব্যয়"
+
+#: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
+#: ../calendar/gui/tasktypes.xml.h:45
+msgid "VIP"
+msgstr "গুরুত্বপূর্ণ ব্যক্তি"
+
+#: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
+#: ../calendar/gui/tasktypes.xml.h:46
+msgid "Waiting"
+msgstr "অপেক্ষা করা হচ্ছে"
+
+#: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
+#: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "ধারন করে"
+
+#: ../calendar/gui/caltypes.xml.h:43 ../calendar/gui/memotypes.xml.h:40
+#: ../calendar/gui/tasktypes.xml.h:48 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "ধারন করে না"
+
+#: ../calendar/gui/caltypes.xml.h:44 ../calendar/gui/memotypes.xml.h:41
+#: ../calendar/gui/tasktypes.xml.h:49 ../mail/em-filter-i18n.h:30
+msgid "is"
+msgstr "হলো"
+
+#: ../calendar/gui/caltypes.xml.h:45 ../calendar/gui/memotypes.xml.h:42
+#: ../calendar/gui/tasktypes.xml.h:52 ../mail/em-filter-i18n.h:36
+msgid "is not"
+msgstr "নয়"
+
 #: ../calendar/gui/comp-editor-factory.c:405
 msgid "Error while opening the calendar"
 msgstr "বর্ষপঞ্জি পড়ার সময় সমস্যা হয়েছে"
@@ -5419,11 +5663,11 @@ msgstr "বর্ষপঞ্জি খোলার সময় মেথড স�
 msgid "Permission denied to open the calendar"
 msgstr "বর্ষপঞ্জি পড়ার অনুমতি পাওয়া যায়নি"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "অজানা সমস্যা"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:616
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "সতর্কধ্বনি সম্পাদনা করুন"
 
@@ -5456,17 +5700,17 @@ msgid "Mes_sage:"
 msgstr "বার্তা (_s):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Play a sound"
 msgstr "একটি শব্দ বাজাও"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:450
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Pop up an alert"
 msgstr "পপ-আপ সতর্কবার্তা"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:458
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Run a program"
 msgstr "একটি প্রোগ্রাম চালাও"
 
@@ -5479,7 +5723,7 @@ msgid "Send To:"
 msgstr "প্রাপক:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Send an email"
 msgstr "একটি ই-মেইল প্রেরণ করুন"
 
@@ -5535,7 +5779,7 @@ msgstr "মিনিট"
 msgid "start of appointment"
 msgstr "সাক্ষাৎকারের শুরু"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "কর্ম/ট্রিগার"
 
@@ -5546,16 +5790,15 @@ msgstr "যোগ করুন (_d)"
 #: ../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
-#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "সতর্কধ্বনি"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
-#: ../composer/e-msg-composer-select-file.c:93
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
+#: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "সংযুক্ত বস্তু স্বয়ংক্রিয়ভাবে প্রদর্শণ করার পরামর্শ (_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "বস্তু সংযুক্ত করুন"
 
@@ -5625,8 +5868,8 @@ msgid "Display"
 msgstr "প্রদর্শন করা হবে"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1098
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "শুক্রবার"
 
@@ -5641,8 +5884,8 @@ msgstr ""
 "দিন"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1094
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "সোমবার"
 
@@ -5665,7 +5908,7 @@ msgstr ""
 "রবিবার"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "একটি রঙ নির্বাচন করুন"
 
@@ -5676,8 +5919,8 @@ msgid "S_un"
 msgstr "রবি (_u)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1099
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "শনিবার"
 
@@ -5694,8 +5937,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "তারিখ নেভিগেটরে সপ্তাহের সংখ্যা প্রদর্শন করা হবে (_n)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1100
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "রবিবার"
 
@@ -5713,13 +5956,13 @@ msgid "Template:"
 msgstr "টেমপ্লেট:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "বৃহঃস্পতিবার"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "সময়-অঞ্চল (_z):"
 
@@ -5728,14 +5971,14 @@ msgid "Time format:"
 msgstr "সময় বিন্যাস:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1095
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "মঙ্গলবার"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1096
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "বুধবার"
 
@@ -5813,305 +6056,458 @@ msgstr "বুধ (_W)"
 msgid "before every appointment"
 msgstr "প্রতি সাক্ষাৎকারের পূর্বে"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "অফলাইন কর্মের উদ্দেশ্যে বর্ষপঞ্জির বিষয়বস্তু স্থানীয় ফোল্ডারে কপি করুন (_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "অফলাইন কর্মের উদ্দেশ্যে কার্যতালিকার বিষয়বস্তু স্থানীয় ফোল্ডারে কপি করুন (_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "অফলাইন কর্মের উদ্দেশ্যে কর্মসূচী বিষয়বস্তু স্থানীয় ফোল্ডারে কপি করুন (_y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
-msgid "C_olor:"
-msgstr "রঙ (_o):"
+#: ../calendar/gui/dialogs/calendar-setup.c:344
+msgid "Colo_r:"
+msgstr "রঙ: (_r)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "কার্য-তালিকা"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "কর্মসূচী"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:478
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "বর্ষপঞ্জির বৈশিষ্ট্যাবলী"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:480
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "নতুন বর্ষপঞ্জি"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:536
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "কার্য-তালিকার বৈশিষ্ট্যাবলী"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:592
+#: ../calendar/gui/dialogs/calendar-setup.c:531
+msgid "New Task List"
+msgstr "নতুন কর্ম-তালিকা"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:587
+msgid "Memo List Properties"
+msgstr "মেমো-তালিকার বৈশিষ্ট্যাবলী"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "নতুন কর্মসূচী"
 
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:56
 msgid "This event has been deleted."
 msgstr "এই ঘটনাটি মুছে ফেলা হয়েছে।"
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This task has been deleted."
 msgstr "এই কর্মটি মুছে ফেলা হয়েছে।"
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This memo has been deleted."
 msgstr "এই মেমোটি মুছে ফেলা হয়েছে।"
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:73
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  আপনি কিছু পরিবর্তন সাধন করেছেন। এই পরিবর্তনগুলি বাতিল করে এডিটর বন্ধ করা হবে "
 "কি?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  আপনি কোনো পরিবর্তন সাধন করেননি, এখন এডিটর বন্ধ করা হবে কি?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:80
 msgid "This event has been changed."
 msgstr "এই ঘটনাটি পরিবর্তন করা হয়েছে।"
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This task has been changed."
 msgstr "এই কর্মটি পরিবর্তন করা হয়েছে।"
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This memo has been changed."
 msgstr "এই মেমোটি পরিবর্তন করা হয়েছে।"
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:97
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  আপনি কিছু পরিবর্তন সাধন করেছেন। এই পরিবর্তনগুলি বাতিল করে এডিটর আপডেট করা "
 "হবে কি?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  আপনি কোনো পরিবর্তন সাধন করেননি, এডিটর আপডেট করা হবে কি?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:519
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "বৈধতা সংক্রান্ত ত্রুটি: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2356
 msgid " to "
 msgstr " প্রতি "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2360
 msgid " (Completed "
 msgstr " (সম্পন্ন "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2362
 msgid "Completed "
 msgstr "সম্পন্ন"
 
 # FIXME
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2367
 msgid " (Due "
 msgstr " (পূর্বনির্ধারিত "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2369
 msgid "Due "
 msgstr "পূর্বনির্ধারিত "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2850
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "সংযুক্ত বার্তা - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:387 ../composer/e-msg-composer.c:2855
-#: ../composer/e-msg-composer.c:3037
+#: ../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
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d-টি সংযুক্ত বার্তা"
+msgstr[1] "%d-টি সংযুক্ত বার্তা"
 
-#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:3101
-#: ../mail/em-folder-tree.c:997 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2066
+#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2056
+#: ../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 "স্থানান্তর করুন (_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:460 ../composer/e-msg-composer.c:3103
-#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2058
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "ড্র্যাগ প্রক্রিয়া বাতিল করুন (_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:663
-#: ../calendar/gui/dialogs/comp-editor.c:2821 ../mail/em-utils.c:372
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:359
+#: ../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 "সংযুক্ত বস্তু"
 
-#: ../calendar/gui/dialogs/comp-editor.c:825
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "অবজেক্টটি আপডেট করা যায়নি"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975 ../composer/e-msg-composer.c:2487
-#, c-format
-msgid "<b>%d</b> Attachment"
-msgid_plural "<b>%d</b> Attachments"
-msgstr[0] "<b>%d</b>-টি সংযুক্ত বস্তু"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1007
-msgid "Hide Attachment _Bar"
-msgstr "সংযুক্ত বস্তুর বার আড়াল করুন (_B)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1010
-#: ../calendar/gui/dialogs/comp-editor.c:1558
-msgid "Show Attachment _Bar"
-msgstr "সংযুক্ত বস্তুসহ বার প্রদর্শন করা হবে (_B)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-#: ../calendar/gui/dialogs/event-page.c:1967
-#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3630
-#: ../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 "সরাও (_R)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1132
-#: ../composer/e-msg-composer.c:3633
-msgid "_Add attachment..."
-msgstr "বস্তু সংযুক্ত করুন (_A)..."
-
-#: ../calendar/gui/dialogs/comp-editor.c:1582
-#: ../mail/em-format-html-display.c:2374
-msgid "Show Attachments"
-msgstr "সংযুক্ত বস্তু প্রদর্শন করা হবে"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1583
-msgid "Press space key to toggle attachment bar"
-msgstr ""
-
-#: ../calendar/gui/dialogs/comp-editor.c:2189
-#: ../calendar/gui/dialogs/comp-editor.c:2232
+#: ../calendar/gui/dialogs/comp-editor.c:930
 msgid "Edit Appointment"
 msgstr "সাক্ষাৎকার সম্পাদন করুন"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2195
-#: ../calendar/gui/dialogs/comp-editor.c:2238
+#: ../calendar/gui/dialogs/comp-editor.c:937
 #, c-format
 msgid "Meeting - %s"
 msgstr "সভা - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2197
-#: ../calendar/gui/dialogs/comp-editor.c:2240
+#: ../calendar/gui/dialogs/comp-editor.c:939
 #, c-format
 msgid "Appointment - %s"
 msgstr "সাক্ষাৎকার - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2201
-#: ../calendar/gui/dialogs/comp-editor.c:2244
+#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "নির্ধারিত কর্ম - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2203
-#: ../calendar/gui/dialogs/comp-editor.c:2246
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Task - %s"
 msgstr "কর্ম - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2206
-#: ../calendar/gui/dialogs/comp-editor.c:2249
+#: ../calendar/gui/dialogs/comp-editor.c:952
 #, c-format
 msgid "Memo - %s"
 msgstr "মেমো - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2217
-#: ../calendar/gui/dialogs/comp-editor.c:2259
-msgid "No summary"
+#: ../calendar/gui/dialogs/comp-editor.c:968
+msgid "No Summary"
 msgstr "সারাংশহীন"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2910
-#: ../calendar/gui/dialogs/comp-editor.c:2964
-#: ../calendar/gui/dialogs/comp-editor.c:2988
+#: ../calendar/gui/dialogs/comp-editor.c:1262
+msgid "Click here to close the current window"
+msgstr "বর্তমান উইন্ডো বন্ধ করতে এই স্থানে ক্লিক করুন"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1269
+msgid "Copy selected text to the clipboard"
+msgstr "নির্বাচিত টেক্সটটি ক্লিপবোর্ডে কপি করা হবে"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1276
+msgid "Cut selected text to the clipboard"
+msgstr "নির্বাচিত টেক্সটটি ক্লিপবোর্ডে কাট করুন"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1283
+msgid "Click here to view help available"
+msgstr "উপলব্ধ সহায়িকা দেখতে এই স্থানে ক্লিক করুন"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1290
+msgid "Paste text from the clipboard"
+msgstr "ক্লিপবোর্ড থেকে টেক্সট পেস্ট করুন"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1311
+msgid "Click here to save the current window"
+msgstr "বর্তমান উইন্ডো সংরক্ষণ করতে এই স্থানে ক্লিক করুন"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1318
+msgid "Select all text"
+msgstr "সমস্ত টেক্সট নির্বাচন করুন"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1325
+msgid "_Classification"
+msgstr "শ্রেণীবিভাগ (_C)"
+
+#: ../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 "ফাইল (_F)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
+msgid "_Help"
+msgstr "সাহায্য (_H)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1353
+msgid "_Insert"
+msgstr "সন্নিবেশ করুন (_I)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1360
+msgid "_Options"
+msgstr "বিকল্প (_O)"
+
+#: ../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 "প্রদর্শণ (_V)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:471
+msgid "_Attachment..."
+msgstr "সংযুক্ত বস্তু(_A)..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1379
+msgid "Click here to attach a file"
+msgstr "ফাইল সংযুক্ত করতে এইস্থানে ক্লিক করুন"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1387
+msgid "_Categories"
+msgstr "শ্রেণীবিভাগ(_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1389
+msgid "Toggles whether to display categories"
+msgstr "শ্রেণী প্রদর্শিত হবে কিনা তা টগল করে"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1395
+msgid "Time _Zone"
+msgstr "সময়-অঞ্চল (_Z)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1397
+msgid "Toggles whether the time zone is displayed"
+msgstr "সময়ের অঞ্চল প্রদর্শিত হবে কিনা তা টগল করে"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1406
+msgid "Pu_blic"
+msgstr "সার্বজনীন (_b)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1408
+msgid "Classify as public"
+msgstr "সার্বজনীন রূপে চিহ্নিত করা হবে"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1413
+msgid "_Private"
+msgstr "ব্যক্তিগত (_P)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1415
+msgid "Classify as private"
+msgstr "ব্যক্তিগত রূপে চিহ্নিত"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1420
+msgid "_Confidential"
+msgstr "গোপনীয় (_C)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1422
+msgid "Classify as confidential"
+msgstr "গোপনীয় রূপে চিহ্নিত"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1430
+msgid "R_ole Field"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1432
+msgid "Toggles whether the Role field is displayed"
+msgstr ""
+
+#: ../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 ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1446
+msgid "_Status Field"
+msgstr "অবস্থার ক্ষেত্র (_S)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1448
+msgid "Toggles whether the Status field is displayed"
+msgstr "অবস্থার ক্ষেত্রটি প্রদর্শিত হবে কিনা তা টগল করে"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1454
+msgid "_Type Field"
+msgstr "ধরনের ক্ষেত্র (_T)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1456
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1766
+#: ../composer/e-composer-private.c:65 ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent _Documents"
+msgstr "সম্প্রতি ব্যবহৃত নথিপত্র (_D)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:699
+msgid "Attach"
+msgstr "সংযুক্ত করুন"
+
+#: ../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>-টি সংযুক্ত বস্তু"
+msgstr[1] "<b>%d</b>-টি সংযুক্ত বস্তু"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1912
+msgid "Hide Attachment _Bar"
+msgstr "সংযুক্ত বস্তুর বার আড়াল করুন (_B)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
+msgid "Show Attachment _Bar"
+msgstr "সংযুক্ত বস্তুসহ বার প্রদর্শন করা হবে (_B)"
+
+#: ../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
+#: ../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 "সরাও (_R)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1046
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Add attachment..."
+msgstr "বস্তু সংযুক্ত করুন (_A)..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2201
+msgid "Show Attachments"
+msgstr "সংযুক্ত বস্তু প্রদর্শন করা হবে"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2246
+msgid "Press space key to toggle attachment bar"
+msgstr "সংযুক্ত বস্তর বার প্রদর্শন/আড়াল করার জন্য স্পেস বার টিপুন"
+
+#: ../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 "কোনো আপডেটের আবির্ভাব ঘটলে এখানে যেসব পরিবর্তন করা হয়েছে তা বাতিল করা হতে পারে"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3017
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "বর্তমান সংস্করণ ব্যবহার করা সম্ভব হয়নি!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#: ../calendar/gui/dialogs/copy-source-dialog.c:60
 msgid "Could not open source"
 msgstr "উত্স খোলা সম্ভব হয়নি"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#: ../calendar/gui/dialogs/copy-source-dialog.c:68
 msgid "Could not open destination"
 msgstr "গন্তব্য খোলা সম্ভব হয়নি"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#: ../calendar/gui/dialogs/copy-source-dialog.c:77
 msgid "Destination is read only"
 msgstr "গন্তব্যস্থলটি শুধুমাত্র পড়ার জন্য অনুমোদিত"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr ""
+msgstr "প্রাপকের মেইলবক্স থেকে এই বস্তুটি মুছে ফেলা হবে কি? (_D)"
 
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "একটি কোরবা (Corba) ত্রুটির কারণে এই অনুষ্ঠানটি মুছে ফেলা যায়নি"
 
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "একটি কোরবা (Corba) ত্রুটির কারণে এই কাজটি মুছে ফেলা যায়নি"
 
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The memo could not be deleted due to a corba error"
 msgstr "একটি কোরবা (Corba) ত্রুটির কারণে এই মেমোটি মুছে ফেলা যায়নি"
 
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "একটি কোরবা (Corba) ত্রুটির কারণে এই বস্তুটি মুছে ফেলা যায়নি"
 
-#: ../calendar/gui/dialogs/delete-error.c:70
+#: ../calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "অনুমতির অভাবে এই ঘটনাটি মুছে ফেলা যায়নি"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
+#: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "অনুমতির অভাবে এই কাজটি মুছে ফেলা যায়নি"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The memo could not be deleted because permission was denied"
 msgstr "অনুমতির অভাবে এই মেমোটি মুছে ফেলা যায়নি"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "অনুমতির অভাবে এই বস্তুটি মুছে ফেলা যায়নি"
 
-#: ../calendar/gui/dialogs/delete-error.c:86
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "একটি ত্রুটির দরুন এই ঘটনাটি মুছে ফেলা যায়নি"
 
-#: ../calendar/gui/dialogs/delete-error.c:89
+#: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "একটি ত্রুটির দরুন এই কাজটি মুছে ফেলা যায়নি"
 
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The memo could not be deleted due to an error"
 msgstr "একটি ত্রুটির দরুন এই মেমোটি মুছে ফেলা যায়নি"
 
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "একটি ত্রুটির দরুন এই বস্তুটি মুছে ফেলা যায়নি"
 
@@ -6121,7 +6517,7 @@ msgstr "পরিচিতি..."
 
 # FIXME
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To:"
 msgstr "বন্টন করুন:"
 
@@ -6130,133 +6526,182 @@ msgstr "বন্টন করুন:"
 msgid "Enter Delegate"
 msgstr "প্রতিনিধির নাম লিখুন"
 
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:196
+msgid "_Alarms"
+msgstr "সতর্কধ্বনি (_A)"
+
+#: ../calendar/gui/dialogs/event-editor.c:198
+msgid "Click here to set or unset alarms for this event"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:203
+msgid "_Recurrence"
+msgstr "পুনরাবৃত্তি (_R)"
+
+#: ../calendar/gui/dialogs/event-editor.c:205
+msgid "Make this a recurring event"
+msgstr "এই অনুষ্ঠান পুনরাবৃত্তি করা হব"
+
+#: ../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 "প্রেরণ সংক্রান্ত অপশন"
+
+#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/task-editor.c:125
+msgid "Insert advanced send options"
+msgstr "প্রেরণ সংক্রান্ত উন্নত অপশন সন্নিবেশ করুন"
+
+#: ../calendar/gui/dialogs/event-editor.c:220
+msgid "All _Day Event"
+msgstr "সারাদনব্যাপী নতুন অনুষ্ঠান(_D)"
+
+#: ../calendar/gui/dialogs/event-editor.c:222
+msgid "Toggles whether to have All Day Event"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:228
+msgid "Show Time as _Busy"
+msgstr "ব্যস্ত হিসাবে সময় প্রদর্শন করা হবে (_B)"
+
+#: ../calendar/gui/dialogs/event-editor.c:230
+msgid "Toggles whether to show time as busy"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:239
+msgid "_Free/Busy"
+msgstr "মুক্ত/ব্যস্ত(_F)"
+
+#: ../calendar/gui/dialogs/event-editor.c:241
+msgid "Query free / busy information for the attendees"
+msgstr "অংশগ্রহণকারীদের জন্য মুক্ত/ব্যস্ত তথ্য অনুসন্ধান করুন"
+
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "সাক্ষাৎকার(_m)"
 
-#: ../calendar/gui/dialogs/event-editor.c:606
-#: ../ui/evolution-event-editor.xml.h:14
-msgid "Recurrence"
-msgstr "পুনরাবৃত্তি"
-
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.c:2835
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "চেতাবনীসহ অনুষ্ঠান"
 
-#: ../calendar/gui/dialogs/event-page.c:906
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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 "সংগঠক(_g):"
 
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "প্রতিনিধিবৃন্দ(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "অংশগ্রহণকারীবৃন্দ(_n)"
 
-#: ../calendar/gui/dialogs/event-page.c:1128
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "আরম্ভের তারিখবিহীন ঘটনা"
 
-#: ../calendar/gui/dialogs/event-page.c:1131
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "সমাপ্তির তারিখবিহীন ঘটনা"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
-#: ../calendar/gui/dialogs/memo-page.c:734
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1198
+#: ../calendar/gui/dialogs/memo-page.c:636
+#: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "আরম্ভের তারিখটি ভুল"
 
-#: ../calendar/gui/dialogs/event-page.c:1313
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "সমাপ্তির তারিখটি ভুল"
 
-#: ../calendar/gui/dialogs/event-page.c:1336
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "আরম্ভের সময়টি ভুল"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "সমাপ্তির সময়টি ভুল"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
-#: ../calendar/gui/dialogs/memo-page.c:774
-#: ../calendar/gui/dialogs/task-page.c:952
+#: ../calendar/gui/dialogs/event-page.c:1401
+#: ../calendar/gui/dialogs/memo-page.c:677
+#: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "যে সংগঠকেকে নির্বাচন করা হয়েছে তার কোনো অ্যাকাউন্ট বর্তমানে উপস্থিত নেই।"
 
-#: ../calendar/gui/dialogs/event-page.c:1511
-#: ../calendar/gui/dialogs/memo-page.c:780
-#: ../calendar/gui/dialogs/task-page.c:958
+#: ../calendar/gui/dialogs/event-page.c:1407
+#: ../calendar/gui/dialogs/memo-page.c:683
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "একটি সংগঠক আবশ্যক"
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/task-page.c:982
+#: ../calendar/gui/dialogs/event-page.c:1432
+#: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "অন্তত একজন অংশগ্রহণকারী আবশ্যক।"
 
-#: ../calendar/gui/dialogs/event-page.c:1968
-#: ../calendar/gui/dialogs/task-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1872
+#: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "যোগ করুন (_A)"
 
-#: ../calendar/gui/dialogs/event-page.c:2711
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "'%s' বর্ষপঞ্জিটি খোলা যায়নি।"
 
-#: ../calendar/gui/dialogs/event-page.c:2755
-#: ../calendar/gui/dialogs/memo-page.c:990
-#: ../calendar/gui/dialogs/task-page.c:1928
+#: ../calendar/gui/dialogs/event-page.c:2634
+#: ../calendar/gui/dialogs/memo-page.c:886
+#: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "আপনি %s-র প্রতিনিধিরূপে কর্ম সঞ্চালন করছেন"
 
-#: ../calendar/gui/dialogs/event-page.c:3053
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "সাক্ষাৎকারের পূর্বে %d দিন"
+msgstr[1] "সাক্ষাৎকারের পূর্বে %d দিন"
 
 # FIXME
-#: ../calendar/gui/dialogs/event-page.c:3059
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "সাক্ষাৎকারের পূর্বে %d ঘন্টা"
+msgstr[1] "সাক্ষাৎকারের পূর্বে %d ঘন্টা"
 
-#: ../calendar/gui/dialogs/event-page.c:3065
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "সাক্ষাৎকারের পূর্বে %d মিনিট"
+msgstr[1] "সাক্ষাৎকারের পূর্বে %d মিনিট"
 
-#: ../calendar/gui/dialogs/event-page.c:3078
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "স্বনির্বাচিত"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3083
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
-#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
-#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
+#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:944
+#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
+#: ../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:205
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
 #: ../plugins/itip-formatter/itip-formatter.c:2021
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
-#: ../widgets/misc/e-dateedit.c:1745
-#: ../widgets/misc/e-signature-combo-box.c:50
+#: ../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 "একটিও নয়"
 
@@ -6281,23 +6726,25 @@ msgid "Custom Alarm:"
 msgstr "স্বনির্বাচিত সতর্কধ্বনির শব্দ:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "বিবরণ (_e):"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "ঘটনা সংক্রান্ত বিবরণ:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../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 "সারাংশ (_m):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "_Alarm"
 msgstr "সতর্কধ্বনি(_A)"
 
+#: ../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 "বিবরণ: (_D)"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "সময়: (_T)"
@@ -6328,28 +6775,24 @@ msgstr "সংগঠক পরিবর্তন করুন (_h)"
 msgid "Co_ntacts..."
 msgstr "পরিচিতি...(_n)"
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "Organizer"
-msgstr "সংগঠক"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "সংগঠক:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2476
 msgid "Memo"
 msgstr "কর্মসূচী"
 
-#: ../calendar/gui/dialogs/memo-page.c:952
+#: ../calendar/gui/dialogs/memo-page.c:847
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s'-এ উপস্থিত কর্মসূচী খোলা সম্ভব হয়নি।"
 
-#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1545
-#: ../mail/em-format-html.c:1603 ../mail/em-format-html.c:1629
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:888
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
+#: ../calendar/gui/dialogs/memo-page.c:1002 ../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
 msgid "To"
 msgstr "প্রাপক"
 
@@ -6362,65 +6805,61 @@ msgstr "আরম্ভের তারিখ (_r):"
 msgid "T_o:"
 msgstr "প্রাপক:(_o)"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "বিবরণ: (_D)"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:451
+#: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "দল (_G):"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:50
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "পুনরাবৃত্তিমূলক অনুষ্ঠান পরিবর্তনের প্রচেষ্টা করা হচ্ছে। আপনি কী পরিবর্তন করতে ইচ্ছুক?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "পুনরাবৃত্তিমূলক অনুষ্ঠান বণ্টনের প্রচেষ্টা করা হচ্ছে। আপনি কী পরিবর্তন করতে ইচ্ছুক?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "পুনরাবৃত্তিমূলক কর্ম পরিবর্তনের প্রচেষ্টা করা হচ্ছে। আপনি কী পরিবর্তন করতে ইচ্ছুক?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "পুনরাবৃত্তিমূলক মেমো পরিবর্তনের প্রচেষ্টা করা হচ্ছে। আপনি কী পরিবর্তন করতে ইচ্ছুক?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:85
 msgid "This Instance Only"
 msgstr "শুধুমাত্র এই ইনস্ট্যান্সটি"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This and Prior Instances"
 msgstr "এটি এবং এর পূর্বের ইনস্ট্যান্সগুলি"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Future Instances"
 msgstr "এটি এবং ভবিষ্যতের ইনস্ট্যান্সগুলি"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "All Instances"
 msgstr "সমস্ত ইনস্ট্যান্স"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:505
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "চিহ্নিত সাক্ষাৎ‌কারের মধ্যে উপস্থিত পুনরাবৃত্তিকর বিষয়বস্ত Evolution-র দ্বারা সম্পাদন "
 "করা সম্ভব নয়।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:826
+#: ../calendar/gui/dialogs/recurrence-page.c:890
 msgid "Recurrence date is invalid"
 msgstr "রেকারেন্সের তারিখ বৈধ নয়"
 
 #. 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:939
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "উপর"
 
@@ -6428,7 +6867,7 @@ msgstr "উপর"
 #. * (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:1003
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "first"
 msgstr "প্রথম"
 
@@ -6437,7 +6876,7 @@ msgstr "প্রথম"
 #. * (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:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:998
 msgid "second"
 msgstr "দ্বিতীয়"
 
@@ -6445,7 +6884,7 @@ msgstr "দ্বিতীয়"
 #. * (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:1014
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "তৃতীয়"
 
@@ -6453,7 +6892,7 @@ msgstr "তৃতীয়"
 #. * (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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "fourth"
 msgstr "চতুর্থ"
 
@@ -6461,13 +6900,13 @@ msgstr "চতুর্থ"
 #. * (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:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "last"
 msgstr "শেষ"
 
 #. 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:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "অন্য তারিখ"
 
@@ -6475,7 +6914,7 @@ msgstr "অন্য তারিখ"
 #. * 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:1058
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
 msgstr "১ম থেকে ১০ম"
 
@@ -6483,7 +6922,7 @@ msgstr "১ম থেকে ১০ম"
 #. * 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:1064
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
 msgstr "১১তম থেকে ২০তম"
 
@@ -6491,45 +6930,45 @@ msgstr "১১তম থেকে ২০তম"
 #. * 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:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
 msgstr "২১তম থেকে ৩১তম"
 
 #. 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:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "day"
 msgstr "দিন"
 
 #. 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:1233
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 msgid "on the"
 msgstr "এর উপর"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1426
+#: ../calendar/gui/dialogs/recurrence-page.c:1384
 msgid "occurrences"
 msgstr "ঘটনাসমূহ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2087
 msgid "Add exception"
-msgstr ""
+msgstr "ব্যতিক্রম যোগ করুন"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2128
 msgid "Could not get a selection to modify."
 msgstr "পরিবর্তনের উদ্দেশ্যে নির্বাচিত অংশ পাওয়া যায়নি।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2216
+#: ../calendar/gui/dialogs/recurrence-page.c:2134
 msgid "Modify exception"
-msgstr ""
+msgstr "ব্যতিক্রম সম্পাদনা"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2178
 msgid "Could not get a selection to delete."
 msgstr "মুছে ফেলার উদ্দেশ্যে নির্বাচিত অংশ পাওয়া যায়নি।"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2393
+#: ../calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "তারিখ/সময়"
 
@@ -6580,12 +7019,12 @@ msgstr "সপ্তাহ"
 msgid "year(s)"
 msgstr "বছর"
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:377
+#: ../calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
 msgstr "সমাপ্তির তারিখ সঠিক নয়"
 
-#: ../calendar/gui/dialogs/task-details-page.c:515
+#: ../calendar/gui/dialogs/task-details-page.c:482
 msgid "Web Page"
 msgstr "ওয়েব পেজ"
 
@@ -6600,51 +7039,55 @@ msgstr "<span weight=\"bold\">অবস্থা</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:236
+#: ../calendar/gui/e-cal-component-preview.c:253
 #: ../calendar/gui/e-cal-model-tasks.c:358
 #: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:933
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:642 ../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:2552 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Completed"
 msgstr "সম্পন্ন"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
+#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-calendar-table.c:567 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1065
 msgid "High"
 msgstr "উঁচু"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-cal-model-tasks.c:356
 #: ../calendar/gui/e-cal-model-tasks.c:673
 #: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:641 ../calendar/gui/print.c:2549
 msgid "In Progress"
 msgstr "চলছে"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
+#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1063
 msgid "Low"
 msgstr "নিচু"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:257
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-cal-model.c:985 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1064
 msgid "Normal"
 msgstr "স্বাভাবিক"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../calendar/gui/e-cal-component-preview.c:260
 #: ../calendar/gui/e-cal-model-tasks.c:354
 #: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:230
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:640 ../calendar/gui/print.c:2546
+#: ../calendar/gui/tasktypes.xml.h:33
 msgid "Not Started"
 msgstr "আরম্ভ হয়নি"
 
@@ -6657,7 +7100,7 @@ msgid "Stat_us:"
 msgstr "অবস্থা:(_u)"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:363
+#: ../calendar/gui/e-calendar-table.c:570 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "অনুল্লেখকৃত"
 
@@ -6666,7 +7109,7 @@ msgid "_Date completed:"
 msgstr "সমাপ্তির তারিখ (_D):"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_Priority:"
 msgstr "অগ্রগণ্য (_P):"
 
@@ -6674,25 +7117,37 @@ msgstr "অগ্রগণ্য (_P):"
 msgid "_Web Page:"
 msgstr "ওয়েব পেজে (_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1322
+#: ../calendar/gui/dialogs/task-editor.c:113
+msgid "_Status Details"
+msgstr "অবস্থার বিকল্প (_S)"
+
+#: ../calendar/gui/dialogs/task-editor.c:115
+msgid "Click to change or view the status details of the task"
+msgstr "কর্মের অবস্থা চিহ্নকারী বিবরণ পরিবর্তন অথবা প্রদর্শনের জন্য ক্লিক করুন"
+
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:527
+msgid "_Send Options"
+msgstr "প্রেরণ সংক্রান্ত বিকল্প(_S)"
+
+#: ../calendar/gui/dialogs/task-editor.c:318
 msgid "_Task"
 msgstr "কাজ (_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:430
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "Task Details"
 msgstr "কর্মের বিবরণ"
 
-#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.c:368
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "সংগঠক: (_z)"
 
-#: ../calendar/gui/dialogs/task-page.c:866
+#: ../calendar/gui/dialogs/task-page.c:781
 msgid "Due date is wrong"
 msgstr "দেয় তারিখ সঠিক নয়"
 
-#: ../calendar/gui/dialogs/task-page.c:1885
+#: ../calendar/gui/dialogs/task-page.c:1750
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s'-এ উপস্থিত কার্য খোলা সম্ভব হয়নি।"
@@ -6706,160 +7161,142 @@ msgid "Categor_ies..."
 msgstr "শ্রেণীবিভাগ...(_i)"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "বিবরণ: (_s)"
+msgid "D_ue date:"
+msgstr "দেয় তারিখ: (_D)"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "সময়-অঞ্চল:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "দেয় তারিখ (_D):"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/e-alarm-list.c:392
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d দিন"
+msgstr[1] "%d দিন"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/e-alarm-list.c:398
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d সপ্তাহ"
+msgstr[1] "%d সপ্তাহ"
 
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:460
 msgid "Unknown action to be performed"
 msgstr "যে অজানা কার্য সম্পন্ন করতে হবে"
 
 #. 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:478
+#: ../calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s সাক্ষাত্কার আরম্ভের %s পূর্বে"
 
 #. 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:483
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s সাক্ষাত্কার আরম্ভের %s পরে"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:490
+#: ../calendar/gui/e-alarm-list.c:486
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "সাক্ষাত্কার আরম্ভের %s সময়"
 
 #. 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:501
+#: ../calendar/gui/e-alarm-list.c:497
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s সাক্ষাত্কার শেষ হওয়ার পূর্বে"
 
 #. 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:506
+#: ../calendar/gui/e-alarm-list.c:502
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s সাক্ষাত্কার শেষ হওয়ার পরে"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:513
+#: ../calendar/gui/e-alarm-list.c:509
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s সাক্ষাত্কার শেষ হওয়ার সময়"
 
 #. 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:537
+#: ../calendar/gui/e-alarm-list.c:533
 #, c-format
 msgid "%s at %s"
 msgstr "%s %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:545
+#: ../calendar/gui/e-alarm-list.c:541
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s অজানা ধরনের ট্রিগারের জন্য"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3328
+#: ../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 "%s খোলার জন্য ক্লিক করুন"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:160
-#: ../calendar/gui/e-cal-component-preview.c:160 ../filter/filter-rule.c:805
-#: ../shell/e-shell-folder-title-bar.c:593
+#: ../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 "শিরোনামহীন"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:212
-#: ../calendar/gui/e-cal-component-preview.c:200
-#: ../calendar/gui/e-cal-component-preview.c:211
+#: ../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 "আরম্ভের তারিখ:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:225
-#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-itip-control.c:1201
+#: ../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 "বিবরণ:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:261
-#: ../calendar/gui/e-cal-component-preview.c:307
+#: ../calendar/gui/e-cal-component-memo-preview.c:224
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Web Page:"
 msgstr "ওয়েব পেজ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-itip-control.c:1145
+#: ../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 "সারাংশ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Due Date:"
 msgstr "দেয় তারিখ:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:229
-#: ../calendar/gui/e-itip-control.c:1169
-#: ../plugins/exchange-operations/exchange-account-setup.c:269
+#: ../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 "অবস্থা:"
 
-#: ../calendar/gui/e-cal-component-preview.c:253
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Priority:"
 msgstr "অগ্রগণ্য:"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
-#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
-msgid "Public"
-msgstr "পাবলিক"
-
-#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-calendar-table.c:339
-msgid "Private"
-msgstr "ব্যক্তিগত"
-
-#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
-#: ../calendar/gui/e-calendar-table.c:340
-msgid "Confidential"
-msgstr "গোপনীয়"
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "সমাপ্তির তারিখ"
@@ -6869,21 +7306,14 @@ msgstr "সমাপ্তির তারিখ"
 msgid "Start Date"
 msgstr "আরম্ভের তারিখ"
 
-#: ../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 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:382
-msgid "Summary"
-msgstr "সারাংশ"
-
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:619
 msgid "Free"
 msgstr "মুক্ত"
 
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:413
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-cal-model-calendar.c:190
+#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "Busy"
 msgstr "ব্যস্ত"
 
@@ -6897,199 +7327,225 @@ msgstr ""
 "\n"
 "৪৫.৪৩৬৮৪৫, ১২৫.৮৬২৫০১"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/e-meeting-store.c:749
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../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 "হ্যাঁ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../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 "না"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
-#: ../calendar/gui/e-meeting-list-view.c:169
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/print.c:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
-#: ../plugins/itip-formatter/itip-formatter.c:410
+#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-cal-popup.c:105
+#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
+#: ../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:985
+#: ../calendar/gui/print.c:1002 ../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:84
-#: ../widgets/misc/e-attachment-bar.c:721
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../widgets/misc/e-attachment-bar.c:821
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "অজানা"
 
-#: ../calendar/gui/e-cal-model.c:968
+#: ../calendar/gui/e-cal-model.c:987
 msgid "Recurring"
 msgstr "পুনরাবৃত্ত"
 
-#: ../calendar/gui/e-cal-model.c:970
+#: ../calendar/gui/e-cal-model.c:989
 msgid "Assigned"
 msgstr "বরাদ্দকৃত"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
+#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "নতুন নামে সংরক্ষণ করুন..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
+#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2035
 msgid "Select folder to save selected attachments..."
 msgstr "নির্বাচিত সংযুক্ত বস্তু সংরক্ষণের উদ্দেশ্যে নির্বাচিত ফোল্ডার নির্বাচিত করুন..."
 
-#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:454
+#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1367
-#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:571 ../mail/em-popup.c:582
+#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1576
+#: ../calendar/gui/e-calendar-view.c:1672 ../calendar/gui/e-memo-table.c:926
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 msgid "_Save As..."
 msgstr "নতুন নামে সংরক্ষণ করুন (_S)..."
 
-#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:572
-#: ../mail/em-popup.c:583
+#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "পটভূমী হিসাবে নির্ধারণ করুন(_B)"
 
-#: ../calendar/gui/e-cal-popup.c:281
+#: ../calendar/gui/e-cal-popup.c:287
 msgid "_Save Selected"
 msgstr "নির্বাচিত বস্তু সংরক্ষণ (_S)"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:790
+#: ../calendar/gui/e-cal-popup.c:428 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "%s এ খোলো..."
 
-#: ../calendar/gui/e-calendar-table.c:382
+#: ../calendar/gui/e-calendar-table.c:338
+msgid "* No Summary *"
+msgstr "* সারাংশহীন *"
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2215
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "সংগঠক: %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:377
+#: ../calendar/gui/e-calendar-view.c:2219
+#, c-format
+msgid "Organizer: %s"
+msgstr "সংগঠক: %s"
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "Start: "
+msgstr "আরম্ভ: "
+
+#: ../calendar/gui/e-calendar-table.c:420
+msgid "Due: "
+msgstr "দেয়: "
+
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
 msgstr "০%"
 
-#: ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "10%"
 msgstr "১০%"
 
-#: ../calendar/gui/e-calendar-table.c:384
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "20%"
 msgstr "২০%"
 
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "30%"
 msgstr "৩০%"
 
-#: ../calendar/gui/e-calendar-table.c:386
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "40%"
 msgstr "৪০%"
 
-#: ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "50%"
 msgstr "৫০%"
 
-#: ../calendar/gui/e-calendar-table.c:388
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "60%"
 msgstr "৬০%"
 
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "70%"
 msgstr "৭০%"
 
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "80%"
 msgstr "৮০%"
 
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "90%"
 msgstr "৯০%"
 
-#: ../calendar/gui/e-calendar-table.c:392
+#: ../calendar/gui/e-calendar-table.c:599
 msgid "100%"
 msgstr "১০০%"
 
-#: ../calendar/gui/e-calendar-table.c:670
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:879
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "নির্বাচিত অবজেক্টগুলি মোছা হচ্ছে"
 
-#: ../calendar/gui/e-calendar-table.c:954
-#: ../calendar/gui/e-calendar-view.c:807 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:645
 msgid "Updating objects"
 msgstr "অবজেক্টগুলি আপডেট করা হচ্ছে"
 
-#: ../calendar/gui/e-calendar-table.c:1139
-#: ../calendar/gui/e-calendar-view.c:1233 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-msg-composer.c:1472
+#: ../calendar/gui/e-calendar-table.c:1348
+#: ../calendar/gui/e-calendar-view.c:1221 ../calendar/gui/e-memo-table.c:821
+#: ../composer/e-composer-actions.c:277
 msgid "Save as..."
 msgstr "নতুন নামে সংরক্ষণ..."
 
-#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-table.c:1571
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "নতুন কার্য(_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1366 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1575 ../calendar/gui/e-memo-table.c:925
 msgid "Open _Web Page"
 msgstr "ওয়েব পেজ খুলুন (_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1368
-#: ../calendar/gui/e-calendar-view.c:1669 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1577
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:927
 msgid "P_rint..."
 msgstr "প্রিন্ট করুন...(_r)"
 
-#: ../calendar/gui/e-calendar-table.c:1372
-#: ../calendar/gui/e-calendar-view.c:1689 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:931
 #: ../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 "কাট করুন (_u)"
 
-#: ../calendar/gui/e-calendar-table.c:1374
-#: ../calendar/gui/e-calendar-view.c:1672
-#: ../calendar/gui/e-calendar-view.c:1691 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-table.c:1583
+#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:933
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "পেস্ট করুন (_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1378 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1587 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "কর্ম বরাদ্দ করুন (_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1379 ../calendar/gui/e-memo-table.c:937
+#: ../calendar/gui/e-calendar-table.c:1588 ../calendar/gui/e-memo-table.c:937
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "iCalendar হিসাবে ফরওয়ার্ড করুন (_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1380
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark as Complete"
 msgstr "সম্পন্ন হিসাবে চিহ্নিত করা হবে(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1381
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark Selected Tasks as Complete"
 msgstr "নির্বাচিত কার্যগুলিকে সম্পন্ন হিসাবে চিহ্নিত করা হবে(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1382
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark as Incomplete"
 msgstr "অসম্পন্ন হিসাবে চিহ্নিত করা হবে(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1383
+#: ../calendar/gui/e-calendar-table.c:1592
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "নির্বাচিত কর্মগুলি সম্পন্ন রূপে চিহ্নিত করা হবে(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1388
+#: ../calendar/gui/e-calendar-table.c:1597
 msgid "_Delete Selected Tasks"
 msgstr "নির্বাচিত কার্যগুলি মুছে ফেলুন (_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1625
+#: ../calendar/gui/e-calendar-table.c:1834
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "কার্য যোগ করতে হলে ক্লিক করুন"
@@ -7112,7 +7568,8 @@ msgid "Due date"
 msgstr "দেয় তারিখ"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../calendar/gui/tasktypes.xml.h:37
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Priority"
 msgstr "অগ্রগণ্য"
 
@@ -7120,128 +7577,109 @@ msgstr "অগ্রগণ্য"
 msgid "Start date"
 msgstr "আরম্ভের তারিখ"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:538
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "অবস্থা"
-
-#: ../calendar/gui/e-calendar-view.c:1352
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "বস্তু সরানো হচ্ছে"
 
-#: ../calendar/gui/e-calendar-view.c:1354
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "বস্তু কপি করা হচ্ছে"
 
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "নতুন সাক্ষাত্কার (_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1664
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "নতুন সমস্তদিনব্যাপী ঘটনা (_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1665
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "নতুন সভা(_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "বর্তমান প্রদর্শনক্ষেত্র (_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "আজকের তারিখ নির্বাচন করুন (_o)"
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
 msgstr "তারিখ নির্বাচন করুন (_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1685
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Pri_nt..."
 msgstr "প্রিন্ট করুন...(_n)"
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
 msgstr "বর্ষপঞ্জিতে কপি করুন (_y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
 msgstr "বর্ষপঞ্জিতে স্থানান্তর করুন (_v)..."
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
 msgstr "সভার কর্ম বন্টন করুন (_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1698
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "সভার অনুসূচী তৈরি করুন (_S)..."
 
 # msgstr "সভার অনুসূচনা করে (_ম)..."
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar হিসাবে ফরওয়ার্ড করুন (_F)...."
 
-#: ../calendar/gui/e-calendar-view.c:1700
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "প্রত্যুত্তর(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1701 ../mail/em-folder-view.c:1336
-#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
+#: ../calendar/gui/e-calendar-view.c:1689 ../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 "সকলের প্রতি উত্তর (_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1706
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "এই ঘটনাটি স্থানান্তরযোগ্য বানাও (_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1707 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "এই ঘটনাটি মুছে ফেলুন (_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1708
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "সমস্ত ঘটনাগুলি মুছে ফেলুন (_A)"
 
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2208
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "সংগঠক: %s <%s>"
-
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2212
-#, c-format
-msgid "Organizer: %s"
-msgstr "সংগঠক: %s"
-
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2228 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2508
 #, c-format
 msgid "Location: %s"
 msgstr "অবস্থান: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2262
+#: ../calendar/gui/e-calendar-view.c:2269
 #, c-format
 msgid "Time: %s %s"
 msgstr "সময়: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:116
+#: ../calendar/gui/e-cell-date-edit-text.c:111
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:119
+#: ../calendar/gui/e-cell-date-edit-text.c:114
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:127
+#: ../calendar/gui/e-cell-date-edit-text.c:122
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7254,7 +7692,7 @@ 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:807
+#: ../calendar/gui/e-day-view-time-item.c:583
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i মিনিট ভাগসমূহ"
@@ -7265,150 +7703,126 @@ msgstr "%02i মিনিট ভাগসমূহ"
 #. 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:1359
-#: ../calendar/gui/e-day-view.c:2145
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1656
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1549
+#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1672
 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:770 ../calendar/gui/e-day-view.c:1123
-#: ../calendar/gui/e-week-view.c:511 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:789 ../calendar/gui/e-week-view.c:524
+#: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "পূর্বাহ্ন"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:773 ../calendar/gui/e-day-view.c:1126
-#: ../calendar/gui/e-week-view.c:514 ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:792 ../calendar/gui/e-week-view.c:527
+#: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "অপরাহ্ন"
 
-#: ../calendar/gui/e-itip-control.c:769
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "হ্যাঁ।  (কমপ্লেক্স রেকারেন্স)"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d day/days"
-#. For Translators : 'Every day' is event Recurring every day
-#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
-msgstr[0] "প্রতি %d দিন"
+msgstr[0] "প্রতিদিন"
+msgstr[1] "প্রতি %d দিন"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d week/weeks"
-#. For Translators : 'Every week' is event Recurring every week
-#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
 #: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
-msgstr[0] "প্রতি %d সপ্তাহে"
+msgstr[0] "প্রতি সপ্তাহে"
+msgstr[1] "প্রতি %d সপ্তাহে"
 
-#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
-#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:799
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
-msgstr[0] "প্রতি  %d সপ্তাহের"
+msgstr[0] "প্রতি  সপ্তাহের"
+msgstr[1] "প্রতি  %d সপ্তাহের"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " এবং "
 
-#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "এর %s দিন "
 
-#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
-#. eg,third monday of every month
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr " %s %s এর"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d month/months"
-#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
-#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
-#. %d is a digit
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
-msgstr[0] "প্রতি %d মাস"
+msgstr[0] "প্রতি মাস"
+msgstr[1] "প্রতি %d মাস"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d year/years"
-#. For Translators : 'Every year' is event Recurring every year
-#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:853
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
-msgstr[0] "প্রতি %d বছর"
+msgstr[0] "প্রতি বছর"
+msgstr[1] "প্রতি %d বছর"
 
-#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
-#. 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
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "সর্বমোট %d বার"
+msgstr[1] "সর্বমোট %d বার"
 
 #. 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:876
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", এ সমাপ্ত হচ্ছে "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:898
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "আরম্ভ হচ্ছে"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:912
+#: ../calendar/gui/e-itip-control.c:921
 msgid "Ends"
 msgstr "সমাপ্ত হচ্ছে"
 
-#: ../calendar/gui/e-itip-control.c:946
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../calendar/gui/e-itip-control.c:961
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Due"
 msgstr "দেয়"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1043
+#: ../calendar/gui/e-itip-control.c:1003 ../calendar/gui/e-itip-control.c:1060
 msgid "iCalendar Information"
 msgstr "iCalendar সংক্রান্ত তথ্য"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1003
+#: ../calendar/gui/e-itip-control.c:1020
 msgid "iCalendar Error"
 msgstr "iCalendar সংক্রান্ত ত্রুটি"
 
-#: ../calendar/gui/e-itip-control.c:1075 ../calendar/gui/e-itip-control.c:1091
-#: ../calendar/gui/e-itip-control.c:1102 ../calendar/gui/e-itip-control.c:1119
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:348
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:436
-#: ../plugins/itip-formatter/itip-view.c:523
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../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 "একজন অজানা ব্যক্তি"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1126
+#: ../calendar/gui/e-itip-control.c:1143
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7416,288 +7830,288 @@ msgstr ""
 "<br>অনুগ্রহ করে নিম্নলিখিত তথ্যটি পুনরায় দর্শন করুন, এবং নীচের মেনু থেকে একটি কর্ম "
 "নির্বাচন করুন।"
 
-#: ../calendar/gui/e-itip-control.c:1174
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/itip-utils.c:728
+#: ../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 "গ্রহণ করা হয়েছে"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
+#: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
 #: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "পরীক্ষার্থে গ্রহণ করা হয়েছে"
 
-#: ../calendar/gui/e-itip-control.c:1182
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../calendar/gui/itip-utils.c:734 ../calendar/gui/itip-utils.c:763
+#: ../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 "প্রত্যাখ্যান করুন"
 
-#: ../calendar/gui/e-itip-control.c:1266
+#: ../calendar/gui/e-itip-control.c:1283
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "সভাটি বাতিল করা হলেও এটি আপনার বর্যপঞ্জিতে খুঁজে পাওয়া যায়নি।"
 
-#: ../calendar/gui/e-itip-control.c:1268
+#: ../calendar/gui/e-itip-control.c:1285
 msgid "The task has been canceled, however it could not be found in your task lists"
 msgstr "কাজটি বাতিল করা হলেও এটি আপনার কর্মতালিকায় খুঁজে পাওয়া যায়নি।"
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1363
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> সভার তথ্য প্রকাশ করেছে।"
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1364
 msgid "Meeting Information"
 msgstr "সভার তথ্য"
 
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../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> %s কে সভায় উপস্থিত থাকতে অনুরোধ করেছে।"
 
-#: ../calendar/gui/e-itip-control.c:1355
+#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> সভায় আপনার উপস্থিতি অনুরোধ করেছেন।"
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Proposal"
 msgstr "সভার প্রস্তাব"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../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> বিদ্যমান সভায় যোগ করতে ইচ্ছুক।"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Update"
 msgstr "সভার আপডেট"
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1384
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> সর্বশেষ সভার তথ্য পেতে ইচ্ছুক।"
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1385
 msgid "Meeting Update Request"
 msgstr "সভার আপডেটের অনুরোধ"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1392
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> সভার অনুরোধের উত্তর দিয়েছেন।"
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1393
 msgid "Meeting Reply"
 msgstr "সভার উত্তর"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> সভা বাতিল করেছেন।"
 
-#: ../calendar/gui/e-itip-control.c:1384
+#: ../calendar/gui/e-itip-control.c:1401
 msgid "Meeting Cancelation"
 msgstr "সভার বিলোপন"
 
-#: ../calendar/gui/e-itip-control.c:1394 ../calendar/gui/e-itip-control.c:1471
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../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> একটি অবোধ্য বার্তা পাঠিয়েছেন।"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Bad Meeting Message"
 msgstr "সভার বার্তা ভুল"
 
-#: ../calendar/gui/e-itip-control.c:1422
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> কাজের তথ্য প্রকাশ করেছেন।"
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Information"
 msgstr "কাজের তথ্য"
 
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1447
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> %s কে একটি কাজ করতে অনুরোধ করেছেন।"
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> আপনাকে একটি কাজ করতে অনুরোধ করেছেন।"
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Proposal"
 msgstr "কাজের প্রস্তাব"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../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> উপস্থিত কাজে যোগ করতে ইচ্ছুক।"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Update"
 msgstr "কাজের আপডেট"
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> সর্বশেষ কাজের তথ্য পেতে ইচ্ছুক।"
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
 msgstr "কাজ আপডেটের অনুরোধ"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1469
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> একটি কর্ম-নির্ধারণের উত্তর দিয়েছেন।"
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1470
 msgid "Task Reply"
 msgstr "কাজে উত্তর"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> একটি কাজ বাতিল করেছেন।"
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Task Cancelation"
 msgstr "কর্ম বিলোপন করা হয়েছে"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1489
 msgid "Bad Task Message"
 msgstr "বাজে কাজের বার্তা"
 
-#: ../calendar/gui/e-itip-control.c:1496
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> একটি মুক্ত/ব্যস্ত তথ্য প্রকাশ করেছেন।"
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Information"
 msgstr "মুক্ত/ব্যস্ত তথ্য"
 
-#: ../calendar/gui/e-itip-control.c:1501
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> আপনার মুক্ত/ব্যস্ত তথ্য জানতে অনুরোধ করেছেন।"
 
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Free/Busy Request"
 msgstr "মুক্ত/ব্যস্ত অনুরোধ"
 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1523
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> একটি মুক্ত/ব্যস্ত অনুরোধের উত্তর দিয়েছেন।"
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1524
 msgid "Free/Busy Reply"
 msgstr "মুক্ত/ব্যস্ত উত্তর"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1529
 msgid "Bad Free/Busy Message"
 msgstr "বাজে মুক্ত/ব্যস্ত বার্তা"
 
-#: ../calendar/gui/e-itip-control.c:1588
+#: ../calendar/gui/e-itip-control.c:1605
 msgid "The message does not appear to be properly formed"
 msgstr "এই বার্তাটি সঠিকভাবে গঠন করা হয়নি"
 
-#: ../calendar/gui/e-itip-control.c:1647
+#: ../calendar/gui/e-itip-control.c:1664
 msgid "The message contains only unsupported requests."
 msgstr "এই তথ্যে শুধুমাত্র অসমর্থিত অনুরোধ অন্তর্ভুক্ত আছে।"
 
-#: ../calendar/gui/e-itip-control.c:1680
+#: ../calendar/gui/e-itip-control.c:1697
 msgid "The attachment does not contain a valid calendar message"
 msgstr "সংযুক্ত বস্তুটিতে কোনো বৈধ বর্ষপঞ্জির বার্তা অন্তর্ভুক্ত নেই"
 
-#: ../calendar/gui/e-itip-control.c:1712
+#: ../calendar/gui/e-itip-control.c:1735
 msgid "The attachment has no viewable calendar items"
 msgstr "এই সংযুক্ত বস্তুতে কোনো দর্শণীয় বর্ষপঞ্জির বস্তুসমূহ উপস্থিত নেই নেই"
 
-#: ../calendar/gui/e-itip-control.c:1957
+#: ../calendar/gui/e-itip-control.c:1980
 msgid "Update complete\n"
 msgstr "আপডেট সম্পন্ন হয়েছে\n"
 
-#: ../calendar/gui/e-itip-control.c:1991
+#: ../calendar/gui/e-itip-control.c:2014
 msgid "Object is invalid and cannot be updated\n"
 msgstr "অবজেক্টটি বৈধ নয় এবং আপডেট করা সম্ভব নয়\n"
 
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2031
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "বর্তমানে উপস্থিত কোনো অংশগ্রহণকারীর থেকে এই প্রত্যূত্তরটি আসে নি।  নতুন অংশগ্রহণকারী "
 "হিসাবে যোগ করা হবে কি?"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2049
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "অবৈধ মান হওয়ার দরুন অংশগ্রহনকারীর অবস্থা আপডেট করা সম্ভব হয়নি!\n"
 
-#: ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2073
 msgid "Attendee status updated\n"
 msgstr "অংশগ্রহণকারীর অবস্থা আপডেট করা হচ্ছে\n"
 
-#: ../calendar/gui/e-itip-control.c:2057
-#: ../plugins/itip-formatter/itip-formatter.c:1251
+#: ../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 "অংশগ্রহণকারীর অবস্থা আপডেট করা সম্ভব হয়নি কারন বস্তুটির আর অস্তিত্ব নেই"
 
-#: ../calendar/gui/e-itip-control.c:2088 ../calendar/gui/e-itip-control.c:2145
+#: ../calendar/gui/e-itip-control.c:2111 ../calendar/gui/e-itip-control.c:2168
 msgid "Item sent!\n"
 msgstr "বস্তু প্রেরিত হয়েছে!\n"
 
-#: ../calendar/gui/e-itip-control.c:2094 ../calendar/gui/e-itip-control.c:2153
+#: ../calendar/gui/e-itip-control.c:2117 ../calendar/gui/e-itip-control.c:2176
 msgid "The item could not be sent!\n"
 msgstr "বস্তুটি প্রেরণ করা সম্ভব হয়নি!\n"
 
-#: ../calendar/gui/e-itip-control.c:2233
+#: ../calendar/gui/e-itip-control.c:2256
 msgid "Choose an action:"
 msgstr "কাজ নির্বাচন করুন:"
 
-#: ../calendar/gui/e-itip-control.c:2304
+#: ../calendar/gui/e-itip-control.c:2327
 msgid "Update"
 msgstr "আপডেট করুন"
 
-#: ../calendar/gui/e-itip-control.c:2332
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "গ্রহণ করুন"
 
-#: ../calendar/gui/e-itip-control.c:2333
+#: ../calendar/gui/e-itip-control.c:2356
 msgid "Tentatively accept"
 msgstr "পরীক্ষার্থে গ্রহণ করুন"
 
-#: ../calendar/gui/e-itip-control.c:2334
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../calendar/gui/e-itip-control.c:2357
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "প্রত্যাখ্যান করুন"
 
-#: ../calendar/gui/e-itip-control.c:2363
+#: ../calendar/gui/e-itip-control.c:2386
 msgid "Send Free/Busy Information"
 msgstr "মুক্ত/ব্যস্ত তথ্য পাঠানো হবে"
 
-#: ../calendar/gui/e-itip-control.c:2391
+#: ../calendar/gui/e-itip-control.c:2414
 msgid "Update respondent status"
 msgstr "প্রত্যুত্তকারীর অবস্থা আপডেট করুন"
 
-#: ../calendar/gui/e-itip-control.c:2419
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "সর্বশেষ তথ্য পাঠানো হবে"
 
-#: ../calendar/gui/e-itip-control.c:2447 ../calendar/gui/itip-utils.c:751
+#: ../calendar/gui/e-itip-control.c:2470 ../calendar/gui/itip-utils.c:687
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "বাতিল করুন"
@@ -7726,112 +8140,112 @@ msgstr "বর্ষপঞ্জি লোড করা হচ্ছে..."
 msgid "Server Message:"
 msgstr "সার্ভারের বার্তা:"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Chair Persons"
 msgstr "সভাপতি"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Required Participants"
 msgstr "আবশ্যক অংশগ্রহনকারী"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Optional Participants"
 msgstr "ঐচ্ছিক অংশগ্রহণকারীরা"
 
-#: ../calendar/gui/e-meeting-list-view.c:73
+#: ../calendar/gui/e-meeting-list-view.c:71
 msgid "Resources"
 msgstr "রিসোর্সসমূহ"
 
-#: ../calendar/gui/e-meeting-list-view.c:154
+#: ../calendar/gui/e-meeting-list-view.c:152
 msgid "Attendees"
 msgstr "অংশগ্রহণকারীবৃন্দ"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:965
+#: ../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:981
 msgid "Individual"
 msgstr "ব্যক্তিবিশেষ"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
+#: ../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:982 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "দল"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
-#: ../calendar/gui/print.c:967
+#: ../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:983
 msgid "Resource"
 msgstr "রিসোর্স"
 
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/print.c:968
+#: ../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:984
 msgid "Room"
 msgstr "ঘর"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:982
+#: ../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:998
 msgid "Chair"
 msgstr "চেয়ার"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/e-meeting-store.c:746 ../calendar/gui/print.c:983
+#: ../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:999
 msgid "Required Participant"
 msgstr "আবশ্যক অংশগ্রহণকারী"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/print.c:984
+#: ../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:1000
 msgid "Optional Participant"
 msgstr "ঐচ্ছিক অংশগ্রহণকারী"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/print.c:985
+#: ../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:1001
 msgid "Non-Participant"
 msgstr "অংশগ্রহণকারী নয়"
 
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:756
+#: ../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 "কর্ম প্রয়েজন"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../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:397
 msgid "Tentative"
 msgstr "অস্থযায়ীরূপে"
 
-#: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../calendar/gui/itip-utils.c:737
+#: ../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 "বন্টন করা হয়েছে"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:484
+#: ../calendar/gui/e-meeting-list-view.c:491
 msgid "Attendee                          "
 msgstr "অংশগ্রহনকারী                          "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:526
+#: ../calendar/gui/e-meeting-list-view.c:533
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "আর-এস-ভি-পি"
 
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
 msgid "In Process"
 msgstr "প্রসেস করা হচ্ছে"
 
 #. 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:464
-#: ../calendar/gui/e-meeting-time-sel.c:2137
+#: ../calendar/gui/e-meeting-time-sel-item.c:467
+#: ../calendar/gui/e-meeting-time-sel.c:2122
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7839,85 +8253,81 @@ msgstr "%A, %B %d, %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:468
-#: ../calendar/gui/e-meeting-time-sel.c:2168
+#: ../calendar/gui/e-meeting-time-sel-item.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:2153
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:472
+#: ../calendar/gui/e-meeting-time-sel-item.c:475
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:399
 msgid "Out of Office"
 msgstr "অফিসে উপস্থিত নেই"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:400
 msgid "No Information"
 msgstr "কোনো তথ্য নেই"
 
-#: ../calendar/gui/e-meeting-time-sel.c:430
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "A_ttendees..."
 msgstr "অংশগ্রহণকারীবৃন্দ...(_t)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:451
+#: ../calendar/gui/e-meeting-time-sel.c:436
 msgid "O_ptions"
 msgstr "বিকল্প (_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:453
 msgid "Show _only working hours"
 msgstr "শুধুমাত্র কাজের ঘন্টা প্রদর্শন করা হবে (_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:463
 msgid "Show _zoomed out"
 msgstr "ছোট করে প্রদর্শন করা হবে(_z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "_Update free/busy"
 msgstr "মুক্ত/ ব্যস্ত অবস্থা আপডেট করা হবে (_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:508
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:511
 msgid "_Autopick"
 msgstr "অটোপিক (_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:541
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:558
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "_All people and resources"
 msgstr "সকল ব্যক্তি এবং রিসোর্সসমূহ (_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:567
+#: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "All _people and one resource"
 msgstr "সকল ব্যক্তি এবং একটি রিসোর্স (_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:576
+#: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "_Required people"
 msgstr "আবশ্যক ব্যক্তি (_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "Required people and _one resource"
 msgstr "আবশ্যক ব্যক্তি এবং একটি রিসোর্স (_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:606
 msgid "_Start time:"
 msgstr "আরম্ভের সময় (_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:648
+#: ../calendar/gui/e-meeting-time-sel.c:633
 msgid "_End time:"
 msgstr "সমাপ্তির সময় (_E):"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "অংশগ্রহণকারী"
-
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 msgid "Click here to add an attendee"
 msgstr "এইখানে ক্লিক করে অংশগ্রহণকারী যোগ করুন"
@@ -7950,8 +8360,8 @@ msgstr "নির্বাচিত কর্মসূচী মুছে ফে
 msgid "Click to add a memo"
 msgstr "কর্মসূচী যোগ করতে ক্লিক করুন"
 
-#: ../calendar/gui/e-memos.c:791 ../calendar/gui/e-tasks.c:923
-#: ../calendar/gui/gnome-cal.c:2871
+#: ../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"
@@ -7960,85 +8370,80 @@ msgstr ""
 "%s-এ ত্রুটি:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:840
+#: ../calendar/gui/e-memos.c:809
 msgid "Loading memos"
 msgstr "কর্মসূচী লোড করা হচ্ছে"
 
-#: ../calendar/gui/e-memos.c:921
+#: ../calendar/gui/e-memos.c:890
 #, c-format
 msgid "Opening memos at %s"
 msgstr "%s -এ উপস্থিত কর্মসূচী খোলা হচ্ছে"
 
-#: ../calendar/gui/e-memos.c:1094 ../calendar/gui/e-tasks.c:1334
+#: ../calendar/gui/e-memos.c:1062 ../calendar/gui/e-tasks.c:1321
 msgid "Deleting selected objects..."
 msgstr "নির্বাচিত অবজেক্ট মোছা হচ্ছে..."
 
-#: ../calendar/gui/e-tasks.c:976
+#: ../calendar/gui/e-tasks.c:963
 msgid "Loading tasks"
 msgstr "কাজ লোড করা হচ্ছে"
 
-#: ../calendar/gui/e-tasks.c:1066
+#: ../calendar/gui/e-tasks.c:1053
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s -এ কাজ খোলো"
 
-#: ../calendar/gui/e-tasks.c:1311
+#: ../calendar/gui/e-tasks.c:1298
 msgid "Completing tasks..."
 msgstr "কর্ম সম্পন্ন করা হচ্ছে..."
 
-#: ../calendar/gui/e-tasks.c:1361
+#: ../calendar/gui/e-tasks.c:1348
 msgid "Expunging"
 msgstr "এক্সপাঞ্জ করা হচ্ছে"
 
-#: ../calendar/gui/e-timezone-entry.c:135
+#: ../calendar/gui/e-timezone-entry.c:129
 msgid "Select Timezone"
 msgstr "সময়ের অঞ্চল নির্বাচন করুন"
 
 #. 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:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1637
+#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1653
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:828
-msgid "Updating query"
-msgstr "কোয়েরি আপডেট করা হচ্ছে"
-
-#: ../calendar/gui/gnome-cal.c:2508
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "স্বনির্বাচিত প্রদর্শনক্ষেত্র(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2509
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "স্বনির্বাচিত প্রদর্শনক্ষেত্র সংরক্ষণ করুন(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2514
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
 msgstr "প্রদর্শনক্ষেত্র নির্ধারণ করুন...(_D)"
 
-#: ../calendar/gui/gnome-cal.c:2695
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s-এর সাক্ষাৎকার লোড করা হচ্ছে"
 
-#: ../calendar/gui/gnome-cal.c:2714
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s-এর কাজ লোড করা হচ্ছে"
 
-#: ../calendar/gui/gnome-cal.c:2723
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "%s'র কর্মসূচী লোড করা হচ্ছে"
 
-#: ../calendar/gui/gnome-cal.c:2830
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "%s খোলা হচ্ছে"
 
-#: ../calendar/gui/gnome-cal.c:3787
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "মুছে ফেলা হচ্ছে"
 
@@ -8098,57 +8503,57 @@ msgstr "সেপ্টেম্বর"
 msgid "_Select Today"
 msgstr "আজকের তারিখ নির্বাচন করুন (_S)"
 
-#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
-#: ../calendar/gui/itip-utils.c:604
+#: ../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 "একটি সংগঠক নির্ধারণ করতে হবে।"
 
-#: ../calendar/gui/itip-utils.c:485
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "অন্তত একজন অংশগ্রহণকারী আবশ্যক"
 
-#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
+#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:741
 msgid "Event information"
 msgstr "ঘটনার তথ্য"
 
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:744
 msgid "Task information"
 msgstr "কাজের তথ্য"
 
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:747
 msgid "Memo information"
 msgstr "মেমো সংক্রান্ত তথ্য"
 
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:765
 msgid "Free/Busy information"
 msgstr "মুক্ত/ব্যস্ত তথ্য"
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:634
 msgid "Calendar information"
 msgstr "বর্ষপঞ্জির তথ্য"
 
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:683
 msgid "Updated"
 msgstr "আপডেট করা হয়েছে"
 
-#: ../calendar/gui/itip-utils.c:755
+#: ../calendar/gui/itip-utils.c:691
 msgid "Refresh"
 msgstr "নতুন করে প্রদর্শন"
 
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:695
 msgid "Counter-proposal"
 msgstr "বিপরীত-প্রস্তাব"
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:762
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "মুক্ত/ব্যস্ত তথ্য (%s to %s)"
 
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:770
 msgid "iCalendar information"
 msgstr "iCalendar সংক্রান্ত তথ্য"
 
-#: ../calendar/gui/itip-utils.c:1009
+#: ../calendar/gui/itip-utils.c:941
 msgid "You must be an attendee of the event."
 msgstr "অনুষ্ঠানে আপনার উপস্থিতি আবশ্যক।"
 
@@ -8161,12 +8566,14 @@ msgstr "নতুন কর্মসূচী (_N)"
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d কর্মসূচী"
+msgstr[1] "%d কর্মসূচী"
 
 #: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ",%d টি নির্বাচিত"
+msgstr[1] ",%d টি নির্বাচিত"
 
 #: ../calendar/gui/memos-component.c:593
 msgid "Failed upgrading memos."
@@ -8185,47 +8592,54 @@ msgstr "কর্মসূচী তৈরি করার জন্য কো�
 msgid "Memo Source Selector"
 msgstr "কর্মসূচী উৎ‌স নির্বাচক"
 
-#: ../calendar/gui/memos-component.c:1259
+#: ../calendar/gui/memos-component.c:1260
 msgid "New memo"
 msgstr "নতুন কর্মসূচী"
 
-#: ../calendar/gui/memos-component.c:1260
+#: ../calendar/gui/memos-component.c:1261
+msgctxt "New"
 msgid "Mem_o"
-msgstr "কর্মসূচী (_o)"
+msgstr "মেমো (_o)"
 
-#: ../calendar/gui/memos-component.c:1261
+#: ../calendar/gui/memos-component.c:1262
 msgid "Create a new memo"
 msgstr "নতুন কর্মসূচী নির্মাণ করুন"
 
-#: ../calendar/gui/memos-component.c:1267
+#: ../calendar/gui/memos-component.c:1268
 msgid "New shared memo"
 msgstr "নতুন যৌথ কর্মসূচী"
 
-#: ../calendar/gui/memos-component.c:1268
+#: ../calendar/gui/memos-component.c:1269
+msgctxt "New"
 msgid "_Shared memo"
-msgstr "যৌথ কর্মসূচী (_S)"
+msgstr "যৌথ মেমো (_S)"
 
-#: ../calendar/gui/memos-component.c:1269
+#: ../calendar/gui/memos-component.c:1270
 msgid "Create a shared new memo"
 msgstr "নতুন যৌথ কর্মসূচী নির্মাণ করুন"
 
-#: ../calendar/gui/memos-component.c:1275
+#: ../calendar/gui/memos-component.c:1276
 msgid "New memo list"
 msgstr "নতুন কর্মসূচীর তালিকা"
 
-#: ../calendar/gui/memos-component.c:1276
+#: ../calendar/gui/memos-component.c:1277
+msgctxt "New"
 msgid "Memo li_st"
-msgstr "কর্ম সূচীর তালিকা (_s)"
+msgstr "মেমোর তালিকা (_s)"
 
-#: ../calendar/gui/memos-component.c:1277
+#: ../calendar/gui/memos-component.c:1278
 msgid "Create a new memo list"
 msgstr "একটি নতুন কর্মসূচীর তালিকা তৈরি করুন"
 
-#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
 msgstr "কর্মসূচী প্রিন্ট করুন"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/memotypes.xml.h:25
+msgid "Next 7 Days"
+msgstr "পরবর্তী ৭ দিন"
+
+#: ../calendar/gui/migration.c:157
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8237,7 +8651,7 @@ msgstr ""
 "\n"
 "Evolution আপনার ফোল্ডার মাইগ্রেট করছে অনুগ্রহ করে অপেক্ষা করুন..."
 
-#: ../calendar/gui/migration.c:168
+#: ../calendar/gui/migration.c:161
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8250,27 +8664,27 @@ msgstr ""
 "Evolution আপনার ফোল্ডার মাইগ্রেট করছে অনুগ্রহ করে অপেক্ষা করুন..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:781 ../calendar/gui/migration.c:949
+#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "evolution/config.xmldb থেকে পুরোনো বৈশিষ্ট্যাবলী পড়া সম্ভব হয়নি"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:810
+#: ../calendar/gui/migration.c:804
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "`%s' বর্ষপঞ্জিটি মাইগ্রেট করা সম্ভব হয়নি"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:978
+#: ../calendar/gui/migration.c:972
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "`%s' কর্মটি মাইগ্রেট করা সম্ভব হয়নি"
 
 #: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
+#: ../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 "নোট"
 
@@ -8427,57 +8841,52 @@ msgstr "শুক্র"
 msgid "Sa"
 msgstr "শনি"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2472
 msgid "Appointment"
 msgstr "সাক্ষাৎকার"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2474
 msgid "Task"
 msgstr "কাজ"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2499
 #, c-format
 msgid "Summary: %s"
 msgstr "সারাংশ: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2522
 msgid "Attendees: "
 msgstr "অংশগ্রহণকারী: "
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2562
 #, c-format
 msgid "Status: %s"
 msgstr "অবস্থা: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2579
 #, c-format
 msgid "Priority: %s"
 msgstr "প্রাধান্য: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "শতাংশ সম্পন্ন : %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2603
 #, c-format
 msgid "URL: %s"
 msgstr "ইউ-আর-এল: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2616
 #, c-format
 msgid "Categories: %s"
 msgstr "শ্রেণীসমূহ: %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2627
 msgid "Contacts: "
 msgstr "পরিচিতি: "
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
-msgid "Upcoming Appointments"
-msgstr "নিকটবর্তী সাক্ষাৎকার"
-
 #: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "নতুন কার্য-তালিকা(_N)"
@@ -8486,7 +8895,8 @@ msgstr "নতুন কার্য-তালিকা(_N)"
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
-msgstr[0] "%d টি কর্ম"
+msgstr[0] "%d-টি কর্ম"
+msgstr[1] "%d-টি কর্ম"
 
 #: ../calendar/gui/tasks-component.c:584
 msgid "Failed upgrading tasks."
@@ -8505,39 +8915,46 @@ msgstr "কর্ম তৈরি করার জন্য কোনো বর�
 msgid "Task Source Selector"
 msgstr "কর্মের উৎ‌স নির্বাচক"
 
-#: ../calendar/gui/tasks-component.c:1321
+#: ../calendar/gui/tasks-component.c:1325
 msgid "New task"
 msgstr "নতুন কাজ"
 
-#: ../calendar/gui/tasks-component.c:1323
+#: ../calendar/gui/tasks-component.c:1326
+msgctxt "New"
+msgid "_Task"
+msgstr "কাজ (_T)"
+
+#: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "একটি নতুন কাজ তৈরি করুন"
 
-#: ../calendar/gui/tasks-component.c:1329
+#: ../calendar/gui/tasks-component.c:1333
 msgid "New assigned task"
 msgstr "নতুন কর্ম যা বরাদ্দ করা হয়েছে"
 
-#: ../calendar/gui/tasks-component.c:1330
+#: ../calendar/gui/tasks-component.c:1334
+msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "বরাদ্দ কর্ম (_d)"
 
-#: ../calendar/gui/tasks-component.c:1331
+#: ../calendar/gui/tasks-component.c:1335
 msgid "Create a new assigned task"
 msgstr "একটি নতুন বরাদ্দ কর্ম তৈরি করুন"
 
-#: ../calendar/gui/tasks-component.c:1337
+#: ../calendar/gui/tasks-component.c:1341
 msgid "New task list"
 msgstr "নতুন কার্য তালিকা"
 
-#: ../calendar/gui/tasks-component.c:1338
+#: ../calendar/gui/tasks-component.c:1342
+msgctxt "New"
 msgid "Tas_k list"
 msgstr "কার্য-তালিকা (_k)"
 
-#: ../calendar/gui/tasks-component.c:1339
+#: ../calendar/gui/tasks-component.c:1343
 msgid "Create a new task list"
 msgstr "একটি নতুন কার্য-তালিকা তৈরি করুন"
 
-#: ../calendar/gui/tasks-control.c:455
+#: ../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"
@@ -8549,1661 +8966,1894 @@ msgstr ""
 "\n"
 "সত্যি-ই কাজগুলি মুছে দেবো?"
 
-#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1132
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "আমাকে পুনরায় জিঞ্জাসা করবে না।"
 
-#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
+#: ../calendar/gui/tasks-control.c:492 ../calendar/gui/tasks-control.c:508
 msgid "Print Tasks"
 msgstr "কর্ম প্রিন্ট করুন"
 
-#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/gui/tasktypes.xml.h:2
+#, no-c-format
+msgid "% Completed"
+msgstr "% সম্পন্ন"
+
+#: ../calendar/gui/tasktypes.xml.h:10
+msgid "Cancelled"
+msgstr "বাতিল করা হয়েছে"
+
+#: ../calendar/gui/tasktypes.xml.h:26
+msgid "In progress"
+msgstr "চলছে"
+
+#: ../calendar/gui/tasktypes.xml.h:50 ../mail/em-filter-i18n.h:34
+msgid "is greater than"
+msgstr "থেকে বেশি"
+
+#: ../calendar/gui/tasktypes.xml.h:51 ../mail/em-filter-i18n.h:35
+msgid "is less than"
+msgstr "থেকে কম"
+
+#: ../calendar/importers/icalendar-importer.c:73
 msgid "Appointments and Meetings"
 msgstr "সাক্ষাৎকার এবং সভা"
 
-#: ../calendar/importers/icalendar-importer.c:337
-#: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1580
+#: ../calendar/importers/icalendar-importer.c:331
+#: ../calendar/importers/icalendar-importer.c:614
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "বর্ষপঞ্জি খোলা হচ্ছে"
 
-#: ../calendar/importers/icalendar-importer.c:444
+#: ../calendar/importers/icalendar-importer.c:438
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar-র ফাইল(.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:445
+#: ../calendar/importers/icalendar-importer.c:439
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar importer"
 
-#: ../calendar/importers/icalendar-importer.c:521
+#: ../calendar/importers/icalendar-importer.c:515
 msgid "Reminder!"
 msgstr "তাগাদা!"
 
-#: ../calendar/importers/icalendar-importer.c:573
+#: ../calendar/importers/icalendar-importer.c:567
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar-র ফাইল(.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:574
+#: ../calendar/importers/icalendar-importer.c:568
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar importer"
 
-#: ../calendar/importers/icalendar-importer.c:736
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "Calendar Events"
 msgstr "বর্ষপঞ্জির ঘটনাসমূহ"
 
-#: ../calendar/importers/icalendar-importer.c:773
+#: ../calendar/importers/icalendar-importer.c:767
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution বর্ষপঞ্জি বুদ্ধিমান ইম্পোর্টকারী"
 
 #.
+#. *
+#. * 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)
+#. *
+#.
+#.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: ../calendar/zones.h:7
+#: ../calendar/zones.h:26
 msgid "Africa/Abidjan"
 msgstr "আফ্রিকা/আবিদজান"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "আফ্রিকা/আক্রা"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "আফ্রিকা/আডিস আবাবা"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
 msgstr "আফ্রিকা/আলজিয়ারস্‌"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "আফ্রিকা/আসমেরা"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "আফ্রিকা/বামাকো"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "আফ্রিকা/বাঁগুই"
 
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
 msgstr "আফ্রিকা/বানজুল"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "আফ্রিকা/বিসাউ"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "আফ্রিকা/ব্ল্যানটায়ার"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "আফ্রিকা/ব্রাজাভিল"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "আফ্রিকা/বুজুমবুরা"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "আফ্রিকা/কায়রো"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "আফ্রিকা/ক্যাসাব্ল্যান্কা"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "আফ্রিকা/সিউটা"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "আফ্রিকা/কোনাক্রি"
 
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
 msgid "Africa/Dakar"
 msgstr "আফ্রিকা/ডাকার"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr "আফ্রিকা/ডার-এস-সালাম"
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "আফ্রিকা/জিবাউটি"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "আফ্রিকা/ডৌলা"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "আফ্রিকা/এল-আইউন"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "আফ্রিকা/ফ্রিটাউন"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "আফ্রিকা/গ্যাবোরোন"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "আফ্রিকা/হারারে"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "আফ্রিকা/জোহানেসবার্গ"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "আফ্রিকা/কাম্পালা"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
 msgstr "আফ্রিকা/খার্টোউম"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "আফ্রিকা/কিগালি"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "আফ্রিকা/কিনশাসা"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "আফ্রিকা/লাগোস"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "আফ্রিকা/লিবরেভিল"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "আফ্রিকা/লোম"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "আফ্রিকা/লুয়ান্ডা"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "আফ্রিকা/লুবুমবাসি"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "আফ্রিকা/লুসাকা"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "আফ্রিকা/ম্যালাবো"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "আফ্রিকা/মাপুটো"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "আফ্রিকা/মাসেরু"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "আফ্রিকা/মবাবেন"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
 msgstr "আফ্রিকা/মোগাদিশু"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "আফ্রিকা/মনরোভিয়া"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "আফ্রিকা/নাইরোবি"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "আফ্রিকা/এনডিজামেনা"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "আফ্রিকা/নিয়ামি"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "আফ্রিকা/নৌয়াকছোট"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "আফ্রিকা/উগাডৌগৌ"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "আফ্রিকা/পোর্টো-নোভো"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr "আফ্রিকা/সাও_টোম"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "আফ্রিকা/টিমবাক্টু"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
 msgstr "আফ্রিকা/ত্রিপোলি"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "আফ্রিকা/টিউনিস"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "আফ্রিকা/উইন্ডহোক"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr "আমেরিকা/আদাক"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr "আমেরিকা/এনকোরাজে"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "আমেরিকা/আনগুইলা"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "আমেরিকা/এন্টিগা"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr "আমেরিকা/এরাগুয়েনা"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "আমেরিকা/আরুবা"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "আমেরিকা/এসানসিয়ন"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "আমেরিকা/বার্বাডোজ"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "আমেরিকা/বেলেম"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "আমেরিকা/বেলিজে"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "আমেরিকা/বোয়া_ভিস্টা"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "আমেরিকা/বোগোটা"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "আমেরিকা/বোইসে"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "আমেরিকা/বুয়েনেস_এয়ার্স"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr "আমেরিকা/কেমব্রিজ_বে"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "আমেরিকা/ক্যানকুন"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "আমেরিকা/ক্যারাক্যাস"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr "আমেরিকা/ক্যাটাম্যারকা"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr "আমেরিকা/কেইন"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr "আমেরিকা/কেম্যান"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "আমেরিকা/শিকাগো"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "আমেরিকা/চিহুয়াহুয়া"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "আমেরিকা/কর্ডোবা"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "আমেরিকা/কোস্টা_রিকা"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "আমেরিকা/কুইয়াবা"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr "আমেরিকা/কুরাকাও"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr "আমেরিকা/ড্যানমার্কস্যাভন"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "আমেরিকা/ডসন"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "আমেরিকা/ডসন_ক্রীক"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "আমেরিকা/ডেনভার"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "আমেরিকা/ডেট্রয়েট"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "আমেরিকা/ডোমিনিকা"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "আমেরিকা/এডমনটন"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr "আমেরিকা/এইরুনেপি"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "আমেরিকা/এল_সালভাদোর"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "আমেরিকা/ফোর্টালিজা"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "আমেরিকা/গ্লেস_বে"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr "আমেরিকা/গডথ্যাব"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "আমেরিকা/গুস_বে"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr "আমেরিকা/গ্র্যান্ড_টার্ক"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "আমেরিকা/গ্রেনাডা"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr "আমেরিকা/গুয়াডেলুপে"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "আমেরিকা/গুয়াতেমালা"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "আমেরিকা/গুয়াইয়াকুইল"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "আমেরিকা/গায়ানা"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr "আমেরিকা/হ্যালিফ্যাক্স"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "আমেরিকা/হাভানা"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr "আমেরিকা/হার্মোসিলো"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "আমেরিকা/ইন্ডিয়ানা/ইন্ডিয়ানাপোলিস"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "আমেরিকা/ইন্ডিয়ানা/নক্স"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "আমেরিকা/ইন্ডিয়ানা/ম্যারেনগো"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "আমেরিকা/ইন্ডিয়ানা/ভিভে"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "আমেরিকা/ইন্ডিয়ানাপোলিস"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "আমেরিকা/ইনুভিক"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr "আমেরিকা/ইকালুইট"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "আমেরিকা/জামাইকা"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr "আমেরিকা/জুজুই"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr "আমেরিকা/জুনেই"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "আমেরিকা/কেনটুকি/লুইসভিল"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "আমেরিকা/কেনটুকি/মন্টিসিলো"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "আমেরিকা/লা_পাজ"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "আমেরিকা/লিমা"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
 msgstr "আমেরিকা/লস_এঞ্জেলস"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "আমেরিকা/লুইসভিল"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
 msgstr "আমেরিকা/ম্যাসিও"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "আমেরিকা/ম্যানাগুয়া"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "আমেরিকা/ম্যানাউস"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
 msgstr "আমেরিকা/মার্টিনিক"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr "আমেরিকা/মাজাতলান"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "আমেরিকা/মেনডোজা"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "আমেরিকা/মেনোমিনী"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
 msgstr "আমেরিকা/মেরিডা"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "আমেরিকা/মেক্সিকো_সিটি"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "আমেরিকা/মিকিউলন"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "আমেরিকা/মন্ট্যারি"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
 msgstr "আমেরিকা/মন্টিভিডিও"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "আমেরিকা/মন্ট্রিয়াল"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
 msgstr "আমেরিকা/মন্টসেরাত"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr "আমেরিকা/নাসাউ"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:157
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "আমেরিকা/নিউ_ইয়র্ক"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "আমেরিকা/নিপিগন"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "আমেরিকা/নোম"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr "আমেরিকা/নোরোনহা"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "আমেরিকা/উত্তর_ডাকোটা/সেন্টার"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "আমেরিকা/পানামা"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr "আমেরিকা/প্যাঙ্গনির্টাঙ্গ"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
 msgstr "আমেরিকা/প্যারাম্যারিবো"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "আমেরিকা/ফিনিক্স"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr "আমেরিকা/পোর্ট-এউ-প্রিন্স"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
 msgstr "আমেরিকা/পোর্ট_অফ_স্পেন"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
 msgstr "আমেরিকা/পোর্টো_ভেলহো"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
 msgstr "আমেরিকা/পুয়ের্টো_রিকো"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr "আমেরিকা/রেইনি_রিভার"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
 msgstr "আমেরিকা/রেনকিন_ইনলেট"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "আমেরিকা/রিসাইফে"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
 msgstr "আমেরিকা/রেজিনা"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "আমেরিকা/রিও_ব্র্যাঙ্কো"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr "আমেরিকা/রোসারিও"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "আমেরিকা/স্যান্টিয়াগো"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "আমেরিকা/স্যান্টো_ডোমিঙ্গো"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
 msgstr "আমেরিকা/সাও_পাওলো"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr "আমেরিকা/স্কোরসবাইসুন্দ"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr "আমেরিকা/সিপরক"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
 msgstr "আমেরিকা/সেন্ট_জনস্‌"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
 msgstr "আমেরিকা/সেন্ট_কিটস্‌"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "আমেরিকা/সেন্ট_লুসিয়া"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr "আমেরিকা/সেন্ট_থমাস"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr "আমেরিকা/সেন্ট_ভিনসেন্ট"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr "আমেরিকা/সুইফ্ট_কারেন্ট"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
 msgstr "আমেরিকা/তেগুসিয়াগাল্পা"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr "আমেরিকা/থুল্পে"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "আমেরিকা/থান্ডার_বে"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "আমেরিকা/তিজুয়ানা"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr "আমেরিকা/টর্টোলা"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "আমেরিকা/ভ্যাঙ্কুভার"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr "আমেরিকা/হোয়াইটহর্স"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr "আমেরিকা/উইন্নিপেগ"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr "আমেরিকা/ইয়াকুটাট"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr "আমেরিকা/ইয়েলোনাইফ"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr "অ্যান্টার্কটিকা/ক্যাসে"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "আন্টার্কটিকা/ডেভিস"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "আন্টার্কটিকা/ডিউমন্টড্যউর্ভিল"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "আন্টার্কটিকা/মসন"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "আন্টার্কটিকা/ম্যাকমার্ডো"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "আন্টার্কটিকা/পালমার"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "আন্টার্কটিকা/দক্ষিন_মেরু"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "আন্টার্কটিকা/সিওয়া"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "আন্টার্কটিকা/ভস্তক"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "আন্টার্কটিকা/লংইয়ারবিন"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "এশিয়া/এডেন"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
 msgstr "এশিয়া/আলমাটি"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "এশিয়া/আম্মান"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "এশিয়া/এনাডির"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "এশিয়া/অ্যাকটাউ"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "এশিয়া/অ্যাকটোবে"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "এশিয়া/অ্যাশগাবাট"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "এশিয়া/বাগদাদ"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "এশিয়া/বাহরেন"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "এশিয়া/বাকু"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "এশিয়া/ব্যাঙ্কক"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "এশিয়া/বেইরুট"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "এশিয়া/বিশকেক"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
 msgstr "এশিয়া/ব্রুনেই"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "এশিয়া/কলকাতা"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "এশিয়া/ছোইবালসান"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "এশিয়া/চোং-কিং"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "এশিয়া/কলোম্বো"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "এশিয়া/দামাস্কাস"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "এশিয়া/ঢাকা"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "এশিয়া/দিল্লি"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
 msgstr "এশিয়া/দুবাই"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "এশিয়া/দুশানবে"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "এশিয়া/গাজা"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "এশিয়া/হার্বিন"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
 msgstr "এশিয়া/হং_কং"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "এশিয়া/হভদ"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "এশিয়া/ইরকুটস্ক"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "এশিয়া/ইস্তানবুল"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "এশিয়া/জাকার্তা"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "এশিয়া/জয়াপুরা"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "এশিয়া/জেরুসেলাম"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "এশিয়া/কাবুল"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "এশিয়া/কামচাট্‌কা"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "এশিয়া/করাচি"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "এশিয়া/কাশগড়"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
 msgstr "এশিয়া/কাঠমান্ডু"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "এশিয়া/ক্র্যাশনোয়ারস্ক"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "এশিয়া/কুয়ালা_লামপুর"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "এশিয়া/কুচিং"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "এশিয়া/কুয়েত"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "এশিয়া/ম্যাকাও"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "এশিয়া/ম্যাকাউ"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "এশিয়া/ম্যাগাদান"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "এশিয়া/মাকাসসার"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "এশিয়া/ম্যানিলা"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "এশিয়া/মাসকেট"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "এশিয়া/নিকোসিয়া"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "এশিয়া/নোভোসিবার্স্ক"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "এশিয়া/ওমস্ক"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "এশিয়া/ওরাল"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "এশিয়া/নোম্‌_ফেন"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "এশিয়া/পন্টিয়ানাক"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "এশিয়া/পিয়ংইয়াং"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "এশিয়া/কাতার"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "এশিয়া/কিজিলর্ডা"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "এশিয়া/রেঙ্গুন"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "এশিয়া/রিয়াদ"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "এশিয়া/সাইগন"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "এশিয়া/সাখালিন"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "এশিয়া/সামারকান্দ"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "এশিয়া/সিওল"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "এশিয়া/সাংহাই"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "এশিয়া/সিঙ্গাপুর"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "এশিয়া/তাইপে"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "এশিয়া/তাসকেন্ত"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "এশিয়া/তিবলিসি"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "এশিয়া/তেহ্‌রান"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "এশিয়া/থিম্পু"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "এশিয়া/টোকিও"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "এশিয়া/উজুঙ্গ_পানডাং"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "এশিয়া/উলানবাতোর"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
 msgstr "এশিয়া/উরুমকি"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "এশিয়া/ভিয়েনতিয়েন"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "এশিয়া/ভ্লাডিভস্টক"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "এশিয়া/ইয়াকুৎস্ক"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "এশিয়া/ইয়েকাতেরিনবার্গ"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "এশিয়া/ইয়েরভান"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "আটলান্টিক/এজোরেস"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "আটলান্টিক/বারমুডা"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "আটলান্টিক/ক্যানারি"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "আটলান্টিক/কেপ_ভার্দে"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "আটলান্টিক/ফেইরো"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "আটলান্টিক/জান_মেয়েন"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "আটলান্টিক/মেদেইরা"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "আটলান্টিক/রেকিয়াভিক"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "আটলান্টিক/দক্ষিণ_জর্জিয়া"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "আটলান্টিক/সেন্ট_হেলেনা"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "আটলান্টিক/স্ট্যানলি"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "অস্ট্রেলিয়া/অ্যাডিলেড"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "অস্ট্রেলিয়া/ব্রিসবেইন"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "অস্ট্রেলিয়া/ব্রোকেন_হিল"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "অস্ট্রেলিয়া/ডারউইন"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "অস্ট্রেলিয়া/হোবার্ট"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "অস্ট্রেলিয়া/লিন্ডেম্যান"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "অস্ট্রেলিয়া/লর্ড_হোয়ে"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "অস্ট্রেলিয়া/মেলবোর্ণ"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "অস্ট্রেলিয়া/পার্থ"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "অস্ট্রেলিয়া/সিডনি"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "ইউরোপ/আমস্টারডাম"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "ইউরোপ/এন্ডোরা"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "ইউরোপ/এথেন্স"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "ইউরোপ/বেলফাস্ট"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "ইউরোপ/বেলগ্রেড"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "ইউরোপ/বার্লিন"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "ইউরোপ/ব্রাটিসলাভা"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "ইউরোপ/ব্রাসেল্‌স"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "ইউরোপ/বুখারেস্ট"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "ইউরোপ/বুডাপেস্ট"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
 msgstr "ইউরোপ/চিসিনাউ"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "ইউরোপ/কোপেনহেগেন"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "ইউরোপ/ডাবলিন"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "ইউরোপ/জিব্রাল্টার"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "ইউরোপ/হেলসিঙ্কি"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "ইউরোপ/ইস্তানবুল"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "ইউরোপ/কালিনিনগ্রাদ"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "ইউরোপ/কিভ"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "ইউরোপ/লিসবন"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "ইউরোপ/লজুবল্‌জানা"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "ইউরোপ/লন্ডন"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "ইউরোপ/লাক্সেমবার্গ"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "ইউরোপ/মাদ্রিদ"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "ইউরোপ/মল্টা"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "ইউরোপ/মিন্‌স্ক"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "ইউরোপ/মোনাকো"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "ইউরোপ/মস্কো"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "ইউরোপ/নিকোসিয়া"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "ইউরোপ/অসলো"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "ইউরোপ/প্যারিস"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "ইউরোপ/প্রাগ"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "ইউরোপ/রিগা"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "ইউরোপ/রোম"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "ইউরোপ/সামারা"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "ইউরোপ/সান_মারিনো"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "ইউরোপ/সারায়েভো"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "ইউরোপ/সিমফেরোপল"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "ইউরোপ /স্কোপজি"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "ইউরোপ/সোফিয়া"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "ইউরোপ/স্টকহোম"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "ইউরোপ/টালিন"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "ইউরোপ/টিরানে"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "ইউরোপ/উজগোরোড"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "ইউরোপ/ভাডুজ"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "ইউরোপ/ভ্যাটিকান"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "ইউরোপ/ভিয়েনা"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "ইউরোপ/ভিলনিয়াস"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "ইউরোপ/ওয়ারসঅ"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "ইউরোপ/জাগ্রেব"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
 msgstr "ইউরোপ/জাপোরোজি"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "ইউরোপ/জুরিখ"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "ভারতীয়/আন্টানানারিভো"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "ভারতীয়/চাগোস"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "ভারতীয়/খ্রীষ্টমাস"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "ভারতীয়/কোকোস"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "ভারতীয়/কোমোরো"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "ভারতীয়/কারগুলিন"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "ভারতীয়/মাহে"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "ভারতীয়/মালদীভস"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "ভারতীয়/মরিশাস"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "ভারতীয়/মায়োটি"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "ভারতীয়/রিউনিয়ন"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "প্রশান্ত মহাসাগরীয়/ আপিয়া"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "প্রশান্ত মহাসাগরীয়/অকল্যান্ড"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "প্রশান্ত মহাসাগরীয়/ চ্যাটহ্যাম"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "প্রশান্ত মহাসাগরীয়/ ইস্টার"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "প্রশান্ত মহাসাগরীয়/ ইফেট"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "প্রশান্ত মহাসাগরীয়/এনডারবারি"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "প্রশান্ত মহাসাগরীয়/ফাকাওফো"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "প্রশান্ত মহাসাগরীয়/ফিজি"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "প্রশান্ত মহাসাগরীয়/ফুনাফুতি"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "প্রশান্ত মহাসাগরীয়/গালাপাগোস"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "প্রশান্ত মহাসাগরীয়/গ্যামবিয়ার"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "প্রশান্ত মহাসাগরীয়/গডালক্যানাল"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "প্রশান্ত মহাসাগরীয়/গুয়াম"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "প্রশান্ত মহাসাগরীয়/হনলুলু"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "প্রশান্ত মহাসাগরীয়/জনস্টন"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "প্রশান্ত মহাসাগরীয়/কিরিবাস"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "প্রশান্ত মহাসাগরীয়/কোসরে"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "প্রশান্ত মহাসাগরীয়/কোয়াজালেন"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "প্রশান্ত মহাসাগরীয়/মাজুরো"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "প্রশান্ত মহাসাগরীয়/মারকুইসাস"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "প্রশান্ত মহাসাগরীয়/মিডওয়ে"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "প্রশান্ত মহাসাগরীয়/নাউরু"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "প্রশান্ত মহাসাগরীয়/নিউ"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "প্রশান্ত মহাসাগরীয়/নরফক"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "প্রশান্ত মহাসাগরীয়/নুমিয়া"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "প্রশান্ত মহাসাগরীয়/পাগো_পাগো"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "প্রশান্ত মহাসাগরীয়/পালাউ"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "প্রশান্ত মহাসাগরীয়/পিটসায়ার্ন"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "প্রশান্ত মহাসাগরীয়/পোনাপে"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "প্রশান্ত মহাসাগরীয়/বন্দর_মোরেসবি"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "প্রশান্ত মহাসাগরীয়/রারোটোঙ্গা"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "প্রশান্ত মহাসাগরীয়/সাইপান"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "প্রশান্ত মহাসাগরীয়/তাহিতি"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "প্রশান্ত মহাসাগরীয়/তারাওয়া"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "প্রশান্ত মহাসাগরীয়/টোঙ্গাটাপু"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "প্রশান্ত মহাসাগরীয়/ট্রুক"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "প্রশান্ত মহাসাগরীয়/ওয়েক"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "প্রশান্ত মহাসাগরীয়/ওয়ালিস"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "প্রশান্ত মহাসাগরীয়/ইয়াপ"
 
-#: ../composer/e-composer-name-header.c:95
-msgid "Click here for the address book"
-msgstr "ঠিকানাবই পড়ার জন্য এখানে ক্লিক করুন"
+#: ../composer/e-composer-autosave.c:275
+msgid "Could not open autosave file"
+msgstr "autosave ফাইল খোলা যায়নি"
 
-#: ../composer/e-composer-post-header.c:117
-msgid "Posting destination"
-msgstr "পোস্ট করার গন্তব্যস্থল"
+#: ../composer/e-composer-autosave.c:282
+msgid "Unable to retrieve message from editor"
+msgstr "এডিটার থেকে বার্তা উদ্ধার করা সম্ভব হয়নি"
 
-# which is virtual - trash or folder (sm's question)
-#: ../composer/e-composer-post-header.c:118
-msgid "Choose folders to post the message to."
-msgstr "যে ফোল্ডারগুলিতে বার্তা পোস্ট করা হবে তা নির্বাচন করুন।"
+#: ../composer/e-composer-actions.c:47
+msgid "Insert Attachment"
+msgstr "সংযুক্ত বস্তু সন্নিবেশ করুন"
 
-#: ../composer/e-composer-post-header.c:152
-msgid "Click here to select folders to post to"
-msgstr "যে ফোল্ডারগুলিতে পোস্ট করা হবে তা নির্বাচন করতে এখানে ক্লিক করুন"
+#: ../composer/e-composer-actions.c:51
+msgid "A_ttach"
+msgstr "সংযুক্ত করুন (_t)"
 
-#. Now add the signature stuff.
-#: ../composer/e-msg-composer-hdrs.c:221
-msgid "Si_gnature:"
-msgstr "স্বাক্ষর(_g):"
+#: ../composer/e-composer-actions.c:142
+msgid "Untitled Message"
+msgstr "শিরোনামহীন বার্তা"
+
+#: ../composer/e-composer-actions.c:473
+msgid "Attach a file"
+msgstr "একটি ফাইল সংযুক্ত করুন"
+
+#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
+#: ../ui/evolution-mail-messagedisplay.xml.h:4
+msgid "_Close"
+msgstr "বন্ধ করুন (_C)"
+
+#: ../composer/e-composer-actions.c:480
+msgid "Close the current file"
+msgstr "বর্তমান ফাইলটি বন্ধ করুন"
+
+#: ../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 "প্রিন্ট করুন (_P)..."
+
+#: ../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 "প্রিন্টের পূর্বপ্রদর্শন (_v)"
+
+#: ../composer/e-composer-actions.c:501
+msgid "Save the current file"
+msgstr "বর্তমান ফাইলটি সংরক্ষণ করুন"
+
+#: ../composer/e-composer-actions.c:506
+msgid "Save _As..."
+msgstr "নতুন নামে সংরক্ষণ করুন (_A)..."
+
+#: ../composer/e-composer-actions.c:508
+msgid "Save the current file with a different name"
+msgstr "বর্তমান ফাইলটি একটি পৃথক নামে সংরক্ষণ করুন"
+
+#: ../composer/e-composer-actions.c:513
+msgid "Save _Draft"
+msgstr "খসড়া হিসাবে সংরক্ষণ করুন (_D)"
+
+#: ../composer/e-composer-actions.c:515
+msgid "Save as draft"
+msgstr "খসড়া হিসাবে সংরক্ষণ করুন"
+
+#: ../composer/e-composer-actions.c:520
+msgid "S_end"
+msgstr "প্রেরণ করুন (_e)"
+
+#: ../composer/e-composer-actions.c:522
+msgid "Send this message"
+msgstr "বার্তাটি প্রেরণ করুন"
+
+#: ../composer/e-composer-actions.c:529
+msgid "Insert Send options"
+msgstr "প্রেরণ সংক্রান্ত বিকল্প অন্তর্ভুক্ত করুন"
+
+#: ../composer/e-composer-actions.c:534
+msgid "New _Message"
+msgstr "নতুন বার্তা (_M)"
+
+#: ../composer/e-composer-actions.c:536
+msgid "Open New Message window"
+msgstr "নতুন বার্তার উইন্ডো খুলুন"
+
+#: ../composer/e-composer-actions.c:543
+msgid "Character _Encoding"
+msgstr "ক্যারেক্টার এনকোডিং (_E)"
+
+#: ../composer/e-composer-actions.c:550
+msgid "_Security"
+msgstr "সুরক্ষা (_S)"
+
+#: ../composer/e-composer-actions.c:560
+msgid "PGP _Encrypt"
+msgstr "PGP এনক্রিপ্ট (_E)"
+
+#: ../composer/e-composer-actions.c:562
+msgid "Encrypt this message with PGP"
+msgstr "এই বার্তাটি PGP ব্যবহার করে এনক্রিপ্ট করুন"
+
+#: ../composer/e-composer-actions.c:568
+msgid "PGP _Sign"
+msgstr "PGP স্বাক্ষর (_S)"
+
+#: ../composer/e-composer-actions.c:570
+msgid "Sign this message with your PGP key"
+msgstr "এই বার্তাটি আপনার PGP কী (key)-র সাহায্য স্বাক্ষর করুন"
+
+#: ../composer/e-composer-actions.c:576
+msgid "_Prioritize Message"
+msgstr "বার্তার গুরুত্ব বৃদ্ধি (_P)"
+
+#: ../composer/e-composer-actions.c:578
+msgid "Set the message priority to high"
+msgstr "বার্তার গুরুত্ব 'উচ্চ' রূপে ধার্য করুন"
+
+#: ../composer/e-composer-actions.c:584
+msgid "Re_quest Read Receipt"
+msgstr "মেইল-পাঠের সূচনা প্রদানের অনুরোধ করা হবে (_q)"
+
+#: ../composer/e-composer-actions.c:586
+msgid "Get delivery notification when your message is read"
+msgstr "আপনার বার্তা পাঠ হওয়ার পরে সূচনা প্রাপ্তি করুন"
+
+#: ../composer/e-composer-actions.c:592
+msgid "S/MIME En_crypt"
+msgstr "S/MIME এনক্রিপ্ট (_c)"
 
-#: ../composer/e-msg-composer-hdrs.c:326
+#: ../composer/e-composer-actions.c:594
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr "চিহ্নিত বার্তাটি আপনার S/MIME এনক্রিপশন সার্টিফিকেট সহযোগে এনক্রিপ্ট করুন"
+
+#: ../composer/e-composer-actions.c:600
+msgid "S/MIME Sig_n"
+msgstr "S/MIME স্বাক্ষর (_n)"
+
+#: ../composer/e-composer-actions.c:602
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "এই বার্তাটি আপনার S/MIME স্বাক্ষর সার্টিফিকেটের সাহায্যে স্বাক্ষর করুন"
+
+#: ../composer/e-composer-actions.c:608
+msgid "_Bcc Field"
+msgstr "অপ্রকাশিত অনুলিপিপ্রাপকের ক্ষেত্র (_B)"
+
+#: ../composer/e-composer-actions.c:610
+msgid "Toggles whether the BCC field is displayed"
+msgstr "অপ্রকাশিত অনুলিপিপ্রাপকদের নামের ক্ষেত্র প্রদর্শিত হবে কিনা তা টগল করে"
+
+#: ../composer/e-composer-actions.c:616
+msgid "_Cc Field"
+msgstr "অনুলিপিপ্রাপকের ক্ষেত্র (_C)"
+
+#: ../composer/e-composer-actions.c:618
+msgid "Toggles whether the CC field is displayed"
+msgstr "অনুলিপিপ্রাপকদের নামের ক্ষেত্র প্রদর্শিত হবে কিনা তা টগল করে"
+
+#: ../composer/e-composer-actions.c:624
+msgid "_From Field"
+msgstr "প্রেরক ক্ষেত্র (_F)"
+
+#: ../composer/e-composer-actions.c:626
+msgid "Toggles whether the From chooser is displayed"
+msgstr "প্রেরকের নামের ক্ষেত্রটি প্রদর্শিত হবে কিনা তা টগল করে"
+
+#: ../composer/e-composer-actions.c:632
+msgid "_Post-To Field"
+msgstr "এখানে-পোস্ট-করুন ক্ষেত্র (_P)"
+
+#: ../composer/e-composer-actions.c:634
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "এখানে পোস্ট-করুন ক্ষেত্রটি প্রদর্শিত হবে কিনা তা টগল করে"
+
+#: ../composer/e-composer-actions.c:640
+msgid "_Reply-To Field"
+msgstr "উত্তর-প্রাপক ক্ষেত্র (_R)"
+
+#: ../composer/e-composer-actions.c:642
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "উত্তর-প্রাপক ক্ষেত্রটি প্রদর্শিত হবে কিনা তা টগল করে"
+
+#: ../composer/e-composer-actions.c:648
+msgid "_Subject Field"
+msgstr "প্রসঙ্গ লেখার ক্ষেত্র (_S)"
+
+#: ../composer/e-composer-actions.c:650
+msgid "Toggles whether the Subject field is displayed"
+msgstr "প্রসঙ্গের ক্ষেত্রটি প্রদর্শিত হবে কিনা তা টগল করে"
+
+#: ../composer/e-composer-actions.c:656
+msgid "_To Field"
+msgstr "প্রাপকের নামের ক্ষেত্র (_T)"
+
+#: ../composer/e-composer-actions.c:658
+msgid "Toggles whether the To field is displayed"
+msgstr "প্রাপকের নামের ক্ষেত্রটি প্রদর্শিত হবে কিনা তা টগল করে"
+
+#: ../composer/e-composer-header-table.c:66
+msgid "Enter the recipients of the message"
+msgstr "বার্তা প্রাপকদের নাম লিখুন"
+
+#: ../composer/e-composer-header-table.c:68
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "বার্তার অনুলিপি প্রাপকদের ঠিকানা লিখুন"
+
+#: ../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"
+msgstr "বার্তার অপ্রকাশিত অনুলিপি প্রাপকদের ঠিকানা লিখুন।"
+
+#: ../composer/e-composer-header-table.c:645
 msgid "Fr_om:"
 msgstr "প্রেরক(_o):"
 
-#: ../composer/e-msg-composer-hdrs.c:332
+#: ../composer/e-composer-header-table.c:654
 msgid "_Reply-To:"
 msgstr "উত্তর-প্রাপক:(_R)"
 
-#: ../composer/e-msg-composer-hdrs.c:335
+#: ../composer/e-composer-header-table.c:658
 msgid "_To:"
 msgstr "প্রাপক(_T):"
 
-#: ../composer/e-msg-composer-hdrs.c:337
-msgid "Enter the recipients of the message"
-msgstr "বার্তা প্রাপকদের নাম লিখুন"
-
-#: ../composer/e-msg-composer-hdrs.c:340
+#: ../composer/e-composer-header-table.c:663
 msgid "_Cc:"
 msgstr "অনুলিপি প্রাপক(_C):"
 
-#: ../composer/e-msg-composer-hdrs.c:342
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "বার্তার অনুলিপি প্রাপকদের ঠিকানা লিখুন"
-
-#: ../composer/e-msg-composer-hdrs.c:346
+#: ../composer/e-composer-header-table.c:668
 msgid "_Bcc:"
 msgstr "অপ্রকাশিত অনুলিপি প্রাপক(_B):"
 
-#: ../composer/e-msg-composer-hdrs.c:348
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message"
-msgstr "বার্তার অপ্রকাশিত অনুলিপি প্রাপকদের ঠিকানা লিখুন।"
-
-#: ../composer/e-msg-composer-hdrs.c:353
+#: ../composer/e-composer-header-table.c:673
 msgid "_Post To:"
 msgstr "উল্লিখিত স্থানে পোস্ট করুন(_P):"
 
-#: ../composer/e-msg-composer-hdrs.c:356
+#: ../composer/e-composer-header-table.c:677
 msgid "S_ubject:"
 msgstr "বিষয়(_u):"
 
-#: ../composer/e-msg-composer-select-file.c:77
-msgid "A_ttach"
-msgstr "সংযুক্ত করুন (_t)"
+#: ../composer/e-composer-header-table.c:686
+msgid "Si_gnature:"
+msgstr "স্বাক্ষর(_g):"
 
-#: ../composer/e-msg-composer-select-file.c:198
-msgid "Insert Attachment"
-msgstr "সংযুক্ত বস্তু সন্নিবেশ করুন"
+#: ../composer/e-composer-name-header.c:115
+msgid "Click here for the address book"
+msgstr "ঠিকানাবই পড়ার জন্য এখানে ক্লিক করুন"
 
-#: ../composer/e-msg-composer.c:819
+#: ../composer/e-composer-post-header.c:137
+msgid "Posting destination"
+msgstr "পোস্ট করার গন্তব্যস্থল"
+
+# which is virtual - trash or folder (sm's question)
+#: ../composer/e-composer-post-header.c:138
+msgid "Choose folders to post the message to."
+msgstr "যে ফোল্ডারগুলিতে বার্তা পোস্ট করা হবে তা নির্বাচন করুন।"
+
+#: ../composer/e-composer-post-header.c:172
+msgid "Click here to select folders to post to"
+msgstr "যে ফোল্ডারগুলিতে পোস্ট করা হবে তা নির্বাচন করতে এখানে ক্লিক করুন"
+
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1556
+msgid "Show _Attachment Bar"
+msgstr "সংযুক্ত বস্তুসহ বার প্রদর্শন করা হবে (_A)"
+
+#: ../composer/e-msg-composer.c:870
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "বহির্মুখি বার্তা স্বাক্ষর করা সম্ভব নয়: এই অ্যাকাউন্টের জন্য কোনো স্বাক্ষরকারী "
 "সার্টিফিকেট নির্ধারিত হয়নি"
 
-#: ../composer/e-msg-composer.c:826
+#: ../composer/e-msg-composer.c:877
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10211,42 +10861,23 @@ msgstr ""
 "বহির্মুখি বার্তা এনক্রিপ্ট করা সম্ভব নয়: এই অ্যাকাউন্টের জন্য কোনো এনক্রিপশনকারী "
 "সার্টিফিকেট নির্ধারিত হয়নি"
 
-#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
+#: ../composer/e-msg-composer.c:1498 ../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] "সংযুক্ত বস্তু"
+msgstr[1] "সংযুক্ত বস্তু"
+
+#: ../composer/e-msg-composer.c:1554
 msgid "Hide _Attachment Bar"
 msgstr "সংযুক্ত বস্তুর বার আড়াল করা হবে (_A)"
 
-#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
-#: ../composer/e-msg-composer.c:3878
-msgid "Show _Attachment Bar"
-msgstr "সংযুক্ত বস্তুসহ বার প্রদর্শন করা হবে (_A)"
-
-#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
-msgid "Unknown reason"
-msgstr "অজানা কারণ"
-
-#: ../composer/e-msg-composer.c:1525
-msgid "Could not open file"
-msgstr "ফাইল খোলা যায়নি"
-
-#: ../composer/e-msg-composer.c:1533
-msgid "Unable to retrieve message from editor"
-msgstr "এডিটার থেকে বার্তা উদ্ধার করা সম্ভব হয়নি"
-
-#: ../composer/e-msg-composer.c:1820
-msgid "Untitled Message"
-msgstr "শিরোনামহীন বার্তা"
-
-#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1856
-msgid "Open File"
-msgstr "ফাইল খুলুন"
-
-#: ../composer/e-msg-composer.c:2530 ../composer/e-msg-composer.c:3758
-#: ../composer/e-msg-composer.c:3761
+#: ../composer/e-msg-composer.c:1571 ../composer/e-msg-composer.c:2778
 msgid "Compose Message"
 msgstr "বার্তা লিখুন"
 
-#: ../composer/e-msg-composer.c:5031
+#: ../composer/e-msg-composer.c:4053
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10274,8 +10905,7 @@ msgstr "আপনি '{0}' শীরোনামের যে বার্তা
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "&quot;{0}&quot;-র কারণে, বিভিন্ন মেইল অপশন নির্বাচন করার প্রয়োজন হতে পারে।"
 
-#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:5
 msgid "Because &quot;{1}&quot;."
 msgstr "&quot;{1}&quot;-র কারণে।"
 
@@ -10391,23 +11021,27 @@ msgstr "আপনি `{0}' ফাইলটিকে এই বার্তার
 msgid "You need to configure an account before you can compose mail."
 msgstr "মেইল লেখার আগে আপনাকে একটি অ্যাকাউন্ট কনফিগার করতে হবে।"
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "সম্পাদনা কর্মে এগিয়ে চলুন (_C)"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "উদ্ধার করা হবে না (_D)"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:317
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "উদ্ধার করুন(_R)"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "বার্তা সংরক্ষণ করুন (_S)"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "খসড়া হিসাবে সংরক্ষণ করুন (_S)"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution মেইল ও বর্ষপঞ্জি"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:753
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
 msgid "Groupware Suite"
 msgstr "Groupware Suite"
 
@@ -10423,57 +11057,80 @@ msgstr "ঠিকানার কার্ড"
 msgid "calendar information"
 msgstr "বর্ষপঞ্জির তথ্য"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
+#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
 msgid "Evolution Error"
 msgstr "Evolution-র সমস্যা"
 
-#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
 msgid "Evolution Warning"
 msgstr "Evolution Warning"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:117
 msgid "Evolution Information"
 msgstr "Evolution সংক্রান্ত তথ্য"
 
-#: ../e-util/e-error.c:128
+#: ../e-util/e-error.c:119
 msgid "Evolution Query"
 msgstr "ইভোলিউশন কোয়েরি"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:454
+#: ../e-util/e-error.c:449
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "অভ্যন্তরীণ সমস্যা, অজানা সমস্যা '%s' অনুরোধ করা হয়েছে"
 
-#: ../e-util/e-print.c:138
+#: ../e-util/e-logger.c:156
+msgid "Component"
+msgstr ""
+
+#: ../e-util/e-logger.c:157
+msgid "Name of the component being logged"
+msgstr ""
+
+#: ../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 "সক্রিয়"
+
+#: ../e-util/e-plugin.c:309
+msgid "Whether the plugin is enabled"
+msgstr "চিহ্নিত প্লাগ-ইন সক্রিয় রয়েছে কি না"
+
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "প্রিন্ট করার সময় সমস্যা"
 
-#: ../e-util/e-print.c:145
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "উৎপন্ন ত্রুটি সম্পর্কে প্রিন্ট ব্যবস্থা থেকে নিম্নলিখিত বিবরণ প্রাপ্ত হয়েছে:"
 
-#: ../e-util/e-print.c:151
+#: ../e-util/e-print.c:173
 msgid "The printing system did not report any additional details about the error."
 msgstr "প্রিন্ট ব্যবস্থা দ্বারা ত্রুটি সম্পর্কে অধিক বিবরণ উপলব্ধ করা হয় না।"
 
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+msgid "Because \"{1}\"."
+msgstr " \"{1}\"-র কারণে।"
+
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; ফাইলটি খোলা যায়নি।"
+msgid "Cannot open file \"{0}\"."
+msgstr "\"{0}\" ফাইলটি খোলা যাচ্ছে না।"
 
 # "%s ইতিমধ্যেই বিদ্যমান\n"
 # "আপনি কি এটি মুছে ফেলে নতুন করে লিখতে চান?"
 #: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; ফাইলটি সংরক্ষণ করা যায়নি।"
+msgid "Cannot save file \"{0}\"."
+msgstr "\"{0}\" ফাইলটি সংরক্ষণ করা যায়নি।"
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
 msgstr "আপনি কি মুছে ফেলে নতুন করে লিখতে ইচ্ছুক?"
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; ফাইলটি বর্তমানে উপস্থিত রয়েছে।"
+msgid "File exists \"{0}\"."
+msgstr "\"{0}\" ফাইলটি বর্তমানে উপস্থিত রয়েছে।"
 
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
@@ -10483,133 +11140,164 @@ msgstr "এই ফাইলটি কি মুছে লেখা হবে?"
 msgid "_Overwrite"
 msgstr "মুছে নতুন করে লিখুন(_O)"
 
-#: ../e-util/e-util-labels.c:45
+#: ../e-util/e-util.c:97
+msgid "Could not display help for Evolution."
+msgstr "Evolution সংক্রান্ত সহায়ক তথ্য প্রদর্শন করা যায়নি।"
+
+#: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "প্রয়োজনীয় (_m)"
 
 #. red
-#: ../e-util/e-util-labels.c:46
+#: ../e-util/e-util-labels.c:38
 msgid "_Work"
 msgstr "কর্ম(_W)"
 
 #. orange
-#: ../e-util/e-util-labels.c:47
+#: ../e-util/e-util-labels.c:39
 msgid "_Personal"
 msgstr "ব্যক্তিগত(_P)"
 
 #. green
-#: ../e-util/e-util-labels.c:48
+#: ../e-util/e-util-labels.c:40
 msgid "_To Do"
 msgstr "করনীয় (_T)"
 
 #. blue
-#: ../e-util/e-util-labels.c:49
+#: ../e-util/e-util-labels.c:41
 msgid "_Later"
 msgstr "পরে (_L)"
 
-#: ../e-util/e-util-labels.c:317
+#: ../e-util/e-util-labels.c:309
 msgid "Label _Name:"
 msgstr "লেবেলের নাম :(_N)"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Edit Label"
 msgstr "লেবেল সম্পাদনা"
 
-#: ../e-util/e-util-labels.c:339
+#: ../e-util/e-util-labels.c:332
 msgid "Add Label"
 msgstr "লেবেল যোগ করুন"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:351
 msgid "Label name cannot be empty."
 msgstr "লেবেলর নাম ফাঁকা রাখা যাবে না"
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label with same tag already exists. Rename your label please."
+#: ../e-util/e-util-labels.c:356
+msgid ""
+"A label having the same tag already exists on the server. Please rename your "
+"label."
 msgstr ""
+"একই ট্যাগ সহ একটি লেবেল বর্তমানে সার্ভারে উপস্থিত রয়েছে। অনুগ্রহ করে আপনার লেখা "
+"লেবেলটি পরিবর্তন করুন।"
+
+#: ../e-util/gconf-bridge.c:1218
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf সংক্রান্ত ত্রুটি: %s"
+
+#: ../e-util/gconf-bridge.c:1228
+msgid "All further errors shown only on terminal."
+msgstr "পরবর্তী সকল ত্রুটি শুধুমাত্র টার্মিনালে প্রদর্শন করা হবে।"
 
 #: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
-msgstr[0] "%d সেকেন্ড পূর্বে"
+msgstr[0] "১ সেকেন্ড পূর্বে"
+msgstr[1] "%d সেকেন্ড পূর্বে"
 
 #: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
-msgstr[0] "%d সেকেন্ড পরে"
+msgstr[0] "১ সেকেন্ড পরে"
+msgstr[1] "%d সেকেন্ড পরে"
 
 #: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
-msgstr[0] "%d মিনিট পূর্বে"
+msgstr[0] "১ মিনিট পূর্বে"
+msgstr[1] "%d মিনিট পূর্বে"
 
 #: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
-msgstr[0] "%d মিনিট পরে"
+msgstr[0] "১ মিনিট পরে"
+msgstr[1] "%d মিনিট পরে"
 
 #: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
-msgstr[0] "%d ঘন্টা পূর্বে"
+msgstr[0] "১ ঘন্টা পূর্বে"
+msgstr[1] "%d ঘন্টা পূর্বে"
 
 #: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
-msgstr[0] "%d ঘন্টা পরে"
+msgstr[0] "১ ঘন্টা পরে"
+msgstr[1] "%d ঘন্টা পরে"
 
 #: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
-msgstr[0] "%d দিন পূর্বে"
+msgstr[0] "১ দিন পূর্বে"
+msgstr[1] "%d দিন পূর্বে"
 
 #: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
-msgstr[0] "%d দিন পরে"
+msgstr[0] "১ দিন পরে"
+msgstr[1] "%d দিন পরে"
 
 #: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
-msgstr[0] "%d সপ্তাহ পূর্বে"
+msgstr[0] "১ সপ্তাহ পূর্বে"
+msgstr[1] "%d সপ্তাহ পূর্বে"
 
 #: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
-msgstr[0] "%d সপ্তাহ পরে"
+msgstr[0] "১ সপ্তাহ পরে"
+msgstr[1] "%d সপ্তাহ পরে"
 
 #: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d মাস পূর্বে"
+msgstr[1] "%d মাস পূর্বে"
 
 #: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "%d মাস পরে"
+msgstr[1] "%d মাস পরে"
 
 #: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d বৎসর পূর্বে"
+msgstr[1] "%d বৎসর পূর্বে"
 
 #: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "%d বৎসর পরে"
+msgstr[1] "%d বৎসর পরে"
 
 #: ../filter/filter-datespec.c:287
 msgid "<click here to select a date>"
@@ -10629,66 +11317,66 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "তুলনা করার জন্য একটি সময় বাছাই করুন"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:284
 msgid "Choose a file"
 msgstr "একটি ফাইল নির্বাচন করুন"
 
-#: ../filter/filter-part.c:533
+#: ../filter/filter-part.c:532
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "পরীক্ষা"
 
-#: ../filter/filter-rule.c:800
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "নিয়মের নাম: (_u)"
 
-#: ../filter/filter-rule.c:828
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "নিম্নলিখিত মান অনুসারে বস্তু অনুসন্ধান করুন"
 
-#: ../filter/filter-rule.c:862
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "ফিল্টার করার নিয়ম যোগ করুন (_d)"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "সকল মাত্রা পূরণ করা হলে"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "যে কোনো মাত্রা পূরণ করা হলে"
 
-#: ../filter/filter-rule.c:870
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "বস্তু অনুসন্ধান করুন:(_F)"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "সমস্ত সম্পর্কিত"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "প্রত্যুত্তর"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "উত্তর এবং মূল বার্তা"
 
-#: ../filter/filter-rule.c:892
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "উত্তর অথবা ঊর্ধ্বতন অনুপস্থিত"
 
 # FIXME
-#: ../filter/filter-rule.c:894
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "থ্রেড অন্তর্ভুক্ত করুন (_n)"
 
-#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "অন্তর্মুখী"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "বহির্গমনকারী"
 
@@ -10712,7 +11400,7 @@ msgstr "অনুপস্থিত তারিখ।"
 msgid "Missing file name."
 msgstr "অনুপস্থিত ফাইলের নাম।"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "অনুপস্থিত নাম।"
 
@@ -10789,7 +11477,7 @@ msgstr "পরে"
 msgid "months"
 msgstr "মাস"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:182
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:195
 msgid "seconds"
 msgstr "সেকেন্ড"
 
@@ -10801,9 +11489,10 @@ msgstr "বর্তমান সময়"
 msgid "the time you specify"
 msgstr "আপনার নির্ধারিত সময়"
 
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:291
+#: ../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:398
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "সপ্তাহ"
 
@@ -10819,7 +11508,7 @@ msgstr "নিয়ম যোগ করুন"
 msgid "Edit Rule"
 msgstr "নিয়ম সম্পাদন করুন"
 
-#: ../filter/rule-editor.c:747
+#: ../filter/rule-editor.c:786
 msgid "Rule name"
 msgstr "নিয়মের নাম"
 
@@ -10840,57 +11529,69 @@ msgid "Configure your email accounts here"
 msgstr "আপনার ই-মেইল অ্যাকাউন্টগুলিকে এখানে কনফিগার করুন"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your network connection settings here"
+msgstr "নেটওয়ার্ক সংযোগ সংক্রান্ত বৈশিষ্ট্য এইখানে কনফিগার করুন"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "Evolution Mail"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail accounts configuration control"
 msgstr "Evolution মেইল অ্যাকাউন্ট কনফিগারেশন নিয়ন্ত্রন"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "Evolution মেইল কম্পোনেন্ট"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "Evolution মেইল কম্পোসার"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail composer configuration control"
 msgstr "Evolution মেইল কম্পোসার কনফিগারেশন নিয়ন্ত্রন"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "Evolution মেইল পছন্দতালিকা নিয়ন্ত্রন"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:611
-#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
-#: ../mail/mail-component.c:575 ../mail/mail-component.c:576
-#: ../mail/mail-component.c:740
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Evolution Network configuration control"
+msgstr "Evolution Network কনফিগারেশন নিয়ন্ত্রণ ব্যবস্থা"
+
+#: ../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:380
+#: ../mail/mail-component.c:593 ../mail/mail-component.c:594
+#: ../mail/mail-component.c:763
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "মেইল"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:502
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/em-account-prefs.c:495
 msgid "Mail Accounts"
 msgstr "মেইল অ্যাকাউন্ট"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:102
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
+#: ../mail/mail-config.glade.h:103
 msgid "Mail Preferences"
 msgstr "মেইলের বৈশিষ্ট্যাবলী"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
+msgid "Network Preferences"
+msgstr "নেটওয়ার্ক সংক্রান্ত বৈশিষ্ট্য"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "মেইল (_M)"
 
-#: ../mail/em-account-editor.c:403
+#: ../mail/em-account-editor.c:387
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s লাইসেন্স সংক্রান্ত চুক্তিপত্র"
 
-#: ../mail/em-account-editor.c:410
+#: ../mail/em-account-editor.c:394
 #, c-format
 msgid ""
 "\n"
@@ -10903,115 +11604,109 @@ msgstr ""
 "চুক্তিপত্রটি মনোযোগ দিয়ে পড়ুন এবং সম্মতি\n"
 "জানাবার জন্য চেকবক্সটিতে টিক (tick) চিহ্ন দিন\n"
 
-#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:512
+#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "ফোল্ডার নির্বাচন করুন"
 
-#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
-#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
+#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:98
 msgid "Autogenerated"
 msgstr "স্বয়ংক্রিয়ভাবে উত্পন্ন"
 
-#: ../mail/em-account-editor.c:778
+#: ../mail/em-account-editor.c:762
 msgid "Ask for each message"
 msgstr "প্রতিটি বার্তার জন্য জিজ্ঞাসা করা হবে"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:93
+#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "পরিচয়"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:120
+#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "ই-মেইল আহরণ করা হচ্ছে"
 
-#: ../mail/em-account-editor.c:2053
+#: ../mail/em-account-editor.c:2131
 msgid "Check for _new messages every"
 msgstr "নতুন মেইলের জন্য পরীক্ষা করা হবে প্রতি (_n)"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2139
 msgid "minu_tes"
 msgstr "মিনিট (_t)"
 
-#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2327 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "ই-মেইল প্রেরণ করা হচ্ছে"
 
-#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2386 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "ডিফল্ট মান"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:126
-#: ../plugins/exchange-operations/exchange-account-setup.c:317
+#: ../mail/em-account-editor.c:2452 ../mail/mail-config.glade.h:131
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "সুরক্ষা"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Receiving Options"
 msgstr "আহরণের অপশন"
 
-#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+#: ../mail/em-account-editor.c:2490 ../mail/em-account-editor.c:2581
 msgid "Checking for New Messages"
 msgstr "নতুন মেইল আছে কিনা তা পরীক্ষা করা হচ্ছে"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "অ্যাকাউন্ট এডিটর"
 
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2932 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Evolution অ্যাকাউন্টের সাহায়ক"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:436
+#: ../mail/em-account-prefs.c:429
 msgid "[Default]"
 msgstr "[ডিফল্ট]"
 
-#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:947
-#: ../plugins/plugin-manager/plugin-manager.c:323
-#: ../plugins/publish-calendar/publish-calendar.c:510
-msgid "Enabled"
-msgstr "সক্রিয়"
-
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:488
 msgid "Account name"
 msgstr "অ্যাকাউন্টের নাম"
 
-#: ../mail/em-account-prefs.c:497
+#: ../mail/em-account-prefs.c:490
 msgid "Protocol"
 msgstr "প্রোটোকল"
 
-#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:1062
+#: ../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 "নামহীন"
 
-#: ../mail/em-composer-prefs.c:953
+#: ../mail/em-composer-prefs.c:992
 msgid "Language(s)"
 msgstr "ভাষা"
 
-#: ../mail/em-composer-prefs.c:996
+#: ../mail/em-composer-prefs.c:1041
 msgid "Add signature script"
 msgstr "স্বাক্ষরের স্ক্রিপ্ট যোগ করুন"
 
-#: ../mail/em-composer-prefs.c:1016
+#: ../mail/em-composer-prefs.c:1083
 msgid "Signature(s)"
 msgstr "স্বাক্ষর"
 
-#: ../mail/em-composer-utils.c:898 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- ফরওয়ার্ড করা বার্তা --------"
 
-#: ../mail/em-composer-utils.c:1703
+#: ../mail/em-composer-utils.c:1962
 msgid "an unknown sender"
 msgstr "অজানা প্রেরক"
 
 #. 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:1750
+#: ../mail/em-composer-utils.c:2009
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11019,11 +11714,11 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} -র ${24Hour}:${Minute} "
 "${TimeZone}-এ, ${Sender} লিখেছিলেন:"
 
-#: ../mail/em-composer-utils.c:1891
+#: ../mail/em-composer-utils.c:2152
 msgid "-----Original Message-----"
 msgstr "--------  মূল বার্তা --------"
 
-#: ../mail/em-filter-editor.c:155
+#: ../mail/em-filter-editor.c:156
 msgid "_Filter Rules"
 msgstr "ফিল্টারের নিয়মাবলী(_F)"
 
@@ -11040,10 +11735,6 @@ msgstr "রঙ নির্ধারণ করুন"
 msgid "Assign Score"
 msgstr "পরিমাপ অঙ্ক নির্দিষ্ট করুন"
 
-#: ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "সংযুক্ত বস্তু"
-
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "অপ্রকাশিত অনুলিপি প্রাপক"
@@ -11060,10 +11751,6 @@ msgstr "অনুলিপি প্রাপক"
 msgid "Completed On"
 msgstr "সমাপ্তির তারিখ"
 
-#: ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "ধারন করে"
-
 #: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "ফোল্ডারে কপি করুন"
@@ -11077,7 +11764,7 @@ msgid "Date sent"
 msgstr "তারিখে প্রেরিত"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:778
+#: ../plugins/groupwise-features/share-folder.c:767
 #: ../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
@@ -11088,10 +11775,6 @@ msgstr "মুছে ফেলুন"
 msgid "Deleted"
 msgstr "মুছে ফেলা হয়েছে"
 
-#: ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "ধারন করে না"
-
 #: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "এটা সহ শেষ হয় না"
@@ -11112,10 +11795,6 @@ msgstr "মত শোনায় না"
 msgid "does not start with"
 msgstr "দিয়ে আরম্ভ হয়না"
 
-#: ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "অনুপস্থিত"
-
 #: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "খসড়া"
@@ -11124,10 +11803,6 @@ msgstr "খসড়া"
 msgid "ends with"
 msgstr "এই সহ শেষ হয়"
 
-#: ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "উপস্থিত"
-
 #: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "উপস্থিত"
@@ -11140,14 +11815,10 @@ msgstr "এক্সপ্রেশন"
 msgid "Follow Up"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
 msgid "Important"
 msgstr "প্রয়োজনীয়"
 
-#: ../mail/em-filter-i18n.h:30
-msgid "is"
-msgstr "হলো"
-
 #: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "পরে"
@@ -11160,18 +11831,6 @@ msgstr "পূর্বে"
 msgid "is Flagged"
 msgstr "ফ্ল্যাগ করা"
 
-#: ../mail/em-filter-i18n.h:34
-msgid "is greater than"
-msgstr "থেকে বেশি"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "is less than"
-msgstr "থেকে কম"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is not"
-msgstr "নয়"
-
 #: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "ফ্ল্যাগ করা নয়"
@@ -11184,7 +11843,7 @@ msgstr "নির্ধারিত নয়"
 msgid "is set"
 msgstr "নির্ধারিত"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:96
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:97
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "অনাকাঙ্ক্ষিত"
@@ -11193,7 +11852,7 @@ msgstr "অনাকাঙ্ক্ষিত"
 msgid "Junk Test"
 msgstr "অকাঙ্ক্ষিতর জন্য পরীক্ষা"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:188
 msgid "Label"
 msgstr "লেবেল"
 
@@ -11235,7 +11894,7 @@ msgstr "শব্দ বাজাও"
 
 #. 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:82
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:63
 msgid "Read"
 msgstr "পড়ো"
 
@@ -11307,10 +11966,9 @@ msgstr "এই দিয়ে আরম্ভ হয়"
 msgid "Stop Processing"
 msgstr "প্রসেস প্রক্রিয়া স্থগিত করা হবে"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1702
-#: ../mail/em-format-quote.c:322 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:337
+#: ../mail/em-filter-i18n.h:72 ../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"
@@ -11321,94 +11979,116 @@ msgid "Unset Status"
 msgstr "অবস্থার মান বাতিল করুন"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:489
+#: ../mail/em-filter-rule.c:522
 msgid "Then"
 msgstr "এর পরে"
 
-#: ../mail/em-filter-rule.c:517
+#: ../mail/em-filter-rule.c:550
 msgid "Add Ac_tion"
 msgstr "কর্ম যোগ করুন (_t)"
 
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
 msgstr "অনুসন্ধানের ফলাফল থেকে অনুসন্ধানের ফোল্ডার নির্মাণ করা হবে (_r)..."
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "সমস্ত বার্তা"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "না পড়া বার্তা"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "লেবেলবিহীন"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "পাঠ হওয়া বার্তা"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "সাম্প্রতিক বার্তা"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "সর্বশেষ ৫ দিনের বার্তা"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "সংযুক্ত বস্তুসহ বার্তা"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "গুরুত্বপূর্ণ বার্তা"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "বার্তাটি অনাকাঙ্ক্ষিত নয়"
 
-#: ../mail/em-folder-browser.c:1123
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "অ্যাকাউন্ট অনুসন্ধান"
 
-#: ../mail/em-folder-browser.c:1176
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "সর্বধরনের অ্যাকাউন্ট অনুসন্ধান"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:149
+#: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "না পড়া বার্তা:"
+msgstr[1] "না পড়া বার্তা:"
 
 #. 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:163
+#: ../mail/em-folder-properties.c:178
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "সর্বমোট বার্তা:"
+msgstr[1] "সর্বমোট বার্তা:"
+
+#: ../mail/em-folder-properties.c:196
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "বরাদ্দ স্থলের ব্যবহার (%s):"
+
+#: ../mail/em-folder-properties.c:198
+#, c-format
+msgid "Quota usage"
+msgstr "বরাদ্দ স্থলের ব্যবহার"
 
-#: ../mail/em-folder-properties.c:323
+#. 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:160
+#: ../mail/mail-component.c:581
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:594
+msgid "Inbox"
+msgstr "ইনবক্স"
+
+#: ../mail/em-folder-properties.c:389
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "ফোল্ডারের বৈশিষ্ট্যাবলী"
 
-#: ../mail/em-folder-selection-button.c:124
+#: ../mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<ফোল্ডার নির্বাচন করতে হলে এখানে ক্লিক করুন>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:254
 msgid "C_reate"
 msgstr "তৈরি করুন (_r)"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:258
 msgid "Folder _name:"
 msgstr "ফোল্ডারের নাম (_n):"
 
+#. load store to mail component
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
+#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "ফোল্ডার অনুসন্ধান করুন"
 
@@ -11417,27 +12097,19 @@ msgstr "ফোল্ডার অনুসন্ধান করুন"
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:157
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "খসড়া"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2535
-#: ../mail/mail-component.c:156
-#: ../plugins/exchange-operations/exchange-delegates-user.c:88
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "ইনবক্স"
-
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "আউটবক্স"
 
-#: ../mail/em-folder-tree-model.c:502 ../mail/mail-component.c:159
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "প্রেরণ করা বস্তু"
 
-#: ../mail/em-folder-tree-model.c:524 ../mail/em-folder-tree-model.c:831
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "লোড করা হচ্ছে..."
 
@@ -11456,343 +12128,333 @@ msgstr "লোড করা হচ্ছে..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:372
+#: ../mail/em-folder-tree.c:380
 #, c-format
-msgid "folder-display|%s (%u)"
+msgctxt "folder-display"
+msgid "%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "মেইল ফোল্ডার ট্রি"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s ফোল্ডারটি সরিয়ে ফেলা হচ্ছে"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s ফোল্ডারটি কপি করা হচ্ছে"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1974
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "%s ফোল্ডারে বার্তা সরিয়ে নেওয়া হচ্ছে"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1976
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "%s ফোল্ডারে বার্তা কপি করা হচ্ছে"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "উপরের স্তরের সংগ্রহস্থলে বার্তা ফেলা যাচ্ছে না"
 
-#: ../mail/em-folder-tree.c:994 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
 msgstr "উল্লিখিত ফোল্ডারে কপি করুন (_C)"
 
-#: ../mail/em-folder-tree.c:995 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
 msgid "_Move to Folder"
 msgstr "এই ফোল্ডারে সরাও (_M)"
 
-#: ../mail/em-folder-tree.c:1704 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" এ রক্ষিত ফোল্ডারগুলি স্ক্যান করা হচ্ছে"
 
-#: ../mail/em-folder-tree.c:2077 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:54
-msgid "_View"
-msgstr "প্রদর্শণ (_V)"
-
-#: ../mail/em-folder-tree.c:2078
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "নতুন উইন্ডোতে খোলো (_N)"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2083
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "নতুন ফোল্ডার (_N)..."
 
-#: ../mail/em-folder-tree.c:2086
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "স্থানান্তর করুন (_M)..."
 
-#: ../mail/em-folder-tree.c:2093 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "নাম পরিবর্তন করুন (_R)..."
 
-#: ../mail/em-folder-tree.c:2094
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "নতুন করে প্রদর্শন (_f)"
 
-#: ../mail/em-folder-tree.c:2095
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
-msgstr ""
+msgstr "আউটবক্স পরিশ্রুত করুন (_u)"
 
-#: ../mail/em-folder-tree.c:2101 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "আবর্জনা ফাঁকা করা হবে (_E)"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "`%s',`%s'-এ কপি করা হচ্ছে"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
-#: ../mail/em-folder-view.c:1207
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder"
 msgstr "ফোল্ডার নির্বাচন করুন"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "কপি করুন (_o)"
 
-#: ../mail/em-folder-utils.c:587
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../mail/em-folder-utils.c:585
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "`%s' ফোল্ডারটি তৈরি করা হচ্ছে"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "ফোল্ডার তৈরি করুন"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "ফোল্ডার কোথায় তৈরি করা হবে তা নির্ধারণ করুন:"
 
-#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "মেইল মুছে ফেলতে ব্যর্থ"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "এই বার্তা মুছে ফেলার জন্য পর্যাপ্ত অনুমতি আপনার নেই।"
 
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "প্রেরকের প্রতি উত্তর (_R)"
 
-#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:578 ../mail/em-popup.c:589
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../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 "ফরওয়ার্ড (_F)"
 
 #. 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:1341 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "নতুন বার্তা হিসাবে সম্পাদন করুন (_E)..."
 
-#: ../mail/em-folder-view.c:1343
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "প্রিন্ট করুন (_P)..."
-
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "পুনরুদ্ধার করুন (_n)"
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "এই ফোল্ডারে সরিয়ে ফেলুন (_M)..."
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "এই ফোল্ডারে কপি করুন ... (_C)"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "পড়া হয়েছে হিসাবে চিহ্নিত করুন (_k)"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "পড়া-হয়নি হিসাবে চিহ্নিত করা হবে(_U)"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "প্রয়োজনীয় হিসাবে চিহ্নিত করুন (_I)"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "অপ্রয়োজনীয় হিসাবে চিহ্নিত করুন (_i)"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "অনাকঙ্ক্ষিত হিসাবে চিহ্নিত করুন (_J)"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "অনাকাঙ্ক্ষিত নয় হিসাবে চিহ্নিত করুন (_N)"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr ""
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "লেবেল(_L)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:498
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "শূণ্য (_N)"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "নতুন লেবেল (_N)"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "কাজ সম্পুর্ণর ফ্ল্যাগ (_g)"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "ফ্ল্যাগ মুছে ফেলুন (_e)"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "বার্তা থেকে নিয়ম তৈরি করুন (_t)"
 
 #. 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:1374
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "বিষয় অনুসারে ফোল্ডারে অনুসন্ধান (_S)"
 
-#: ../mail/em-folder-view.c:1375
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "প্রেরক অনুসারে ফোল্ডারে অনুসন্ধান (_n)"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "প্রাপক অনুসারে ফোল্ডারে অনুসন্ধান (_R)"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "মেইলিং-লিস্ট অনুসারে ফোল্ডারে অনুসন্ধান (_L)"
 
 #. 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:1382
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "বিষয় অনুযায়ী ফিল্টার করা হবে (_j)"
 
-#: ../mail/em-folder-view.c:1383
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "প্রেরক অনুযায়ী ফিল্টার করা হবে (_d)"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "প্রাপকদের অনুযায়ী ফিল্টার করা হবে (_c)"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "মেইলিং লিস্ট অনুযায়ী ফিল্টার করা হবে (_M)"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2267 ../mail/em-folder-view.c:2311
+#. 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 "ডিফল্ট"
 
-#: ../mail/em-folder-view.c:2529
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr " বার্তা উদ্ধার করা সম্ভব হয়নি"
 
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr "বার্তা উদ্ধার করা হচ্ছে..."
 
-#: ../mail/em-folder-view.c:2807
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr ""
 
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "অনুসন্ধানের ফোল্ডার নির্মাণ (_S)"
 
-#: ../mail/em-folder-view.c:2811
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "উল্লিখিত ঠিকানা থেকে প্রাপ্ত(_F)"
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "উল্লিখিত ঠিকানায় প্রেরিত (_T)"
 
-#: ../mail/em-folder-view.c:3309
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "%s -কে মেইল করতে হলে ক্লিক করুন"
 
-#: ../mail/em-folder-view.c:3321
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "%s-কে কল করতে হলে ক্লিক করুন"
 
-#: ../mail/em-folder-view.c:3326
+#: ../mail/em-folder-view.c:3313
 msgid "Click to hide/unhide addresses"
 msgstr "ঠিকানা প্রদর্শন/আড়াল করার উদ্দেশ্যে ক্লিক করুন"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:515
+#: ../mail/em-format-html-display.c:471
 #, c-format
 msgid "Matches: %d"
 msgstr "মিল: %d"
 
-#: ../mail/em-format-html-display.c:659
+#: ../mail/em-format-html-display.c:615
 msgid "Fin_d:"
 msgstr "অনুসন্ধান:(_d)"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:683
+#: ../mail/em-format-html-display.c:639
 msgid "_Previous"
 msgstr "পূর্ববর্তী (_P)"
 
-#: ../mail/em-format-html-display.c:688
+#: ../mail/em-format-html-display.c:644
 msgid "_Next"
 msgstr "পরবর্তী (_N)"
 
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:649
 msgid "M_atch case"
 msgstr "হরফের ছাঁদ মেলানো হবে (_a)"
 
-#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:641
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "স্বাক্ষরিত নয়"
 
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:948
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "এই বার্তাটি ডিজিটালি স্বাক্ষরিত নয়। এই বার্তাটির সত্যতা প্রমানিত হয়নি।"
 
-#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:642
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "বৈধ স্বাক্ষর"
 
-#: ../mail/em-format-html-display.c:993
+#: ../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."
 msgstr "এই বার্তাটি ডিজিটালি স্বাক্ষরিত এবং এর সত্যতা প্রমানিত হয়েছে।"
 
-#: ../mail/em-format-html-display.c:994 ../mail/em-format-html.c:643
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "অবৈধ স্বাক্ষর"
 
-#: ../mail/em-format-html-display.c:994
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11800,11 +12462,11 @@ msgstr ""
 "এই বার্তাটির স্বাক্ষরটি পরীক্ষা করা সম্ভব হয়নি, সম্ভবত যাত্রাকালে এতে পরিবর্তন করা "
 "হয়েছে।"
 
-#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:644
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "স্বাক্ষর বৈধ কিন্তু প্রেরকের পরিচয় প্রমাণিত হয়নি"
 
-#: ../mail/em-format-html-display.c:995
+#: ../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."
@@ -11812,21 +12474,21 @@ msgstr ""
 "এই বার্তাটি একটি বৈধ স্বাক্ষরসহ স্বাক্ষরিত হয়েছে, কিন্তু প্রেরকের পরিচয় নিশ্চিতায়ন "
 "করা সম্ভব হয়নি।"
 
-#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "স্বাক্ষ র উপস্থিত হলেও সার্বজনীন-কি আবশ্যক"
 
-#: ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:952
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "এই বার্তাটি একটি বৈধ স্বাক্ষরসহ স্বাক্ষরিত হয়েছে, কিন্তু যথাযত সার্বজনীন-কি অনুপস্থিত।"
 
-#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "এনক্রিপ্ট করা নয়"
 
-#: ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:959
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11834,11 +12496,11 @@ msgstr ""
 "এই বার্তাটি এনক্রিপ্ট করা হয়নি।  ইন্টারনেটের মাধ্যমে যাত্রাকালে এতে অন্তর্ভুক্ত বস্তু "
 "প্রত্যক্ষ করা সম্ভব।"
 
-#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "এনক্রিপ্ট করা, দুর্বল"
 
-#: ../mail/em-format-html-display.c:1004
+#: ../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 "
@@ -11848,11 +12510,11 @@ msgstr ""
 "বহিরাগত ব্যক্তি সহজে না হলেও, কিছু সময় ব্যয় করলে এতে অন্তর্ভুক্ত বস্তু পড়তে সক্ষম হতে "
 "পারে।"
 
-#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "এনক্রিপ্ট করা হয়েছে"
 
-#: ../mail/em-format-html-display.c:1005
+#: ../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."
@@ -11860,11 +12522,11 @@ msgstr ""
 "এই বার্তাটি এনক্রিপ্ট করা হয়েছে।  কোনো বহিরাগত ব্যক্তি সহজে এতে অন্তর্ভুক্ত বস্তু পড়তে "
 "পারবে না।"
 
-#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "এনক্রিপ্ট করা, দৃঢ়ভাবে"
 
-#: ../mail/em-format-html-display.c:1006
+#: ../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 "
@@ -11874,93 +12536,89 @@ msgstr ""
 "বহিরাগত ব্যক্তির দ্বারা স্বাভাবিক সময়ের মধ্যে এই বার্তার বিষয়বস্তু পাঠ করা সম্ভব হবে "
 "না।"
 
-#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1063 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "সার্টিফিকেট প্রত্যক্ষ করুন (_V)"
 
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1078
 msgid "This certificate is not viewable"
 msgstr "সার্টিফিকেট প্রদর্শনযোগ্য নয়"
 
-#: ../mail/em-format-html-display.c:1441
+#: ../mail/em-format-html-display.c:1377
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p -এ সম্পন্ন হয়েছে"
 
-#: ../mail/em-format-html-display.c:1449
+#: ../mail/em-format-html-display.c:1385
 msgid "Overdue:"
 msgstr "সময়সীমা পার হয়ে গেছে:"
 
-#: ../mail/em-format-html-display.c:1452
+#: ../mail/em-format-html-display.c:1388
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p র দ্বারা"
 
-#: ../mail/em-format-html-display.c:1512
+#: ../mail/em-format-html-display.c:1466
 msgid "_View Inline"
 msgstr "ইনলাইন প্রতক্ষ্য করুন (_V)"
 
-#: ../mail/em-format-html-display.c:1513
+#: ../mail/em-format-html-display.c:1467
 msgid "_Hide"
 msgstr "লুকিয়ে ফেলুন (_H)"
 
-#: ../mail/em-format-html-display.c:1514
+#: ../mail/em-format-html-display.c:1468
 msgid "_Fit to Width"
 msgstr "প্রস্থের মাপ অনুযায়ী (_F)"
 
-#: ../mail/em-format-html-display.c:1515
+#: ../mail/em-format-html-display.c:1469
 msgid "Show _Original Size"
 msgstr "মূল মাপ প্রদর্শন করা হবে (_O)"
 
-#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "সংযুক্ত বস্তু"
-
-#: ../mail/em-format-html-display.c:2173
+#: ../mail/em-format-html-display.c:1989
 msgid "Save attachment as"
 msgstr "সংযুক্ত বস্তু নতুন রূপে সংরক্ষণ"
 
-#: ../mail/em-format-html-display.c:2177
+#: ../mail/em-format-html-display.c:1993
 msgid "Select folder to save all attachments"
 msgstr "সমস্ত সংযুক্ত বস্তু সংরক্ষণের উদ্দেশ্যে ফোল্ডার নির্বাচন করুন"
 
-#: ../mail/em-format-html-display.c:2228
+#: ../mail/em-format-html-display.c:2044
 msgid "_Save Selected..."
 msgstr "নির্বাচিত বস্তু সংরক্ষণ করুন...(_S)"
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2295
+#: ../mail/em-format-html-display.c:2111
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d-টি সংযুক্ত বস্তু (_t)"
+msgstr[1] "%d-টি সংযুক্ত বস্তু (_t)"
 
-#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
+#: ../mail/em-format-html-display.c:2118 ../mail/em-format-html-display.c:2207
 msgid "S_ave"
 msgstr "সংরক্ষণ করুন(_a)"
 
-#: ../mail/em-format-html-display.c:2313
+#: ../mail/em-format-html-display.c:2129
 msgid "S_ave All"
 msgstr "সমস্ত সংরক্ষণ করুন (_a)"
 
-#: ../mail/em-format-html-display.c:2376
+#: ../mail/em-format-html-display.c:2203
 msgid "No Attachment"
 msgstr "সংযুক্ত বস্তু নেই"
 
-#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
+#: ../mail/em-format-html-display.c:2344 ../mail/em-format-html-display.c:2383
 msgid "View _Unformatted"
 msgstr "বিন্যাসবিহীন প্রদর্শন (_U)"
 
-#: ../mail/em-format-html-display.c:2509
+#: ../mail/em-format-html-display.c:2346
 msgid "Hide _Unformatted"
 msgstr "বিন্যাসবিহীন অবস্থায় আড়াল: (_U)"
 
-#: ../mail/em-format-html-display.c:2564
+#: ../mail/em-format-html-display.c:2403
 msgid "O_pen With"
 msgstr "চিহ্নিত প্রোগ্রাম সহযোগে খুলুন (_p)"
 
-#: ../mail/em-format-html-display.c:2635
+#: ../mail/em-format-html-display.c:2479
 msgid ""
-"Evolution cannot render this email as it is too large to handle. You can "
+"Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 msgstr ""
 
@@ -11969,276 +12627,286 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "পৃষ্ঠা %d, %d -র"
 
-#: ../mail/em-format-html.c:495 ../mail/em-format-html.c:504
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "`%s' উদ্ধার করা হচ্ছে"
 
-#: ../mail/em-format-html.c:916
+#: ../mail/em-format-html.c:925
 msgid "Unknown external-body part."
 msgstr "বহিস্থত অংশ অজানা।"
 
-#: ../mail/em-format-html.c:924
+#: ../mail/em-format-html.c:933
 msgid "Malformed external-body part."
 msgstr "বহিস্থত অংশ বিকৃত।"
 
-#: ../mail/em-format-html.c:954
+#: ../mail/em-format-html.c:963
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "এফটিপি সাইটের নির্দেশচিহ্ন (%s)"
 
-#: ../mail/em-format-html.c:965
+#: ../mail/em-format-html.c:974
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "স্থানীয় ফাইলের (%s) নির্দেশচিহ্ন \"%s\" স্থানে বৈধ"
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:976
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "স্থানীয় ফাইলের নির্দেশচিহ্ন (%s)"
 
-#: ../mail/em-format-html.c:988
+#: ../mail/em-format-html.c:997
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "দূরবর্তী ডাটাকে নির্দেশকারী চিহ্ন (%s)"
 
-#: ../mail/em-format-html.c:999
+#: ../mail/em-format-html.c:1008
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "অজানা বহিস্থ ডাটা (\"%s\" ধরনের)-কে নির্দেশকারী চিহ্ন"
 
-#: ../mail/em-format-html.c:1227
+#: ../mail/em-format-html.c:1236
 msgid "Formatting message"
 msgstr "বার্তা ফরম্যাট করা হচ্ছে"
 
-#: ../mail/em-format-html.c:1394
+#: ../mail/em-format-html.c:1410
 msgid "Formatting Message..."
 msgstr "বার্তা ফরম্যাট করা হচ্ছে..."
 
-#: ../mail/em-format-html.c:1546 ../mail/em-format-html.c:1610
-#: ../mail/em-format-html.c:1632 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
+#: ../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 "অনুলিপি প্রাপক"
 
-#: ../mail/em-format-html.c:1547 ../mail/em-format-html.c:1616
-#: ../mail/em-format-html.c:1635 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
+#: ../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 "অপ্রকাশিত অনুলিপি প্রাপক"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1706 ../mail/em-format-quote.c:331
-#: ../mail/em-mailer-prefs.c:1458
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1450
 msgid "Mailer"
 msgstr "মেইলার"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1733
+#: ../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:1738
+#: ../mail/em-format-html.c:1776
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
-#: ../mail/em-format-html.c:1750 ../mail/em-format-quote.c:338
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
-#: ../widgets/misc/e-dateedit.c:368
-msgid "Date"
-msgstr "তারিখ"
-
-#: ../mail/em-format-html.c:1773 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:97
-msgid "Newsgroups"
-msgstr "নিউজগ্রুপ"
-
 #. 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:1866
+#: ../mail/em-format-html.c:1907
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "বার্তাটি <b>%s</b> দ্বারা <b>%s</b>-র পক্ষ থেকে পাঠানো হয়েছে"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:333
+#: ../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 "প্রেরক"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
+#: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "উত্তর - প্রাপক"
 
+#: ../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 "তারিখ"
+
+#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
+msgid "Newsgroups"
+msgstr "নিউজগ্রুপ"
+
 #: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "%s সংযুক্ত বস্তু"
 
-#: ../mail/em-format.c:1196
+#: ../mail/em-format.c:1199
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME বার্তা পার্স করা সম্ভব হয়নি: অজানা সমস্যা"
 
-#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
+#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME বার্তা পার্স করা সম্ভব হয়নি। উত্স হিসাবে প্রদর্শিত হবে।"
 
-#: ../mail/em-format.c:1341
+#: ../mail/em-format.c:1344
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "মাল্টিপার্ট/এনক্রিপ্টকৃতের জন্য অসমর্থিত এনক্রিপশনের ধরন"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message"
 msgstr "PGP/MIME বার্তা পার্স করা সম্ভব হয়নি"
 
-#: ../mail/em-format.c:1351
+#: ../mail/em-format.c:1354
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "PGP/MIME বার্তা পার্স করা সম্ভব হয়নি: অজানা সমস্যা"
 
-#: ../mail/em-format.c:1508
+#: ../mail/em-format.c:1511
 msgid "Unsupported signature format"
 msgstr "অসমর্থিত স্বাক্ষরের ফরমা"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
 msgid "Error verifying signature"
 msgstr "স্বাক্ষর পরীক্ষা করতে ব্যর্থ"
 
-#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
+#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
 msgid "Unknown error verifying signature"
 msgstr "স্বাক্ষর পরীক্ষা করতে অজানা সমস্যা হয়েছে"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message"
 msgstr "PGP বার্তা পার্স করতে ব্যর্থ"
 
-#: ../mail/em-format.c:1659
+#: ../mail/em-format.c:1662
 msgid "Could not parse PGP message: Unknown error"
 msgstr "PGP বার্তা পার্স করা সম্ভব হয়নি: অজানা সমস্যা"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:93
 msgid "Every time"
 msgstr "প্রতি বার"
 
-#: ../mail/em-mailer-prefs.c:109
+#: ../mail/em-mailer-prefs.c:94
 msgid "Once per day"
 msgstr "প্রতিদিন একবার"
 
-#: ../mail/em-mailer-prefs.c:110
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per week"
 msgstr "প্রতি সপ্তাহে একবার"
 
-#: ../mail/em-mailer-prefs.c:111
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per month"
 msgstr "প্রতি মাসে একবার"
 
-#: ../mail/em-mailer-prefs.c:341
+#: ../mail/em-mailer-prefs.c:326
 msgid "Add Custom Junk Header"
 msgstr "অবাঞ্ছিত বার্তার জন্য স্বনির্ধারিত হেডার"
 
-#: ../mail/em-mailer-prefs.c:345
+#: ../mail/em-mailer-prefs.c:330
 msgid "Header Name:"
 msgstr "হেডারের নাম:"
 
-#: ../mail/em-mailer-prefs.c:346
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Value Contains:"
 msgstr "হেডার মানের মধ্যে অন্তর্ভুক্ত হয়েছে:"
 
-#: ../mail/em-mailer-prefs.c:451
+#: ../mail/em-mailer-prefs.c:436
 msgid "Contains Value"
 msgstr "অন্তর্ভুক্ত মান"
 
-#: ../mail/em-mailer-prefs.c:473
+#: ../mail/em-mailer-prefs.c:458
 msgid "Color"
 msgstr "রঙ"
 
-#: ../mail/em-mailer-prefs.c:476
+#: ../mail/em-mailer-prefs.c:461
 msgid "Tag"
 msgstr "ট্যাগ"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
+#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s প্লাগ-ইন উপলব্ধ ও বাইনারি ইনস্টল করা হয়েছে।"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
 #, c-format
 msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s প্লাগ-ইন উপলব্ধ নয়। অনুগ্রহ করে পরীক্ষা করুন প্যাকেজটি ইনস্টল করা হয়েছে কি না।"
 
-#: ../mail/em-mailer-prefs.c:1115
+#: ../mail/em-mailer-prefs.c:1107
 msgid "No Junk plugin available"
 msgstr "অবাঞ্ছিত বার্তা সংক্রান্ত প্লাগ-ইন উপস্থিত নয়"
 
 #. green
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1059
 msgid "To Do"
 msgstr "করনীয়"
 
 #. blue
-#: ../mail/em-migrate.c:1058
+#: ../mail/em-migrate.c:1060
 msgid "Later"
 msgstr "পরে"
 
-#: ../mail/em-migrate.c:1211
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution মেইলবক্স ফোল্ডারের অবস্থান এবং অনুক্রম Evolution ১.x-এর পর থেকে "
-"পরিবর্তিত হয়েছে।\n"
-"\n"
-"Evolution আপনার ফোল্ডার মাইগ্রেট করছে অনুগ্রহ করে অপেক্ষা করুন..."
-
-#: ../mail/em-migrate.c:1650
+#: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "নতুন ফোল্ডার `%s' তৈরি করা যায়নি: %s"
 
 # dont like
-#: ../mail/em-migrate.c:1676
+#: ../mail/em-migrate.c:1678
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "ফোল্ডার `%s' -কে `%s' -এ কপি করা যায়নি: %s"
 
-#: ../mail/em-migrate.c:1861
+#: ../mail/em-migrate.c:1863
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "`%s' এ উপস্থিত মেইলবক্স অনুসন্ধান করা সম্ভব হয়নি: %s"
 
-#: ../mail/em-migrate.c:2065
+#: ../mail/em-migrate.c:1868
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Evolution মেইলবক্স ফোল্ডারের অবস্থান এবং অনুক্রম Evolution ১.x-এর পর থেকে "
+"পরিবর্তিত হয়েছে।\n"
+"\n"
+"Evolution আপনার ফোল্ডার মাইগ্রেট করছে অনুগ্রহ করে অপেক্ষা করুন..."
+
+#: ../mail/em-migrate.c:2069
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "পুরোনো, POP সার্ভারে-সংরক্ষণ-করা-হবে ডাটা `%s' খুলতে ব্যর্থ: %s"
 
-#: ../mail/em-migrate.c:2079
+#: ../mail/em-migrate.c:2083
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "POP3 সার্ভারে-সংরক্ষণ-করা-হবে ডাটা ডিরেক্টরি `%s' তৈরি করতে ব্যর্থ: %s"
 
-#: ../mail/em-migrate.c:2108
+#: ../mail/em-migrate.c:2112
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP3 সার্ভারে-সংরক্ষণ-করা-হবে ডাটা `%s' কপি করতে ব্যর্থ: %s"
 
-#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
+#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "স্থানীয় মেইল সংরক্ষণস্থল `%s' তৈরি করা যায়নি: %s"
 
-#: ../mail/em-migrate.c:2827
+#: ../mail/em-migrate.c:2898
+msgid ""
+"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..."
+msgstr ""
+"Evolution মেইলবক্স ফোল্ডারের সারাংশের বিন্যাস Evolution 2.24-র পরে sqlite-এ "
+"পরিবর্তিত হয়েছে।\n"
+"\n"
+"Evolution দ্বারা আপনার ফোল্ডারগুলি মাইগ্রেট করা হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
+
+#: ../mail/em-migrate.c:2963
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "`%s'-এ স্থানীয় মেইল ফোল্ডার তৈরি করা যায়নি: %s"
 
-#: ../mail/em-migrate.c:2846
+#: ../mail/em-migrate.c:2982
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12246,258 +12914,299 @@ msgstr ""
 "পূর্ববর্তী Evolution ইনস্টলেশনের বৈশিষ্ট্যাবলী পড়া সম্ভব হয়নি, `evolution/config."
 "xmldb' সম্ভবত উপস্থিত নেই অথবা ক্ষতিগ্রস্থ হয়েছে।"
 
-#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "প্রেরকের প্রতি উত্তর (_R)"
 
-#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "লিস্টে উত্তর(_L)"
 
-#: ../mail/em-popup.c:639
+#. make it first item
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "ঠিকানাবইয়ে যোগ করুন (_A)"
 
-#: ../mail/em-subscribe-editor.c:595
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "এই সংরক্ষণস্থলে সাবস্ক্রিপশন সমর্থিত নয় অথবা সক্রিয় করা হয়নি।"
 
-#: ../mail/em-subscribe-editor.c:628
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "সাবস্ক্রাইব করা"
 
-#: ../mail/em-subscribe-editor.c:632
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "ফোল্ডার"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:834
+#: ../mail/em-subscribe-editor.c:822
 msgid "Please select a server."
 msgstr "অনুগ্রহ করে একটি সার্ভার নির্বাচন করুন।"
 
-#: ../mail/em-subscribe-editor.c:855
+#: ../mail/em-subscribe-editor.c:843
 msgid "No server has been selected"
 msgstr "কোনো সার্ভার নির্বাচন করা হয়নি"
 
-#: ../mail/em-utils.c:121
+#. Check buttons
+#: ../mail/em-utils.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:127
 msgid "_Do not show this message again."
 msgstr "এই বার্তাটি পুনরায় প্রদর্শন করা হবে না (_D)"
 
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "বার্তা ফিল্টার"
 
-#: ../mail/em-utils.c:370
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "বার্তা"
 
-#: ../mail/em-utils.c:645
+#: ../mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "বার্তা সংরক্ষণ করুন..."
 
-#: ../mail/em-utils.c:694
+#: ../mail/em-utils.c:703
 msgid "Add address"
 msgstr "ঠিকানা যোগ করুন"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1178
+#: ../mail/em-utils.c:1224
 #, c-format
 msgid "Messages from %s"
 msgstr "%s থেকে বার্তা"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "ফোল্ডার অনুসন্ধান করুন (_F)"
 
-#: ../mail/em-vfolder-rule.c:592
+#: ../mail/em-vfolder-rule.c:593
 msgid "Search Folder source"
 msgstr "অনুসন্ধান ফোল্ডারের উৎ‌স"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Send and Receive Mail\" window height"
+msgstr "\"মেইল প্রেরণ এবং গ্রহণ করুন\" উইন্ডোর উচ্চতা"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "\"মেইল প্রেরণ এবং গ্রহণ করুন\" উইন্ডোর সর্বোচ্চ মাপ বিশিষ্ট অবস্থা"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "\"Send and Receive Mail\" window width"
+msgstr "\"মেইল প্রেরণ এবং গ্রহণ করুন\" উইন্ডোর প্রস্থ"
+
+#: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows evolution to display text part of limited size"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Always request read receipt"
 msgstr "সর্বদা মেইল-পাঠের সূচনা প্রদানের অনুরোধ করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr ""
+msgstr "স্ট্যাটাস বারের মধ্যে ত্রুটি প্রদর্শনের সময়, সেকেন্ডে নির্ধারিত।"
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Automatic emoticon recognition"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Automatic link recognition"
 msgstr "স্বয়ংক্রিয় লিঙ্ক পরিচিতি"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Check incoming mail being junk"
 msgstr "অন্তর্মূখী মেইল জঞ্জাল কি না পরীক্ষা করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Citation highlight color"
 msgstr "উদ্ধৃতি উল্লেখ করতে ব্যবহৃত রং"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Citation highlight color."
 msgstr "উদ্ধৃতি উল্লেখ করতে ব্যবহৃত রং।"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
 msgstr "কম্পোসার উইন্ডোর ডিফল্ট উচ্চতা"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
 msgstr "কম্পোসার উইন্ডোর ডিফল্ট প্রস্থ"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../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."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:18
+msgid "Custom headers to use while checking for junk."
+msgstr "আবর্জনা পরীক্ষা করার জন্য ব্যবহৃত স্বনির্ধারিত হেডার।"
+
+#: ../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\"."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
 msgstr "যে ডিফল্ট অক্ষরমালা (charset) ব্যবহার করে বার্তা কম্পোজ করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Default charset in which to compose messages."
 msgstr "যে ডিফল্ট অক্ষরমালা (charset) ব্যবহার করে বার্তা কম্পোজ করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default charset in which to display messages"
 msgstr "যে ডিফল্ট অক্ষরমালা (charset) ব্যবহার করে বার্তা প্রদর্শন করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default charset in which to display messages."
 msgstr "যে ডিফল্ট অক্ষরমালা (charset) ব্যবহার করে বার্তা প্রদর্শন করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Default forward style"
 msgstr "ফরওয়ার্ডের ডিফল্ট বিন্যাস"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default height of the Composer Window."
 msgstr "কম্পোসার উইন্ডোর ডিফল্ট উচ্চতা।"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default height of the message window."
 msgstr "কম্পোসার উইন্ডোর ডিফল্ট প্রস্থ।"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default height of the subscribe dialog."
 msgstr "সাবস্ক্রাইব ডায়লগের ডিফল্ট উচ্চতা।"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default reply style"
 msgstr "উত্তর লেখার ডিফল্ট বিন্যাস"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default value for thread expand state"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default width of the Composer Window."
 msgstr "কম্পোসার উইন্ডোর ডিফল্ট প্রস্থ।"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default width of the message window."
 msgstr "বার্তা উইন্ডোর ডিফল্ট প্রস্থ।"
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default width of the subscribe dialog."
 msgstr "সাবস্ক্রাইব ডায়লগের ডিফল্ট প্রস্থ।"
 
-#: ../mail/evolution-mail.schemas.in.h:27
-msgid "Determines whether to lookup in addressbook for sender email"
-msgstr ""
+#: ../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:28
+#: ../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 loopup the sender email in addressbook. If found, it "
+"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 "
-"can be slow, if remote addressbooks (like ldap) are marked for "
+"can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
-msgstr ""
+msgstr "অবাঞ্ছিত বার্তা পরীক্ষণের জন্য স্বনির্ধারিত হেডার প্রয়োগ করা হবে কি না তা নির্ধারণ করা হয়।"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../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:31
+#: ../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:32
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
-msgstr ""
+msgstr "রচনা ক্ষেত্রে ফাইল লোড ও সংযুক্ত করার জন্য ব্যবহৃড ডিরক্টরি।"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
+msgstr "মেইলের সাথের সামগ্রী সংরক্ষণের উদ্দেশ্যে ব্যবহৃত ডিরেক্টরি।"
+
+#: ../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:34
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr "টাইপ করার সময় ভুল বানানের উপর চিহ্ন আঁকো"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
 msgstr "প্রস্থান করার সময় আবর্জনার ফোল্ডার খালি করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "প্রস্থান করার সময় আবর্জনার ফোল্ডার খালি করবে"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Evolution থেকে প্রস্থান করার সময় আবর্জনার সকল ফোল্ডার খালি করবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "প্রস্থান করার সময় আবর্জনার সকল ফোল্ডার খালি করবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "ক্যারেট মোড সক্রিয় করুন, যাতে বার্তা পড়বার সময় আপনি একটি কার্সার দেখতে পান।"
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
-msgstr ""
+msgstr "ম্যাজিক স্পেস বার সক্রিয় অথবা নিষ্ক্রিয় করুন"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "ফোল্ডার অনুসন্ধান সক্রিয় করুন"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "প্রারম্ভ ফোল্ডা অনুসন্ধান সক্রিয় করা হবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../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 "
@@ -12505,33 +13214,33 @@ msgid ""
 "that folder."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "ক্যারেট মোড সক্রিয়/নিষ্ক্রিয় করুন"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "বার্তা-তালিকা পেইনের উচ্চতা"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "বার্তা-তালিকা পেইনের উচ্চতা।"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
-msgstr ""
+msgstr "ফোল্ডার ভিত্তিক পূর্ব প্রদর্শন আড়াল করে, নির্বাচিত মান সরিয়ে ফেলা হয়"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../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."
@@ -12539,13 +13248,13 @@ msgstr ""
 "ব্যবহারকারীর দ্বারা এক সময়ে ১০ অথবা অধিক সংখ্যক বার্তা পড়ার প্রচেষ্টা করা হলে "
 "ব্যবহারকারীকে সত্রক করে সম্মতি নেওয়া হবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
-msgstr ""
+msgstr "\"পূর্বরূপ\" প্রদর্শনের পেইন সক্রিয় থাকলে, উলম্ব দিশায় প্রদর্শন না করে অনুভূমিক দিশায় প্রদর্শন করা হবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../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 "
@@ -12556,48 +13265,69 @@ msgstr ""
 "ডাটাবেসের মধ্যে উপস্থিত একটি bonobo-component-র সাহায্যে অন্তর্ভুক্ত বিষয়বস্তু প্রদর্শন "
 "করা সম্ভব।"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../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."
+msgstr ""
+
+#: ../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 "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../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."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../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:57
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "আবর্জনা সর্বশেষ পরিষ্কার করা হয়েছিল"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "শেষ যেবার আবর্জনা পরিষ্কার করা হয়েছিল"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "লেবেলের তালিকা এবং তাদের সাথে যুক্ত রঙ"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "গৃহীত অনুমতির তালিকা"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "অ্যাকাউন্টের তালিকা"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12605,11 +13335,15 @@ msgstr ""
 "Evolution-র মেইল কম্পোনেন্টের পরিচিত অ্যাকাউন্টের তালিকা। এই তালিকায় /apps/"
 "evolution/mail/accounts-এর আপেক্ষায় সাবডিরেক্টরিগুলির নাম লেখা আছে।"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "স্বনির্বাচিত হেডার এবং তাদের সক্রিয় অবস্থা সুচক তালিকা।"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "List of dictionary language codes used for spell checking."
+msgstr "বানান পরীক্ষণের জন্য অভিধানে ব্যবহৃত ভাষার কোডের তালিকা।"
+
+#: ../mail/evolution-mail.schemas.in.h:77
 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."
@@ -12617,129 +13351,129 @@ msgstr ""
 "Evolution-র মেইল কম্পোনেন্টের পরিচিত লেবেলের তালিকা। এই তালিকায় নাম:রং লেখা "
 "কিছু পংক্তি অন্তর্ভুক্ত করা আছে এবং রং-এর জন্য HTML hex এনকোডিং ব্যবহার করা হয়।"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "বোনোবো কম্পোনেন্ট প্রদর্শক পরীক্ষণের জন্য mime-এর ধরনের তালিকা"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "যে সব প্রোটোকলের তালিকা গৃহীত হয়েছে তার নামের তালিকা।"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "HTML বার্তার জন্য http-র মাধ্যমে ছবি লোড করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../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 contacts. 2 - "
-"Always load images off the net."
+"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 ""
-"HTML বার্তার ক্ষেত্রে http(s)-র মাধ্যমে ছবি লোড করা হবে। সম্ভাব্য মান হল: ০ - নেট "
-"থেকে কখনো ছবি লোড করা হবে না ১ - ঠিকানাবইয়ের মধ্যে প্রেরক উপস্থিত থাকলে ছবি লোড "
-"করা হবে ২ - নেট থেকে সর্বদা ছবি লোড করা হবে।"
+"HTML বার্তার ক্ষেত্রে http(s)-র মাধ্যমে ছবি লোড করা হবে। সম্ভাব্য মান হল: \"0\" - "
+"নেট থেকে কখনো ছবি লোড করা হবে না \"1\" - ঠিকানাবইয়ের মধ্যে প্রেরক উপস্থিত থাকলে "
+"ছবি লোড করা হবে \"2\" - নেট থেকে সর্বদা ছবি লোড করা হবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "ফিল্টারের কর্ম লগ করবে"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "ফিল্টারের কর্ম লগ নির্ধারিত লগ ফাইলে করবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "ফিল্টারের কর্ম লগ করার জন্য লগফাইল"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "ফিল্টারের কর্ম লগ করার জন্য লগফাইল।"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "নির্দিষ্ট সময়সীমা পার হয়ে গেলে পড়া-হয়েছে বলে চিহ্নিত করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "নির্দিষ্ট সময়সীমা পার হয়ে গেলে পড়া-হয়েছে বলে চিহ্নিত করা হবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "বার্তার \"পূর্বপ্রদর্শন\"-র মধ্যে উদ্ধৃতি চিহ্নিত করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "বার্তার \"পূর্বপ্রদর্শন\"-র মধ্যে উদ্ধৃতি চিহ্নিত করা হবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
 msgstr "বার্তার উইন্ডোর ডিফল্ট উচ্চতা"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
 msgstr "বার্তার উইন্ডোর ডিফল্ট প্রস্থা"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "বার্তা-প্রদর্শনের ধরন (\"normal(স্বাভাবিক)\", \"full headers(সম্পূর্ণ হেডারসহ)\", "
 "\"source(উত্স)\")"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
 msgstr "সবর্নিম্ন যে সংখ্যক দিন অপেক্ষা করে প্রস্থানের সময় আবর্জনা পরিষ্কার করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
 msgstr "সবর্নিম্ন যে সংখ্যক দিন অপেক্ষা করে প্রস্থানের সময় আবর্জনা পরিষ্কার করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "সবর্নিম্ন যে সংখ্যক দিন অপেক্ষা করে প্রস্থানের সময় আবর্জনা পরিষ্কার করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "সবর্নিম্ন যে সংখ্যক দিন অপেক্ষা করে প্রস্থানের সময় আবর্জনা পরিষ্কার করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "কোনো বিষয় না উল্লিখিত না হলে সতর্কবাণী প্রদর্শন করবে"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "কোনো ফোল্ডার এক্সপাঞ্জ করার চেষ্টা করলে ব্যবহারকারীকে সতর্কবাণী প্রদর্শন করবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "বিষয়হীন বার্তা প্রেরণ করার চেষ্টা করলে ব্যবহারকারীকে সতর্কবাণী প্রদর্শন করবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
-msgstr ""
+msgstr "অনুসন্ধানের ফোল্ডারের মধ্যে বার্তা মুছে ফেলার পূর্বে সতর্কবার্তা প্রদর্শন করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "ব্যবহারকারী এক্সপাঞ্জ করলে সতর্কবাণী প্রদর্শন করবে"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "ব্যবহারকারী শুধুমাত্র অপ্রকাশিত অনুলীপিপ্রাপকের নাম লিখলে সতর্কবাণী প্রদর্শন করবে"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "এক সময়ে ১০ অথবা অধিক সংখ্যক বার্তা পড়ার প্রচেষ্টা করা হলে সতর্কবার্তা প্রদর্শন করা "
 "হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../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."
@@ -12747,158 +13481,162 @@ msgstr ""
 "HTML বার্তা গ্রহণে অনিচ্ছুক প্রাপকদের ব্অবহারকারী HTML বার্তা প্রেরণ করার চেষ্টা করলে "
 "সতর্কবাণী প্রদর্শন করবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "ব্যবহারকারী যদি বার্তায় কোনো প্রাপক অথবা অনুলিপী প্রাপকদের নাম না লিখে বার্তা "
 "প্রেরণ করার চেষ্টা করলে সতর্কবাণী প্রদর্শন করবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "ব্যবহারকারী অবাঞ্ছিত HTML প্রেরণ করতে চেষ্টা করলে সতর্কবাণী প্রদর্শন করবে"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "একাধিক বার্তা চিহ্নিত করতে হলে সতর্কবার্তা প্রদর্শিত হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "টেক্সটের মধ্যে ভাব-আইকন অনুসন্ধান করে সেগুলির পরিবর্তে ছবি স্থাপন করা হবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "টেক্সটের মধ্যে লিঙ্ক অনুসন্ধান করে প্রতিস্থাপন করা হবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "আগমনকারী মেইলে জঞ্জাল পরীক্ষা করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "সংরক্ষণের ডিরেক্টরি"
 
-#: ../mail/evolution-mail.schemas.in.h:102
-msgid "Search for the sender photo in local addressbooks"
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Search for the sender photo in local address books"
 msgstr "স্থানীয় ঠিকানাবইয়ের মধ্যে প্রেরকের ছবি অনুসন্ধান করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "ডিফল্টভাবে HTML মেইল প্রেরণ করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "ডিফল্টভাবে HTML মেইল প্রেরণ করা হবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "বার্তা তালিকায় প্রেরকের ই-মেইল ঠিকানার কলাম"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "সার্ভারের সুসংগতির মধ্যে বিরতি"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "অ্যানিমেশন ছবি প্রদর্শন করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "অ্যানিমেশন ছবি অ্যানিমেশন হিসাবে প্রদর্শন করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "মুছে ফেলা বার্তাগুলিকে বার্তা-তালিকায় (মাঝে রেখাঙ্কন করে) প্রদর্শন করা হবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "বার্তা-তলিকায় মুছে-ফেলা বার্তা প্রদর্শন করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "প্রেরকের ছবি প্রদর্শন করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "বার্তা তালিকার একটি পৃথক কলামের মধ্যে প্রেরকের ই-মেইল ঠিকানা প্রদর্শন করা হবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "বার্তা পাঠের পেইনের মধ্যে প্রেরকের ছবি প্রদর্শন করা হবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:115
-msgid "Specifies the header to check for junk."
-msgstr "জঞ্জাল পরীক্ষা করার জন্য ব্যবহৃত হেডার নির্ধারণ করা হয়।"
-
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid ""
-"Specifies the header to check for junk. The format is headername=value in "
-"gconf."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "ইনলাইন বানান পরীক্ষণ"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Spell checking color"
+msgstr "বানান পরীক্ষণে ব্যবহৃত রঙ"
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Spell checking languages"
+msgstr "বানান পরীক্ষণ ভাষা"
+
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
 msgstr "সাবস্ক্রাইব ডায়লগের ডিফল্ট উচ্চতা"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
 msgstr "সাবস্ক্রাইব ডায়লগের ডিফল্ট প্রস্থ"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "টার্মিন্যালের ফন্ট"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "অবাঞ্ছিত বার্তা আটক করতে ব্যবহৃত ডিফল্ট প্লাগ-ইন"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "আবর্জনার বাক্স সর্বশেষ ফাঁকা করার সময়কাল, দিন হিসাবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "মেইল প্রদর্শনের জন্য টার্মিন্যালে যে ফন্ট ব্যবহার করা হবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "মেইল প্রদর্শন করার জন্য পরিবর্তনশীল বিস্তারের ফন্ট।"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../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 "তিনটি সম্ভাব্য মান। ত্রুটির ক্ষেত্রে ০ (0), সতর্কবার্তার ক্ষেত্রে ১ (1) এবং ডিবাগ বার্তার ক্ষেত্রে ২ (2)।"
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
+msgstr ""
+"তিনটি সম্ভাব্য মান। ত্রুটির ক্ষেত্রে \"0\", সতর্কবার্তার ক্ষেত্রে  \"1\" এবং ডিবাগ "
+"বার্তার ক্ষেত্রে \"2\"।"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../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 interms of KB."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../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:130
+#: ../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."
+"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:131
+#: ../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;"
@@ -12909,130 +13647,145 @@ msgstr ""
 "স্ট্রাকচারের তালিকা থাকা উচিত। XML স্ট্রাকচার হলো &lt;হেডার সক্রিয়&gt; - মেইল ভিউ-"
 "তে হেডার প্রদর্শন করতে হলে সক্রিয় হিসাবে নির্ধারণ করুন।"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../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 ""
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../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."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../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."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../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 "
 "restart."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "বার্তা তালিকা থ্রেড করা হবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "বার্তা তালিকা থ্রেড করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "বার্তা তালিকা বিষয় অনুসারে থ্রেড করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "বার্তা পড়া-হয়েছে হিসাবে চিহ্নিত করার সময়সীমা"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Timeout for marking message as seen."
 msgstr "বার্তাগুলিকে পড়া-হয়েছে হিসাবে চিহ্নিত করার সময়সীমা।"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
 msgstr "ডিফল্ট অ্যাকাউন্টের জন্য UID-র স্ট্রিং।"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../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 ডেমন ও ক্লায়েন্ট ব্যবহার করা হবে"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Spamassassin ডেমন ও ক্লায়েন্ট ব্যবহার করুন (spamc/spamd)।"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Use custom fonts"
 msgstr "স্বনির্বাচিত ফন্ট ব্যবহার করুন"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Use custom fonts for displaying mail."
 msgstr "স্বনির্বাচিত ফন্ট ব্যবহার করে মেইল প্রদর্শন করা হবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Use only local spam tests."
 msgstr "শুধুমাত্র স্থানীয় স্প্যাম পরীক্ষা ব্যবহার করা হবে।"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Use only the local spam tests (no DNS)."
 msgstr "শুধুমাত্র স্থানীয় স্প্যাম পরীক্ষা ব্যবহার করা হবে (DNS বিহীন)।"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Use side-by-side or wide layout"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Variable width font"
 msgstr "পরিবর্তনশীল-বিস্তারের ফন্ট"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "View/Bcc menu item is checked"
 msgstr "ভিউ/অপ্রকাশিত অনুলিপিপ্রাপক মেনুর বস্তুটি চিহ্নিত রয়েছে"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "View/Bcc menu item is checked."
 msgstr "ভিউ/অপ্রকাশিত অনুলিপিপ্রাপক মেনুর বস্তুটি চিহ্নিত রয়েছে।"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "View/Cc menu item is checked"
 msgstr "ভিউ/অনুলিপিপ্রাপক মেনুর বস্তুটি চিহ্নিত রয়েছে"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "View/Cc menu item is checked."
 msgstr "ভিউ/অনুলীপিপ্রাপক মেনুর বস্তুটি চিহ্নিত রয়েছে।"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "View/From menu item is checked"
 msgstr "ভিউ/প্রেরক মেনুর বস্তুটি চিহ্নিত রয়েছে"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "View/From menu item is checked."
 msgstr "ভিউ/প্রেরক মেনুর বস্তুটি চিহ্নিত রয়েছে।"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "View/PostTo menu item is checked"
 msgstr "প্রদর্শন/এইস্থানে পোস্ট করুন মেনুর বস্তুটি চিহ্নিত রয়েছে"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "View/PostTo menu item is checked."
 msgstr "প্রদর্শন/এইস্থানে পোস্ট করুন মেনুর বস্তুটি চিহ্নিত রয়েছে।"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "View/ReplyTo menu item is checked"
 msgstr "ভিউ/প্রত্যুত্তর মেনুর বস্তুটি চিহ্নিত রয়েছে"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "View/ReplyTo menu item is checked."
 msgstr "ভিউ/প্রত্যুত্তর মেনুর বস্তুটি চিহ্নিত রয়েছে।"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../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."
@@ -13040,43 +13793,43 @@ msgstr ""
 "কোনো বার্তার হেডারে এর-উত্তরে অথবা প্রসঙ্গ উল্লেখ না করা থাকলে বিষয় অনুসারে বার্তা "
 "থ্রেড করা হবে কি না।"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Whether sort threads based on latest message in that thread"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Width of the message-list pane"
 msgstr "বার্তা-তালিকা পেইনের প্রস্থ"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Width of the message-list pane."
 msgstr "বার্তা-তালিকা পেইনের প্রস্থ।"
 
-#: ../mail/importers/elm-importer.c:184
+#: ../mail/importers/elm-importer.c:182
 msgid "Importing Elm data"
 msgstr "এল্ম-এর ডাটা ইম্পোর্ট করা হচ্ছে"
 
-#: ../mail/importers/elm-importer.c:369
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm ইম্পোর্টার"
 
-#: ../mail/importers/elm-importer.c:370
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "Elm থেকে মেইল ইম্পোর্ট করা হবে।"
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:80
 msgid "Destination folder:"
 msgstr "গন্তব্যের ফোল্ডার:"
 
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-mbox-importer.c:83
 msgid "Select folder to import into"
 msgstr "যে ফোল্ডারে ইম্পোর্ট করা হবে তা নির্বাচন করুন"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley মেইলবক্স (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:221
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importer Berkeley Mailbox বিন্যাসের ফোল্ডার"
 
@@ -13084,7 +13837,7 @@ msgstr "Importer Berkeley Mailbox বিন্যাসের ফোল্ডা
 msgid "Importing mailbox"
 msgstr "মেইলবক্স ইম্পোর্ট করা হচ্ছে"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "`%s' ইম্পোর্ট করা হচ্ছে"
@@ -13094,167 +13847,190 @@ msgstr "`%s' ইম্পোর্ট করা হচ্ছে"
 msgid "Scanning %s"
 msgstr "%s স্ক্যান করা হচ্ছে"
 
-#: ../mail/importers/pine-importer.c:229
+#: ../mail/importers/pine-importer.c:227
 msgid "Importing Pine data"
 msgstr "পাইনের ডাটা ইম্পোর্ট করা হচ্ছে"
 
-#: ../mail/importers/pine-importer.c:428
+#: ../mail/importers/pine-importer.c:426
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine ইম্পোর্ট ব্যবস্থা"
 
-#: ../mail/importers/pine-importer.c:429
+#: ../mail/importers/pine-importer.c:427
 msgid "Import mail from Pine."
 msgstr "Pine থেকে মেইল ইম্পোর্ট করুন।"
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
 msgstr "%s কে লেখা মেইল"
 
-#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
+#: ../mail/mail-autofilter.c:239 ../mail/mail-autofilter.c:278
 #, c-format
 msgid "Mail from %s"
 msgstr "%s থেকে মেইল"
 
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Subject is %s"
 msgstr "বিষয় হল %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:297
 #, c-format
 msgid "%s mailing list"
 msgstr "%s মেইলিং লিস্ট"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:368
 msgid "Add Filter Rule"
 msgstr "ফিল্টার করার নিয়ম যোগ করুন"
 
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
+#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+msgid "Templates"
+msgstr "টেমপ্লেট"
+
+#: ../mail/mail-component.c:546
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d-টি নির্বাচিত,"
+msgstr[1] "%d-টি নির্বাচিত,"
 
-#: ../mail/mail-component.c:540
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d টি মুছে ফেলা হয়েছে"
+msgstr[1] "%d টি মুছে ফেলা হয়েছে"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:557
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
-msgstr[0] "%d টি অনাকাঙ্ক্ষিত"
+msgstr[0] "%d টি অবাঞ্ছিত"
+msgstr[1] "%d টি অবাঞ্ছিত"
 
-#: ../mail/mail-component.c:545
+#: ../mail/mail-component.c:560
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d টি খসড়া"
+msgstr[1] "%d টি খসড়া"
 
-#: ../mail/mail-component.c:547
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d টি প্রেরিত"
+msgstr[1] "%d টি প্রেরিত"
 
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d টি প্রেরিত হয়নি"
+msgstr[1] "%d টি প্রেরিত হয়নি"
 
-#: ../mail/mail-component.c:555
+#: ../mail/mail-component.c:570
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d-টি পড়া হয়নি"
+msgstr[1] "%d-টি পড়া হয়নি"
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:571
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d-টি সর্বমোট"
+msgstr[1] "%d-টি সর্বমোট"
 
-#: ../mail/mail-component.c:896
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "নতুন মেইল বার্তা"
 
-#: ../mail/mail-component.c:897
+#: ../mail/mail-component.c:924
+msgctxt "New"
 msgid "_Mail Message"
 msgstr "মেইল বার্তা (_M)"
 
-#: ../mail/mail-component.c:898
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "একটি নতুন মেইল বার্তা লিখুন"
 
-#: ../mail/mail-component.c:904
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "নতুন মেইল ফোল্ডার"
 
-#: ../mail/mail-component.c:905
+#: ../mail/mail-component.c:932
+msgctxt "New"
 msgid "Mail _Folder"
 msgstr "মেইল ফোল্ডার (_F)"
 
-#: ../mail/mail-component.c:906
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "একটি নতুন মেইল ফোল্ডার তৈরি করুন"
 
-#: ../mail/mail-component.c:1053
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "মেইলের বৈশিষ্ট্যাবলী অথবা ফোল্ডার আপডেট করতে ব্যর্থ।"
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1596
 msgid "Error"
 msgstr "ত্রুটি"
 
-#: ../mail/mail-component.c:1522
+#: ../mail/mail-component.c:1596
 msgid "Errors"
 msgstr "ত্রুটি"
 
-#: ../mail/mail-component.c:1523
+#: ../mail/mail-component.c:1597
 msgid "Warnings and Errors"
 msgstr "সতর্কবার্তা ও ত্রুটি"
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1598
 msgid "Debug"
 msgstr "ডিবাগ করুন"
 
-#: ../mail/mail-component.c:1524
+#: ../mail/mail-component.c:1598
 msgid "Error, Warnings and Debug messages"
 msgstr "ত্রুটি, সতর্কবার্তা ও ডিবাগ বার্তা"
 
-#: ../mail/mail-component.c:1634
+#: ../mail/mail-component.c:1725
 msgid "Debug Logs"
 msgstr "ডিবাগের লগ"
 
-#: ../mail/mail-component.c:1638
+#: ../mail/mail-component.c:1739
 msgid "Show _errors in the status bar for"
 msgstr "স্ট্যাটাস বারের মধ্যে ত্রুটিগুলি চিহ্নিত সময় অবধি প্রদর্শিত হবে (_e)"
 
-#: ../mail/mail-component.c:1645
-msgid "seconds."
+#. Translators: This is the second part of the sentence
+#. * "Show _errors in the status bar for" - XXX - "second(s)."
+#: ../mail/mail-component.c:1755
+msgid "second(s)."
 msgstr "সেকেন্ড।"
 
-#: ../mail/mail-component.c:1655
+#: ../mail/mail-component.c:1761
 msgid "Log Messages:"
 msgstr "লগ বার্তা:"
 
-#: ../mail/mail-component.c:1707
+#: ../mail/mail-component.c:1802
 msgid "Log Level"
 msgstr "লগের স্তর"
 
-#: ../mail/mail-component.c:1714 ../widgets/misc/e-dateedit.c:410
+#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "সময়"
 
-#: ../mail/mail-component.c:1721 ../mail/message-list.c:2406
+#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "বার্তা"
 
+#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "এই উইন্ডোটি বন্ধ করুন"
+
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " সমর্থিত ধরন পরীক্ষা করা হবে (_e) "
@@ -13268,7 +14044,7 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>বর্তমান গঠনের Evolution SSL সমর্থন করে না</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>Sender  Photograph</b>"
+msgid "<b>Sender Photograph</b>"
 msgstr "<b>প্রেরকের ছবি</b>"
 
 #: ../mail/mail-config.glade.h:6
@@ -13349,73 +14125,73 @@ msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">মুদ্রিত ফন্ট</span>"
 
 #: ../mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Proxy Settings</span>"
+msgstr "<span weight=\"bold\">প্রক্সি সংক্রান্ত বৈশিষ্ট্য</span>"
+
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">আবশ্যক তথ্য</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">সুরক্ষিত MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">সুরক্ষা</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">প্রেরিত এবং খসড়া করা বার্তা</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">সার্ভারের কনফিগারেশন</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">_Authentication Type</span>"
 msgstr "<span weight=\"bold\">পরিচয়-প্রমান প্রক্রিয়ার ধরন (_A)</span>"
 
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "অ্যাকাউন্ট নিয়ন্ত্রন"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "নতুন স্বাক্ষর যোগ করা হবে (_w)..."
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "স্ক্রিপ্ট যোগ করা হবে (_S)"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "চিহ্নিত অ্যাকাউন্ট ব্যবহার করে প্রেরিত বার্তা সর্বদা স্বাক্ষর করা হবে (_w)"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "এনক্রিপ্ট করা মেইল প্রেরণের সময় নিজের ঠিকানাতেও বার্তা এনক্রিপ্ট করা হবে (_f)"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "সর্বদা এখানে একটি অনুলিপি প্রেরণ করবে (_s):"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "সর্বদা এখানে একটি অপ্রকাশিত অনুলিপি প্রেরণ করবে (_b):"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "এনক্রিপ্ট করার সময় আমার কীরিং-এর কী (key)গুলিকে সর্বদা বিশ্বাস করা হবে (_t)"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "এনক্রিপ্ট করা মেইল প্রেরণের সময় নিজের ক্ষেত্রে বার্তা সর্বদা এনক্রিপ্ট করা হবে (_m)"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:44
 msgid "Always request rea_d receipt"
 msgstr "সর্বদা মেইল-পাঠের সূচনা প্রদানের অনুরোধ করা হবে (_d)"
 
-#: ../mail/mail-config.glade.h:44
-msgid "Attach original message"
-msgstr "মূল বার্তা সংযুক্ত করা হবে"
-
 #: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _emoticon images"
 msgstr "স্বয়ংক্রিয়ভাবে ভাব-আইকন ছবি সন্নিবেশ করা হবে (_e)"
@@ -13433,13 +14209,13 @@ msgid "C_haracter set:"
 msgstr "অক্ষর মালা (_h):"
 
 #: ../mail/mail-config.glade.h:50
-msgid "C_heck custom headers for junk"
-msgstr "অবাঞ্ছিত মেইল যাচাইয়ের জন্য স্বনির্ধারিত হেডার পরীক্ষা করুন (_h)"
-
-#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "সমর্থিত ধরন পরীক্ষা করা হবে (_e)"
 
+#: ../mail/mail-config.glade.h:51
+msgid "Check cu_stom headers for junk"
+msgstr "অবাঞ্ছিত মেইল যাচাইয়ের জন্য স্বনির্ধারিত হেডার পরীক্ষা করা হবে (_s)"
+
 #: ../mail/mail-config.glade.h:52
 msgid "Check incoming _messages for junk"
 msgstr "আগমনকারী মেইলের মাঝে অবাঞ্ছিত মেইল পরীক্ষা করুন (_m)"
@@ -13501,16 +14277,16 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "বাহিরগামী বার্তা ডিজিট্যালভাবে স্বাক্ষর করা হবে (ডিফল্টরূপে) (_u)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do _not mark messages as junk if sender is in my addressbook"
+msgid "Do not format messages when text si_ze exceeds"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:72
-msgid "Do not format text contents in messages if the text si_ze exceeds"
+msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:73
-msgid "Do not quote original message"
-msgstr "মূল বার্তা উদ্ধৃত করবে না"
+msgid "Do not quote"
+msgstr "উদ্ধৃত করা হবে না"
 
 #: ../mail/mail-config.glade.h:74
 msgid "Done"
@@ -13534,7 +14310,7 @@ msgstr "প্রস্থান করার সময় আবর্জনার
 
 #: ../mail/mail-config.glade.h:79
 msgid "Enable Magic S_pacebar "
-msgstr ""
+msgstr "ম্যাজিক স্পেস-বার সক্রিয় করা হবে (_p)"
 
 #: ../mail/mail-config.glade.h:80
 msgid "Enable Sea_rch Folders"
@@ -13573,68 +14349,84 @@ msgid "HTML Messages"
 msgstr "HTML বার্তা"
 
 #: ../mail/mail-config.glade.h:91
+msgid "H_TTP Proxy:"
+msgstr "HTTP প্রক্সি: (_T)"
+
+#: ../mail/mail-config.glade.h:92
 msgid "Headers"
 msgstr "হেডার"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Highlight _quotations with"
 msgstr "এর দ্বারা উদ্ধৃতি উজ্জ্বলিত করা হবে (_q)"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Inline"
 msgstr "ইনলাইন"
 
-#: ../mail/mail-config.glade.h:95
-msgid "Inline original message (Outlook style)"
+#: ../mail/mail-config.glade.h:96
+msgid "Inline (Outlook style)"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "KB"
 msgstr "কিলোবাইট"
 
-#: ../mail/mail-config.glade.h:98 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:99 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "লেবেল"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Languages Table"
 msgstr "ভাষার টেবিল"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Configuration"
 msgstr "মেইলের কনফিগারেশন"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Headers Table"
 msgstr "মেইল হেডারের টেবিল"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "Mailbox location"
 msgstr "মেইলবক্সের স্থান"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Message Composer"
 msgstr "বার্তা কম্পোসার"
 
-#: ../mail/mail-config.glade.h:105
+#: ../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 ""
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "উল্লেখ্য: প্রথমবার সংযোগ না করা অবধি আপনাকে পাসওয়ার্ড লিখতে বলা হবে না"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:109
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "প্রতিষ্ঠান (_g):"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:112
+msgid "Pass_word:"
+msgstr "পাসওয়ার্ড: (_w)"
+
+#: ../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."
@@ -13642,7 +14434,7 @@ msgstr ""
 "অনুগ্রহ করে নিম্নলিখিত স্থানে চিহ্নিত অ্যাকাউন্টের জন্য একটি বর্ণনামূলক নাম লিখুন।\n"
 "শুধুমাত্র প্রদর্শনেটর উদ্দেশ্যে এই নামটি ব্যবহৃত হবে।"
 
-#: ../mail/mail-config.glade.h:112
+#: ../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."
@@ -13650,7 +14442,7 @@ msgstr ""
 "আপনার মেইল প্রেরণের প্রক্রিয়া সম্বন্ধে তথ্য লিখুন। এই বিষয়ে নিশ্চিত না হলে আপনার "
 "সিস্টেম অ্যাডমিনিস্ট্রেটর অথবা ইন্টারনেট পরিসেবা উপলব্ধকারির সাথে যোগাযোগ করুন।"
 
-#: ../mail/mail-config.glade.h:113
+#: ../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 "
@@ -13659,115 +14451,123 @@ msgstr ""
 "আপনার নাম এবং ঠিকানা নিম্নোক্ত জায়গায় লিখুন। ই-মেইলে এই তথ্যগুলি পাঠাতে না চাইলে,"
 "\"ঐচ্ছিক\" ক্ষেত্রগুলি পূরণ করার প্রয়োজন নেই।"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "নিম্নলিখিত অপশনের মধ্য থেকে নির্বাচন করুন"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:119
+msgid "Port:"
+msgstr "পোর্ট:"
+
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "বার্তায় শুধুমাত্র অপ্রকাশিত অনুলিপি প্রাপকদের নাম লেখা থাকলে সতর্কবাণী প্রদর্শন করবে"
 "(_o)"
 
-#: ../mail/mail-config.glade.h:116
-msgid "Quote original message"
-msgstr "মূল বার্তার উদ্ধৃতি"
-
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "উদ্ধৃত"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "পাসওয়ার্ড মনে রাখবে (_m)"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "উত্তর-প্রাপক (_p):"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "পাসওয়ার্ড মনে রাখবে (_p)"
 
-#: ../mail/mail-config.glade.h:122
-msgid "S_earch for sender photograph only in local addressbooks"
+#: ../mail/mail-config.glade.h:126
+msgid "S_OCKS Host:"
+msgstr "SOCKS হোস্ট: (_O)"
+
+#: ../mail/mail-config.glade.h:127
+msgid "S_earch for sender photograph only in local address books"
 msgstr "শুধুমাত্র স্থানীয় ঠিকানাবাইয়ের মধ্যে প্রেরকের ছবি অনুসন্ধান করা হবে (_e)"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "নির্বাচন করুন (_e)..."
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "বার্তার প্রাপ্তির সূচনা প্রেরণ করুন:(_e)"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "আদর্শ ফন্ট (_t):"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "HTML এর স্থায়ী বিস্তারের ফন্ট নির্বাচন করুন"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "প্রিন্ট করার জন্য HTML এর স্থায়ী বিস্তারের ফন্ট নির্বাচন করুন"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "HTML এর পরিবর্তনশীল বিস্তারের ফন্ট নির্বাচন করুন"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "প্রিন্ট করার জন্য HTML এর পরিবর্তনশীল বিস্তারের ফন্ট নির্বাচন করুন"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "মেইল প্রেরণ করা হচ্ছে"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "প্রেরিত বার্তার ফোল্ডার (_M):"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "সার্ভারে অনুমোদনের প্রয়োজন আছে (_v)"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "সার্ভারের ধরন (_T): "
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "স্বাক্ষরকারী সার্টিফিকেট (_n):"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "স্বাক্ষর (_u):"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "স্বাক্ষর"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "স্বাক্ষরের টেবিল"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "বানান পরীক্ষণ"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:146
+msgid "Start _typing at the bottom on replying"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "ধরন(_y): "
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "এই স্থানে প্রদর্শিত ভাষার তালিকায় উপস্থিত ভাষাগুলির জন্য অভিধান ইনস্টল করা হয়েছে।"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13777,11 +14577,7 @@ msgstr ""
 "ব্যবহৃত হবে। আপনার নির্ধারিত নাম শুধুমাত্র\n"
 "প্রদর্শনের জন্য ব্যবহৃত হবে।"
 
-#: ../mail/mail-config.glade.h:146
-msgid "This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13789,16 +14585,26 @@ msgstr ""
 "এই অ্যাকাউন্টটি আপনি যে নামে চিহ্নিত করতে ইচ্ছুক তা লিখুন।\n"
 "উল্লেখ্য: \"কার্য \" অথবা \"ব্যক্তিগত \""
 
-#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:358
+#: ../mail/mail-config.glade.h:154
+msgid "Us_ername:"
+msgstr "ব্যবহারকারীর নাম: (_e)"
+
+#: ../mail/mail-config.glade.h:155
+msgid "Use Authe_ntication"
+msgstr "অনুমোদন ব্যবস্থা প্রয়োগ করা হবে (_n)"
+
+#: ../mail/mail-config.glade.h:156 ../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 "ব্যবহারকারীর নাম (_n):"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:157
 msgid "V_ariable-width:"
 msgstr "পরিবর্তনশীল-বিস্তার (_a):"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:158
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13808,102 +14614,126 @@ msgstr ""
 "\n"
 "আরম্ভ করার জন্য \"পরবর্তী ধাপ\" -এ ক্লিক করুন।"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
 msgstr "স্বাক্ষর যোগ করুন (_A)"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:162
 msgid "_Always load images from the Internet"
 msgstr "ইন্টারনেট থেকে সর্বদা ছবি লোড করবে (_A)"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:163
+msgid "_Automatic proxy configuration URL:"
+msgstr "স্বয়ংক্রিয় প্রক্সি কনফিগারেশনের URL: (_A)"
+
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "অবাঞ্ছিত বার্তার ডিফল্ট প্লাগ-ইন: (_D)"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:165
+msgid "_Direct connection to the Internet"
+msgstr "ইন্টারনেটের সাথে সরাসরি সংযোগ (_D)"
+
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "সভার অনুরোধ স্বাক্ষর করা হবে না (Outlook সাথে সামঞ্জস্য বজায় রাখার উদ্দেশ্যে) (_D)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "অনুবর্তনের ধরন (_F):"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "প্রত্যুত্তরের সময়, মূল বার্তার উপরে স্বাক্ষর স্থাপিত হবে (_K)"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "পরিচিত প্রেরকদের থেকে প্রাপ্ত মেইলের ছবি লোড করা হবে (_L)"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:171
+msgid "_Lookup in local address book only"
+msgstr "শুধুমাত্র স্থানীয় ঠিকানা বইয়ের মধ্যে অনুসন্ধান করা হবে (_L)"
+
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "আমার ডিফল্ট অ্যাকাউন্ট হিসাবে চিহ্নিত করা হবে (_M)"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:173
+msgid "_Manual proxy configuration:"
+msgstr "ব্যবহারকারী দ্বারা প্রক্সি কনফিগারেশন: (_M)"
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "কত সময়ের পরে বার্তাগুলিতে পড়া-হয়েছে চিহ্ন দেওয়া হবে (_M)"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "ইন্টারনেট থেকে ছবি কখনো লোড করবে না (_N)"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "পাথ (_P):"
 
-#: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+#: ../mail/mail-config.glade.h:178
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 "HTML বার্তা গ্রহণে অনিচ্ছুক প্রাপকদের HTML বার্তা প্রেরণ করার পূর্বে সতর্কবাণী প্রদান "
-"করা হবে(_P)"
+"করা হবে (_P)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "বার্তার বিষয় আলাদা ভাবে উল্লেখ না করা থাকলে সতর্কবাণী দেবে (_P)"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "উত্তর লেখার ধরন (_R):"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "স্ক্রিপ্ট (_S):"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:182
+msgid "_Secure HTTP Proxy:"
+msgstr "নিরাপদ HTTP প্রক্সি: (_S)"
+
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "নির্বাচন করুন... (_S)"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "অ্যানিমেশন ছবি প্রদর্শন করা হবে (_S)"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "বার্তার পূর্বরূপ প্রদর্শনকালে প্রেরকের ছবি প্রদর্শন করা হবে (_S)"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr ""
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "সুরক্ষিত সংযোগব্যবস্থা প্রয়োগ করা হবে (_U):"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:190
+msgid "_Use system defaults"
+msgstr "ডিফল্ট মান ব্যবহার করা হবে (_U)"
+
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "অন্যান্য অ্যাপ্লিকেশনে ব্যবহৃত ফন্ট ব্যবহার করা হবে (_U)"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:192
 msgid "addresses"
 msgstr "ঠিকানা"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:193
 msgid "color"
 msgstr "রং"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:194
 msgid "description"
 msgstr "বিবরণ"
 
@@ -13943,65 +14773,65 @@ msgstr "অক্ষরের ছাঁদ সম্পর্কে সচেত
 msgid "Co_mpleted"
 msgstr "সমাপ্ত (_m)"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "অনুসন্ধান(_i):"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "বার্তার মধ্যে খোঁজ করুন"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "ফোল্ডারের সাবস্ক্রিপশন"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "লাইসেন্স সংক্রান্ত চুক্তিপত্র"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "কিছু বাছাই করা হয়নি"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "সার্ভার (_e):"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "সুরক্ষা সংক্রান্ত তথ্য"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "সুনির্দিষ্ট ফোল্ডার"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../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."
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "লাইসেন্সে সম্মতি প্রদান করুন(_A)"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "নির্ধারিত সময়সীমা (_D):"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "ফ্ল্যাগ (_F):"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "লাইসেন্স সংক্রান্ত চুক্তিপত্র গ্রহণ করতে এই স্থানে টিক (tick) চিহ্ন দিন(_T)"
 
-#: ../mail/mail-folder-cache.c:826
+#: ../mail/mail-folder-cache.c:832
 #, c-format
 msgid "Pinging %s"
 msgstr "%s এ ping করা হচ্ছে"
@@ -14048,97 +14878,104 @@ msgstr "বার্তা %d , %d-র মধ্যে, কে প্রের�
 msgid "Failed to send %d of %d messages"
 msgstr "%d বার্তা, %d-এর মাঝে থেকে প্রেরণ করতে ব্যর্থ"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "বাতিল করা হয়েছে।"
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "সমপন্ন।"
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:871
 msgid "Saving message to folder"
 msgstr "ফোল্ডারে বার্তা সংরক্ষণ করা হচ্ছে"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "%s এ বার্তা সরিয়ে নেওয়া হচ্ছে"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Copying messages to %s"
 msgstr "%s এ বার্তা কপি করা হচ্ছে"
 
-#: ../mail/mail-ops.c:1164
+#: ../mail/mail-ops.c:1166
 msgid "Forwarded messages"
 msgstr "ফরওয়ার্ড করা বার্তা"
 
-#: ../mail/mail-ops.c:1205
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s ফোল্ডারটি খোলা হচ্ছে"
 
-#: ../mail/mail-ops.c:1270
+#: ../mail/mail-ops.c:1272
+#, c-format
+msgid "Retrieving quota information for folder %s"
+msgstr "%s ফোল্ডারের জন্য বরাদ্দ স্থান সংক্রান্ত তথ্য প্রাপ্ত করা হচ্ছে"
+
+#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Opening store %s"
 msgstr "%s সংগ্রহস্থলটি খোলা হচ্ছে"
 
-#: ../mail/mail-ops.c:1341
+#: ../mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s ফোল্ডারটি মুছে ফেলা হচ্ছে"
 
-#: ../mail/mail-ops.c:1430
+#: ../mail/mail-ops.c:1501
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "'%s' ফোল্ডারটি সংরক্ষণ করা হচ্ছে"
 
-#: ../mail/mail-ops.c:1493
+#: ../mail/mail-ops.c:1564
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "'%s' অ্যাকাউন্ট এক্সপাঞ্জ করে সংরক্ষণ করা হচ্ছে"
 
-#: ../mail/mail-ops.c:1494
+#: ../mail/mail-ops.c:1565
 #, c-format
 msgid "Storing account '%s'"
 msgstr "'%s' অ্যাকাউন্টিট সংরক্ষণ করা হচ্ছে"
 
-#: ../mail/mail-ops.c:1548
+#: ../mail/mail-ops.c:1619
 msgid "Refreshing folder"
 msgstr "ফোল্ডার নতুন করে প্রদর্শন করা হচ্ছে"
 
-#: ../mail/mail-ops.c:1585 ../mail/mail-ops.c:1635
+#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
 msgid "Expunging folder"
 msgstr "ফোল্ডার এক্সপাঞ্জ করা হচ্ছে"
 
-#: ../mail/mail-ops.c:1632
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' এ অবস্থিত অবর্জনা ফেলে দেওয়া হচ্ছে"
 
-#: ../mail/mail-ops.c:1633
+#: ../mail/mail-ops.c:1707
 msgid "Local Folders"
 msgstr "স্থানীয় ফোল্ডার"
 
-#: ../mail/mail-ops.c:1714
+#: ../mail/mail-ops.c:1788
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s বার্তা উদ্ধার করা হচ্ছে"
 
-#: ../mail/mail-ops.c:1821
+#: ../mail/mail-ops.c:1895
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d টি বার্তা উদ্ধার করা হচ্ছে"
+msgstr[1] "%d টি বার্তা উদ্ধার করা হচ্ছে"
 
-#: ../mail/mail-ops.c:1906
+#: ../mail/mail-ops.c:1980
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
-msgstr[0] "%d টি বার্তা সংরক্ষণ করা হচ্ছে"
+msgid_plural "Saving %d messages"
+msgstr[0] "%d-টি বার্তা সংরক্ষণ করা হচ্ছে"
+msgstr[1] "%d-টি বার্তা সংরক্ষণ করা হচ্ছে"
 
-#: ../mail/mail-ops.c:1976
+#: ../mail/mail-ops.c:2058
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14147,11 +14984,11 @@ msgstr ""
 "এখানে বার্তা সংরক্ষণ করতে সমস্যা হয়েছে: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2048
+#: ../mail/mail-ops.c:2130
 msgid "Saving attachment"
 msgstr "সংযুক্ত বস্তুটি সংরক্ষণ করা হচ্ছে"
 
-#: ../mail/mail-ops.c:2060 ../mail/mail-ops.c:2066
+#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14160,89 +14997,89 @@ msgstr ""
 "আউটপুট ফাইল  তৈরি করা সম্ভব হয়নি: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2076
+#: ../mail/mail-ops.c:2171
 #, c-format
 msgid "Could not write data: %s"
 msgstr "ডাটা লেখা সম্ভব হয়নি: %s"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s থেকে সংযোগ বিচ্ছিন্ন করা হচ্ছে"
 
-#: ../mail/mail-ops.c:2222
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s এর সাথে পুনরায় সংযোগ করা হচ্ছে"
 
-#: ../mail/mail-ops.c:2318
+#: ../mail/mail-ops.c:2413
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "'%s' অ্যাকাউন্ট অফলাইন অবস্থায় ব্যবহারের জন্য প্রস্তুত করা হচ্ছে"
 
-#: ../mail/mail-ops.c:2404
+#: ../mail/mail-ops.c:2499
 msgid "Checking Service"
 msgstr "পরিসেবা পরীক্ষা করা হচ্ছে"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "বাতিল করা হচ্ছে ..."
 
-#: ../mail/mail-send-recv.c:393
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "মেইল প্রেরণ এবং গ্রহণ করুন"
 
-#: ../mail/mail-send-recv.c:400
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "সব বাতিল করুন (_A)"
 
-#: ../mail/mail-send-recv.c:510
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "আপডেট করা হচ্ছে..."
 
-#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "অপেক্ষা করা হচ্ছে ..."
 
-#: ../mail/mail-send-recv.c:810
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "নতুনপ্রাপ্ত মেইল অনুসন্ধান করা হচ্ছে"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:207
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "%s-র জন্য পাসওয়ার্ড লিখুন"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 msgid "Enter Passphrase"
 msgstr "পাসওয়ার্ড লিখুন"
 
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:212
+#: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s -এর জন্য পাসওয়ার্ড লিখুন"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 msgid "Enter Password"
 msgstr "পাসওয়ার্ড লিখুন"
 
-#: ../mail/mail-session.c:254
+#: ../mail/mail-session.c:256
 msgid "User canceled operation."
 msgstr "ব্যবহারকারীর দ্বারা কার্য বাতিল করা হয়েছে।"
 
-#: ../mail/mail-signature-editor.c:384
-msgid "Edit signature"
-msgstr "স্বাক্ষর সম্পাদন করুন"
+#: ../mail/mail-signature-editor.c:201
+msgid "_Save and Close"
+msgstr "সংরক্ষণ করে বন্ধ করুন (_S)"
 
-#: ../mail/mail-signature-editor.c:431
-msgid "Enter a name for this signature."
-msgstr "এই স্বাক্ষরের জন্য একটি নাম লিখুন।"
+#: ../mail/mail-signature-editor.c:355
+msgid "Edit Signature"
+msgstr "স্বাক্ষর সম্পাদন করুন"
 
-#: ../mail/mail-signature-editor.c:434
-msgid "Name:"
-msgstr "নাম:"
+#: ../mail/mail-signature-editor.c:370
+msgid "_Signature Name:"
+msgstr "স্বাক্ষরের নাম: (_S)"
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -14283,53 +15120,53 @@ msgstr "'%s:%s'-র জন্য অনুসন্ধানের ফোল্�
 msgid "Updating Search Folders for '%s'"
 msgstr "'%s'-র জন্য অনুসন্ধানের ফোল্ডার আপডেট করা হচ্ছে"
 
-#: ../mail/mail-vfolder.c:1059
+#: ../mail/mail-vfolder.c:1066
 msgid "Edit Search Folder"
 msgstr "অনুসন্ধানের ফোল্ডার সম্পাদনা"
 
-#: ../mail/mail-vfolder.c:1148
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "নতুন অনুসন্ধানের ফোল্ডার"
 
 #: ../mail/mail.error.xml.h:1
-msgid "A folder named &quot;{0}&quot; already exists. Please use a different name."
+msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr ""
-"&quot;{0}&quot; নামের একটি ফোল্ডার বর্তমানে উপস্থিত আছে। অনুগ্রহ করে অন্য একটি নাম "
-"নির্বাচন করুন।"
+"\"{0}\" নামের একটি ফোল্ডার বর্তমানে উপস্থিত আছে। অনুগ্রহ করে অন্য একটি নাম নির্বাচন "
+"করুন।"
 
 #: ../mail/mail.error.xml.h:2
-msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
-"&quot;{1}&quot; নামের একটি ফোল্ডার বর্তমানে উপস্থিত আছে। অনুগ্রহ করে অন্য একটি নাম "
-"নির্বাচন করুন।"
+"\"{1}\" নামের একটি ফোল্ডার বর্তমানে উপস্থিত আছে। অনুগ্রহ করে অন্য একটি নাম নির্বাচন "
+"করুন।"
 
 #: ../mail/mail.error.xml.h:3
 msgid ""
-"A non-empty folder at &quot;{1}&quot; already exists.\n"
+"A non-empty folder at \"{1}\" already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
 msgstr ""
-"অন্তর্ভুক্ত বস্তুসহ &quot;{1}&quot;-এ একটি ফোল্ডার উপস্থিত আছে।\n"
+"অন্তর্ভুক্ত বস্তুসহ \"{1}\"-এ একটি ফোল্ডার উপস্থিত আছে।\n"
 "\n"
 "আপনি এই ফোল্ডারটি উপেক্ষা করতে, নতুন করে লিখতে অথবা এর মধ্যে অন্তর্ভুক্ত বস্তু যোগ "
-"করতে, অথবা প্রস্থান করতে পারেন।"
+"করতে পারেন, অথবা প্রস্থান করতে পারেন।"
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
-"receipt notification to {0}?"
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
 msgstr ""
-"&quot;{1}&quot;-র জন্য মেইল প্রাপ্তিস্বীকারের অনুরোধ করা হয়েছে।  প্রাপ্তি স্বীকারের "
-"সূচনা {0}-এ প্রেরিত হবে কি?"
+"\"{1}\"-র জন্য মেইল প্রাপ্তিস্বীকারের অনুরোধ করা হয়েছে।  প্রাপ্তি স্বীকারের সূচনা {0}-"
+"এ প্রেরিত হবে কি?"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
-"A signature already exists with the name &quot;{0}&quot;. Please specify a "
-"different name."
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
 msgstr ""
-"&quot;{0}&quot; নামের একটি ফোল্ডার বর্তমানে উপস্থিত আছে। অনুগ্রহ করে অন্য একটি নাম "
-"নির্বাচন করুন।"
+"\"{0}\" নামের একটি স্বাক্ষর বর্তমানে উপস্থিত আছে। অনুগ্রহ করে অন্য একটি নাম নির্বাচন "
+"করুন।"
 
 #: ../mail/mail.error.xml.h:8
 msgid ""
@@ -14366,10 +15203,10 @@ msgstr ""
 #: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
-"folder &quot;{0}&quot;?"
+"folder \"{0}\"?"
 msgstr ""
-"আপনি কি নিশ্চিতরূপে &quot;{0}&quot; ফোল্ডারের মধ্যে উপস্থিত সমস্ত মুছে ফেলা বার্তা "
-"স্থায়ীরূপে মুছে ফেলতে ইচ্ছুক?"
+"আপনি কি  \"{0}\" ফোল্ডারে অবস্থিত মুছে ফেলা বার্তাগুলি স্থায়ীরূপে মুছে ফেলার বিষয়ে "
+"নিশ্চিত?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -14384,99 +15221,102 @@ msgid "Are you sure you want to send a message without a subject?"
 msgstr "আপনি কি প্রসঙ্গ উল্লৈখ না করে বার্তা প্রেরণ করার বিষয়ে নিশ্চিত?"
 
 #: ../mail/mail.error.xml.h:18
-msgid "Because &quot;{0}&quot;."
-msgstr "&quot;{0}&quot;-র দরুন।"
+msgid "Because \"{0}\"."
+msgstr "\"{0}\"-র দরুন।"
 
 #: ../mail/mail.error.xml.h:20
-msgid "Because &quot;{2}&quot;."
-msgstr "&quot;{2}&quot;-র দরুন।"
+msgid "Because \"{2}\"."
+msgstr "\"{2}\"-র দরুন।"
 
 #: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "স্বাক্ষর ফাঁকা"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "অনুসন্ধানের ফোল্ডার &quot;{0}&quot; যোগ করা যায়নি।"
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "অনুসন্ধানের ফোল্ডার \"{0}\" যোগ করা যায়নি।"
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "ফোল্ডার &quot;{0}&quot;, &quot;{1}&quot;-এ কপি করা সম্ভব নয়।"
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "ফোল্ডার \"{0}\", \"{1}\"-এ কপি করা সম্ভব নয়।"
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "ফোল্ডার &quot;{0}&quot; নির্মাণ করা সম্ভব নয়।"
+msgid "Cannot create folder \"{0}\"."
+msgstr "ফোল্ডার \"{0}\" নির্মাণ করা সম্ভব নয়।"
 
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "অস্থায়ী সংরক্ষণের ডিরেক্টরি তৈরি করা সম্ভব হয়নি।"
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because &quot;{1}&quot;"
-msgstr "&quot;{1}&quot;-র দরুন সংরক্ষণের ডিরেক্টরি নির্মাণ করা যায়নি"
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "\"{1}\"-র দরুন সংরক্ষণের ডিরেক্টরি নির্মাণ করা যায়নি"
 
 #: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr "ফোল্ডার &quot;{0}&quot; মুছে ফেলা সম্ভব নয়।"
+msgid "Cannot delete folder \"{0}\"."
+msgstr "ফোল্ডার \"{0}\" মুছে ফেলা সম্ভব নয়।"
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr "সিস্টেম ফোল্ডার &quot;{0}&quot; মুছে ফেলা সম্ভব নয়।"
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "সিস্টেম ফোল্ডার  \"{0}\" মুছে ফেলা সম্ভব নয়।"
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr "অনুপস্থিত অনুসন্ধানের ফোল্ডার &quot;{0}&quot; সম্পাদন করা সম্ভব নয়।"
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "অনুপস্থিত অনুসন্ধানের ফোল্ডার  \"{0}\" সম্পাদন করা সম্ভব নয়।"
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "ফোল্ডার &quot;{0}&quot; কে &quot;{1}&quot;-এ সরানো সম্ভব নয়।"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "ফোল্ডার  \"{0}\" কে \"{1}\"-এ সরানো সম্ভব নয়।"
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source &quot;{1}&quot;"
-msgstr "উত্স &quot;{1}&quot; খোলা সম্ভব নয়"
+msgid "Cannot open source \"{1}\""
+msgstr "উৎস \"{1}\" খোলা সম্ভব নয়"
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source &quot;{2}&quot;."
-msgstr "উত্স &quot;{2}&quot; খোলা সম্ভব নয়"
+msgid "Cannot open source \"{2}\"."
+msgstr "উৎস \"{2}\" খোলা সম্ভব নয়"
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target &quot;{2}&quot;."
-msgstr "উত্স &quot;{1}&quot; খোলা সম্ভব নয়."
+msgid "Cannot open target \"{2}\"."
+msgstr "\"{2}\" গন্তব্যস্থল খোলা সম্ভব নয়।"
 
 #: ../mail/mail.error.xml.h:34
 msgid ""
-"Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem. You will not be able to use this provider until you can accept its "
-"license."
+"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."
 msgstr ""
-"ইনস্টলেশন জড়িত সমস্যার জন্য &quot;{0}&quot; লাইসেন্স ফাইলটি পড়া সম্ভব হয়নি।  "
-"লাইসেন্স গ্রহণ না করা অবধি আপনি এই উপলব্ধকারীর পরিসেবা ব্যবহার করতে সক্ষম হবেন না।"
+"ইনস্টলেশন জড়িত সমস্যার জন্য  \"{0}\" লাইসেন্স ফাইলটি পড়া সম্ভব হয়নি।  লাইসেন্স "
+"গ্রহণ না করা অবধি আপনি এই উপলব্ধকারীর পরিসেবা ব্যবহার করতে সক্ষম হবেন না।"
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "&quot;{0}&quot; থেকে &quot;{1}&quot;-এ নাম পরিবর্তন করা সম্ভব নয়।"
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "\"{0}\" থেকে  \"{1}\"-এ নাম পরিবর্তন করা সম্ভব নয়।"
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder &quot;{0}&quot;."
-msgstr "সিস্টেম ফোল্ডার &quot;{0}&quot;-র নাম পরিবর্তন করা অথবা সরানো সম্ভব নয়।"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "সিস্টেম ফোল্ডার \"{0}\"-র নাম পরিবর্তন করা অথবা সরানো সম্ভব নয়।"
 
 #: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "অ্যাকাউন্টে পরিবর্তন সংরক্ষণ করা সম্ভব নয়।"
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory &quot;{0}&quot;."
-msgstr "ডিরেক্টরি &quot;{0}&quot;-তে সংরক্ষণ করতে ব্যর্থ।"
+msgid "Cannot save to directory \"{0}\"."
+msgstr "ডিরেক্টরি \"{0}\"-তে সংরক্ষণ করতে ব্যর্থ।"
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file &quot;{0}&quot;."
-msgstr "&quot;{0}&quot; ফাইলে সংরক্ষণ করা সম্ভব নয়।"
+msgid "Cannot save to file \"{0}\"."
+msgstr "\"{0}\" ফাইলে সংরক্ষণ করা সম্ভব নয়।"
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script &quot;{0}&quot;."
-msgstr "স্বাক্ষরের স্ক্রিপ্ট &quot;{0}&quot; স্থাপন করা সম্ভব নয়।"
+msgid "Cannot set signature script \"{0}\"."
+msgstr "স্বাক্ষরের স্ক্রিপ্ট \"{0}\" স্থাপন করা সম্ভব নয়।"
 
 #: ../mail/mail.error.xml.h:41
+msgid "Check Junk Failed"
+msgstr "অনাকাঙ্ক্ষিত বার্তা পরীক্ষণ ব্যর্থ"
+
+#: ../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."
@@ -14485,46 +15325,42 @@ msgstr ""
 "বড় এবং ছোট হাতের অক্ষর সম্পর্কে সচেতন থাকে; আপনার ক্যাপস-লক বাটনটি সক্রিয় থাকতে "
 "পারে।"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "স্বাক্ষরের ফাইলটি সংরক্ষণ করা সম্ভব হয়নি।"
 
-#: ../mail/mail.error.xml.h:43
-msgid "Delete &quot;{0}&quot;?"
-msgstr "&quot;{0}&quot; মুছে ফেলা হবে কি?"
-
 #: ../mail/mail.error.xml.h:44
-msgid "Delete account?"
-msgstr "অ্যাকাউন্ট মুছে ফেলা হবে কি?"
+msgid "Delete \"{0}\"?"
+msgstr "\"{0}\" মুছে ফেলা হবে কি?"
 
 #: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-msgstr "অনুসন্ধান ফোল্ডার &quot;{0}&quot;-র মধ্যে বার্তা মুছে ফেলা হবে কি?"
+msgid "Delete account?"
+msgstr "অ্যাকাউন্ট মুছে ফেলা হবে কি?"
 
 #: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder \"{0}\"?"
+msgstr "\"{0}\" অনুসন্ধানের ফোল্ডারের বার্তা মুছে ফেলা হবে কি?"
+
+#: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
 msgstr "অনুসন্ধানের ফোল্ডারের বার্তা মুছে ফেলা হবে কি?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Discard changes?"
 msgstr "পরিবর্তিতটি বাতিল করা হবে কি?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "মুছে ফেলা হবে না (_e)"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do not delete"
 msgstr "মুছে ফেলা হবে না"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do not disable"
 msgstr "নিষ্ক্রিয় করা হবে"
 
-#: ../mail/mail.error.xml.h:51
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "সাব-ফোল্ডারের মধ্যেও কি এই কর্ম সঞ্চালিত হবে?"
-
 #: ../mail/mail.error.xml.h:52
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
@@ -14628,36 +15464,28 @@ msgid "Mark all messages as read"
 msgstr "সমস্ত বার্তা পড়া-হয়েছে হিসাবে চিহ্নিত করা হবে"
 
 #: ../mail/mail.error.xml.h:74
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "ফোল্ডার ও সাব-ফোল্ডারের সমস্ত বার্তা পড়া-হয়েছে হিসাবে চিহ্নিত করা হবে কি?"
-
-#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "অনুপস্থিত ফোল্ডার।"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "কোনো উত্স বাছাই করা হয়নি।"
 
-#: ../mail/mail.error.xml.h:78
-msgid "Only on _Current Folder"
-msgstr "শুধুমাত্র বর্তমান ফোল্ডারে (_C)"
-
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr ""
 "এক সময়ে অনেকগুলি বার্তা পড়ার প্রচেষ্টা করা হলে অত্যাধিক সময় ব্যয় হওয়ার সম্ভাবনা "
 "রয়েছে।"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "অনুগ্রহ করে আপনার অ্যাকাউন্টের বৈশিষ্ট্যাবলী পরীক্ষা করে পুনরায় চেষ্টা করুন।"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "অনুগ্রহ করে অ্যাকাউন্ট সক্রিয় করুন অথবা একটি পৃথক অ্যাকাউন্ট ব্যবহার করে প্রেরণ করুন।"
 
-#: ../mail/mail.error.xml.h:82
+#: ../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."
@@ -14666,7 +15494,7 @@ msgstr ""
 "পাশে অবস্থিত প্রাপক: বাটনটিতে টিপে আপনি ই-মেইল ঠিকানার খোঁজ করতে পারবেন।"
 
 # not sure
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14676,33 +15504,41 @@ msgstr ""
 "করুন:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "এই স্বাক্ষরের জন্য একটি স্বতন্ত্র নাম লিখুন।"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "অনুগ্রহ করে প্রতীক্ষা করুন।"
 
-#: ../mail/mail.error.xml.h:87
-msgid "Problem migrating old mail folder &quot;{0}&quot;."
-msgstr "পুরানো মেইল ফোল্ডার &quot;{0}&quot; মাইগ্রেট করাতে সমস্যা দেখা দিয়েছে।"
+#: ../mail/mail.error.xml.h:85
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr "পুরানো মেইল ফোল্ডার \"{0}\" মাইগ্রেট করাতে সমস্যা দেখা দিয়েছে।"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server"
 msgstr "অনুসন্ধান করতে ব্যবহৃত সার্ভার"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:87
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "সমর্থিত অনুমোদন ব্যবস্থার তালিকা প্রাপ্ত করতে সার্ভারে অনুসন্ধান করা হচ্ছে।"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid "Read receipt requested."
 msgstr "মেইল-পাঠের সূচনার অনুরোধ করা হয়েছে।"
 
+#: ../mail/mail.error.xml.h:89
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "ফোল্ডার \"{0}\" এবং এর সকল সাবফোল্ডারগুলি কি নিশ্চিতরূপে মুছে ফেলা হবে?"
+
+#: ../mail/mail.error.xml.h:90
+msgid "Report Junk Failed"
+msgstr "অবাঞ্ছিত বার্তার সূচনা প্রদানে ব্যর্থ"
+
 #: ../mail/mail.error.xml.h:91
-msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
-msgstr "ফোল্ডার &quot;{0}&quot; এবং এর সকল সাবফোল্ডারগুলি কি নিশ্চিতরূপে মুছে ফেলা হবে?"
+msgid "Report Not Junk Failed"
+msgstr "অবাঞ্ছিত না হওয়া বার্তার সূচনা প্রদানে ব্যর্থ"
 
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
@@ -14754,13 +15590,13 @@ msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
-"নিম্নলিখিত অনুসন্ধানের ফোল্ডার(গুলি)-র দ্বারা:\n"
+"নিম্নলিখিত অনুসন্ধানের ফোল্ডার(গুলি) দ্বারা:\n"
 "{0}\n"
 "অপসারিত ফোল্ডার ব্যবহার করা হত:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "এই সংক্রান্ত তথ্য এখন আপডেট করা হয়েছে।"
 
 #: ../mail/mail.error.xml.h:106
@@ -14768,13 +15604,13 @@ msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "And have been updated."
 msgstr ""
 "নিম্নলিখিত ফিল্টারের নিয়ম(গুলি)-র দ্বারা:\n"
 "{0}\n"
 "অপসারিত ফোল্ডার ব্যবহার করা হত:\n"
-"    &quot;{1}&quot;\n"
+"    \"{1}\"\n"
 "এই সংক্রান্ত তথ্য এখন আপডেট করা হয়েছে।"
 
 #: ../mail/mail.error.xml.h:111
@@ -14881,8 +15717,8 @@ msgstr ""
 "করে, অথবা দুই।"
 
 #: ../mail/mail.error.xml.h:134
-msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr "আপনার সার্ভার &quot;{0}&quot; -এ আপনার লগ-ইন &quot;{0}&quot; ব্যর্থ হয়েছে।"
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "আপনার সার্ভার \"{0}\"-এ আপনার লগ-ইন \"{0}\" ব্যর্থ হয়েছে।"
 
 #: ../mail/mail.error.xml.h:135
 msgid "_Append"
@@ -14904,22 +15740,22 @@ msgstr "স্থায়ীরূপে বর্জন করা হবে (_E)"
 msgid "_Open Messages"
 msgstr "খোলা বার্তা (_O)"
 
-#: ../mail/mail.error.xml.h:143
-msgid "on Current Folder and _Subfolders"
-msgstr "বর্তমান ফোল্ডার ও সাব-ফোল্ডারের মধ্যে (_S)"
-
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "পড়া হয়নি"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "পড়া হয়েছে"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "উত্তর দেওয়া হয়েছে"
 
+#: ../mail/message-list.c:1055
+msgid "Forwarded"
+msgstr "ফরওয়ার্ড করা হয়েছে"
+
 #: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "একাধিক না পড়া বার্তা"
@@ -14944,37 +15780,48 @@ msgstr "উচ্চতর"
 msgid "Highest"
 msgstr "সর্বোত্তম"
 
-#: ../mail/message-list.c:1614 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1596 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1621 ../plugins/itip-formatter/itip-view.c:206
+#: ../mail/message-list.c:1603 ../plugins/itip-formatter/itip-view.c:203
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "আজ %l:%M %p"
 
-#: ../mail/message-list.c:1630 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1612 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "গতকাল %l:%M %p"
 
-#: ../mail/message-list.c:1642 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1624 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1650 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1652 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1634 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:3849
+#. 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
 msgid "Generating message list"
 msgstr "বার্তার তালিকা প্রস্তুত করা হচ্ছে"
 
+#: ../mail/message-list.c:4224
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+
+#: ../mail/message-list.c:4226
+msgid "There are no messages in this folder."
+msgstr "এই ফোল্ডারের মধ্যে কোনো বার্তা উপস্থিত নেই।"
+
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "প্রদেয় তারিখ"
@@ -15004,39 +15851,39 @@ msgstr "প্রেরিত বার্তা"
 msgid "Size"
 msgstr "মাপ"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:56
 msgid "Call"
 msgstr "ফোন করুন"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:57
 msgid "Do Not Forward"
 msgstr "ফরওয়ার্ড করবে না"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:58
 msgid "Follow-Up"
 msgstr ""
 
-#: ../mail/message-tag-followup.c:78
+#: ../mail/message-tag-followup.c:59
 msgid "For Your Information"
 msgstr "আপনার তথ্য জ্ঞাপনের জন্য"
 
-#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:60 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "ফরওয়ার্ড"
 
-#: ../mail/message-tag-followup.c:80
+#: ../mail/message-tag-followup.c:61
 msgid "No Response Necessary"
 msgstr "কোনো প্রতিক্রিয়ার প্রয়োজন নেই"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "প্রত্যুত্তর"
 
-#: ../mail/message-tag-followup.c:84 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:65 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "সকলের প্রতি উত্তর"
 
-#: ../mail/message-tag-followup.c:85
+#: ../mail/message-tag-followup.c:66
 msgid "Review"
 msgstr "পর্যালোচনা"
 
@@ -15061,6 +15908,10 @@ msgid "Subject contains"
 msgstr "বিষয়ে অন্তর্ভুক্ত আছে"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr "বিষয় অথবা প্রেরকে অন্তর্ভুক্ত রয়েছে"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "বিষয় অথবা প্রেরকে অন্তর্ভুক্ত রয়েছে"
 
@@ -15073,33 +15924,22 @@ msgid "Provides core functionality for local address books."
 msgstr "স্থানীয় ঠিকানাবইয়ের জন্য মৌলিক কার্যকারিতা উপলব্ধ করা হয়।"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "Enable attachment reminder plugin"
-msgstr ""
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "Enable attachment reminder plugin."
-msgstr ""
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
 msgstr ""
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+#: ../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."
 msgstr ""
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
+#: ../plugins/attachment-reminder/attachment-reminder.c:474
+#: ../plugins/templates/templates.c:394
 msgid "Keywords"
 msgstr "প্রাসঙ্গিক-শব্দ"
 
-#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
-msgid "Remind _missing attachments"
-msgstr ""
-
 #: ../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"
@@ -15121,9 +15961,9 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "সংযুক্ত বস্তুবিহীন বার্তা"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Continue Editing"
-msgstr "সম্পাদনা কর্মে এগিয়ে চলুন (_C)"
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Edit Message"
+msgstr "বার্তা সম্পাদনা (_E)"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
@@ -15137,122 +15977,146 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "ইনলাইন অডিও প্লাগ-ইন"
 
-#: ../plugins/backup-restore/backup-restore.c:96
+#: ../plugins/backup-restore/backup-restore.c:127
 msgid "Select name of the Evolution backup file"
 msgstr "Evolution ব্যাক-আপ ফাইলের নাম নির্বাচন করুন"
 
-#: ../plugins/backup-restore/backup-restore.c:120
+#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
 msgstr "ব্যাক-আপ সমাপ্ত করে Evolution পুনরায় আরম্ভ করুন(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:179
 msgid "Select name of the Evolution backup file to restore"
 msgstr "পুনরুদ্ধারের উদ্দেশ্যে Evolution ব্যাক-আপ ফাইলের নাম নির্বাচন করুন"
 
-#: ../plugins/backup-restore/backup-restore.c:163
+#: ../plugins/backup-restore/backup-restore.c:203
 msgid "_Restart Evolution after restore"
 msgstr "তথ্য পুনরুদ্ধারে পরে Evolution পুনরায় আরম্ভ করুন (_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:236
+#: ../plugins/backup-restore/backup-restore.c:276
 msgid "Restore from backup"
 msgstr "ব্যাক-আপ থেকে পুনরুদ্ধার করুন"
 
-#: ../plugins/backup-restore/backup-restore.c:238
+#: ../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"
 "It also restores all your personal settings, mail filters etc."
 msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:244
+#: ../plugins/backup-restore/backup-restore.c:284
 msgid "_Restore Evolution from the backup file"
 msgstr "ব্যাক-আপ ফাইল থেকে Evolution পুনরুদ্ধার করুন(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:291
 msgid "Please select an Evolution Archive to restore:"
 msgstr "পুনরুদ্ধারের উদ্দেশ্যে অনুগ্রহ করে একটি Evolution আর্কাইভ নির্বাচন করুন:"
 
-#: ../plugins/backup-restore/backup-restore.c:254
+#: ../plugins/backup-restore/backup-restore.c:294
 msgid "Choose a file to restore"
 msgstr "পুনরুদ্ধারের জন্য একটি ফাইল নির্বাচন করুন"
 
-#: ../plugins/backup-restore/backup.c:40
+#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
 msgstr "Evolution-র সমস্যা"
 
-#: ../plugins/backup-restore/backup.c:42
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
 msgstr "Evolution-র সমস্যা"
 
-#: ../plugins/backup-restore/backup.c:44
+#: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
 msgstr "Evolution ব্যাক-আপ পরীক্ষা করুন"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "Evolution পুনরায় আরম্ভ করুন"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
 msgstr "গ্রাফিক্যাল ইউজার ইন্টারফেস সহযোগে"
 
-#: ../plugins/backup-restore/backup.c:69
-#: ../plugins/backup-restore/backup.c:110
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
 msgid "Shutting down Evolution"
 msgstr "Evolution বন্ধ করা হচ্ছে"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:132
 msgid "Backing Evolution accounts and settings"
 msgstr "Evolution-র অ্যাকউন্ট ও বৈশিষ্ট্যাবলী ব্যাক-আপ করুন"
 
-#: ../plugins/backup-restore/backup.c:78
+#: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "Evolution-র তথ্য ব্যাক-আপ করুন (মেইল, পরিচিতি, বর্ষপঞ্জি, কর্ম, মেমো)"
 
-#: ../plugins/backup-restore/backup.c:88
+#: ../plugins/backup-restore/backup.c:147
 msgid "Backup complete"
 msgstr "ব্যাক-আপ সম্পন্ন"
 
-#: ../plugins/backup-restore/backup.c:93
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
 msgid "Restarting Evolution"
 msgstr "Evolution পুনরায় আরম্ভ করা হচ্ছে"
 
-#: ../plugins/backup-restore/backup.c:114
+#: ../plugins/backup-restore/backup.c:262
 msgid "Backup current Evolution data"
 msgstr "Evolution-র বর্তমান তথ্য ব্যাক-আপ করুন"
 
-#: ../plugins/backup-restore/backup.c:119
+#: ../plugins/backup-restore/backup.c:267
 msgid "Extracting files from backup"
 msgstr "ব্যাক-আপ থেকে ফাইল উদ্ধার করা হচ্ছে"
 
-#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:274
 msgid "Loading Evolution settings"
 msgstr "Evolution-র বৈশিষ্ট্যাবলী লোড করা হচ্ছে"
 
-#: ../plugins/backup-restore/backup.c:129
+#: ../plugins/backup-restore/backup.c:278
 msgid "Removing temporary backup files"
 msgstr "অস্থায়ী ব্যাক-আপ ফাইল মুছে ফেলা হচ্ছে"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:285
+msgid "Ensuring local sources"
+msgstr "স্থানীয় উৎস নিশ্চিত করুন"
+
+#: ../plugins/backup-restore/backup.c:455
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "ফোল্ডার %s ব্যাক-আপ করা হচ্ছে"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:460
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "%s ফোল্ডার থেকে পুনরুদ্ধার করা হচ্ছে"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Backup"
 msgstr "Evolution ব্যাক-আপ"
 
-#: ../plugins/backup-restore/backup.c:270
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Restore"
 msgstr "Evolution পুনরুদ্ধার"
 
+#: ../plugins/backup-restore/backup.c:514
+msgid "Backing up Evolution Data"
+msgstr "Evolution-র বর্তমান তথ্যের ব্যাক-আপ"
+
+#: ../plugins/backup-restore/backup.c:515
+msgid "Please wait while Evolution is backing up your data."
+msgstr "Evolution দ্বারা তথ্য ব্যাক-আপ করা হচ্ছে। অনুগ্রহ করে প্রতীক্ষা করুন।"
+
+#: ../plugins/backup-restore/backup.c:517
+msgid "Restoring Evolution Data"
+msgstr "Evolution-র তথ্য পুনরুদ্ধার"
+
+#: ../plugins/backup-restore/backup.c:518
+msgid "Please wait while Evolution is restoring your data."
+msgstr "Evolution দ্বারা তথ্য পুনরুদ্ধার করা হচ্ছে। অনুগ্রহ করে প্রতীক্ষা করুন।"
+
+#: ../plugins/backup-restore/backup.c:536
+msgid "This may take a while depending on the amount of data in your account."
+msgstr "অ্যাকাউন্টের মধ্যে উপস্থিত তথ্যের পরিমাণের ভিত্তিতপ এই কাজের জন্য সময় ব্যয় হবে।"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr "Evolution-র তথ্য ও বৈশিষ্ট্য ব্যাক-আপ ও পুনরুদ্ধার করতে ব্যবহৃত প্লাগ-ইন।"
@@ -15279,14 +16143,22 @@ msgid ""
 msgstr ""
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Insufficient Permissions"
+msgstr "পর্যাপ্ত অনুমতি নেই"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
 msgstr "Evolution ব্যাক-আপ ফাইল বৈধ নয়"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Please select a valid backup file to restore."
 msgstr "পুনরুদ্ধারের উদ্দেশ্যে বৈধ Evolution ব্যাক-আপ ফাইল নির্বাচন করুন"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+msgid "The selected folder is not writable."
+msgstr "নির্বাচিত ফোল্ডারটি লিখনযোগ্য নয়।"
+
+#: ../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 "
@@ -15308,46 +16180,44 @@ msgid "_Backup Settings..."
 msgstr "ব্যাক-আপ সংক্রান্ত বৈশিষ্ট্যাবলী ...(_B)"
 
 # FIXME
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "স্বয়ংক্রিয় পরিচিতি"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
-msgid "_Automatically create entries in the addressbook when responding to messages"
+#: ../plugins/bbdb/bbdb.c:567
+msgid "_Auto-create address book entries when replying to messages"
 msgstr ""
 "বার্তার প্রত্যুত্তর প্রেরণ করার সময় স্বয়ংক্রিয়রূপে ঠিকানাবইয়ের মধ্যে পরিচিতি তথ্য যোগ "
 "করা হবে (_A)"
 
 # FIXME
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr "স্বয়ংক্রিয় পরিচিতিদের জন্য ঠিকানা বই নির্বাচন করুন"
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "ইনস্ট্যান্ট মেসেজিংয়ের পরিচিতি তালিকা"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
-msgstr "Pidgin-এ উপস্থিত পরিচিতি তালিকা থেকে তথ্য ও ছবি নিয়মিতরূপে সুসংগত করা হবে"
+#: ../plugins/bbdb/bbdb.c:603
+msgid "Synchronize contact info and images from Pidgin buddy list"
+msgstr "Pidgin-এ উপস্থিত পরিচিতি তালিকা থেকে তথ্য ও ছবি সুসংগত করা হবে"
 
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Pidgin পরিচিতি তালিকার জন্য ঠিকানাবই নির্বাচন করুন"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 msgid "Synchronize with _buddy list now"
 msgstr "পরিচিতি তালিকার সাথে এই মুহূর্তে সুসংগত করা হবে (_b)"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid ""
-"Automatically fills your addressbook with names and email addresses as you "
+"Automatically fills your address book with names and email addresses as you "
 "reply to messages. Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
@@ -15359,7 +16229,28 @@ msgstr ""
 msgid "BBDB"
 msgstr "BBDB"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:303
+#. 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 "%s স্পন করতে সমস্য: %s।"
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
+#, c-format
+msgid "Bogofilter child process does not respond, killing..."
+msgstr "Bogofilter চাইল্ড প্রসেস থেকে কোনো প্রতিক্রিয়া পাওয়া যায়নি, kill করা হচ্ছে..."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
+#, c-format
+msgid "Wait for Bogofilter child process interrupted, terminating..."
+msgstr "Bogofilter চাইল্ড প্রসেস বিঘ্নিত হয়েছে, বন্ধ করা হচ্ছে..."
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
+#, c-format
+msgid "Pipe to Bogofilter failed, error code: %d."
+msgstr "Bogofilter-এ পাইপ করতে ব্যর্থ, উৎপন্ন ত্রুটির কোড: %d।"
+
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
 msgid "Convert message text to _Unicode"
 msgstr "বার্তার বিষয়বস্তু Unicode-এ রূপান্তর করুন (_U)"
 
@@ -15378,20 +16269,25 @@ msgid "Bogofilter Options"
 msgstr "Bogofilter সংক্রান্ত বিকল্প"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Bogofilter junk plugin"
+msgstr "অবাঞ্ছিত বার্তা সংক্রান্ত Bogofilter প্লাগ-ইন"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
 msgstr "Bogofilter সহযোগে অবাঞ্ছিত বার্তা ফিল্টার করুন।"
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:135
+#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:351
+#: ../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 "SSL ব্যবহার করা হবে (_S)"
 
@@ -15411,17 +16307,18 @@ msgstr "স্থানীয় বর্ষপঞ্জি"
 msgid "Provides core functionality for local calendars."
 msgstr "স্থানীয় বর্ষপঞ্জির জন্য মৌলিক কার্যকারিতা উপলব্ধ করা হয়।"
 
-#: ../plugins/calendar-http/calendar-http.c:273
+#: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:375
-msgid "_Refresh:"
-msgstr "নতুন করে প্রদর্শন করা হবে (_R):"
+#: ../plugins/google-account-setup/google-source.c:642
+#: ../plugins/google-account-setup/google-contacts-source.c:320
+msgid "Re_fresh:"
+msgstr "নতুন করে প্রদর্শন: (_f)"
 
-#: ../plugins/calendar-http/calendar-http.c:341
+#: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
 msgstr "সুরক্ষিত সংযোগ:(_S)"
 
-#: ../plugins/calendar-http/calendar-http.c:406
+#: ../plugins/calendar-http/calendar-http.c:397
 msgid "Userna_me:"
 msgstr "ব্যবহারকারীর নাম: (_m)"
 
@@ -15521,14 +16418,25 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "আপনি কি Evolution-কে নিজের ডিফল্ট মেইল ক্লায়েন্ট হিসাবে স্থির করতে ইচ্ছুক?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:690
+#: ../shell/main.c:585
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../plugins/default-source/default-source.c:81
-#: ../plugins/default-source/default-source.c:108
-msgid "Mark as _default folder"
-msgstr "ডিফল্ট ফোল্ডার হিসাবে চিহ্নিত করুন (_d)"
+#: ../plugins/default-source/default-source.c:82
+msgid "Mark as _default address book"
+msgstr "ডিফল্ট ঠিকানা বই রূপে চিহ্নিত করুন (_d)"
+
+#: ../plugins/default-source/default-source.c:103
+msgid "Mark as _default calendar"
+msgstr "ডিফল্ট বর্ষপঞ্জি হিসাবে চিহ্নিত করুন (_d)"
+
+#: ../plugins/default-source/default-source.c:104
+msgid "Mark as _default task list"
+msgstr "ডিফল্ট কর্মতালিকা হিসাবে চিহ্নিত করুন (_d)"
+
+#: ../plugins/default-source/default-source.c:105
+msgid "Mark as _default memo list"
+msgstr "ডিফল্ট মেমো তালিকা হিসাবে চিহ্নিত করুন (_d)"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
@@ -15536,10 +16444,54 @@ msgstr "ডিফল্ট উৎস "
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
 msgid ""
-"Provides functionality for marking a calendar or an addressbook as the "
+"Provides functionality for marking a calendar or an address book as the "
 "default one."
 msgstr "ডিফল্ট বর্ষপঞ্জি অথবা ঠিকানাবই নির্ধারণের জন্য মৌলিক কার্যকারিতা উপলব্ধ করা হয়।"
 
+#: ../plugins/email-custom-header/email-custom-header.c:558
+msgid "_Custom Header"
+msgstr "স্বনির্ধারিত হেডার (_C)"
+
+#: ../plugins/email-custom-header/email-custom-header.c:879
+msgid "Key"
+msgstr "কি"
+
+#: ../plugins/email-custom-header/email-custom-header.c:890
+#: ../plugins/templates/templates.c:400
+msgid "Values"
+msgstr "মান"
+
+#. 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 "ই-মেইলের স্বনির্ধারিত হেডার"
+
+#. 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 "প্রেরণের জন্য চিহ্নিত বার্তার জন্য স্বনির্ধারিত হেডার প্রয়োগ করা হবে।"
+
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr "স্বনির্ধারিত হেডার"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "স্বনির্ধারিত হেডারের তালিকা"
+
+#: ../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 "অন্যান্য ব্যবহারকারীর ফোল্ডার খুলুন"
@@ -15557,12 +16509,12 @@ msgid "_User:"
 msgstr "ব্যবহারকারী (_U):"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
+#: ../plugins/exchange-operations/exchange-account-setup.c:61
 msgid "Secure Password"
 msgstr "নিরাপদ পাসওয়ার্ড"
 
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
+#: ../plugins/exchange-operations/exchange-account-setup.c:64
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
@@ -15570,11 +16522,11 @@ msgstr ""
 "এই অপশনটির মাধ্যমে নিরাপদ পাসওয়ার্ড (NTLM) অনুমোদন ব্যবস্থার সাহায্যে Exchange "
 "সার্ভারের সাথে সংযোগ করা হবে।"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
+#: ../plugins/exchange-operations/exchange-account-setup.c:72
 msgid "Plaintext Password"
 msgstr "প্লেইনটেক্সট পাসওয়ার্ড"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
@@ -15582,11 +16534,11 @@ msgstr ""
 "এই অপশনটির মাধ্যমে প্লেইনটেক্সট পাসওয়ার্ড অনুমোদন ব্যবস্থার সাহায্যে Exchange "
 "সার্ভারের সাথে সংযোগ করা হবে।"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:257
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "অফিসে উপস্থিত নেই"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:264
+#: ../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."
@@ -15594,83 +16546,87 @@ msgstr ""
 "অফিসে অনুপস্থিত থাকাকালীন প্রাপ্ত বার্তার প্রেরকদের নিম্নোক্ত বার্তাটি \n"
 "স্বয়ংক্রিয়ভবে প্রেরণ করা হবে।"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
-#: ../plugins/exchange-operations/exchange-account-setup.c:281
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "বর্তমানে আমি অফিসে উপস্থিত নেই"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
-#: ../plugins/exchange-operations/exchange-account-setup.c:280
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "বর্তমানে আমি অফিসে উপস্থিত"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "Exchange অ্যাকাউন্টের পাসওয়ার্ড পরিবর্তন করুন"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "পাসওয়ার্ড পরিবর্তন"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Exchange অ্যাকাউন্টের কর্মবন্টন সংক্রান্ত বৈশিষ্ট্যাবলী পরিচালনা"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:337
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assistant"
 msgstr "কর্মবন্টন সহায়ক"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "বিবিধ"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "সমস্ত Exchange ফোল্ডারের মাপ প্রদর্শন করুন"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "ফোল্ডারের মাপ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchange সংক্রান্ত বৈশিষ্ট্যাবলী"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:625
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:651
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "পরিচয় প্রমাণ ব্যবস্থা (_u)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
+msgid "_Mailbox:"
+msgstr "মেইলবক্স: (_M)"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "পরিচয় প্রমাণ ব্যবস্থার প্রকৃতি (_A)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:868
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "সমর্থিত ধরন পরীক্ষা করুন (_e)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:980
+#: ../plugins/exchange-operations/exchange-account-setup.c:1062
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s কিলোবাইট"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:982
+#: ../plugins/exchange-operations/exchange-account-setup.c:1064
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
 msgstr "০ কিলোবাইট"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../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"
@@ -15680,7 +16636,7 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:115
+#: ../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"
@@ -15688,7 +16644,7 @@ msgstr ""
 "আপনার অ্যাকাউন্টের বিদ্যমান পাসওয়ার্ড ও বর্তমান পাসওয়ার্ড মধ্যে গরমিল। অনুগ্রহ করে "
 "সঠিক পাসওয়ার্ড লিখুন।"
 
-#: ../plugins/exchange-operations/exchange-change-password.c:122
+#: ../plugins/exchange-operations/exchange-change-password.c:121
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "দুটি পাসওয়ার্ড মেলেনি। অনুগ্রহ করে পাসওয়ার্ড দুটি পুনরায় লিখুন।"
 
@@ -15708,38 +16664,38 @@ msgstr "নতুন পাসওয়ার্ড:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "আপনার বর্তমান পাসওয়ার্ডের মেয়াদ পূর্ণ হয়েছে। অনুগ্রহ করে পাসওয়ার্ড পরিবর্তন করুন।"
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:660
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "আপনার পাসওয়ার্ডের মেয়াদ %d দিন পরে পূর্ণ হবে"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:164
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../plugins/exchange-operations/exchange-delegates-user.c:152
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "স্বনির্বাচিত"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:194
+#: ../plugins/exchange-operations/exchange-delegates-user.c:182
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "সম্পাদক (পড়ুন, নির্মাণ করুন, সম্পাদনা)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:198
+#: ../plugins/exchange-operations/exchange-delegates-user.c:186
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
 msgstr "লেখক (পড়ুন, নির্মাণ করুন)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:190
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "পর্যালোচনা ব্যবস্থা (শুধুমাত্র পাঠযোগ্য)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:252
+#: ../plugins/exchange-operations/exchange-delegates-user.c:240
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "কর্মবন্টন সংক্রান্ত অনুমতি"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:263
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#: ../plugins/exchange-operations/exchange-delegates-user.c:251
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
 msgstr "%s-র জন্য নির্ধারিত অনুমতি"
@@ -15747,7 +16703,7 @@ msgstr "%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:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:341
 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."
@@ -15755,67 +16711,67 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
+#: ../plugins/exchange-operations/exchange-delegates-user.c:346
 msgid "You have been given the following permissions on my folders:"
 msgstr "আমার ফোল্ডার ব্যবহারকালে নিম্নলিখিত অনুমতিগুলি আপনার জন্য ধার্য করা হয়েছে:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:376
+#: ../plugins/exchange-operations/exchange-delegates-user.c:364
 msgid "You are also permitted to see my private items."
 msgstr ""
 
 #. 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:383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
 msgid "However you are not permitted to see my private items."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:415
+#: ../plugins/exchange-operations/exchange-delegates-user.c:403
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr ""
 
 # FIXME
-#: ../plugins/exchange-operations/exchange-delegates.c:421
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To"
 msgstr "বন্টন করা হবে"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:586
+#: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "%s প্রতিনিধিকে অপসারণ করা হবে?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:704
+#: ../plugins/exchange-operations/exchange-delegates.c:700
 msgid "Could not access Active Directory"
 msgstr "সক্রিয় ডিরেক্টরিটি ব্যবহার করা যায়নি"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:716
+#: ../plugins/exchange-operations/exchange-delegates.c:712
 msgid "Could not find self in Active Directory"
 msgstr "সক্রিয় ডিরেক্টরির মধ্যে নিজেকে পাওয়া যায়নি"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:729
+#: ../plugins/exchange-operations/exchange-delegates.c:725
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "সক্রিয় ডিরেক্টরির মধ্যে %s প্রতিনিধিকে পাওয়া যায়নি"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:741
+#: ../plugins/exchange-operations/exchange-delegates.c:737
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr " %s প্রতিনিধি অপসারণ করা যায়নি"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:801
+#: ../plugins/exchange-operations/exchange-delegates.c:797
 msgid "Could not update list of delegates."
 msgstr "প্রতিনিধিদের তালিকা আপডেট করা যায়নি।"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:819
+#: ../plugins/exchange-operations/exchange-delegates.c:815
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "%s প্রতিনিধি যোগ করা যায়নি"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:987
+#: ../plugins/exchange-operations/exchange-delegates.c:983
 msgid "Error reading delegates list."
 msgstr "প্রতিনিধিদের তালিকা পড়তে সমস্যা।"
 
@@ -15863,20 +16819,25 @@ msgstr "অনুমতির সারসংক্ষেপ (_S)"
 msgid "_Tasks:"
 msgstr "কর্ম (_T):"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:61
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "অনুমতিি"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "ফোল্ডারের নাম"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
 msgstr "ফোল্ডারের মাপ"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:316
+#. FIXME Limit to one user
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
+msgid "User"
+msgstr "ব্যবহারকারী"
+
+#: ../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 "অন্যান্য ব্যবহারকারীদের ফোল্ডারে সাবস্ক্রাইব করুন"
@@ -15885,20 +16846,20 @@ msgstr "অন্যান্য ব্যবহারকারীদের ফ�
 msgid "Exchange Folder Tree"
 msgstr "Exchange ফোল্ডার ট্রি"
 
-#: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:235
-#: ../plugins/exchange-operations/exchange-folder.c:245
+#: ../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 "ফোল্ডার থেকে আনসাবস্ক্রাইব করুন..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:465
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:466
+#: ../plugins/exchange-operations/exchange-folder.c:521
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "\"%s\" ফোল্ডার থেকে নিশ্চিতরূপে আন-সবাস্ক্রাইব করা হবে কি?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:477
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:478
+#: ../plugins/exchange-operations/exchange-folder.c:533
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\" থেকে আন-সবাস্ক্রাইব করুন"
@@ -15963,15 +16924,18 @@ msgstr "আপনার পাসওয়ার্ডের মেয়াদ ৭ �
 msgid "_Change Password"
 msgstr "পাসওয়ার্ড পরিবর্তন করুন (_C)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 msgid "(Permission denied.)"
 msgstr "(অনুমতি প্রদান করা হয়নি।)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 msgid "Add User:"
 msgstr "ব্যবহারকারী যোগ করুন:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#: ../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:715
 msgid "Add User"
 msgstr "ব্যবহারকারী যোগ করুন"
 
@@ -16092,15 +17056,11 @@ msgstr "সংবেদনশীলতা: (_S)"
 msgid "_User"
 msgstr "ব্যবহারকারী (_U)"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
-msgid "button-user"
-msgstr "button-user"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:143
+#: ../plugins/exchange-operations/exchange-user-dialog.c:138
 msgid "Select User"
 msgstr "ব্যবহারকারী নির্বাচন করুন"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:181
+#: ../plugins/exchange-operations/exchange-user-dialog.c:176
 msgid "Address Book..."
 msgstr "ঠিকানাবই..."
 
@@ -16114,7 +17074,7 @@ msgstr "অন্যান্য ব্যবহারকারীর বর্�
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
 msgid ""
-"A plugin that handles a collection of Exchange account specific operations "
+"A plugin that manages a collection of Exchange account specific operations "
 "and features."
 msgstr ""
 
@@ -16205,10 +17165,14 @@ 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 অ্যাকান্ট বর্তমানে অফলাইন অবস্থায় রয়েছে।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
+#: ../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"
@@ -16224,32 +17188,32 @@ msgid ""
 "  "
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Failed to update delegates:"
 msgstr "প্রতিনিধিদের সংক্রান্ত তথ্য আপডেট করা যায়নি:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 msgid "Folder already exists"
 msgstr "ফোল্ডার বর্তমানে উপস্থিত রয়েছে"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder does not exist"
 msgstr "ফোল্ডার বর্তমানে উপস্থিত নেই"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
 msgid "Folder offline"
 msgstr "ফোল্ডার অফলাইন অবস্থায় রয়েছে"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1288
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "সাধারণ সমস্যা"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid "Global Catalog Server is not reachable"
 msgstr "Global Catalog Server'র সাথে সংযোগ স্থাপন করতে ব্যর্থ"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../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."
@@ -16257,71 +17221,71 @@ msgstr ""
 "OWA কোনো ভিন্ন পাথে সঞ্চালিত হলে তা অ্যাকউন্ট কনফিগারেশন ডায়লগ বক্সের মধ্যে উল্লেখ "
 "করা আবশ্যক।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Mailbox for {0} is not on this server."
 msgstr "{0}-র মেইলবক্স এই সার্ভারের মধ্যে উপস্থিত নেই।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the URL is correct and try again."
 msgstr "URL-টি সঠিকরূপে উল্লিখিত হয়েছে কিনা পরীক্ষা করে পুনরায় প্রচেষ্টা করুন।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr "সার্ভারের নামের বানান সঠিকরূপে উল্লিখিত হয়েছে কিনা পরীক্ষা করে পুনরায় প্রচেষ্টা করুন।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the username and password are correct and try again."
 msgstr "ব্যবহারকারীর নাম ও পাসওয়ার্ড সঠিক কিনা পরীক্ষা করে পুনরায় প্রচেষ্টা করুন।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
 msgstr "এই অ্যাকাউন্টের জন্য কোনো Global Catalog সার্ভার কনফিগার করা হয়নি"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No mailbox for user {0} on {1}."
 msgstr "{0} ব্যবহারকারীর জন্য {1}-এ কোনো মেইলবক্স উপস্থিত নেই।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "No such user {0}"
 msgstr "ব্যবহারকারী {0} উপস্থিত নেই"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Password successfully changed."
 msgstr "পাসওয়ার্ড সাফল্যের সাথে পরিবর্তন করা হয়েছে।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../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:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "Global Catalog Server'র নাম সঠিক কিনা তা অনুগ্রহ করে পরীক্ষা করুন।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please restart Evolution for changes to take effect"
 msgstr "পরিবর্তন প্রয়োগ করতে অনুগ্রহ করে Evolution পুনরায় আরম্ভ করুন"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Please select a user."
 msgstr "অনুগ্রহ করে একজন ব্যবহারকারী নির্বাচন করুন।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "Server rejected password because it is too weak."
 msgstr "অত্যন্ত দুর্বল হওয়ার ফলে পাসওয়ার্ডটি সার্ভারের দ্বারা প্রত্যাখ্যান করা হয়েছে।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Evolution থেকে প্রস্থান করার সময় Exchange অ্যাকাউন্টটি নিষ্ক্রিয় করা হবে।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Evolution থেকে প্রস্থান করার সময় Exchange অ্যাকাউন্টটি মুছে ফেলা হবে।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Exchange সার্ভারটি Exchange Connector-র সাথে সুসংগত নয়।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
+#: ../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."
@@ -16329,7 +17293,7 @@ msgstr ""
 "সার্ভারের মধ্যে Exchange 5.5 চালানো হচ্ছে। Exchange Connector-র দ্বারা \n"
 "শুধুমাত্র Microsoft Exchange 2000 ও 2003 সমর্থিত হয়।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
+#: ../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"
@@ -16338,57 +17302,58 @@ msgid ""
 "Or you might have just typed your password wrong."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Try again with a different password."
 msgstr "একটি পৃথক পাসওয়ার্ড প্রয়োগ করে পুনরায় প্রচেষ্টা করুন।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to add user to access control list:"
 msgstr "প্রবেশাধিকার নিয়ন্ত্রণ তালিকা (ACL)-র মধ্যে ব্যবহারকারী যোগ করা যায়নি:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unable to edit delegates."
 msgstr "প্রতিনিধি সংক্রান্ত তথ্য সম্পাদন করা সম্ভব নয়।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error looking up {0}"
 msgstr "{0} সংক্রান্ত তথ্য অনুসন্ধান করতে অজানা সমস্যা উৎ‌পন্ন হয়েছে"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/google-account-setup/google-source.c:543
 msgid "Unknown error."
 msgstr "অজানা সমস্যা।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unknown type"
 msgstr "অজানা ধরন"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
 msgstr "অসমর্থিত কর্ম"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../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 "এই সার্ভারে মেইল সংরক্ষণের জন্য বরাদ্দ স্থানের সীমা অতিক্রম করতে চলেছেন।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../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:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You cannot make yourself your own delegate"
 msgstr "আপনি নিজেকে নিজের প্রতিনিধিরূপে ধার্য করতে পারবেন না"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "এই সার্ভারে মেইল সংরক্ষণের জন্য বরাদ্দ স্থানের সীমা অতিক্রম করেছেন।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "You may only configure a single Exchange account."
 msgstr "আপনি শুধুমাত্র একটি Exchange অ্যাকাউন্ট করতে পারবেন।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../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."
@@ -16396,7 +17361,7 @@ msgstr ""
 "আপনি বর্তমানে ব্যবহার করেছেন : {0} কিলোবাইট। কিছু মেইল মুছে স্থান ফাঁকা করার চেষ্টা "
 "করুন।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../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."
@@ -16404,7 +17369,7 @@ msgstr ""
 "আপনি বর্তমানে ব্যবহার করেছেন : {0} কিলোবাইট। আপনি এখন মেইল প্রেরণ অথবা প্রাপ্ত "
 "করতে পারবেন না।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../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."
@@ -16412,19 +17377,19 @@ msgstr ""
 "আপনি বর্তমানে ব্যবহার করেছেন : {0} কিলোবাইট। কিছু মেইল মুছে স্থান ফাঁকা না করা "
 "অবধি আপনি মেইল প্রেরণ করতে সক্ষম হবেন না।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "Your password has expired."
 msgstr "আপনার পাসওয়ার্ডের মেয়াদ পূর্ণ হয়েছে।"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} কোনো প্রবেশাধিকা নিয়ন্ত্রণ তালিকা (acl)-র মধ্যে অন্তর্ভুক্ত করা যাবে না"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already a delegate"
 msgstr "{0} প্রতিনিধি হিসাবে উপস্থিত রয়েছে"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
 msgid "{0} is already in the list"
 msgstr "{0} বর্তমানে তালিকায় উপস্থিত রয়েছেন"
 
@@ -16436,6 +17401,14 @@ msgstr "অন্যান্য ব্যবহারকারীদের ক�
 msgid "Check folder permissions"
 msgstr "ফোল্ডারের অনুমতি পরীক্ষা করুন"
 
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Default External Editor"
+msgstr "ডিফল্ট স্বত্বন্ত্র সম্পাদন ব্যবস্থা"
+
+#: ../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 "
@@ -16447,23 +17420,55 @@ msgstr ""
 msgid "External Editor"
 msgstr "স্বত্বন্ত্র সম্পাদন ব্যবস্থা"
 
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+msgid "Cannot create Temporary File"
+msgstr "অস্থায়ী ফাইল তৈরি করা সম্ভব হয়নি।"
+
+#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+msgid "Editor not launchable"
+msgstr "এডিটর আরম্ভ করা সম্ভব নয়"
+
+#: ../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."
+msgstr ""
+
+#: ../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."
+msgstr ""
+
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
-msgstr "স্বতন্ত্র সম্পাদন ব্যবস্থার মধ্যে কম্পোজ করুন"
+msgid "Compose in _External Editor"
+msgstr "স্বতন্ত্র সম্পাদন ব্যবস্থার মধ্যে রচনা করুন (_E)"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
 msgstr "স্বতন্ত্র সম্পাদন ব্যবস্থার মধ্যে বার্তা কম্পোজ করুন"
 
-#: ../plugins/face/face.c:57
+#: ../plugins/external-editor/external-editor.c:112
+msgid "Command to be executed to launch the editor: "
+msgstr "এডিটর আরম্ভ করার জন্য সঞ্চালিত কমান্ড: "
+
+#: ../plugins/external-editor/external-editor.c:113
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim\""
+msgstr ""
+"Emacs-র জন্য \"xemacs\" ব্যবহার করুন\n"
+"VI-র জন্য \"gvim\" ব্যবহার করুন"
+
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "৭০০ বাইটের কম মাপের একটি png (48*48) ছবি নির্বাচন করুন"
 
-#: ../plugins/face/face.c:67
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "PNG ফাইল"
 
-#: ../plugins/face/org-gnome-face-ui.xml.h:1
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "_Face"
 
@@ -16497,20 +17502,54 @@ msgstr "ফোল্ডার থেকে আনসাবস্ক্রাই�
 msgid "_Unsubscribe"
 msgstr "আনসাবস্ক্রাইব (_U)"
 
-#: ../plugins/google-account-setup/google-source.c:71
-#: ../plugins/google-account-setup/google-source.c:78
+#: ../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 "অনুগ্রহ করে ব্যবহারকারীর নাম লিখুন।"
+
+#: ../plugins/google-account-setup/google-source.c:443
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr "সাবস্ক্রাইব করা বর্ষপঞ্জির তালিকায় দেখার জন্য %s ব্যবহারকারীর পাসওয়ার্ড লিখুন।"
+
+#: ../plugins/google-account-setup/google-source.c:543
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"Google সার্ভার থেকে তথ্য পড়তে ব্যর্থ।\n"
+"%s"
+
+#: ../plugins/google-account-setup/google-source.c:693
+msgid "Cal_endar:"
+msgstr "বর্ষপঞ্জি: (_e)"
+
+#: ../plugins/google-account-setup/google-source.c:728
+msgid "Retrieve _list"
+msgstr "তালিকা উদ্ধার করুন (_l)"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:268
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
+msgid "<b>Server</b>"
+msgstr "<b>সার্ভার</b>"
+
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup google calendar."
-msgstr "google ক্যালেন্ডার প্রস্তুতির একটি প্লাগ-ইন।"
+msgid "A plugin to setup google calendar and contacts."
+msgstr "google ক্যালেন্ডার ও পরিচিতি প্রস্তুতির একটি প্লাগ-ইন।"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "Google-র সোর্স"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 msgid "Checklist"
 msgstr "পরীক্ষণতালিকা"
 
@@ -16545,16 +17584,16 @@ msgstr "শেয়ার করা ফোল্ডার ইনস্টল ক�
 msgid "Shared Folder Installation"
 msgstr "শেয়ার করা ফোল্ডার ইনস্টলেশনের প্রকৃতি"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:78
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
 msgstr "অনাকাঙ্ক্ষিত বস্তু সংক্রান্ত বৈশিষ্ট্যাবলী"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:91
+#: ../plugins/groupwise-features/junk-mail-settings.c:93
 #: ../plugins/groupwise-features/junk-settings.glade.h:3
 msgid "Junk Mail Settings"
 msgstr "অনাকাঙ্ক্ষিত বার্তা সংক্রান্ত বৈশিষ্ট্যাবলী"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:115
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
 msgstr "অনাকাঙ্ক্ষিত বার্তা সংক্রান্ত বৈশিষ্ট্যাবলী ..."
 
@@ -16580,10 +17619,20 @@ msgid "_Junk List"
 msgstr "অনাকাঙ্ক্ষিত বস্তুর তালিকা(_J)"
 
 #: ../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 ""
 
-#: ../plugins/groupwise-features/mail-retract.c:60
+#: ../plugins/groupwise-features/mail-retract.c:87
 msgid "Retract Mail"
 msgstr ""
 
@@ -16591,12 +17640,6 @@ msgstr ""
 msgid "Add Send Options to groupwise messages"
 msgstr "Groupwise বার্তার জন্য প্রেরণ সংক্রান্ত অপশন যোগ করুন"
 
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
-#: ../widgets/misc/e-send-options.glade.h:19
-msgid "Send Options"
-msgstr "প্রেরণ সংক্রান্ত অপশন"
-
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "Groupwise অ্যাকাউন্টের বৈশিষ্ট্যের জন্য একটি প্লাগ-ইন"
@@ -16605,7 +17648,74 @@ msgstr "Groupwise অ্যাকাউন্টের বৈশিষ্ট্�
 msgid "Groupwise Features"
 msgstr "Groupwise সংক্রান্ত বৈশিষ্ট্যাবলী"
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../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 "অবৈধ ব্যবহারকারী"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
+msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+msgstr "&quot;{0}&quot; ব্যবহারকারীর জন্য প্রক্সির ব্যবহারের অনুমতি প্রদান করা যাবে না"
+
+#: ../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 "ব্যবহারকারী নির্বাচন করুন"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
+msgid "You have already given proxy permissions to this user."
+msgstr "চিহ্নিত ব্যবহারকারীর জন্য প্রক্সি সংক্রান্ত অনুমতি প্রদান করা হয়েছে।"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
+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 ""
+"&quot;{0}&quot; নামের একটি অ্যাকাউন্ট বর্তমানে উপস্থিত আছে। অনুগ্রহ করে ফোল্ডার-ট্রি "
+"পরীক্ষা করুন।"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
+msgid "Account Already Exists"
+msgstr "অ্যাকাউন্ট বর্তমানে উপস্থিত রয়েছে"
+
+#: ../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."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+msgid "This is a recurring meeting"
+msgstr "এই সভার পুনরাবৃত্তি হবে"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
+msgid "Would you like to accept it?"
+msgstr "আপনি কি এটি গ্রহণ করতে ইচ্ছুক?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+msgid "Would you like to decline it?"
+msgstr "আপনি কি এটি প্রত্যাখ্যান করতে ইচ্ছুক?"
+
+#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgstr "চিহ্নিত &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"
+msgstr "তালিকার মধ্যে যোগ করার উদ্দেশ্যে ব্যবহারকারীর নাম উল্লেখ করা আবশ্যক"
+
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "অস্থায়ীরূপে গ্রহণ করা হবে"
 
@@ -16622,7 +17732,7 @@ msgid "Con_tacts..."
 msgstr "পরিচিতি...(_t)"
 
 #: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:517
+#: ../widgets/table/e-table-click-to-add.c:516
 msgid "Message"
 msgstr "বার্তা"
 
@@ -16703,9 +17813,9 @@ msgstr "<b>অ্যাকাউন্টের নাম</b>"
 msgid "Proxy Login"
 msgstr "প্রক্সি লগ-ইন"
 
-#: ../plugins/groupwise-features/proxy-login.c:220
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../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:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -16714,40 +17824,44 @@ msgstr "%s %s -র(ব্যবহারকারী %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:521
+#: ../plugins/groupwise-features/proxy-login.c:509
 msgid "_Proxy Login..."
 msgstr "প্রক্সি লগ-ইন(_P)..."
 
-#: ../plugins/groupwise-features/proxy.c:701
+#: ../plugins/groupwise-features/proxy.c:691
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "শুধমাত্র অ্যাকউন্ট সক্রিয় করা হলে প্রক্সি সংক্রান্ত ট্যাব উপলব্ধ করা হবে।"
 
-#: ../plugins/groupwise-features/proxy.c:706
+#: ../plugins/groupwise-features/proxy.c:696
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "শুধমাত্র অ্যাকউন্ট সক্রিয় করা হলে প্রক্সি সংক্রান্ত ট্যাব উপলব্ধ করা হবে।"
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
-#: ../plugins/groupwise-features/share-folder.c:761
+#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "ব্যবহারকারীবৃন্দ"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr "ব্যবহারকারীদের নাম উল্লেখ করে অনুমতি নির্ধারণ করুন"
 
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
 msgstr "যৌথরূপে ব্যবহৃত নতুন ফোল্ডার(_S)..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "যৌথরূপে ব্যবহার"
 
-#: ../plugins/groupwise-features/share-folder.c:766
+#: ../plugins/groupwise-features/share-folder.c:533
+msgid "Custom Notification"
+msgstr "স্বনির্ধারিত সূচনাবার্তা"
+
+#: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
 msgstr "যোগ করুন   "
 
-#: ../plugins/groupwise-features/share-folder.c:772
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Modify"
 msgstr "পরিবর্তন করুন"
 
@@ -16812,11 +17926,11 @@ msgstr "hula ক্যালেন্ডারের সোর্স প্র�
 msgid "Hula Account Setup"
 msgstr "Hula অ্যাকাউন্ট স্থাপনা"
 
-#: ../plugins/imap-features/imap-headers.c:322
+#: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
 msgstr "স্বনির্ধারিত হেডার"
 
-#: ../plugins/imap-features/imap-headers.c:335
+#: ../plugins/imap-features/imap-headers.c:333
 msgid "IMAP Headers"
 msgstr "IMAP হেডার"
 
@@ -16863,28 +17977,28 @@ msgstr "IMAP অ্যাকাউন্টের বৈশিষ্ট্যে
 msgid "IMAP Features"
 msgstr "IMAP-র বৈশিষ্ট্য"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:82
+#: ../plugins/import-ics-attachments/icsimporter.c:78
 msgid "_Import to Calendar"
 msgstr "বর্ষপঞ্জির মধ্যে ইম্পোর্ট করুন (_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:87
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Tasks"
 msgstr "কর্মে ইম্পোর্ট করুন (_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:205
+#: ../plugins/import-ics-attachments/icsimporter.c:201
 msgid "Import ICS"
 msgstr "ICS ইম্পোর্ট করুন"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:224
 msgid "Select Task List"
 msgstr "কর্ম তালিকা নির্বাচন করুন"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:232
+#: ../plugins/import-ics-attachments/icsimporter.c:228
 msgid "Select Calendar"
 msgstr "বর্ষপঞ্জি নির্বাচন করুন"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:263
-#: ../shell/e-shell-importer.c:703
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "ইম্পোর্ট (_I)"
 
@@ -16917,14 +18031,14 @@ msgid ""
 "connected to the system or it is not powered on."
 msgstr ""
 
-#: ../plugins/ipod-sync/ical-format.c:133
-#: ../plugins/save-calendar/ical-format.c:190
+#: ../plugins/ipod-sync/ical-format.c:118
+#: ../plugins/save-calendar/ical-format.c:163
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar বিন্যাস (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
-msgstr "Apple iPod-র সাথে নির্বাচিত কর্ম/মেমো/বর্ষপঞ্জি সুসংগত করুন"
+msgid "Synchronize the selected task/memo/calendar/address book with Apple iPod"
+msgstr "Apple iPod-র সাথে নির্বাচিত কর্ম/মেমো/বর্ষপঞ্জি/ঠিকানাবই সুসংগত করুন"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
@@ -16934,128 +18048,128 @@ msgstr "iPod'র সাথে সুসংগত করুন"
 msgid "iPod Synchronization"
 msgstr "iPod'র সাথে সুসংগতি"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "'%s' বর্ষপঞ্জিটি লোড করতে ব্যর্থ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:589
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "'%s' বর্ষপঞ্জির একটি সাক্ষাৎকার এই বৈঠকের সাথে একই সময়ে চিহ্নিত রয়েছে"
 
-#: ../plugins/itip-formatter/itip-formatter.c:615
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "'%s' বর্ষপঞ্জির মধ্যে সাক্ষাৎকার পাওয়া গিয়েছে"
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "বর্ষপঞ্জি সনাক্ত করতে ব্যর্থ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:698
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "কোনো বর্ষপঞ্জির মধ্যে এই সাক্ষাৎকার পাওয়া যায়নি"
 
-#: ../plugins/itip-formatter/itip-formatter.c:702
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "কোনো কর্ম তালিকায় এই কর্ম সনাক্ত করা যায়নি"
 
-#: ../plugins/itip-formatter/itip-formatter.c:706
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "কোনো মেমো তালিকায় এই মেমো সনাক্ত করা যায়নি"
 
-#: ../plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "চিহ্নিত সাক্ষাৎকারের পূর্ববর্তী সংস্করণ অনুসন্ধান করা হচ্ছে"
 
-#: ../plugins/itip-formatter/itip-formatter.c:943
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "বস্তু পার্স করা সম্ভব হয়নি"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1001
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "'%s' বর্ষপঞ্জিতে বস্তু প্রেরণ করা যায়নি।  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1013
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "'%s' বর্ষপঞ্জিতে গৃহীত হিসাবে প্রেরণ করা হয়েছে"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1017
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "বর্ষপঞ্জিতে '%s' সম্ভাব্য হিসাবে নির্ধারণ করা হবে"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1022
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "'%s' বর্ষপঞ্জিতে প্রত্যাখ্যান বার্তাসহ প্রেরণ করা হয়েছে"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1027
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "'%s' বর্ষপঞ্জিতে বাতিল হিসাবে প্রেরণ করা হয়েছে"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1121
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizer-র দ্বারা %s প্রতিনিধি অপসারণ করা হয়েছে "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "প্রতিনিধির উদ্দেশ্যে বাতিল সংক্রান্ত সূচনা প্রদান করা হয়েছে"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "প্রতিনিধির উদ্দেশ্যে বাতিল সংক্রান্ত সূচনা প্রদান করা যায়নি"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1216
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "অবৈধ মান হওয়ার দরুন অংশগ্রহনকারীর অবস্থা আপডেট করা সম্ভব হয়নি"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1243
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "অংশগ্রহণকারী সংক্রান্ত তথ্য আপডেট করা যায়নি। %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1247
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "অংশগ্রহণকারীর অবস্থা আপডেট করা হয়েছে"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "সভার তথ্য প্রেরিত"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "কর্ম সংক্রান্ত তথ্য প্রেরিত হয়েছে"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "মেমো সংক্রান্ত তথ্য প্রেরিত"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1288
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "সভা সংক্রান্ত তথ্য প্রেরণ করতে ব্যর্থ, এই সভা বর্তমানে উপস্থিত নেই"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr "কর্ম সংক্রান্ত তথ্য প্রেরণ করতে ব্যর্থ, এই কর্ম বর্তমানে উপস্থিত নেই"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "মেমো সংক্রান্ত তথ্য প্রেরণ করতে ব্যর্থ, এই মেমো বর্তমানে উপস্থিত নেই"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1369
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "সংযুক্ত বর্ষপঞ্জি বৈধ নয়"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1370
-#: ../plugins/itip-formatter/itip-formatter.c:1385
+#: ../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."
@@ -17063,15 +18177,15 @@ msgstr ""
 "বার্তার মধ্যে একটি বর্ষপঞ্জির উপস্থিতি সম্বন্ধে দাবি করা হলেও বর্ষপঞ্জিটি বৈধ "
 "iCalendar নয়।"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1420
-#: ../plugins/itip-formatter/itip-formatter.c:1438
-#: ../plugins/itip-formatter/itip-formatter.c:1520
+#: ../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 "বর্ষপঞ্জির মধ্যে উপস্থিত বিষয়বস্তু বৈধ নয়"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1421
-#: ../plugins/itip-formatter/itip-formatter.c:1439
-#: ../plugins/itip-formatter/itip-formatter.c:1521
+#: ../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"
@@ -17079,11 +18193,11 @@ msgstr ""
 "বার্তার মধ্যে একটি বর্ষপঞ্জির উপস্থিতি সম্বন্ধে দাবি করা হলেও বর্ষপঞ্জিটি বৈধ "
 "iCalendar নয়।"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1450
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "সংযুক্ত বর্ষপঞ্জির মধ্যে একাধিক বিষয়বস্তু উপস্থিত রয়েছে"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1451
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17103,302 +18217,302 @@ msgstr "চিহ্নিত মেমোর পুনরাবৃত্তি
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2369
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "কর্ম সঞ্চালনের পরে বার্তা মুছে ফেলা হবে (_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2379
-#: ../plugins/itip-formatter/itip-formatter.c:2411
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "দ্বন্দ্ব অনুসন্ধান"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "সভা সংক্রান্ত দ্বন্দ্ব অনুসন্ধানের উদ্দেশ্যে বর্ষপঞ্জি নির্বাচন করুন"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:239
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:298
 msgid "Today"
 msgstr "আজ"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "আজ %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:201
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "আজ %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:210
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "আজ %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "আগামীকাল"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "আগামীকাল %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "আগামীকাল %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "আগামীকাল %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:238
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "আগামীকাল %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../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:262
+#: ../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:266
+#: ../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:271
+#: ../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:275
+#: ../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:284
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. 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:290
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %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:294
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %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:299
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %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:303
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %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:323
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:327
+#: ../plugins/itip-formatter/itip-view.c:324
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../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 "<b>%s</b>-র পক্ষ থেকে অনুগ্রহ করে উত্তর দিন"
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../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 "<b>%s</b>-র পক্ষ থেকে প্রাপ্ত হয়েছে"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../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>-র দ্বারা, %s-র মাধ্যমে নিম্নলিখিত সভার তথ্য প্রকাশ করা হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b>-র দ্বারা নিম্নলিখিত সভার তথ্য প্রকাশ করা হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b>-র দ্বারা নিম্নলিখিত সভাটি আপনাকে বন্টণ করা হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../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>-র দ্বারা, %s-র মাধ্যমে নিম্নলিখিত সভায় আপনার উপস্থিতি অনুরোধ করেছেন:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b>-র দ্বারা নিম্নলিখিত সভায় আপনার উপস্থিতি অনুরোধ করা হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../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>-র দ্বারা, %s-র মাধ্যমে একটি বিদ্যমান সভায় যোগ করার অনুরোধ জানানো হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b>-র দ্বারা একটি বিদ্যমান সভায় যোগ করার অনুরোধ জানানো হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../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 "<b>%s</b>, %s-র মাধ্যমে নিম্নলিখিত সভা সংক্রান্ত সর্বশেষ তথ্য পেতে ইচ্ছুক:"
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../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> নিম্নলিখিত সভা সংক্রান্ত সর্বশেষ তথ্য পেতে ইচ্ছুক:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b>, %s-র মাধ্যমে সভা সংক্রান্ত নিম্নলিখিত প্রত্যুত্তর পাঠিয়েছেন:"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> সভা সংক্রান্ত নিম্নলিখিত প্রত্যুত্তর পাঠিয়েছেন:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b>-র দ্বারা, %s-র মাধ্যমে নিম্নলিখিত সভা বাতিল করা হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b>-র দ্বারা নিম্নলিখিত সভা বাতিল করা হয়েছে।"
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> %s-র মাধ্যমে সভা সংক্রান্ত নিম্নলিখিত পরিবর্তনগুলির প্রস্তাবনা করেছেন।"
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b>-র দ্বারা সভা সংক্রান্ত নিম্নলিখিত পরিবর্তনগুলির প্রস্তাব জানানো হয়েছে।"
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../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>-র দ্বারা, %s-র মাধ্যমে সভা সংক্রান্ত নিম্নলিখিত প্রস্তাবগুলি প্রত্যাখ্যান করা "
 "হয়েছে।"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b>-র দ্বারা সভা সংক্রান্ত নিম্নলিখিত প্রস্তাবগুলি প্রত্যাখ্যান করা হয়েছে।"
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b>-র দ্বারা, %s-র মাধ্যমে নিম্নলিখিত কর্ম প্রকাশিত করা হয়েছে।"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> নিম্নলিখিত কর্ম প্রকাশ করেছেন:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../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>-র দ্বারা নিম্নলিখিত কর্মের জন্য %s-কে নিযুক্ত করার অনুরোধ জানানো হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b>-র দ্বারা, %s-র মাধ্যমে আপনাকে একটি কর্মের নিযুক্ত করা হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b>-র দ্বারা আপনাকে একটি কর্মে নিযুক্ত করা হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../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>, %s-র দ্বারা একটি বর্তমান কর্মে কিছু যোগ করতে ইচ্ছুক।"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> বর্তমান কাজে যোগ করতে ইচ্ছুক:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -17407,136 +18521,136 @@ msgstr ""
 "<b>%s</b>, %s-র মাধ্যমে নিম্নলিখিত বরাদ্দ কর্ম সংক্রান্ত সর্বশেষ তথ্য প্রাপ্ত করতে "
 "ইচ্ছুক:"
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../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> নিম্নলিখিত বরাদ্দ কর্ম সংক্রান্ত সর্বশেষ তথ্য প্রাপ্ত করতে ইচ্ছুক:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr ""
 "<b>%s</b>, %s-র মাধ্যমে দ্বারা নিম্নলিখিত বরাদ্দ কর্ম সংক্রান্ত প্রত্যুত্তর প্রেরণ করা "
 "হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../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>-র দ্বারা নিম্নলিখিত বরাদ্দ কর্ম সংক্রান্ত প্রত্যুত্তর প্রেরণ করা হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../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>-র দ্বারা, %s-র মাধ্যমে নিম্নলিখিত বরাদ্দ কর্ম বাতিল করা হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b>-র দ্বারা, নিম্নলিখিত বরাদ্দ কর্ম বাতিল করা হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b>, %s-র মাধ্যমে নিম্নলিখিত বরাদ্দ কর্ম সংক্রান্ত পরিবর্তনের প্রস্তাবনা করেছেন:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b>-র দ্বারা নিম্নলিখিত বরাদ্দ কর্ম সংক্রান্ত পরিবর্তনের প্রস্তাব জানানো হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../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>-র দ্বারা, %s-র মাধ্যমে নিম্নলিখিত বরাদ্দ কর্ম বাতিল করা হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b>-র দ্বাটা নিম্নলিখিত বরাদ্দ কর্ম প্রত্যাখ্যান করা হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b>-র দ্বারা, %s-র মাধ্যমে নিম্নলিখিত কর্মসূচী প্রকাশিত করা হয়েছে।"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> নিম্নলিখিত কর্মসূচী প্রকাশ করেছেন:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../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>-র দ্বারা, %s-র মাধ্যমে একটি কর্মসূচী যোগ করার অনুরোধ জানানো হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b>-র দ্বারা একটি বিদ্যমান কর্মসূচীতে তথ্য যোগ করার অনুরোধ জানানো হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../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>-র দ্বারা, %s-র মাধ্যমে নিম্নলিখিত যৌথকর্মসূচী বাতিল করা হয়েছে:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b>-র দ্বারা, নিম্নলিখিত যৌথকর্মসূচী বাতিল করা হয়েছে:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "বর্ষপঞ্জি (_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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 "প্রত্যাখ্যান করুন (_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../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 "গ্রহণ করুন (_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "সমস্ত প্রত্যাখ্যান (_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "অস্থায়ীরূপে (_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../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 "অস্থায়ীরূপে (_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "সমস্ত গ্রহণ করুন (_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "তথ্য প্রেরণ করুন (_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "অংশগ্রহণকারীর অবস্থা আপডেট করুন (_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "আপডেট করুন (_U)"
 
@@ -17632,15 +18746,17 @@ msgstr "D-Bus বার্তা সক্রিয় করা হবে।"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Enable icon in notification area."
-msgstr ""
+msgstr "সূচনাপ্রদানের স্থানে আইকন সক্রিয় করা হবে।"
 
 #: ../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 বার্তা উৎ‌পন্ন করা হয়।"
 
 #: ../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."
-msgstr ""
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr "মান \"true\" হলে বিপ করা হবে, অন্যথা নতুন বার্তা প্রাপ্ত হলে শব্দ বাজানো হবে।"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
@@ -17686,8 +18802,16 @@ msgstr "শুধুমাত্র ইনবক্স ফোল্ডারে�
 msgid "Generate a _D-Bus message"
 msgstr "একটি D-Bus বার্তা নির্মাণ করুন (_D)"
 
+#: ../plugins/mail-notification/mail-notification.c:377
+msgid "Evolution's Mail Notification"
+msgstr "Evolution-র মেইল সংক্রান্ত সূচনা ব্যবস্থা"
+
+#: ../plugins/mail-notification/mail-notification.c:398
+msgid "Mail Notification Properties"
+msgstr "মেইলের সূচনা ব্যবস্থার বৈশিষ্ট্য"
+
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:363
+#: ../plugins/mail-notification/mail-notification.c:457
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17698,58 +18822,61 @@ msgid_plural ""
 msgstr[0] ""
 "%d-টি নতুন বার্তা\n"
 "%s-র মধ্যে প্রাপ্ত করেছেন।"
+msgstr[1] ""
+"%d-টি নতুন বার্তা\n"
+"%s-র মধ্যে প্রাপ্ত করেছেন।"
 
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:462
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "%d-টি নতুন বার্তা প্রাপ্ত করেছেন।"
+msgstr[1] "%d-টি নতুন বার্তা প্রাপ্ত করেছেন।"
 
-
-#: ../plugins/mail-notification/mail-notification.c:380
-#: ../plugins/mail-notification/mail-notification.c:385
+#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:484
 msgid "New email"
 msgstr "নতুন ই-মেইল"
 
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:541
 msgid "Show icon in _notification area"
-msgstr ""
+msgstr "সূচনাপ্রদানের স্থানের আইকন প্রদর্শন করা হবে (_n)"
 
-#: ../plugins/mail-notification/mail-notification.c:443
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "B_link icon in notification area"
-msgstr ""
+msgstr "সূচনাপ্রদানের স্থানের আইকনে ঝলকানি হবে (_l)"
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:546
 msgid "Popup _message together with the icon"
-msgstr ""
+msgstr "আইকনের সাথে বার্তা পপ-আপ করে প্রদর্শিত হবে (_m)"
 
-#: ../plugins/mail-notification/mail-notification.c:626
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "_Play sound when new messages arrive"
 msgstr "নতুন মেইল এলে শব্দ করা হবে (_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:733
 msgid "_Beep"
 msgstr "বিপ শব্দ করা হবে (_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:633
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Play _sound file"
 msgstr "শব্দের ফাইল বাজানে হবে (_s)"
 
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Specify _filename:"
 msgstr "ফাইলের নাম নির্ধারণ করুন (_f):"
 
-#: ../plugins/mail-notification/mail-notification.c:645
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "শব্দের ফাইল নির্বাচন করুন"
 
-#: ../plugins/mail-notification/mail-notification.c:646
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "Pl_ay"
 msgstr "বাজানো হবে (_a)"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:804
 msgid "Notify new messages for _Inbox only"
-msgstr ""
+msgstr "শুধুমাত্র ইনবক্স নতুন বার্তা প্রাপ্তির সূচনা প্রদান করা হবে (_I)"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid ""
@@ -17775,12 +18902,12 @@ msgstr "সভায় রূপান্তর করা হবে (_v)"
 msgid "Mail to meeting"
 msgstr "মেইল থেকে সভায় পরিবর্তন"
 
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "বর্ষপঞ্জি খোলা যাচ্ছে না। %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../plugins/mail-to-task/mail-to-task.c:292
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -17888,7 +19015,7 @@ msgstr "মেইলিং-লিস্টে বার্তা প্রের
 #: ../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 handle.\n"
+"not contain any action we could process.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -17969,6 +19096,26 @@ msgstr "লিস্টে সাবস্ক্রাইব করুন (_S)"
 msgid "_Unsubscribe from List"
 msgstr "লিস্ট থেকে আন-সবাস্ক্রাইব করুন (_U)"
 
+#: ../plugins/mark-all-read/mark-all-read.c:39
+msgid "Also mark messages in subfolders?"
+msgstr "সাবফোল্ডারে উপস্থিত বার্তাগুলিও চিহ্নিত করা হবে কি?"
+
+#: ../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?"
+msgstr ""
+"শুধুমাত্র বর্তমান ফোল্ডারের সমস্ত বার্তা পড়া-হয়েছে হিসাবে চিহ্নিত করা হবে না কি "
+"নির্বাচিত ফোল্ডার ও সেটির সাব-ফোল্ডারের মধ্যে উপস্থিত সমস্ত বার্তা চিহ্নিত করা হবে?"
+
+#: ../plugins/mark-all-read/mark-all-read.c:164
+msgid "Current Folder and _Subfolders"
+msgstr "বর্তমান ফোল্ডার ও সাব-ফোল্ডারের মধ্যে (_S)"
+
+#: ../plugins/mark-all-read/mark-all-read.c:176
+msgid "Current _Folder Only"
+msgstr "শুধুমাত্র বর্তমান ফোল্ডার (_F)"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "পড়া হয়েছে হিসাবে সমস্ত চিহ্নিত করুন"
@@ -18012,7 +19159,7 @@ msgstr "সক্রিয় অথবা নিষ্ক্রিয় প্লা
 # "Manager" এর বাংলা হইলো 'ব্যবস্থাপক'। তবে Context বুঝতে না পারায় আপাতত সেটা লিখলাম না।
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:225
+#: ../plugins/plugin-manager/plugin-manager.c:252
 msgid "Plugin Manager"
 msgstr "প্লাগ-ইন পরিচালন ব্যবস্থা"
 
@@ -18024,33 +19171,24 @@ msgstr "প্লাগ-ইন সক্রিয় অথবা নিষ্ক�
 msgid "_Plugins"
 msgstr "প্লাগ-ইন (_P)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "লেখক"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/table/e-table-config.glade.h:6
-msgid "Description"
-msgstr "বিবরণ"
+#: ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "কনফিগারেশন"
 
-#: ../plugins/plugin-manager/plugin-manager.c:238
+#: ../plugins/plugin-manager/plugin-manager.c:265
 msgid "Note: Some changes will not take effect until restart"
 msgstr "উল্লেখ্য: পুনরায় আরম্ভ না করা অবধি কয়েকটি পরিবর্তন কার্যকর হবে না"
 
-#: ../plugins/plugin-manager/plugin-manager.c:260
+#: ../plugins/plugin-manager/plugin-manager.c:291
 msgid "Overview"
 msgstr "সংক্ষিপ্ত বর্ণনা"
 
-#: ../plugins/plugin-manager/plugin-manager.c:261
-msgid "Configuration"
-msgstr "কনফিগারেশন"
-
-#: ../plugins/plugin-manager/plugin-manager.c:277
-msgid "There is no configuration option for this plugin."
-msgstr "চিহ্নিত প্লাগ-ইনের জন্য কোনো কনফিগারেশন উপস্থিত নেই।"
-
-#: ../plugins/plugin-manager/plugin-manager.c:330
-#: ../plugins/plugin-manager/plugin-manager.c:392
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
 msgstr "প্লাগ-ইন"
 
@@ -18075,42 +19213,23 @@ msgstr "প্লেইন-টেক্সট মোড"
 msgid "Prefer plain-text"
 msgstr "প্লেইন-টেক্সট বাঞ্ছনীয়"
 
-#: ../plugins/prefer-plain/prefer-plain.c:139
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Show HTML if present"
 msgstr "উপস্থিত থসকলে HTML প্রদর্শন করা হবে"
 
 #  not sure abt the context
-#: ../plugins/prefer-plain/prefer-plain.c:140
+#: ../plugins/prefer-plain/prefer-plain.c:192
 msgid "Prefer PLAIN"
 msgstr "PLAIN বাঞ্ছনীয়"
 
-#: ../plugins/prefer-plain/prefer-plain.c:141
+#: ../plugins/prefer-plain/prefer-plain.c:193
 msgid "Only ever show PLAIN"
 msgstr "শুধুমাত্র PLAIN হিসাবে প্রদর্শন করা হবে"
 
-#: ../plugins/prefer-plain/prefer-plain.c:184
+#: ../plugins/prefer-plain/prefer-plain.c:236
 msgid "HTML _Mode"
 msgstr "HTML মোড (_M)"
 
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print from the composer."
-msgstr "কম্পোসার থেকে বার্তা প্রিন্ট করার ব্যবস্থা উপলব্ধ করা হয়।"
-
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-msgid "Print Message"
-msgstr "বার্তা প্রিন্ট করুন"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../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)"
-
-#: ../plugins/print-message/org-gnome-print-message.xml.h:2
-msgid "Prints the message"
-msgstr "বার্তাটি প্রিন্ট করে"
-
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
 msgstr "Evolution Profiler"
@@ -18121,7 +19240,7 @@ msgstr ""
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
-msgstr ""
+msgstr "বর্ষপঞ্জি ওয়েব-এ প্রকাশ করতে ব্যবহৃত হয়"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Calendar Publishing"
@@ -18135,13 +19254,7 @@ msgstr "অবস্থান"
 msgid "_Publish Calendar Information"
 msgstr "বর্ষপঞ্জির তথ্য প্রকাশ করুন (_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:91
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "`%s' এর জন্য পাসওয়ার্ড লিখুন"
-
-#: ../plugins/publish-calendar/publish-calendar.c:416
+#: ../plugins/publish-calendar/publish-calendar.c:595
 msgid "Are you sure you want to remove this URL?"
 msgstr "এই ইউআরএলটি কি আপনি নিশ্চিতরূপে মুছে ফেলতে ইচ্ছুক?"
 
@@ -18229,15 +19342,75 @@ msgstr ""
 "iCal\n"
 "মুক্ত/ব্যস্ত"
 
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "Hello Python"
+
+#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "Python প্লাগ-ইন লোডারের পরীক্ষা"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Python Test Plugin"
+
+#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Python EPlugin লোডারের পরীক্ষামূলক প্লাগ-ইন।"
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
+msgid "A plugin which loads other plugins written using python."
+msgstr ""
+
+#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
+msgid "Python Loader"
+msgstr "Python Loader"
+
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (বিল্ট-ইন)"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
-msgid "This will make Spamassasin more reliable, but slower"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#, c-format
+msgid "SpamAssassin not found, code: %d"
+msgstr "Spamassassin পাওয়া যায়নি, কোড: %d"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:150
+#, c-format
+msgid "Failed to create pipe: %s"
+msgstr "পাইপ নির্মাণ করতে ব্যর্থ: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:189
+#, c-format
+msgid "Error after fork: %s"
+msgstr "ফর্কের পরে ত্রুটি: %s"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:244
+#, c-format
+msgid "SpamAssassin child process does not respond, killing..."
+msgstr "SpamAssassin চাইল্ড প্রসেস থেকে কোনো প্রতিক্রিয়া পাওয়া যাচ্ছে না, kill করা হচ্ছে..."
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:246
+#, c-format
+msgid "Wait for Spamassassin child process interrupted, terminating..."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:255
+#, c-format
+msgid "Pipe to SpamAssassin failed, error code: %d"
+msgstr "SpamAssassin-এ পাইপ করতে ব্যর্থ, উৎপন্ন ত্রুটির কোড: %d"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:498
+#, c-format
+msgid "SpamAssassin is not available."
+msgstr "SpamAssassin উপলব্ধ নয়।"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:865
+msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "এর দরুন Spamassasin ধীরে চলবে, কিন্তু অনেক বেশি নির্ভরশীল হবে"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:871
 msgid "I_nclude remote tests"
 msgstr "দূরবর্তী পরীক্ষণ অন্তর্ভুক্ত করা হবে(_n)"
 
@@ -18261,7 +19434,7 @@ msgstr "সমস্ত সংযুক্ত বস্তু অথবা ব�
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:330
+#: ../plugins/save-attachments/save-attachments.c:314
 msgid "Save attachments"
 msgstr "সংযুক্ত বস্তু সংরক্ষণ করুন"
 
@@ -18273,16 +19446,15 @@ msgstr "সংযুক্ত বস্তু সংরক্ষণ করুন
 msgid "Save all attachments"
 msgstr "সমস্ত সংযুক্ত বস্তু সংরক্ষণ করুন"
 
-#: ../plugins/save-attachments/save-attachments.c:336
+#: ../plugins/save-attachments/save-attachments.c:320
 msgid "Select save base name"
 msgstr ""
 
-#: ../plugins/save-attachments/save-attachments.c:355
+#: ../plugins/save-attachments/save-attachments.c:339
 msgid "MIME Type"
 msgstr "MIME-র ধরন"
 
-#: ../plugins/save-attachments/save-attachments.c:363
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:25
+#: ../plugins/save-attachments/save-attachments.c:347
 msgid "Save"
 msgstr "সংরক্ষণ করুন"
 
@@ -18290,79 +19462,79 @@ msgstr "সংরক্ষণ করুন"
 #. * 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:167
+#: ../plugins/save-calendar/csv-format.c:162
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Description List"
 msgstr "বিবরণের তালিকা"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Categories List"
 msgstr "শ্রেণীর তালিকা"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Comment List"
 msgstr "বক্তব্যের তালিকা"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Created"
 msgstr "নির্মাণের সময়"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Contact List"
 msgstr "পরিচিতি তালিকা"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Start"
 msgstr "আরম্ভ"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "End"
 msgstr "সমাপ্তি"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "percent Done"
 msgstr "শতাংশ সম্পন্ন"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Attendees List"
 msgstr "অংশগ্রহণকারীদের তালিকা"
 
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Modified"
 msgstr "পরিবর্তনের সময়"
 
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:531
 msgid "Advanced options for the CSV format"
 msgstr "CSV বিন্যাসের উন্ন অপশন"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:538
 msgid "Prepend a header"
 msgstr "পূর্বে একটি হেডার যোগ করুন"
 
-#: ../plugins/save-calendar/csv-format.c:561
+#: ../plugins/save-calendar/csv-format.c:547
 msgid "Value delimiter:"
 msgstr "মান বিভাজন চিহ্ন:"
 
-#: ../plugins/save-calendar/csv-format.c:567
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "Record delimiter:"
 msgstr "রেকর্ড বিভাজন চিহ্ন:"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:559
 msgid "Encapsulate values with:"
 msgstr "মান এনক্যাপসুলেট করতে ব্যবহৃত হবে:"
 
-#: ../plugins/save-calendar/csv-format.c:595
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Comma separated value format (.csv)"
 msgstr "কমাচিহ্ন দ্বারা বিভক্ত মানের বিন্যাস (.csv)"
 
@@ -18383,15 +19555,15 @@ msgstr "ডিস্কে সংরক্ষণ করুন (_S)"
 #. * 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:154
+#: ../plugins/save-calendar/rdf-format.c:149
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:390
+#: ../plugins/save-calendar/rdf-format.c:376
 msgid "RDF format (.rdf)"
 msgstr "RDF বিন্যাস (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:164
+#: ../plugins/save-calendar/save-calendar.c:160
 msgid "Select destination file"
 msgstr "গন্তব্য ফাইল নির্বাচন করুন"
 
@@ -18416,22 +19588,22 @@ msgid "Show _only this Task List"
 msgstr "শুধুমাত্র চিহ্নিত কর্মের তালিকা প্রদর্শন করা হবে (_o)"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "A plugin that handles the Startup wizard."
+msgid "Guides you through your initial account setup."
 msgstr ""
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Startup wizard"
-msgstr "আরম্ভের উইজার্ড"
+msgid "Setup Assistant"
+msgstr "প্রস্তুতির সহকারী"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "Evolution সেটআপ সাহায়ক"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "স্বাগতম"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -18443,29 +19615,29 @@ msgstr ""
 "\n"
 "অগ্রসর হতে হলে অনুগ্রহ করে \"অগ্রসর\" বাটনটি টিপুন। "
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "ফাইল ইম্পোর্ট করা হচ্ছে"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:147
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "আপনি যে তথ্যটি ইম্পোর্ট করতে ইচ্ছুক, অনুগ্রহ করে তা নির্বাচন করুন:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:400
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "%s থেকে:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:511
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "ডাটা ইম্পোর্ট করা হচ্ছে।"
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:525
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "অনুগ্রহ করে প্রতীক্ষা করুন"
 
@@ -18482,17 +19654,62 @@ msgid "Thread messages by subject"
 msgstr "বিষয় অনুযায়ী বার্তার থ্রেড নির্ধারণ করা হবে"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:54
+#: ../plugins/subject-thread/subject-thread.c:56
 msgid "F_all back to threading messages by subject"
 msgstr "বিষয় অনুসারে বার্তার থ্রেড নির্মাণ করা হবে (_a)"
 
+#: ../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:615
+msgid "No title"
+msgstr "শিরোনাম বিহীন"
+
+# FIXME
+#: ../plugins/templates/templates.c:743
+msgid "Save as _Template"
+msgstr "টেমপ্লেট রূপে সংরক্ষণ করুন (_T)"
+
+#: ../plugins/templates/templates.c:745
+msgid "Save as Template"
+msgstr "টেমপ্লেট রূপে সংরক্ষণ করুন"
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr ""
+
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
 msgstr ""
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
 msgid "TNEF Attachment decoder"
-msgstr ""
+msgstr "TNEF সংযুক্ত বস্তুর ডিকোডার"
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr "WebDAV পরিচিতি প্রস্তুতির একটি প্লাগ-ইন।"
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "WebDAV পরিচিতি"
+
+#: ../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 "IfMatch উপেক্ষা করা হবে (apache-র 2.2.8-র নীচের সংস্করণের জন্য আবশ্যক) (_A)"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
@@ -18511,16 +19728,16 @@ msgid "Evolution Test component"
 msgstr "Evolution Test-র অংশ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings."
-msgstr "বর্তমান প্রিন্টারের বৈশিষ্ট্যের বর্ণনামূলক পংক্তি।"
+msgid "Authenticate proxy server connections"
+msgstr "প্রক্সি সার্ভারের সংযোগ অনুমোদন করা হবে"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
-msgid "Configuration version"
-msgstr "কনফিগারেশনের সংস্করণ"
+msgid "Automatic proxy configuration URL"
+msgstr "স্বয়ংক্রিয় প্রক্সি কনফিগারেশনের URL"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:3
-msgid "Decides whether the crash detection should be run or not."
-msgstr ""
+msgid "Configuration version"
+msgstr "কনফিগারেশনের সংস্করণ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
@@ -18539,38 +19756,98 @@ msgid "Default window width"
 msgstr "উইন্ডোর ডিফল্ট প্রস্থ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr "ইন্টারনেটের মাধ্যমে HTTP/নিরাপদ HTTP ব্যবহারকালে প্রক্সির জন্য নির্ধারিত বৈশিষ্ট্য প্রয়োগ করা হবে।"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid "HTTP proxy host name"
+msgstr "HTTP প্রক্সি হোস্টের নাম"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "HTTP proxy password"
+msgstr "HTTP প্রক্সি পাসওয়ার্ড"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid "HTTP proxy port"
+msgstr "HTTP প্রক্সি পোর্ট"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "HTTP proxy username"
+msgstr "HTTP প্রক্সি ব্যবহারকারীর নাম"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "আরম্ভের সময় বস্তুর যে ID অথবা উপনাম ডিফল্টভাবে প্রদর্শিত হবে।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../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/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "সর্বশেষ আপগ্রেড কনফিগারেশন সংস্করণ"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "অফলাইন ব্যবহারের জন্য ডিস্কের সাথে যে ফোল্ডারগুলির সামঞ্জস্য করা হবে, তার তালিকা"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "Non-proxy hosts"
+msgstr "প্রক্সি বিহীন হোস্ট"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr "HTTP প্রক্সি প্রয়োগের সময় অনুমোদনের জন্য ব্যবহারযোগ্য পাসওয়ার্ড।"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "Proxy configuration mode"
+msgstr "প্রক্সি কনফিগারেশন মোড"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "SOCKS proxy host name"
+msgstr "SOCKS প্রক্সি হোস্ট-নেম"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "SOCKS proxy port"
+msgstr "SOCKS প্রক্সি পোর্ট"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "Secure HTTP proxy host name"
+msgstr "নিরাপদ HTTP প্রক্সির হোস্ট-নেম"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Secure HTTP proxy port"
+msgstr "নিরাপদ HTTP প্রক্সি পোর্ট"
+
+#: ../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 "
+"configuration\" and \"use proxy configuration provided in the autoconfig url"
+"\" respectively."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "পার্শ্ববর্তী বার প্রদর্শিত হচ্ছে"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "ডিভেলপমেন্টের সতর্কবাণীর ডায়লগটি এড়িয়ে এগিয়ে যাওয়া হবে"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
-msgid "Skip recovery warning dialog"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:576
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "অফলাইন মোডে আরম্ভ করা হবে"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "স্ট্যাটাস-বার প্রদর্শিত হচ্ছে"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -18578,19 +19855,19 @@ msgstr ""
 "Evolution-র কনফিগারেশন সংস্করণ, গুরুতর/গৌণ/কনফিগারেশন স্তর সহ (উদাহরণস্বরূপ \"2.6.0"
 "\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
 msgstr "মূল উইন্ডোর ডিফল্ট উচ্চতা, পিক্সেলে ব্যক্ত।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
 msgstr "মূল উইন্ডোর ডিফল্ট প্রস্থ, পিক্সেলে ব্যক্ত।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
 msgstr "সাইডবারের ডিফল্ট প্রস্থ, পিক্সেলে ব্যক্ত।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../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\")."
@@ -18598,7 +19875,37 @@ msgstr ""
 "সর্বশেষ আপ-গ্রেড করার Evolution-র কনফিগারেশন সংস্করণ, গুরুতর/গৌণ/কনফিগারেশন স্তর "
 "সহ (উদাহরণস্বরূপ \"2.6.0\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:34
+msgid "The machine name to proxy HTTP through."
+msgstr "HTTP প্রক্সির জন্য ব্যবহারযোগ্য মেশিনের নাম।"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:35
+msgid "The machine name to proxy secure HTTP through."
+msgstr "নিরাপদ HTTP প্রক্সির জন্য ব্যবহারযোগ্য মেশিনের নাম।"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+msgid "The machine name to proxy socks through."
+msgstr "socks প্রক্সির জন্য ব্যবহারযোগ্য মেশিনের নাম।"
+
+#: ../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 "
@@ -18608,53 +19915,65 @@ msgstr ""
 "\"টুলবার\"। \"টুলবার\" নির্ধারণ করা হলে GNOME টুলবারের বৈশিষ্ট্য অনুযায়ী "
 "বাটনেরবিন্যাস নির্দিষ্ট করা হয়।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../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 "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"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 "টুলবার প্রদর্শিত হচ্ছে"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid "URL that provides proxy configuration values."
+msgstr "প্রক্সি কনফিগারেশনের মান উপলব্ধকারী URL।"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
+msgid "Use HTTP proxy"
+msgstr "HTTP প্রক্সি ব্যবহার করা হবে"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "User name to pass as authentication when doing HTTP proxying."
+msgstr "HTTP প্রক্সি ব্যবহারের সময় অনুমোদনের জন্য ব্যবহারযোগ্য অ্যাকাউন্টের নাম।"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Evolution অনলাইন মোডের পরিবর্তে অফলাইন মোডে আরম্ভ করা হবে কিনা।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid "Whether crash detection should be done or not"
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "উইন্ডোর সর্বোচ্চ মাপে প্রদর্শন করা হবে কি না।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "পার্শ্ববর্তী বার প্রদর্শিত হবে কি না।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "স্ট্যাটাস-বার প্রদর্শিত হবে কি না।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "টুলবার প্রদর্শিত হবে কি না।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Evolution ডিভেলপমেন্ট সংস্করণে সতর্কবাণীর ডায়লগ বাক্সের প্রদর্শন এড়িয়ে যাওয়া হবে "
 "কি না।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr ""
-
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "উইন্ডোর বাটন প্রদর্শন করা হবে কি না।"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "উইন্ডোর বাটনের বিন্যাস"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "উইন্ডোর বাটন প্রদর্শন করা হবে"
 
@@ -18670,29 +19989,23 @@ msgstr "সক্রিয় সংযোগ"
 msgid "Click OK to close these connections and go offline"
 msgstr "এই সংযোগগুলি বন্ধ করে অফলাইন যেতে হলে ঠিক আছে টিপুন"
 
-#: ../shell/e-shell-importer.c:135
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "যে ধরনের ইম্পোর্টার চালানো হবে তা নির্বাচন করুন:"
 
-#: ../shell/e-shell-importer.c:138
+#: ../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.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+"of file it is from the list."
 msgstr ""
 "আপনি যে ফাইলটি Evolution-এ ইম্পোর্ট করতে ইচ্ছুক সেটি, এবং তালিকা থেকে তার ধরন "
-"নির্বাচন করুন।\n"
-"\n"
-"এই তথ্য আপনার অজানা থাকলে আপনি \"স্বয়ংক্রিয়\" নির্বাচন করতে পারেন এবং Evolution "
-"এই কর্মটি নিজে করার চেষ্টা করবে।"
+"নির্বাচন করুন।"
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr "এই ইম্পোর্ট কর্মটির জন্য একটি গন্তব্য নির্বাচন করুন"
 
-#: ../shell/e-shell-importer.c:150
+#: ../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"
@@ -18704,23 +20017,23 @@ msgstr ""
 "স্থানে কোনো ইম্পোর্টযোগ্য বৈশিষ্ট্য পাওয়া যায়নি। পুনরায়\n"
 "চেষ্টা করতে ইচ্ছুক হলে অনুগ্রহ করে \"পূর্বাবস্থা\" বাটনটি টিপুন।\n"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "ফাইলের নাম(_i):"
 
-#: ../shell/e-shell-importer.c:293
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "একটি ফাইল নির্বাচন করুন"
 
-#: ../shell/e-shell-importer.c:302
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "ফাইলের ধরন (_t):"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "পুরোনো প্রোগ্রাম থেকে ডাটা এবং বৈশিষ্ট্য ইম্পোর্ট করুন (_o)"
 
-#: ../shell/e-shell-importer.c:341
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "শুধুমাত্র একটি ফাইল ইম্পোর্ট করুন (_s)"
 
@@ -18728,54 +20041,34 @@ msgstr "শুধুমাত্র একটি ফাইল ইম্পোর
 msgid "Evolution Preferences"
 msgstr "Evolution সংক্রান্ত পছন্দ"
 
-#: ../shell/e-shell-utils.c:118
-msgid "No folder name specified."
-msgstr "কোনো ফোল্ডারের নাম উল্লেখ করা হয়নি।"
-
-#: ../shell/e-shell-utils.c:125
-msgid "Folder name cannot contain the Return character."
-msgstr "ফোল্ডারের নামের মাঝে রিটার্নের অক্ষরটি রাখা যাবে না।"
-
-#: ../shell/e-shell-utils.c:131
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "ফোল্ডারের নামের মাঝে \"/\" অক্ষরটি রাখা যাবে না।"
-
-#: ../shell/e-shell-utils.c:137
-msgid "Folder name cannot contain the character \"#\"."
-msgstr "ফোল্ডারের নামের মাঝে \"#\" অক্ষরটি রাখা যাবে না।"
-
-#: ../shell/e-shell-utils.c:143
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' এবং '..' ফোল্ডারের নামগুলি সংরক্ষিত।"
-
 #. 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:50 ../shell/e-shell-window.c:342
+#: ../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:77
+#: ../shell/e-shell-window-commands.c:75
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "গহনোম পাইলট টুলগুলি সম্ভবত এই সিস্টেমে ইনস্টল করা হয়নি।"
 
-#: ../shell/e-shell-window-commands.c:85
+#: ../shell/e-shell-window-commands.c:83
 #, c-format
 msgid "Error executing %s."
 msgstr "%s চালাতে সমস্যা হয়েছে।"
 
-#: ../shell/e-shell-window-commands.c:141
+#: ../shell/e-shell-window-commands.c:139
 msgid "Bug buddy is not installed."
 msgstr "বাগ-বাডি ইনস্টল করা হয়নি।"
 
-#: ../shell/e-shell-window-commands.c:144
+#: ../shell/e-shell-window-commands.c:142
 msgid "Bug buddy could not be run."
 msgstr "বাগ-বাডি চালানো যায়নি।"
 
 #. 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:744
+#: ../shell/e-shell-window-commands.c:729
 msgid "translator-credits"
 msgstr ""
 "Moumita Nandi <rimi19822003@yahoo.co.in>, Semati Ghosh <semanti_84@yahoo.co."
@@ -18783,65 +20076,73 @@ msgstr ""
 "<deepayan@bengalinux.org>, Progga <progga@bengalinux.org>, Sayamindu "
 "Dasgupta <sayamindu@bengalinux.org>, Runa Bhattacharjee <runa@bengalinux.org>"
 
-#: ../shell/e-shell-window-commands.c:755
+#: ../shell/e-shell-window-commands.c:740
 msgid "Evolution Website"
 msgstr "Evolution ওয়েব-সাইট"
 
-#: ../shell/e-shell-window-commands.c:773
+#: ../shell/e-shell-window-commands.c:758
 msgid "Error opening the FAQ webpage."
 msgstr "FAQ ওয়েব-পেজ পড়তে সমস্যা হয়েছে।"
 
-#: ../shell/e-shell-window-commands.c:970
+#: ../shell/e-shell-window-commands.c:955
 msgid "_Work Online"
 msgstr "অনলাইন কাজ করা হবে (_W)"
 
-#: ../shell/e-shell-window-commands.c:983 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "অফলাইন কাজ করুন (_W)"
 
-#: ../shell/e-shell-window-commands.c:996
+#: ../shell/e-shell-window-commands.c:981
 msgid "Work Offline"
 msgstr "অফলাইন কাজ করুন"
 
-#: ../shell/e-shell-window.c:382
-msgid "Evolution is currently online. Click on this button to work offline."
-msgstr "Evolution বর্তমানে অনলাইন কাজ করছে।  এই বাটনটি টিপে অফলাইনে কাজ করুন।"
+#: ../shell/e-shell-window.c:381
+msgid ""
+"Evolution is currently online.\n"
+"Click on this button to work offline."
+msgstr ""
+"Evolution বর্তমানে অনলাইন কাজ করছে।\n"
+"এই বাটনটি টিপে অফলাইনে কাজ করুন।"
 
-#: ../shell/e-shell-window.c:389
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution অফলাইন যাচ্ছে।"
 
-#: ../shell/e-shell-window.c:396
-msgid "Evolution is currently offline. Click on this button to work online."
-msgstr "Evolution বর্তমানে অফলাইন কাজ করছে।  এই বাটনটি টিপে অনলাইনে কাজ করুন।"
+#: ../shell/e-shell-window.c:395
+msgid ""
+"Evolution is currently offline.\n"
+"Click on this button to work online."
+msgstr ""
+"Evolution বর্তমানে অফলাইন কাজ করছে।\n"
+"এই বাটনটি টিপে অনলাইনে কাজ করুন।"
 
-#: ../shell/e-shell-window.c:805
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "%s-এ পরিবর্তন করুন"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "অজ্ঞাত সিস্টেমের সমস্যা।"
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
 #, c-format
 msgid "%ld KB"
 msgstr "%ld কিলোবাইট"
 
-#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "ঠিক আছে"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "অবৈধ আর্গুমেন্ট"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "OAF-এ রেজিস্টার করা যায়নি"
 
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "কনফিগারেশনের ডাটাবেস পাওয়া যায়নি"
 
@@ -18851,15 +20152,16 @@ msgstr "কনফিগারেশনের ডাটাবেস পাওয়�
 msgid "New"
 msgstr "নতুন"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "নতুন পরীক্ষা"
 
-#: ../shell/test/evolution-test-component.c:108
+#: ../shell/test/evolution-test-component.c:106
+msgctxt "New"
 msgid "_Test"
-msgstr "পরীক্ষা(_T)"
+msgstr "পরীক্ষা (_T)"
 
-#: ../shell/test/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "একটি নতুন পরীক্ষার বস্তু তৈরি করুন"
 
@@ -18902,7 +20204,7 @@ msgstr ""
 "ইম্পোর্ট করার প্রক্রিয়ায় সাহায্য করবে।"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18938,7 +20240,7 @@ msgstr ""
 "আশা করবো আপনারা আমাদের এই পরিশ্রমের দরুন উপকৃত হবেন\n"
 " এবং আমরা আপনাদের মতামতের জন্য অধীর অপেক্ষায় থাকবো!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18946,63 +20248,43 @@ msgstr ""
 "ধন্যবাদ\n"
 "Evolution দলের পক্ষ থেকে\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "পুনরায় বলা হবে না"
 
-#: ../shell/main.c:314
-msgid "Evolution Crash Detection"
-msgstr ""
-
-#: ../shell/main.c:316
-msgid "Ig_nore"
-msgstr "উপেক্ষা করা হবে (_n)"
-
-#: ../shell/main.c:331
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-
-#: ../shell/main.c:342
-msgid "_Do not show this message again"
-msgstr "এই বার্তাটি পুনরায় প্রদর্শন করা হবে না। (_D)"
-
-#: ../shell/main.c:574
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "নির্দিষ্ট কম্পোনেন্টকে সক্রিয় করে Evolution আরম্ভ করুন"
 
-#: ../shell/main.c:578
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "অনলাইন মোডে আরম্ভ করা হবে"
 
-#: ../shell/main.c:581
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "Evolution-র সমস্ত অংশবিশেষ বলপূর্বক বন্ধ করা হবে"
 
-#: ../shell/main.c:585
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Evolution ১.৪ থেকে বলপূর্বক পুনরায় মাইগ্রেট করা হবে"
 
-#: ../shell/main.c:588
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "সকল কম্পোনেন্টের ডিবাগিং প্রক্রিয়ার আউটপুট একটি ফাইলে প্রেরণ করা হবে।"
 
-#: ../shell/main.c:590
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "প্লাগ-ইন লোড করার ব্যবস্থা নিষ্ক্রিয় করা হবে।"
 
-#: ../shell/main.c:592
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
-msgstr ""
+msgstr "বার্তা, পরিচিতি ও কর্মের পূর্বরূপ প্রদর্শনের পেইন নিষ্ক্রিয় করা হবে।"
 
-#: ../shell/main.c:677
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM ও Email Client"
 
-#: ../shell/main.c:694
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19143,7 +20425,7 @@ msgstr ""
 "\n"
 "অগ্রসর হলে আপনি আপনার কিছু পুরোনো ডাটা ব্যবহার করতে সক্ষম হবেন না।\n"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:102
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19154,7 +20436,7 @@ msgstr ""
 "\n"
 "আপনার ট্রাস্ট সংক্রান্ত বৈশিষ্ট্য সম্পাদন করুন:"
 
-#: ../smime/gui/cert-trust-dialog.c:154
+#: ../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 "
@@ -19163,7 +20445,7 @@ msgstr ""
 "আপনি যেহেতু এই সার্টিফিকেট ইসুকারী অথোরিটিকে বিশ্বাস করেন, সেহেতু অন্য কোনো কারণ "
 "না দর্শানো থাকেল, আপনি নির্বিঘ্নে এই সার্টিফিকেটের সত্যতা ভরসা করতে পারবেন"
 
-#: ../smime/gui/cert-trust-dialog.c:158
+#: ../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 "
@@ -19220,22 +20502,27 @@ msgstr "ই-মেইল ঠিকানা"
 msgid "All CA certificate files"
 msgstr "সব CA সার্টিফিকেট ফাইল"
 
-#: ../smime/gui/certificate-viewer.c:341
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "সার্টিফিকেট প্রদর্শনকারী: %s"
 
+#: ../smime/gui/component.c:46
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "`%s' এর জন্য পাসওয়ার্ড লিখুন"
+
 #. we're setting the password initially
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:69
 msgid "Enter new password for certificate database"
 msgstr "সার্টিফিকেট ডিরেক্টরির জন্য নতুন পাসওয়ার্ড লিখুন"
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "নতুন পাসওয়ার্ড লিখুন"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -19244,7 +20531,7 @@ msgstr ""
 "উল্লিখিত পরিচিতির উদ্দেশ্যে প্রকাশ করা হয়েছে:\n"
 "  বিষয়: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19253,7 +20540,7 @@ msgstr ""
 "প্রকাশক:\n"
 "  বিষয়: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:174
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "সার্টিফিকেট নির্বাচন করুন"
 
@@ -19440,7 +20727,7 @@ msgid "_Edit CA Trust"
 msgstr "CA ট্রাস্ট সম্পাদন করুন (_E)"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:679
+#: ../smime/lib/e-cert-db.c:672
 msgid "Certificate already exists"
 msgstr "এই সার্টিফিকেটটি ইতিমধ্যেই বিদ্যমান"
 
@@ -19607,15 +20894,15 @@ msgstr "পরিচিতির নিজস্ব ID"
 msgid "Certificate Signature Value"
 msgstr "সার্টিফিকেট স্বাক্ষরের মান"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "PKCS12 File Password"
 msgstr "PKCS12 ফাইল পাসওয়ার্ড"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "Enter password for PKCS12 file:"
 msgstr "PKCS12 ফাইলের জন্য পাসওয়ার্ড লিখুন:"
 
-#: ../smime/lib/e-pkcs12.c:365
+#: ../smime/lib/e-pkcs12.c:343
 msgid "Imported Certificate"
 msgstr "ইম্পোর্ট করা সার্টিফিকেট"
 
@@ -19649,8 +20936,7 @@ msgstr "সমস্ত পরিচিতি চিহ্নিত স্থা
 msgid "Contact _Preview"
 msgstr "পরিচিতির তথ্যের পূর্বপ্রদর্শন (_P)"
 
-#: ../ui/evolution-addressbook.xml.h:6
-#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "কপি করুন"
@@ -19672,11 +20958,10 @@ msgid "Copy to Folder..."
 msgstr "ফোল্ডারে কপি করুন ..."
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
+msgid "Create a new address book folder"
 msgstr "নতুন ঠিকানা বই ফোল্ডার নির্মাণ করুন"
 
-#: ../ui/evolution-addressbook.xml.h:12
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "কাট করুন"
@@ -19720,8 +21005,7 @@ msgstr ""
 msgid "Move to Folder..."
 msgstr "ফোল্ডারে সরিয়ে ফেলুন ..."
 
-#: ../ui/evolution-addressbook.xml.h:23
-#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "পেস্ট করুন"
@@ -19758,13 +21042,11 @@ msgstr "নির্বাচিত পরিচিতিকে ভিকার�
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "নির্বাচিত ফোল্ডারের পরিচিতি তালিকা VCard রূপে সংরক্ষণ করা হবে"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "সমস্ত নির্বাচন করুন"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "সমস্ত নির্বাচন করুন (_A)"
 
@@ -19834,7 +21116,7 @@ msgstr "পরিচিতি চিহ্নিত অবস্থানে স
 msgid "_Move Folder Contacts To"
 msgstr "ফোল্ডারের মধ্যে উপস্থিত পরিচিত চিহ্নিত স্থানে কপি করুন (_M)"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "নতুন (_N)"
 
@@ -19895,7 +21177,7 @@ msgid "Month"
 msgstr "মাস"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "পরবর্তী"
 
@@ -19904,7 +21186,7 @@ msgid "Previews the calendar to be printed"
 msgstr "যে বর্ষপঞ্জিটি প্রিন্ট করা হবে তার পূর্বপ্রদর্শন করে"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "পূর্বাবস্থা"
 
@@ -19973,232 +21255,6 @@ msgstr "কার্যসপ্তাহ"
 msgid "_Open Appointment"
 msgstr "সাক্ষাৎকার খোলো(_O)"
 
-#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
-msgid "Copy selected text to the clipboard"
-msgstr "নির্বাচিত টেক্সটটি ক্লিপবোর্ডে কপি করা হবে"
-
-#: ../ui/evolution-composer-entries.xml.h:3
-msgid "Copy selection to clipboard"
-msgstr "নির্বাচিত অংশ ক্লিপবোর্ডে কপি করা হবে"
-
-#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
-msgid "Cut selected text to the clipboard"
-msgstr "নির্বাচিত টেক্সটটি ক্লিপবোর্ডে কাট করুন"
-
-#: ../ui/evolution-composer-entries.xml.h:7
-msgid "Cut selection to clipboard"
-msgstr "নির্বাচিত অংশ ক্লিপবোর্ডে কাট করুন"
-
-#: ../ui/evolution-composer-entries.xml.h:9
-msgid "Paste from clipboard"
-msgstr "ক্লিপবোর্ডের বস্তু পেস্ট করুন"
-
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
-msgid "Paste text from the clipboard"
-msgstr "ক্লিপবোর্ড থেকে টেক্সট পেস্ট করুন"
-
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
-msgid "Select all text"
-msgstr "সমস্ত টেক্সট নির্বাচন করুন"
-
-#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "সংযুক্ত করুন"
-
-#: ../ui/evolution-editor.xml.h:2
-msgid "Click here to attach a file"
-msgstr "ফাইল সংযুক্ত করতে এইস্থানে ক্লিক করুন"
-
-#: ../ui/evolution-editor.xml.h:3
-msgid "Click here to close the current window"
-msgstr "বর্তমান উইন্ডো বন্ধ করতে এই স্থানে ক্লিক করুন"
-
-#: ../ui/evolution-editor.xml.h:4
-msgid "Click here to save the current window"
-msgstr "বর্তমান উইন্ডো সংরক্ষণ করতে এই স্থানে ক্লিক করুন"
-
-#: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help available"
-msgstr "উপলব্ধ সহায়িকা দেখতে এই স্থানে ক্লিক করুন"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "বন্ধ করুন"
-
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "সন্নিবেশ করুন (_n)"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
-msgid "_Attachment..."
-msgstr "সংযুক্ত বস্তু(_A)..."
-
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:50 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "বন্ধ করুন (_C)"
-
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:53
-#: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
-msgid "_File"
-msgstr "ফাইল (_F)"
-
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:45
-msgid "_Help"
-msgstr "সাহায্য (_H)"
-
-#: ../ui/evolution-editor.xml.h:21
-msgid "_Options"
-msgstr "বিকল্প (_O)"
-
-#: ../ui/evolution-event-editor.xml.h:2
-msgid "All Day Event"
-msgstr "সারাদনব্যাপী নতুন অনুষ্ঠান"
-
-#: ../ui/evolution-event-editor.xml.h:3
-msgid "All _Day Event"
-msgstr "সারাদনব্যাপী নতুন অনুষ্ঠান(_D)"
-
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
-#: ../ui/evolution-task-editor.xml.h:1
-msgid "Classify as Confidential"
-msgstr "গোপনীয় রূপে চিহ্নিত"
-
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
-#: ../ui/evolution-task-editor.xml.h:2
-msgid "Classify as Private"
-msgstr "ব্যক্তিগত রূপে চিহ্নিত করা হবে"
-
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:3
-msgid "Classify as public"
-msgstr "সার্বজনীন রূপে চিহ্নিত করা হবে"
-
-#: ../ui/evolution-event-editor.xml.h:7
-msgid "Click here to set or unset alarms for this event"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-msgid "Insert advanced send options"
-msgstr "প্রেরণ সংক্রান্ত উন্নত অপশন সন্নিবেশ করুন"
-
-#: ../ui/evolution-event-editor.xml.h:10
-msgid "Make this a recurring event"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:6
-msgid "Pu_blic"
-msgstr "সার্বজনীন (_b)"
-
-#: ../ui/evolution-event-editor.xml.h:12
-msgid "Query free / busy information for the attendees"
-msgstr "অংশগ্রহণকারীদের জন্য মুক্ত/ব্যস্ত তথ্য অনুসন্ধান করুন"
-
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-msgid "R_ole Field"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:16
-msgid "Send _Options"
-msgstr "প্রেরণ সংক্রান্ত বিকল্প (_O)"
-
-#: ../ui/evolution-event-editor.xml.h:17
-msgid "Show time as _busy"
-msgstr "ব্যস্ত হিসাবে সময় প্রদর্শন করা হবে(_b)"
-
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
-msgid "Time _Zone"
-msgstr "সময়-অঞ্চল (_Z)"
-
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
-msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "অংশগ্রহণকারী নামের ক্ষেত্রটি প্রদর্শিত হবে কিনা তা টগল করে"
-
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
-msgid "Toggles whether the RSVP field is displayed"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
-msgid "Toggles whether the Role field is displayed"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
-msgid "Toggles whether the Status field is displayed"
-msgstr "অবস্থার ক্ষেত্রটি প্রদর্শিত হবে কিনা তা টগল করে"
-
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
-msgid "Toggles whether the time zone is displayed"
-msgstr "সময়ের অঞ্চল প্রদর্শিত হবে কিনা তা টগল করে"
-
-#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:17
-msgid "Toggles whether to display categories"
-msgstr "শ্রেণী প্রদর্শিত হবে কিনা তা টগল করে"
-
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "Toggles whether to have All Day Event"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:26
-msgid "Toggles whether to show time as busy"
-msgstr ""
-
-#: ../ui/evolution-event-editor.xml.h:27
-msgid "_Alarms"
-msgstr "সতর্কধ্বনি (_A)"
-
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "শ্রেণীবিভাগ(_C)"
-
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
-#: ../ui/evolution-task-editor.xml.h:19
-msgid "_Classification"
-msgstr "শ্রেণীবিভাগ (_C)"
-
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:20
-msgid "_Confidential"
-msgstr "গোপনীয়(_C)"
-
-#: ../ui/evolution-event-editor.xml.h:31
-msgid "_Free/Busy"
-msgstr "মুক্ত/ব্যস্ত(_F)"
-
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
-#: ../ui/evolution-task-editor.xml.h:21
-msgid "_Private"
-msgstr "ব্যক্তিগত(_P)"
-
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../ui/evolution-event-editor.xml.h:34
-msgid "_Recurrence"
-msgstr "পুনরাবৃত্তি(_R)"
-
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
-msgid "_Status Field"
-msgstr "অবস্থার ক্ষেত্র (_S)"
-
-#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
-msgid "_Type Field"
-msgstr "ধরনের ক্ষেত্র (_T)"
-
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "বর্তমান মেইল অপারেশনটি বাতিল করুন"
@@ -20221,14 +21277,13 @@ msgstr "নতুন মেইল ফিল্টার করার জন্�
 
 #: ../ui/evolution-mail-global.xml.h:7
 msgid "Download messages of accounts/folders marked for offline"
-msgstr ""
+msgstr "অফ-লাইন ব্যবহারের জন্য চিহ্নিত অ্যাকাউন্ট/ফোল্ডারের বার্তা ডাউনলোড করা হবে"
 
 #: ../ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
 msgstr "আবর্জনা মুছে ফেলুন (_T)"
 
 #: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-#: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "ফোল্ডার (_o)"
 
@@ -20267,7 +21322,7 @@ msgstr "দূরবর্তী সার্ভারে অবস্থিত
 
 #: ../ui/evolution-mail-global.xml.h:19
 msgid "View the debug console for log messages"
-msgstr ""
+msgstr "লগ বার্তার ডিবাগ কনসোল প্রদর্শন করা হবে"
 
 #: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
@@ -20445,7 +21500,7 @@ msgstr "থ্রেড অনুযায়ী বার্তার তালি
 msgid "_Group By Threads"
 msgstr "থ্রেড অনুসারে দলভুক্ত করা হবে (_G)"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "বার্তা (_M)"
@@ -20781,129 +21836,125 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "প্রদর্শিত বার্তার মূল অংশের মাঝে ঝলকানিসহ একটি কার্সার প্রদর্শন করুন"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "বার্তাগুলি সাধারণ বিন্যাসে প্রদর্শন করুন"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "সমস্ত ই-মেইল হেডারসহ বার্তা প্রদর্শন করুন"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "এই বার্তাটির ই-মেইল উত্স প্রদর্শন করুন"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "নির্বাচিত বার্তাগুলি মুছে না ফেলে, উদ্ধার করুন"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "অপ্রয়োজনীয়(_m)"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "ছোট করে প্রদর্শন (_O)"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "সংযুক্ত (_A)"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "ক্যারেট মোড (_C)"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "ফ্ল্যাগ মুছে ফেলুন (_C)"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "বার্তা মুছে ফেলুন (_D)"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "বার্তার মধ্যে অনুসন্ধান করুন (_F)..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "কাজ সমাপ্তির ফ্ল্যাগ (_F)"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "এখানে যাও (_G)"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "গুরুত্বপূর্ণ(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "ইনলাইন(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "অনাকাঙ্ক্ষিত(_J)"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "ছবি লোড করা হবে (_L)"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "বার্তার উৎস(_M)"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "পরবর্তী বার্তা (_N)"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "স্বাভাবিক মাপ (_N)"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "অনাকাঙ্ক্ষিত নয়(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "নতুন উইন্ডোতে খুলুন(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "পূর্ববর্তী বার্তা (_P)"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "উদ্ধৃত(_Q)"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "পড়ুন (_R)"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "বার্তা সংরক্ষণ করুন(_S)..."
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "মুছে ফেলা বার্তা পুনরুদ্ধার (_U)"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "পড়া হয়নি(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
 msgstr "বড় করে প্রদর্শন (_Z)"
 
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "বড় করে প্রদর্শন (_Z)"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "এই উইন্ডোটি বন্ধ করুন"
+#: ../ui/evolution-mail-messagedisplay.xml.h:1
+msgid "Close"
+msgstr "বন্ধ করুন"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
@@ -20941,291 +21992,6 @@ msgstr "নির্বাচিত কর্মসূচী প্রদর্�
 msgid "_Open Memo"
 msgstr "খোলা কর্মসূচী (_O)"
 
-#: ../ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "একটি ফাইল সংযুক্ত করুন"
-
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:13
-msgid "Close the current file"
-msgstr "বর্তমান ফাইলটি বন্ধ করুন"
-
-#: ../ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "স্বাক্ষর ব্যতীত সমস্ত মুছে ফেলুন"
-
-#: ../ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "এই বার্তাটি PGP ব্যবহার করে এনক্রিপ্ট করুন"
-
-#: ../ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "চিহ্নিত বার্তাটি আপনার S/MIME এনক্রিপশন সার্টিফিকেট সহযোগে এনক্রিপ্ট করুন"
-
-# FIXME
-#: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "For_mat"
-msgstr "বিন্যাস (_m)"
-
-#: ../ui/evolution-message-composer.xml.h:9
-msgid "Get delivery notification when your message is read"
-msgstr "আপনার বার্তা পাঠ হওয়ার পরে সূচনা প্রাপ্তি করুন"
-
-#: ../ui/evolution-message-composer.xml.h:10
-msgid "HT_ML"
-msgstr "HT_ML"
-
-#: ../ui/evolution-message-composer.xml.h:12
-msgid "Insert Send options"
-msgstr "প্রেরণ সংক্রান্ত বিকল্প অন্তর্ভুক্ত করুন"
-
-#: ../ui/evolution-message-composer.xml.h:14
-msgid "Open a file"
-msgstr "একটি ফাইল খোলো"
-
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "PGP Encrypt"
-msgstr "PGP এনক্রিপ্ট"
-
-#: ../ui/evolution-message-composer.xml.h:16
-msgid "PGP Sign"
-msgstr "PGP স্বাক্ষর"
-
-#: ../ui/evolution-message-composer.xml.h:17
-msgid "PGP _Encrypt"
-msgstr "PGP এনক্রিপ্ট (_E)"
-
-#: ../ui/evolution-message-composer.xml.h:18
-msgid "PGP _Sign"
-msgstr "PGP স্বাক্ষর (_S)"
-
-#: ../ui/evolution-message-composer.xml.h:19
-msgid "R_equest Read Receipt"
-msgstr "মেইল-পাঠের সূচনা প্রদানের অনুরোধ করা হবে(_e)"
-
-#: ../ui/evolution-message-composer.xml.h:20
-msgid "S/MIME En_crypt"
-msgstr "S/MIME এনক্রিপ্ট (_c)"
-
-#: ../ui/evolution-message-composer.xml.h:21
-msgid "S/MIME Encrypt"
-msgstr "S/MIME এনক্রিপ্ট"
-
-#: ../ui/evolution-message-composer.xml.h:22
-msgid "S/MIME Sig_n"
-msgstr "S/MIME স্বাক্ষর (_n)"
-
-#: ../ui/evolution-message-composer.xml.h:23
-msgid "S/MIME Sign"
-msgstr "S/MIME স্বাক্ষর"
-
-#: ../ui/evolution-message-composer.xml.h:24
-msgid "S_end"
-msgstr "প্রেরণ করুন (_e)"
-
-#: ../ui/evolution-message-composer.xml.h:26
-msgid "Save As"
-msgstr "নতুন নামে সংরক্ষণ করুন"
-
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "Save Draft"
-msgstr "খসড়া হিসাবে সংরক্ষণ করুন"
-
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Save _As..."
-msgstr "নতুন নামে সংরক্ষণ করুন (_A)..."
-
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Save _Draft"
-msgstr "খসড়া হিসাবে সংরক্ষণ করুন (_D)"
-
-#: ../ui/evolution-message-composer.xml.h:30
-msgid "Save as draft"
-msgstr "খসড়া হিসাবে সংরক্ষণ করুন"
-
-#: ../ui/evolution-message-composer.xml.h:31
-msgid "Save in folder..."
-msgstr "এই ফোল্ডারে সংরক্ষণ করুন..."
-
-#: ../ui/evolution-message-composer.xml.h:32
-msgid "Save the current file"
-msgstr "বর্তমান ফাইলটি সংরক্ষণ করুন"
-
-#: ../ui/evolution-message-composer.xml.h:33
-msgid "Save the current file with a different name"
-msgstr "বর্তমান ফাইলটি একটি পৃথক নামে সংরক্ষণ করুন"
-
-#: ../ui/evolution-message-composer.xml.h:34
-msgid "Save the message in a specified folder"
-msgstr "বার্তাটি একটি নির্দিষ্ট ফোল্ডারে সংরক্ষণ করুন"
-
-#: ../ui/evolution-message-composer.xml.h:35
-msgid "Send"
-msgstr "প্রেরণ করুন"
-
-#: ../ui/evolution-message-composer.xml.h:36
-#: ../ui/evolution-signature-editor.xml.h:23
-msgid "Send the mail in HTML format"
-msgstr "HTML ফরমায় বার্তা প্রেরণ করুন"
-
-#: ../ui/evolution-message-composer.xml.h:37
-msgid "Send this message"
-msgstr "বার্তাটি প্রেরণ করুন"
-
-#: ../ui/evolution-message-composer.xml.h:38
-msgid "Set the message priority to high"
-msgstr "বার্তার গুরুত্ব 'উচ্চ' রূপে ধার্য করুন"
-
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "Sign this message with your PGP key"
-msgstr "এই বার্তাটি আপনার PGP কী (key)-র সাহায্য স্বাক্ষর করুন"
-
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "এই বার্তাটি আপনার S/MIME স্বাক্ষর সার্টিফিকেটের সাহায্যে স্বাক্ষর করুন"
-
-#: ../ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the BCC field is displayed"
-msgstr "অপ্রকাশিত অনুলিপিপ্রাপকদের নামের ক্ষেত্র প্রদর্শিত হবে কিনা তা টগল করে"
-
-#: ../ui/evolution-message-composer.xml.h:42
-msgid "Toggles whether the CC field is displayed"
-msgstr "অনুলিপিপ্রাপকদের নামের ক্ষেত্র প্রদর্শিত হবে কিনা তা টগল করে"
-
-#: ../ui/evolution-message-composer.xml.h:43
-msgid "Toggles whether the From chooser is displayed"
-msgstr "প্রেরকের নামের ক্ষেত্রটি প্রদর্শিত হবে কিনা তা টগল করে"
-
-#: ../ui/evolution-message-composer.xml.h:44
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "এখানে পোস্ট-করুন ক্ষেত্রটি প্রদর্শিত হবে কিনা তা টগল করে"
-
-#: ../ui/evolution-message-composer.xml.h:45
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "উত্তর-প্রাপক ক্ষেত্রটি প্রদর্শিত হবে কিনা তা টগল করে"
-
-#: ../ui/evolution-message-composer.xml.h:46
-msgid "Toggles whether the To field is displayed"
-msgstr "প্রাপকের নামের ক্ষেত্রটি প্রদর্শিত হবে কিনা তা টগল করে"
-
-#: ../ui/evolution-message-composer.xml.h:48
-msgid "_Bcc Field"
-msgstr "অপ্রকাশিত অনুলিপিপ্রাপকের ক্ষেত্র (_B)"
-
-#: ../ui/evolution-message-composer.xml.h:49
-msgid "_Cc Field"
-msgstr "অনুলিপিপ্রাপকের ক্ষেত্র (_C)"
-
-#: ../ui/evolution-message-composer.xml.h:51
-msgid "_Delete all"
-msgstr "সমস্ত মুছে ফেলুন (_D)"
-
-#: ../ui/evolution-message-composer.xml.h:54
-msgid "_From Field"
-msgstr "প্রেরক ক্ষেত্র (_F)"
-
-#: ../ui/evolution-message-composer.xml.h:55
-msgid "_Open..."
-msgstr "খুলুন(_O)..."
-
-#: ../ui/evolution-message-composer.xml.h:56
-msgid "_Post-To Field"
-msgstr "এখানে-পোস্ট-করুন ক্ষেত্র (_P)"
-
-#: ../ui/evolution-message-composer.xml.h:57
-msgid "_Prioritize Message"
-msgstr "বার্তার গুরুত্ব বৃদ্ধি (_P)"
-
-#: ../ui/evolution-message-composer.xml.h:58
-msgid "_Reply-To Field"
-msgstr "উত্তর-প্রাপক ক্ষেত্র (_R)"
-
-#: ../ui/evolution-message-composer.xml.h:60
-msgid "_Security"
-msgstr "সুরক্ষা (_S)"
-
-#: ../ui/evolution-message-composer.xml.h:61
-#: ../ui/evolution-task-editor.xml.h:23
-msgid "_Send Options"
-msgstr "প্রেরণ সংক্রান্ত বিকল্প(_S)"
-
-#: ../ui/evolution-message-composer.xml.h:62
-msgid "_To Field"
-msgstr "প্রাপকের নামের ক্ষেত্র (_T)"
-
-#: ../ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "বন্ধ (_l)"
-
-#: ../ui/evolution-signature-editor.xml.h:15
-msgid "H_TML"
-msgstr "H_TML"
-
-#: ../ui/evolution-signature-editor.xml.h:17
-msgid "Save and Close"
-msgstr "সংরক্ষণ করে বন্ধ করুন"
-
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
-msgid "Save and _Close"
-msgstr "সংরক্ষণ করে বন্ধ করুন (_C)"
-
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Save the current file and close the window"
-msgstr "বর্তমান ফাইলটি সংরক্ষণ করে উইন্ডোটি বন্ধ করুন"
-
-#: ../ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "আপনার সাবস্ক্রাইব করা ফোল্ডারের তালিকায় ফোল্ডার যোগ করুন"
-
-#: ../ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "তালিকা নতুনভাবে লেখো"
-
-#: ../ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "ফোল্ডারের তালিকা নতুন করে লেখো"
-
-#: ../ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "আপনার সাবস্ক্রাইব করা ফোল্ডারের তালিকা থেকে ফোল্ডার মুছে ফেলুন"
-
-#: ../ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "সাবস্ক্রাইব করুন"
-
-#: ../ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "আনসাবস্ক্রাইব করুন"
-
-#: ../ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "নির্বাচন প্রত্যাহার করুন (_I)"
-
-#: ../ui/evolution-task-editor.xml.h:4
-msgid "Click change / view the status details of the task"
-msgstr ""
-
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Status Details"
-msgstr "অবস্থার বিবরণ"
-
-#: ../ui/evolution-task-editor.xml.h:10
-msgid "Time Zone"
-msgstr "সময়-অঞ্চল"
-
-#: ../ui/evolution-task-editor.xml.h:24
-msgid "_Status Details"
-msgstr "অবস্থার বিকল্প (_S)"
-
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "নির্বাচিত কর্ম কপি করুন"
@@ -21348,7 +22114,7 @@ msgstr "নতুন উইন্ডো (_W)"
 
 #: ../ui/evolution.xml.h:20
 msgid "Open the Frequently Asked Questions webpage"
-msgstr ""
+msgstr "সাধারণ প্রশ্নাবলীর ওয়েব-পেজ প্রদর্শন করা হবে"
 
 #: ../ui/evolution.xml.h:21
 msgid "Page Set_up..."
@@ -21419,50 +22185,54 @@ msgid "View/Hide the Status Bar"
 msgstr "স্ট্যাটাস বার প্রদর্শন/আড়াল করুন"
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "অফলাইন কাজ করুন (_O)"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "পরিচিতি (_A)"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "উইন্ডো বন্ধ করুন (_C)"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "পাসওয়ার্ড মনে রাখা হবে না (_F)"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
 msgstr "প্রশ্নাবলী (_F)"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "বাটন আড়াল করা হবে (_H)"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "শুধুমাত্র আইকন ব্যবহৃত হবে (_I)"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "দ্রুত তথ্য প্রাপ্তি (_Q)"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "প্রস্থান (_Q)"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "অদলবদলকারীর চেহারাছবি (_S)"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "সুসংগতি সংক্রান্ত অপশন (_S)..."
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "শুধুমাত্র টেক্সট (_T)"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "উইন্ডো (_W)"
 
@@ -21539,11 +22309,11 @@ msgid "With _Status"
 msgstr "অবস্থা সহ (_S)"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:442
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
+#: ../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"
 
@@ -21560,8 +22330,8 @@ msgid "Select a Time Zone"
 msgstr "একটি সময়ের অঞ্চল নির্বাচন করুন"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
-msgid "TimeZone Combobox"
-msgstr "সময়-অঞ্চলের কম্বোবক্স"
+msgid "Timezone drop-down combination box"
+msgstr "সময়ের অঞ্চলের ড্রপ-ডাউন কমবিনেশন বক্স"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -21573,19 +22343,19 @@ msgstr ""
 "নির্বাচন করুন।\n"
 "মাউসের ডানদিকে বাটন ব্যবহার করে মানচিত্র ছোট করে প্রদর্শন করুন।"
 
-#: ../widgets/menus/gal-define-views-dialog.c:78
-#: ../widgets/menus/gal-define-views-model.c:186
+#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "সংগ্রহ"
 
-#: ../widgets/menus/gal-define-views-dialog.c:360
+#: ../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 "%s-র জন্য প্রদর্শনক্ষেত্র নির্বাচন করুন"
 
+#: ../widgets/menus/gal-define-views-dialog.c:366
 #: ../widgets/menus/gal-define-views-dialog.c:368
-#: ../widgets/menus/gal-define-views-dialog.c:370
 msgid "Define Views"
 msgstr "প্রদর্শন ক্ষেত্র নির্ধারণ করুন"
 
@@ -21595,17 +22365,17 @@ msgid "Define Views for \"%s\""
 msgstr "\"%s\"-র জন্য প্রদর্শনক্ষেত্র নির্ধারণ করুন"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-header-item.c:1922
 #: ../widgets/table/e-table-scrolled.c:216
 #: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "টেবিল"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
 msgid "Instance"
 msgstr "ইনস্ট্যান্স"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
 msgid "Save Current View"
 msgstr "বর্তমান প্রদর্শন সংরক্ষণ করুন"
 
@@ -21619,7 +22389,7 @@ msgstr "উপস্থিত প্রদর্শন ক্ষেত্র প
 
 #. bonobo displays this string so it must be in locale
 #: ../widgets/menus/gal-view-instance.c:582
-#: ../widgets/menus/gal-view-menus.c:354
+#: ../widgets/menus/gal-view-menus.c:368
 msgid "Custom View"
 msgstr "স্বনির্বাচিত ভিউ"
 
@@ -21628,40 +22398,40 @@ msgid "Save Custom View"
 msgstr "স্বনির্বাচিত প্রদর্শনক্ষেত্র সংরক্ষণ করুন"
 
 #: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:378
+#: ../widgets/menus/gal-view-menus.c:392
 msgid "Define Views..."
 msgstr "ভিউ নির্ধারণ করুন..."
 
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:305
 msgid "C_urrent View"
 msgstr "বর্তমান প্রদর্শনক্ষেত্র (_u)"
 
-#: ../widgets/menus/gal-view-menus.c:315
+#: ../widgets/menus/gal-view-menus.c:329
 #, c-format
 msgid "Select View: %s"
 msgstr "প্রদর্শন নির্বাচন: %s"
 
-#: ../widgets/menus/gal-view-menus.c:359
+#: ../widgets/menus/gal-view-menus.c:373
 msgid "Current view is a customized view"
 msgstr "বর্তমান প্রদর্শনে স্বনির্ধারিত বিন্যাস ব্যবহৃত হচ্ছে"
 
-#: ../widgets/menus/gal-view-menus.c:364
+#: ../widgets/menus/gal-view-menus.c:378
 msgid "Save Custom View..."
 msgstr "স্বনির্বাচিত ভিউ সংরক্ষণ করুন..."
 
-#: ../widgets/menus/gal-view-menus.c:369
+#: ../widgets/menus/gal-view-menus.c:383
 msgid "Save current custom view"
 msgstr "বর্তমান স্বনির্ধারিত প্রদর্শন বিন্যাস সংরক্ষণ করুন"
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:397
 msgid "Create or edit views"
 msgstr "প্রদর্শন ক্ষেত্র নির্মাণ অথবা সম্পাদনা"
 
-#: ../widgets/menus/gal-view-new-dialog.c:72
+#: ../widgets/menus/gal-view-new-dialog.c:70
 msgid "Factory"
 msgstr "ফ্যাক্টরি"
 
-#: ../widgets/menus/gal-view-new-dialog.c:107
+#: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
 msgstr "নতুন ভিউ নির্ধারণ করুন"
 
@@ -21677,17 +22447,17 @@ msgstr "প্রদর্শন ক্ষেত্রের ধরন"
 msgid "Type of view:"
 msgstr "প্রদর্শন ক্ষেত্রের ধরন:"
 
-#: ../widgets/misc/e-attachment-bar.c:1028
+#: ../widgets/misc/e-attachment-bar.c:1137
 msgid "Attachment Bar"
 msgstr "সংযুক্ত বস্তু প্রদর্শনের বার"
 
-#: ../widgets/misc/e-attachment.c:306 ../widgets/misc/e-attachment.c:321
-#: ../widgets/misc/e-attachment.c:522 ../widgets/misc/e-attachment.c:539
+#: ../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 "%s ফাইলটি যোগ করা যায়নি: %s"
 
-#: ../widgets/misc/e-attachment.c:314 ../widgets/misc/e-attachment.c:531
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "%s ফাইলটি যোগ করা যায়নি: এটা সাধারণ ফাইল নয়"
@@ -21709,33 +22479,32 @@ msgid "Suggest automatic display of attachment"
 msgstr "সংযুক্ত বস্তু স্বয়ংক্রিয়ভাবে প্রদর্শণ করার পরামর্শ দাও"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1077
-#: ../widgets/misc/e-calendar-item.c:1726
+#: ../widgets/misc/e-calendar-item.c:1267
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:226
+#: ../widgets/misc/e-calendar.c:221
 msgid "Month Calendar"
 msgstr "মাস অনুযায়ী বর্ষপঞ্জি"
 
 #: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3642
-#: ../widgets/text/e-text.c:3643
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
 msgid "Fill color"
 msgstr "পূরণ করতে ব্যবহৃত রং"
 
 #: ../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:3649
-#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
-#: ../widgets/text/e-text.c:3658
+#: ../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 পূরণ করতে ব্যবহৃত রং"
 
 #: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3664
-#: ../widgets/text/e-text.c:3665
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr ""
 
@@ -21759,30 +22528,30 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3071
+#: ../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 "সর্বনিম্ন প্রস্থ"
 
-#: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3072
+#: ../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 "সর্বনিম্ন প্রস্থ"
 
-#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
+#: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "মধ্যবর্তী স্থান"
 
-#: ../widgets/misc/e-cell-date-edit.c:231
+#: ../widgets/misc/e-cell-date-edit.c:290
 msgid "Now"
 msgstr "এখন"
 
-#: ../widgets/misc/e-cell-date-edit.c:795
+#: ../widgets/misc/e-cell-date-edit.c:847
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "তারিখ যে ফরমায় হতে হবে: %s"
@@ -21791,152 +22560,150 @@ msgstr "তারিখ যে ফরমায় হতে হবে: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "শতাংশের মান ০ থেকে ১০০ -র মধ্যে হতে হবে, দুটি সংখ্যাই এর অন্তর্ভুক্ত"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Arabic"
 msgstr "আরবি"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "বল্টিক"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "মধ্য ইউরোপীয়"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "চীনি"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "সিরিলিক"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "গ্রিক"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
 msgstr "হিব্রু"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "জাপানি"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "কোরীয়"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Thai"
 msgstr "থাই"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "তুর্কি"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr "ইউনিকোড"
 
-#: ../widgets/misc/e-charset-picker.c:77
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr "পশ্চিম ইউরোপীয়"
 
-#: ../widgets/misc/e-charset-picker.c:78
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "পশ্চিম ইউরোপীয়, নতুন"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:91
 msgid "Traditional"
 msgstr "পারম্পরিক"
 
-#: ../widgets/misc/e-charset-picker.c:100
-#: ../widgets/misc/e-charset-picker.c:101
-#: ../widgets/misc/e-charset-picker.c:102
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../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 "সরলীকৃত"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
 msgstr "ইউক্রেইনিয়েন"
 
-#: ../widgets/misc/e-charset-picker.c:109
+#: ../widgets/misc/e-charset-picker.c:101
 msgid "Visual"
 msgstr "ভিসুয়াল"
 
-#: ../widgets/misc/e-charset-picker.c:178
+#: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "অজানা অক্ষরমালা: %s"
 
-#: ../widgets/misc/e-charset-picker.c:223
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "অক্ষর মালা"
 
-#: ../widgets/misc/e-charset-picker.c:238
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr "যে অক্ষরমালাটি ব্যবহার করা হবে তা লিখুন"
 
-#: ../widgets/misc/e-charset-picker.c:345
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "অন্যান্য..."
 
-#: ../widgets/misc/e-charset-picker.c:486
+#: ../widgets/misc/e-charset-picker.c:599
 msgid "Ch_aracter Encoding"
 msgstr "ক্যারেক্টার এনকোডিং (_a)"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:309
 msgid "Date and Time"
 msgstr "সময় ও তারিখ"
 
-#: ../widgets/misc/e-dateedit.c:345
+#: ../widgets/misc/e-dateedit.c:330
 msgid "Text entry to input date"
 msgstr "তারিখ লেখঅর উদ্দেশ্যে টেক্সট এন্ট্রি"
 
-#: ../widgets/misc/e-dateedit.c:367
+#: ../widgets/misc/e-dateedit.c:352
 msgid "Click this button to show a calendar"
 msgstr "বর্ষপঞ্জি প্রদর্শনের জন্য এই বাটন ক্লিক করুন"
 
-#: ../widgets/misc/e-dateedit.c:409
-msgid "Combo box to select time"
+#: ../widgets/misc/e-dateedit.c:394
+msgid "Drop-down combination box to select time"
 msgstr "সময় নির্বাচন করতে ব্যবহৃত কম্বোবক্স"
 
-#: ../widgets/misc/e-dateedit.c:484
+#: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
 msgstr "এই মুহূর্তে (_w)"
 
-#: ../widgets/misc/e-dateedit.c:490
+#: ../widgets/misc/e-dateedit.c:476
 msgid "_Today"
 msgstr "আজ(_T)"
 
-#: ../widgets/misc/e-dateedit.c:1655
+#: ../widgets/misc/e-dateedit.c:1641
 msgid "Invalid Date Value"
 msgstr "তারিখের মান অবৈধ"
 
-#: ../widgets/misc/e-dateedit.c:1684
+#: ../widgets/misc/e-dateedit.c:1670
 msgid "Invalid Time Value"
 msgstr "সময়ের মান অবৈধ"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:180
 msgid "Expanded"
 msgstr "প্রসারিত"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:181
 msgid "Whether or not the expander is expanded"
 msgstr "এক্সপ্যান্ডারটি প্রসারিত করা আছে কি না"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:189
 msgid "Text of the expander's label"
 msgstr "এক্সপ্যান্ডারের লেবেলের উপরে লেখা টেক্সট"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:196
 msgid "Use underline"
 msgstr "নিম্নরেখাঙ্কন করুন"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../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"
@@ -21944,110 +22711,118 @@ msgstr ""
 "যদি নির্ধারিত থাকে, টেক্সটের দাগ সংকেত করে যে গতিবর্ধকের জন্যে পরবর্তী অক্ষর ব্যবহৃত "
 "হবে"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:205
 msgid "Space to put between the label and the child"
 msgstr "লেবেল এবং চাইল্ডের মধ্যবর্তী শূণ্যস্থান"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:214
 msgid "Label widget"
 msgstr "লেবেল উইজেট"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:215
 msgid "A widget to display in place of the usual expander label"
 msgstr "স্বাভাবিক এক্সপ্যান্ডারের লেবেলের পরিবর্তে যে উইজেটটি প্রদর্শিত হবে"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
 msgid "Expander Size"
 msgstr "অধিকৃতি দৈর্ঘ্য"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
 msgid "Size of the expander arrow"
 msgstr "অধিকৃতি চিহ্নের দৈর্ঘ্য"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:230
 msgid "Indicator Spacing"
 msgstr "নির্ধারক স্থান"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:231
 msgid "Spacing around expander arrow"
 msgstr "অধিকৃতি চিহ্নের পারিপার্শ্বিক স্থান"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:130 ../widgets/misc/e-filter-bar.c:183
-#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:748
+#: ../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 "উন্নত অনুসন্ধান প্রক্রিয়া"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:234
+#: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
 msgstr "অনুসন্ধান সংরক্ষণ করুন"
 
 # FIXME: 'ভিত্তি' শব্দটার ব্যবহার ঠিক ভাল লাগতেছে না :-(
-#: ../widgets/misc/e-filter-bar.c:271
+#: ../widgets/misc/e-filter-bar.c:267
 msgid "_Searches"
 msgstr "অনুসন্ধান(_S)"
 
 # FIXME: 'ভিত্তি' শব্দটার ব্যবহার ঠিক ভাল লাগতেছে না :-(
-#: ../widgets/misc/e-filter-bar.c:273
+#: ../widgets/misc/e-filter-bar.c:269
 msgid "Searches"
 msgstr "অনুসন্ধান"
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
 msgid "_Save Search..."
 msgstr "অনুসন্ধান সংরক্ষণ করুন(_S)..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
 msgid "_Edit Saved Searches..."
 msgstr "সংরক্ষিত অনুসন্ধান ফল সম্পাদন করুন (_E)..."
 
-#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:114
+#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
 msgid "_Advanced Search..."
 msgstr "উন্নত অনুসন্ধান প্রক্রিয়া(_A)..."
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "All Accounts"
 msgstr "সর্বধরনের অ্যাকাউন্ট"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:108
 msgid "Current Account"
 msgstr "বর্তমান অ্যাকাউন্ট"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:109
 msgid "Current Folder"
 msgstr "বর্তমান ফোল্ডার"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
 msgstr "বর্তমান বার্তা"
 
-#: ../widgets/misc/e-image-chooser.c:173
+#: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
 msgstr "ছবি নির্বাচন করুন"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "পৃথিবীর মানচিত্র"
 
-#: ../widgets/misc/e-map.c:628
+#: ../widgets/misc/e-map.c:629
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should select the timezone from the below combo box instead."
+"should instead select the timezone from the drop-down combination box below."
 msgstr ""
 "সময়ের অঞ্চল নির্বাচনের উদ্দেশ্যে ব্যবহৃত একটি মাউস-ভিত্তিক ইন্টারেকটিভ ম্যাপ উইজেট। "
-"কীবোর্ড ব্যবহারকারীরদের ক্ষেত্রে সময়ের অঞ্চল নির্বাচনের জন্য নীচে অবস্থিত কম্বো বক্স "
+"কি-বোর্ড ব্যবহারকারীরদের ক্ষেত্রে সময়ের অঞ্চল নির্বাচনের জন্য নীচে অবস্থিত কম্বো বক্স "
 "ব্যবহার করা আবশ্যক।"
 
+#: ../widgets/misc/e-online-button.c:109
+msgid "Online"
+msgstr "অন-লাইন"
+
+#: ../widgets/misc/e-online-button.c:110
+msgid "The button state is online"
+msgstr ""
+
 # The equivalent for Sync escapes me now
-#: ../widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-pilot-settings.c:102
 msgid "Sync with:"
 msgstr "উল্লিখিত বস্তুর সাথে সুসংগত করা হবে:"
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
 msgstr "ব্যক্তিগত রেকর্ড মেলাও:"
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
 msgstr "বিভাগ সিঙ্ক করুন:"
 
@@ -22063,74 +22838,74 @@ msgstr "রিফ্লো মডেল"
 msgid "Column width"
 msgstr "কলামের প্রস্থ"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "অনুসন্ধান করুন"
 
-#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
-#: ../widgets/misc/e-search-bar.c:480
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "অনুসন্ধানের ধরন নির্বাচনের জন্য এই স্থানে ক্লিক করুন"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "অনুসন্ধান করুন (_S)"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "এখন অনুসন্ধান করুন (_F)"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "মুছে ফেলুন (_C)"
 
-#: ../widgets/misc/e-search-bar.c:872
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "আইটেমের পরিচিতি"
 
-#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3564
-#: ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "টেক্সট"
 
 #. 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:1013
+#: ../widgets/misc/e-search-bar.c:1006
 msgid "Sho_w: "
 msgstr "প্রদর্শন করা হবে:(_w)"
 
 #. 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:1030
+#: ../widgets/misc/e-search-bar.c:1023
 msgid "Sear_ch: "
 msgstr "অনুসন্ধান করা হবে:(_c)"
 
 #. 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:1042
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr " চিহ্নিত স্থানে (_n)"
 
-#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/misc/e-selection-model-array.c:594
 #: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "কার্সারের সারি"
 
-#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/misc/e-selection-model-array.c:601
 #: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "কার্সারের কলাম"
 
-#: ../widgets/misc/e-selection-model.c:210
+#: ../widgets/misc/e-selection-model.c:209
 msgid "Sorter"
 msgstr "ক্রমানুযায়ী বিন্যাস ব্যবস্থা"
 
-#: ../widgets/misc/e-selection-model.c:217
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Selection Mode"
 msgstr "নির্বাচনের মোড"
 
-#: ../widgets/misc/e-selection-model.c:225
+#: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
 msgstr "কার্সারের মোড"
 
@@ -22158,10 +22933,6 @@ msgstr "<b>অবস্থা অনুসরণকারী</b>"
 msgid "A_uto-delete sent item"
 msgstr "প্রেরিত বস্তু স্বয়ংক্রিয়রূপে মুছে ফেলুন(_u)"
 
-#: ../widgets/misc/e-send-options.glade.h:6
-msgid "Classification"
-msgstr "শ্রেণীবিভাগ"
-
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
 msgstr "তথ্য অনুসরণ করার জন্য একটি প্রেরিত বস্তু নির্মাণ করুন (_e)"
@@ -22242,44 +23013,45 @@ msgstr "পরে (_A):"
 msgid "_All information"
 msgstr "সমস্ত তথ্য (_A)"
 
-#: ../widgets/misc/e-send-options.glade.h:31
+#. To translators: This means Delay the message delivery for some time
+#: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
 msgstr "বিলম্বের পরে বার্তা প্রেরণ করা হবে (_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Delivered"
 msgstr "প্রেরিত হয়েছে (_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:35
 msgid "_Set expiration date"
 msgstr "মেয়াদপূর্তীর তারিখ নির্ধারণ করুন (_S)"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_Until:"
 msgstr "অবধি (_U):"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When convenient"
 msgstr "সুবিধাজনক সময়ে (_W)"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "_When opened:"
 msgstr "খোলার সময় (_W):"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:297
+#: ../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:303
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% সম্পন্ন)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "URL দেখতে এইস্থানে ক্লিক করুন"
 
@@ -22299,7 +23071,7 @@ msgstr "উপস্থিত শ্রেণীবিভাগ(_A):"
 msgid "categories"
 msgstr "শ্রেণীবিভাগ"
 
-#: ../widgets/table/e-cell-combo.c:169
+#: ../widgets/table/e-cell-combo.c:170
 msgid "popup list"
 msgstr "পপ-আপ তালিকা"
 
@@ -22319,23 +23091,23 @@ msgstr ""
 msgid "Unselected Column"
 msgstr "অনির্বাচিত কলাম"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Strikeout Column"
 msgstr ""
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Underline Column"
 msgstr "কলামের নিম্নরেখাঙ্কন করা হবে"
 
-#: ../widgets/table/e-cell-text.c:1821
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Bold Column"
 msgstr ""
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1829
 msgid "Color Column"
 msgstr ""
 
-#: ../widgets/table/e-cell-text.c:1842
+#: ../widgets/table/e-cell-text.c:1843
 msgid "BG Color Column"
 msgstr ""
 
@@ -22373,7 +23145,7 @@ msgid "A_vailable Fields:"
 msgstr "উপস্থিত ক্ষেত্র (_v):"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Ascending"
 msgstr "ছোট থেকে বড়"
 
@@ -22386,7 +23158,7 @@ msgid "Clear _All"
 msgstr "সমস্ত মুছে ফেলুন (_A)"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Descending"
 msgstr "বড় থেকে ছোট"
 
@@ -22449,14 +23221,14 @@ msgstr "ক্রমানুসারে বিন্যাস (_S)..."
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
 #: ../widgets/table/e-table-field-chooser-item.c:634
 #: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1886
+#: ../widgets/table/e-table-header-item.c:1887
 msgid "DnD code"
 msgstr "DnD কোড"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
 #: ../widgets/table/e-table-field-chooser-item.c:641
 #: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1900
+#: ../widgets/table/e-table-header-item.c:1901
 msgid "Full Header"
 msgstr "সম্পূর্ণ হেডার"
 
@@ -22474,304 +23246,306 @@ msgid ""
 "the location in which you want it to appear."
 msgstr ""
 
-#: ../widgets/table/e-table-group-container.c:345
+#: ../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-টি বস্তু)"
+msgstr[1] "%s : %s (%d-টি বস্তু)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:350
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d-টি বস্তু)"
+msgstr[1] "%s (%d-টি বস্তু)"
 
-#: ../widgets/table/e-table-group-container.c:896
-#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-leaf.c:572
-#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:3029 ../widgets/table/e-table-item.c:3030
+#: ../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 ""
 
-#: ../widgets/table/e-table-group-container.c:903
-#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-leaf.c:579
-#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-tree.c:3309 ../widgets/table/e-tree.c:3310
+#: ../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:3344 ../widgets/table/e-tree.c:3345
 msgid "Horizontal Draw Grid"
 msgstr ""
 
-#: ../widgets/table/e-table-group-container.c:910
-#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-tree.c:3315 ../widgets/table/e-tree.c:3316
+#: ../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:3350 ../widgets/table/e-tree.c:3351
 msgid "Vertical Draw Grid"
 msgstr ""
 
-#: ../widgets/table/e-table-group-container.c:917
-#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
-#: ../widgets/table/e-tree.c:3321 ../widgets/table/e-tree.c:3322
+#: ../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:3356 ../widgets/table/e-tree.c:3357
 msgid "Draw focus"
 msgstr ""
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3057 ../widgets/table/e-table-item.c:3058
+#: ../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 "কার্সার মোড"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../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 "নির্বাচনের মডেল"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3303
-#: ../widgets/table/e-tree.c:3304
+#: ../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:3338
+#: ../widgets/table/e-tree.c:3339
 msgid "Length Threshold"
 msgstr ""
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3335
-#: ../widgets/table/e-tree.c:3336
+#: ../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:3370
+#: ../widgets/table/e-tree.c:3371
 msgid "Uniform row height"
 msgstr ""
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
+#: ../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 ""
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
 msgstr "বর্তমান প্রদর্শন ব্যবস্থা নিজস্ব পছন্দ অনুযায়ী বিন্যাস করুন"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Ascending"
 msgstr "ছোট থেকে বড় ক্রম অনুযায়ী বিন্যাস (_A)"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Sort _Descending"
 msgstr "বড় থেকে ছোট ক্রম অনুযায়ী বিন্যাস (_D)"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "_Unsort"
 msgstr "অবিন্যাস্ত করা হবে (_U)"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Group By This _Field"
 msgstr "চিহ্নিত ক্ষেত্র অনুযায়ী দলভুক্ত করা হবে (_F)"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "Group By _Box"
 msgstr "বক্স অনুযায়ী দলভুক্ত করুন (_B)"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "Remove This _Column"
 msgstr "চিহ্নিত কলাম মুছে ফেলুন (_C)"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Add a C_olumn..."
 msgstr "একটি কলাম যোগ করুন...(_o)"
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "A_lignment"
 msgstr "দিশা (_l)"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "B_est Fit"
 msgstr "সর্বোত্তম মাপ (_e)"
 
 # FIXME
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1485
 msgid "Format Column_s..."
 msgstr "কলাম বিন্যাস করুন...(_s)"
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Custo_mize Current View..."
 msgstr "বর্তমান প্রদর্শনক্ষেত্র নিজস্ব পছন্দ অনুযায়ী বিন্যাস করুন...(_m)"
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1543
 msgid "_Sort By"
 msgstr "ক্রমবিন্যাস করা হবে (_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1561
 msgid "_Custom"
 msgstr "স্বনির্ধারিত (_C)"
 
-#: ../widgets/table/e-table-header-item.c:1893
+#: ../widgets/table/e-table-header-item.c:1894
 msgid "Font Description"
 msgstr "ফন্টের বিবরণ"
 
-#: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-table-sorter.c:173
+#: ../widgets/table/e-table-header-item.c:1915
+#: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "তথ্য ক্রমবিন্যাস করুন"
 
-#: ../widgets/table/e-table-header-item.c:1928
+#: ../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 "ট্রি"
 
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3011 ../widgets/table/e-table-item.c:3012
 msgid "Table header"
 msgstr "টেবিলের শিরোনাম"
 
-#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 msgid "Table model"
 msgstr "টেবিলের মডেল"
 
-#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
+#: ../widgets/table/e-table-item.c:3094 ../widgets/table/e-table-item.c:3095
 msgid "Cursor row"
 msgstr "কার্সারের সারি"
 
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3342
-#: ../widgets/table/e-tree.c:3343
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-tree.c:3378
 msgid "Always search"
 msgstr "সর্বদা অনুসন্ধান করা হবে"
 
-#: ../widgets/table/e-table.c:3328
+#: ../widgets/table/e-table.c:3346
 msgid "Use click to add"
 msgstr "ক্লিক করে যেগ করুন"
 
-#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
 msgid "ETree table adapter"
 msgstr "ETree টেবিল অ্যাডাপ্টার"
 
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-tree.c:3384
 msgid "Retro Look"
 msgstr "পুরোনো রূপ"
 
-#: ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-tree.c:3385
 msgid "Draw lines and +/- expanders."
 msgstr "রেখা ও +/- এক্সপ্যান্ডার আঁকুন।"
 
-#: ../widgets/text/e-text.c:2734
+#: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
 msgstr "ইনপুটের পদ্ধতি"
 
-#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "ঘটনা প্রসেস ব্যবস্থা"
 
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "গাড়"
 
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "অ্যাঙ্কর"
 
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "সমপ্রান্ত নির্ধারণ"
 
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "প্রস্থ হ্রাস করা হবে"
 
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "উচ্চতা হ্রাস করা হবে"
 
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "X অফসেট"
 
-#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "Y অফসেট"
 
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "টেক্সটের প্রস্থ"
 
-#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "হরফের উচ্চতা"
 
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "লাইন গুটানো"
 
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "সর্বাধিক পংক্তি সংখ্যা"
 
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "প্রান্তরেখা আঁকুন"
 
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Allow newlines"
 msgstr "নতুন পংক্তি নির্মাণের অনুমতি প্রদান করা হবে"
 
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "পটভূমী আঁকা হবে"
 
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "বাটন আকুঁন"
 
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "কার্সারের অবস্থান"
 
 # FIXME
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "IM অনুযায়ী"
 
-#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "পপ-আপ ব্যবস্থাপনা"
 
diff --git a/po/ca.po b/po/ca.po
index 3e66307388..5134c5fe75 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-11 01:50+0200\n"
-"PO-Revision-Date: 2008-09-04 20:17+0200\n"
+"POT-Creation-Date: 2008-09-15 16:28+0200\n"
+"PO-Revision-Date: 2008-09-11 21:08+0200\n"
 "Last-Translator: David Planella <david.planella@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "MIME-Version: 1.0\n"
@@ -170,7 +170,7 @@ msgstr "%A, %d de %B del %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:856 ../calendar/gui/e-day-view.c:1566
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1583
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -202,7 +202,7 @@ msgstr "%d de %B del %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:860 ../calendar/gui/e-day-view.c:1582
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1599
 #: ../calendar/gui/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%d %b"
@@ -654,7 +654,7 @@ msgstr "Gestioneu els vostres certificats S/MIME aquí"
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
 #: ../addressbook/gui/component/addressbook-component.c:144
-#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../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
@@ -671,7 +671,7 @@ msgstr "En aquest ordinador"
 #. Create the default Person addressbook
 #. orange
 #: ../addressbook/gui/component/addressbook-component.c:152
-#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../addressbook/gui/component/addressbook-migrate.c:508
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:660
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/caltypes.xml.h:29
@@ -684,7 +684,7 @@ msgstr "Personal"
 
 #. Create the LDAP source group
 #: ../addressbook/gui/component/addressbook-component.c:163
-#: ../addressbook/gui/component/addressbook-migrate.c:517
+#: ../addressbook/gui/component/addressbook-migrate.c:518
 msgid "On LDAP Servers"
 msgstr "Als servidors d'LDAP"
 
@@ -771,26 +771,26 @@ msgstr "Baixada"
 msgid "Address Book Properties"
 msgstr "Propietats de la llibreta d'adreces"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../addressbook/gui/component/addressbook-migrate.c:74
 #: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "S'està migrant..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../addressbook/gui/component/addressbook-migrate.c:126
 #: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
 msgid "Migrating '%s':"
 msgstr "S'està migrant «%s»:"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:645
+#: ../addressbook/gui/component/addressbook-migrate.c:646
 msgid "LDAP Servers"
 msgstr "Servidors d'LDAP"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:760
+#: ../addressbook/gui/component/addressbook-migrate.c:761
 msgid "Autocompletion Settings"
 msgstr "Paràmetres de la compleció automàtica"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1136
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -802,7 +802,7 @@ msgstr ""
 "\n"
 "Espereu mentre l'Evolution migra les carpetes..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1150
+#: ../addressbook/gui/component/addressbook-migrate.c:1151
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -812,7 +812,7 @@ msgstr ""
 "\n"
 "Espereu mentre l'Evolution migra les carpetes..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1159
+#: ../addressbook/gui/component/addressbook-migrate.c:1160
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -822,7 +822,7 @@ msgstr ""
 "\n"
 "Espereu mentre l'Evolution migra les carpetes..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1169
+#: ../addressbook/gui/component/addressbook-migrate.c:1170
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -2473,13 +2473,13 @@ msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
-#: ../mail/em-mailer-prefs.c:466
+#: ../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:350
 #: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 #: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Nom"
@@ -3897,7 +3897,7 @@ msgid "Format"
 msgstr "Format"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:502
+#: ../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:648
 #: ../widgets/table/e-table-field-chooser.c:81
@@ -4778,11 +4778,11 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "No em facis més preguntes sobre aquest programa."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:138
+#: ../calendar/gui/alarm-notify/notify-main.c:141
 msgid "Could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:151
+#: ../calendar/gui/alarm-notify/notify-main.c:154
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
@@ -6848,39 +6848,39 @@ msgstr "_A:"
 msgid "_Group:"
 msgstr "_Grup:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:50
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Esteu modificant un esdeveniment periòdic. Què voleu modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Esteu delegant un esdeveniment periòdic. Què voleu delegar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Esteu modificant una tasca periòdica. Què voleu modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Esteu modificant una anotació periòdica. Què voleu modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:85
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This Instance Only"
 msgstr "Només aquest cas"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:93
 msgid "This and Prior Instances"
 msgstr "Aquests casos i els anteriors"
 
-#: ../calendar/gui/dialogs/recur-comp.c:95
+#: ../calendar/gui/dialogs/recur-comp.c:99
 msgid "This and Future Instances"
 msgstr "Aquests casos i els futurs"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:104
 msgid "All Instances"
 msgstr "Tots els casos"
 
@@ -7349,7 +7349,7 @@ msgstr "Lliure"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
 #: ../calendar/gui/e-calendar-table.c:620
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-meeting-time-sel.c:396
 msgid "Busy"
 msgstr "Ocupat"
 
@@ -7457,11 +7457,11 @@ msgstr "Organitzador: %s"
 
 #: ../calendar/gui/e-calendar-table.c:408
 msgid "Start: "
-msgstr "Comença:"
+msgstr "Inici: "
 
 #: ../calendar/gui/e-calendar-table.c:420
 msgid "Due: "
-msgstr "Venciment:"
+msgstr "Venciment: "
 
 #: ../calendar/gui/e-calendar-table.c:589
 msgid "0%"
@@ -7739,19 +7739,19 @@ msgstr "%02i divisions de minut"
 #. 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:1549
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1566
 #: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1672
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:789 ../calendar/gui/e-week-view.c:524
+#: ../calendar/gui/e-day-view.c:806 ../calendar/gui/e-week-view.c:542
 #: ../calendar/gui/print.c:829
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:792 ../calendar/gui/e-week-view.c:527
+#: ../calendar/gui/e-day-view.c:809 ../calendar/gui/e-week-view.c:545
 #: ../calendar/gui/print.c:831
 msgid "pm"
 msgstr "pm"
@@ -8257,7 +8257,7 @@ msgstr "Precisa una acció"
 
 #: ../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:397
+#: ../calendar/gui/e-meeting-time-sel.c:395
 msgid "Tentative"
 msgstr "Provisionalment"
 
@@ -8282,12 +8282,12 @@ msgstr "Esperem la vostra resposta"
 
 #: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
 msgid "In Process"
-msgstr "En procés"
+msgstr "En progré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:2122
+#: ../calendar/gui/e-meeting-time-sel.c:2120
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
@@ -8296,7 +8296,7 @@ msgstr "%A, %d de %B de %Y"
 #. 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:2153
+#: ../calendar/gui/e-meeting-time-sel.c:2151
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -8306,67 +8306,67 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Out of Office"
 msgstr "Fora de l'oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "No Information"
 msgstr "Cap informació"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "A_ttendees..."
 msgstr "Ass_istents..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:436
+#: ../calendar/gui/e-meeting-time-sel.c:434
 msgid "O_ptions"
 msgstr "O_pcions"
 
-#: ../calendar/gui/e-meeting-time-sel.c:453
+#: ../calendar/gui/e-meeting-time-sel.c:451
 msgid "Show _only working hours"
 msgstr "M_ostra només les hores de treball"
 
-#: ../calendar/gui/e-meeting-time-sel.c:463
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _zoomed out"
 msgstr "Reduei_x l'ampliació"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:476
 msgid "_Update free/busy"
 msgstr "Act_ualitza lliure/ocupat"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:491
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:511
+#: ../calendar/gui/e-meeting-time-sel.c:509
 msgid "_Autopick"
 msgstr "Tria _automàtica"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:524
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-time-sel.c:541
 msgid "_All people and resources"
 msgstr "Tot_es les persones i recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:550
 msgid "All _people and one resource"
 msgstr "Totes les _persones i un recurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:559
 msgid "_Required people"
 msgstr "Pe_rsones necessàries"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:568
 msgid "Required people and _one resource"
 msgstr "Pers_ones necessàries i un recurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:606
+#: ../calendar/gui/e-meeting-time-sel.c:604
 msgid "_Start time:"
 msgstr "Hora d'_inici:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:633
+#: ../calendar/gui/e-meeting-time-sel.c:631
 msgid "_End time:"
 msgstr "Hora d_e finalització:"
 
@@ -10682,7 +10682,7 @@ msgstr "_Missatge nou"
 
 #: ../composer/e-composer-actions.c:536
 msgid "Open New Message window"
-msgstr "Obre la finestra de missatge nou"
+msgstr "Obre una finestra de missatge nou"
 
 #: ../composer/e-composer-actions.c:543
 msgid "Character _Encoding"
@@ -11062,7 +11062,7 @@ msgstr "Desa l'_esborrany"
 msgid "Evolution Mail and Calendar"
 msgstr "Correu i calendari de l'Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
 msgid "Groupware Suite"
 msgstr "Aplicacions de treball en grup"
 
@@ -11151,7 +11151,7 @@ msgstr "El voleu sobreescriure?"
 
 #: ../e-util/e-system.error.xml.h:5
 msgid "File exists \"{0}\"."
-msgstr "El fitxer «{0}» ja existeix."
+msgstr "Ja existeix el fitxer «{0}»."
 
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
@@ -11210,7 +11210,8 @@ msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
 msgstr ""
-"Ja existeix una etiqueta amb el mateix nom. Hauríeu de tornar-la a anomenar."
+"Ja existeix una etiqueta amb el mateix nom al servidor. Hauríeu de canviar-"
+"li el nom."
 
 #: ../e-util/gconf-bridge.c:1218
 #, c-format
@@ -12115,9 +12116,9 @@ msgstr "C_rea"
 msgid "Folder _name:"
 msgstr "_Nom de la carpeta:"
 
-#. load store to mail component at the end, when everything is loaded
+#. load store to mail component
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
+#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "Carpetes de cerca"
 
@@ -12219,7 +12220,7 @@ msgstr "S'està copiant «%s» a «%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:83
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder"
 msgstr "Seleccioneu una carpeta"
 
@@ -12705,7 +12706,7 @@ msgstr "CCO"
 
 #. pseudo-header
 #: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1450
+#: ../mail/em-mailer-prefs.c:1451
 msgid "Mailer"
 msgstr "Generador del correu"
 
@@ -12748,104 +12749,109 @@ msgstr "Data"
 msgid "Newsgroups"
 msgstr "Grups de notícies"
 
-#: ../mail/em-format.c:1157
+#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:83
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "Cares"
+
+#: ../mail/em-format.c:1158
 #, c-format
 msgid "%s attachment"
 msgstr "fitxer adjunt %s"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1200
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S'ha produït un error desconegut en analitzar el missatge S/MIME"
 
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
+#: ../mail/em-format.c:1337 ../mail/em-format.c:1493
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No s'ha pogut analitzar el missatge MIME. Es mostrarà com a codi font."
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1345
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "El tipus de xifratge per a multipart/encrypted no està implementat"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message"
 msgstr "No s'ha pogut analitzar el missatge PGP/MIME"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "No s'ha pogut analitzar el missatge PGP/MIME: error desconegut"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1512
 msgid "Unsupported signature format"
 msgstr "El format de la signatura no està implementat"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1591
 msgid "Error verifying signature"
 msgstr "S'ha produït un error en verificar la contrasenya"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1582 ../mail/em-format.c:1591
 msgid "Unknown error verifying signature"
 msgstr "S'ha produït un error desconegut en verificar la contrasenya"
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1663
 msgid "Could not parse PGP message"
 msgstr "No s'ha pogut analitzar el missatge PGP"
 
-#: ../mail/em-format.c:1662
+#: ../mail/em-format.c:1663
 msgid "Could not parse PGP message: Unknown error"
 msgstr "No s'ha pogut analitzar el missatge PGP: error desconegut"
 
 # Apareix enmig d'una frase, i per tant ha d'anar en minúscula (dpm)
-#: ../mail/em-mailer-prefs.c:93
+#: ../mail/em-mailer-prefs.c:94
 msgid "Every time"
 msgstr "cada vegada"
 
 # Apareix enmig d'una frase, i per tant ha d'anar en minúscula (dpm)
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per day"
 msgstr "una vegada al dia"
 
 # Apareix enmig d'una frase, i per tant ha d'anar en minúscula (dpm)
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per week"
 msgstr "una vegada a la setmana"
 
 # Apareix enmig d'una frase, i per tant ha d'anar en minúscula (dpm)
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per month"
 msgstr "una vegada al mes"
 
 # FIXME: s'ha de mirar si és massa llarg (dpm)
-#: ../mail/em-mailer-prefs.c:326
+#: ../mail/em-mailer-prefs.c:327
 msgid "Add Custom Junk Header"
 msgstr "Afegeix una capçalera de correu brossa personalitzada"
 
-#: ../mail/em-mailer-prefs.c:330
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Name:"
 msgstr "Nom de la capçalera:"
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:332
 msgid "Header Value Contains:"
 msgstr "El valor de la capçalera conté:"
 
-#: ../mail/em-mailer-prefs.c:436
+#: ../mail/em-mailer-prefs.c:437
 msgid "Contains Value"
 msgstr "Conté el valor"
 
-#: ../mail/em-mailer-prefs.c:458
+#: ../mail/em-mailer-prefs.c:459
 msgid "Color"
 msgstr "Color"
 
-#: ../mail/em-mailer-prefs.c:461
+#: ../mail/em-mailer-prefs.c:462
 msgid "Tag"
 msgstr "Etiqueta"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
+#: ../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 "El connector %s està disponible i el fitxer binari està instal·lat."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
+#: ../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."
@@ -12853,7 +12859,7 @@ msgstr ""
 "El connector %s no està disponible. Comproveu que el seu paquet estigui "
 "instal·lat."
 
-#: ../mail/em-mailer-prefs.c:1107
+#: ../mail/em-mailer-prefs.c:1108
 msgid "No Junk plugin available"
 msgstr "No hi ha cap connector de correu brossa disponible"
 
@@ -13095,8 +13101,8 @@ msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
 msgstr ""
-"Especifica les capçaleres personalitzades a cercar per la detecció de correu "
-"brossa. El format és «nomdelacapçalera=valor»."
+"Especifica les capçaleres personalitzades a utilitzar per a la detecció de "
+"correu brossa. El format és «nomdelacapçalera=valor»."
 
 #: ../mail/evolution-mail.schemas.in.h:20
 msgid "Default charset in which to compose messages"
@@ -13734,9 +13740,9 @@ 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 ""
-"Aquesta hauria de ser una clau per llegir una sola vegada i llavors ser "
-"reinicialitzada com a falsa. Això provoca que es desfaci la selecció dels "
-"correus de la llista i que se suprimeixi la previsualització de la carpeta."
+"Aquesta clau es llegeix només una vegada i a continuació es reinicialitza "
+"com a «falsa». Això provoca que es desfaci la selecció dels correus de la "
+"llista i que se suprimeixi la previsualització de la carpeta."
 
 #: ../mail/evolution-mail.schemas.in.h:144
 msgid ""
@@ -13817,7 +13823,9 @@ msgstr "Cadena d'identificació d'usuari del compte predeterminat."
 
 #: ../mail/evolution-mail.schemas.in.h:156
 msgid "Underline color for misspelled words when using inline spelling."
-msgstr "Color de subratllat per a "
+msgstr ""
+"Color de subratllat per als errors ortogràfics quan s'utilitzi la "
+"verificació ortogràfica."
 
 #: ../mail/evolution-mail.schemas.in.h:157
 msgid "Use SpamAssassin daemon and client"
@@ -13935,19 +13943,19 @@ msgstr "Importador Elm de l'Evolution"
 msgid "Import mail from Elm."
 msgstr "S'està important correu de l'Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:80
+#: ../mail/importers/evolution-mbox-importer.c:79
 msgid "Destination folder:"
 msgstr "Carpeta de destí:"
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder to import into"
 msgstr "Seleccioneu a quina carpeta s'importarà"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:219
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Bústia de correu de Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:221
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importador de carpetes de correu de format Berkeley"
 
@@ -14001,8 +14009,8 @@ msgstr "Llista de correu %s"
 msgid "Add Filter Rule"
 msgstr "Afegeix una regla de filtre"
 
-#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
-#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../mail/mail-component.c:164 ../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 "Plantilles"
@@ -14675,7 +14683,7 @@ msgstr "Verificació ortogràfica"
 
 #: ../mail/mail-config.glade.h:146
 msgid "Start _typing at the bottom on replying"
-msgstr "Inici de la redac_ció al final en respondre"
+msgstr "Inicia la redac_ció al final en respondre"
 
 #: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
@@ -14956,7 +14964,7 @@ msgstr "Sen_yalador:"
 msgid "_Tick this to accept the license agreement"
 msgstr "Habili_teu-lo per a acceptar l'acord de llicència"
 
-#: ../mail/mail-folder-cache.c:845
+#: ../mail/mail-folder-cache.c:832
 #, c-format
 msgid "Pinging %s"
 msgstr "S'està enviant un ping a %s"
@@ -15417,7 +15425,7 @@ msgstr "No es pot canviar el nom de «{0}» a «{1}»."
 
 #: ../mail/mail.error.xml.h:36
 msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "No s'ha pogut canviar el nom o moure la carpeta de sistema «{0}»."
+msgstr "No es pot canviar el nom o moure la carpeta de sistema «{0}»."
 
 #: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
@@ -16077,7 +16085,7 @@ msgstr ""
 "cos del missatge."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:474
-#: ../plugins/templates/templates.c:394
+#: ../plugins/templates/templates.c:392
 msgid "Keywords"
 msgstr "Paraules clau"
 
@@ -16634,16 +16642,16 @@ msgstr ""
 "Proporciona funcionalitat per a marcar com a predeterminats un calendari o "
 "una llibreta d'adreces."
 
-#: ../plugins/email-custom-header/email-custom-header.c:558
+#: ../plugins/email-custom-header/email-custom-header.c:560
 msgid "_Custom Header"
 msgstr "Capçalera personalit_zada"
 
-#: ../plugins/email-custom-header/email-custom-header.c:879
+#: ../plugins/email-custom-header/email-custom-header.c:881
 msgid "Key"
 msgstr "Clau"
 
-#: ../plugins/email-custom-header/email-custom-header.c:890
-#: ../plugins/templates/templates.c:400
+#: ../plugins/email-custom-header/email-custom-header.c:892
+#: ../plugins/templates/templates.c:398
 msgid "Values"
 msgstr "Valors"
 
@@ -17668,7 +17676,7 @@ msgid ""
 "setting a different editor."
 msgstr ""
 "No es pot executar l'editor extern especificat a les preferències del "
-"connector. Intenteu de seleccionar-ne un altre."
+"connector. Intenteu seleccionar un altre editor."
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
 msgid "Compose in _External Editor"
@@ -17713,10 +17721,6 @@ msgstr ""
 "base64, la qual s'haurà de desar a ~/.evolution/faces. A partir d'aquí "
 "aquesta imatge s'utilitzarà per a tots els correus enviats."
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "Cares"
-
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
@@ -18071,7 +18075,7 @@ msgstr "Entrada com a delegat"
 #: ../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:83
+#: ../plugins/groupwise-features/send-options.c:85
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sIntroduïu la contrasenya per a %s (usuari %s)"
@@ -18310,8 +18314,8 @@ msgstr "Format de l'iCalendar (.ics)"
 msgid ""
 "Synchronize the selected task/memo/calendar/address book with Apple iPod"
 msgstr ""
-"Sincronitza la llibreta d'adreces, calendari o tasca seleccionats amb un "
-"iPod d'Apple"
+"Sincronitza la llibreta d'adreces, anotació, calendari o tasca seleccionats "
+"amb un iPod d'Apple"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
@@ -19897,7 +19901,7 @@ msgstr "%FT%T"
 msgid "RDF format (.rdf)"
 msgstr "Format RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:160
+#: ../plugins/save-calendar/save-calendar.c:161
 msgid "Select destination file"
 msgstr "Seleccioneu el fitxer destí"
 
@@ -20003,15 +20007,15 @@ msgstr ""
 "Llista de parells de clau/valor que el connector de plantilles substituirà "
 "en el cos d'un missatge."
 
-#: ../plugins/templates/templates.c:615
+#: ../plugins/templates/templates.c:613
 msgid "No title"
 msgstr "Sense títol"
 
-#: ../plugins/templates/templates.c:743
+#: ../plugins/templates/templates.c:741
 msgid "Save as _Template"
 msgstr "Desa com a _plantilla"
 
-#: ../plugins/templates/templates.c:745
+#: ../plugins/templates/templates.c:743
 msgid "Save as Template"
 msgstr "Desa com a plantilla"
 
@@ -20070,9 +20074,7 @@ msgstr "Component de prova de l'Evolution"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
-msgstr ""
-"Utilitza l'autenticació per a les connexions a través del servidor "
-"intermediari"
+msgstr "Autentica les connexions al servidor intermediari"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Automatic proxy configuration URL"
@@ -20137,7 +20139,7 @@ msgstr ""
 "Si és cert, caldrà autenticar-se en connectar-se al servidor intermediari. "
 "El nom d'usuari s'obté de la clau «/apps/evolution/shell/network_config/"
 "authentication_user» del GConf, i la contrasenya de l'anell de claus del "
-"Gnome o bé del fitxer de contrasenyes ~/.gnome2_private/Evolution."
+"GNOME o bé del fitxer de contrasenyes ~/.gnome2_private/Evolution."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
@@ -20453,7 +20455,7 @@ msgstr "No es pot executar el Bug buddy."
 #. 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:729
+#: ../shell/e-shell-window-commands.c:942
 msgid "translator-credits"
 msgstr ""
 "Víctor Nieto <vnie2025@alu-etsetb.upc.es>\n"
@@ -20465,23 +20467,23 @@ msgstr ""
 "Gil Forcada <gilforcada@guifi.net>\n"
 "David Planella Molas <david.planella@gmail.com>"
 
-#: ../shell/e-shell-window-commands.c:740
+#: ../shell/e-shell-window-commands.c:953
 msgid "Evolution Website"
 msgstr "Lloc web de l'Evolution"
 
-#: ../shell/e-shell-window-commands.c:758
+#: ../shell/e-shell-window-commands.c:971
 msgid "Error opening the FAQ webpage."
 msgstr "S'ha produït un error en obrir la pàgina web de les PMF."
 
-#: ../shell/e-shell-window-commands.c:955
+#: ../shell/e-shell-window-commands.c:1168
 msgid "_Work Online"
 msgstr "_Treballa en línia"
 
-#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1181 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Treballa fora de línia"
 
-#: ../shell/e-shell-window-commands.c:981
+#: ../shell/e-shell-window-commands.c:1194
 msgid "Work Offline"
 msgstr "Treballa fora de línia"
 
@@ -22776,16 +22778,16 @@ msgstr "Defineix les visualitzacions per a «%s»"
 # gal/menus/gal-view-factory-etable.c:38
 #: ../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
-#: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "Taula"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
 msgid "Instance"
 msgstr "Instància"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "Desa la visualització actual"
 
@@ -23139,11 +23141,11 @@ msgstr ""
 "Un element d'interfície gràfica a mostrar en comptes de l'etiqueta "
 "d'expansió habitual"
 
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3391
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3390
 msgid "Expander Size"
 msgstr "Mida de l'expansor"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3392
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3391
 msgid "Size of the expander arrow"
 msgstr "Mida de la fletxa de l'expansor"
 
@@ -23218,11 +23220,11 @@ msgstr ""
 "Mapa interactiu per seleccionar el fus horari amb el ratolí. Els usuaris amb "
 "teclat haurien de seleccionar el fus horari amb el quadre combinat de sota."
 
-#: ../widgets/misc/e-online-button.c:109
+#: ../widgets/misc/e-online-button.c:106
 msgid "Online"
 msgstr "En línia"
 
-#: ../widgets/misc/e-online-button.c:110
+#: ../widgets/misc/e-online-button.c:107
 msgid "The button state is online"
 msgstr "L'estat del botó és en línia"
 
@@ -23708,7 +23710,7 @@ msgstr "Alterna els colors de fila"
 #: ../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:3344 ../widgets/table/e-tree.c:3345
+#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
 msgid "Horizontal Draw Grid"
 msgstr "Graella de dibuix horitzontal"
 
@@ -23717,7 +23719,7 @@ msgstr "Graella de dibuix horitzontal"
 #: ../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:3350 ../widgets/table/e-tree.c:3351
+#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
 msgid "Vertical Draw Grid"
 msgstr "Graella de dibuix vertical"
 
@@ -23726,7 +23728,7 @@ msgstr "Graella de dibuix vertical"
 #: ../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:3356 ../widgets/table/e-tree.c:3357
+#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
 msgid "Draw focus"
 msgstr "Dibuixa el focus"
 
@@ -23751,8 +23753,8 @@ msgstr "Model de selecció"
 #: ../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:3338
-#: ../widgets/table/e-tree.c:3339
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3337
+#: ../widgets/table/e-tree.c:3338
 msgid "Length Threshold"
 msgstr "Llindar de la longitud"
 
@@ -23761,8 +23763,8 @@ msgstr "Llindar de la longitud"
 #: ../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:3370
-#: ../widgets/table/e-tree.c:3371
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3369
+#: ../widgets/table/e-tree.c:3370
 msgid "Uniform row height"
 msgstr "Alçada de fila uniforme"
 
@@ -23869,8 +23871,8 @@ msgstr "Model de la taula"
 msgid "Cursor row"
 msgstr "Fila del cursor"
 
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3377
-#: ../widgets/table/e-tree.c:3378
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3376
+#: ../widgets/table/e-tree.c:3377
 msgid "Always search"
 msgstr "Cerca sempre"
 
@@ -23878,15 +23880,15 @@ msgstr "Cerca sempre"
 msgid "Use click to add"
 msgstr "Afegeix amb un clic"
 
-#: ../widgets/table/e-tree.c:3363 ../widgets/table/e-tree.c:3364
+#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
 msgid "ETree table adapter"
 msgstr "Adaptador de taula ETree"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3383
 msgid "Retro Look"
 msgstr "Aparença retro"
 
-#: ../widgets/table/e-tree.c:3385
+#: ../widgets/table/e-tree.c:3384
 msgid "Draw lines and +/- expanders."
 msgstr "Dibuixa línies i expansors +/-."
 
@@ -24023,9 +24025,6 @@ msgstr "Menú emergent de l'ansa"
 #~ msgid "Cale_ndar"
 #~ msgstr "Cale_ndari"
 
-#~ msgid "Recent Docu_ments"
-#~ msgstr "Do_cuments recents"
-
 #~ msgctxt "New"
 #~ msgid "Mem_o"
 #~ msgstr "An_otació"
@@ -24060,12 +24059,15 @@ msgstr "Menú emergent de l'ansa"
 
 #~ msgctxt "New"
 #~ msgid "Mail _Folder"
-#~ msgstr "Carpeta de correu"
+#~ msgstr "_Carpeta de correu"
 
 #~ msgctxt "New"
 #~ msgid "_Test"
 #~ msgstr "P_rova"
 
+#~ msgid "Recent Docu_ments"
+#~ msgstr "Do_cuments recents"
+
 #~ msgid "_Properties..."
 #~ msgstr "_Propietats..."
 
diff --git a/po/cs.po b/po/cs.po
index a82887a1d5..c74ce8f9f7 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -12,13 +12,13 @@
 # Jiří Eischmann <jiri@eischmann.cz>, 2008.
 # Petr Kovar <pknbe@volny.cz>, 2008.
 #
-#: ../shell/main.c:683
+#: ../shell/main.c:589
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-27 20:54+0200\n"
-"PO-Revision-Date: 2008-07-27 20:49+0100\n"
+"POT-Creation-Date: 2008-09-17 22:43+0200\n"
+"PO-Revision-Date: 2008-09-17 22:41+0200\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
 #: ../a11y/addressbook/ea-minicard-view.c:178
-msgid "evolution addressbook"
+msgid "evolution address book"
 msgstr "adresář evolution"
 
 #: ../a11y/addressbook/ea-minicard-view.c:32
@@ -66,63 +66,63 @@ msgstr "Kontakt: "
 msgid "evolution minicard"
 msgstr "minikarta evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:266
+#: ../a11y/calendar/ea-cal-view-event.c:265
 msgid "It has alarms."
 msgstr "Má alarmy."
 
-#: ../a11y/calendar/ea-cal-view-event.c:269
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "It has recurrences."
 msgstr "Opakuje se."
 
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:271
 msgid "It is a meeting."
 msgstr "Je to schůzka."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:277
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Událost kalendáře: Souhrn je %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:280
+#: ../a11y/calendar/ea-cal-view-event.c:279
 msgid "Calendar Event: It has no summary."
 msgstr "Událost kalendáře: Nemá souhrn."
 
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
-msgstr "událost pohledu na kalendář"
+msgstr "událost zobrazení kalendáře"
 
-#: ../a11y/calendar/ea-cal-view-event.c:528
+#: ../a11y/calendar/ea-cal-view-event.c:527
 msgid "Grab Focus"
 msgstr "Získat zaměření"
 
-#: ../a11y/calendar/ea-cal-view.c:302
+#: ../a11y/calendar/ea-cal-view.c:299
 msgid "New Appointment"
 msgstr "Nová událost"
 
-#: ../a11y/calendar/ea-cal-view.c:303
+#: ../a11y/calendar/ea-cal-view.c:300
 msgid "New All Day Event"
 msgstr "Nová celodenní událost"
 
-#: ../a11y/calendar/ea-cal-view.c:304
+#: ../a11y/calendar/ea-cal-view.c:301
 msgid "New Meeting"
 msgstr "Nová schůzka"
 
-#: ../a11y/calendar/ea-cal-view.c:305
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "Go to Today"
 msgstr "Jít na dnešek"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "Go to Date"
 msgstr "Jít na datum"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:303
-#: ../a11y/calendar/ea-week-view-main-item.c:301
+#: ../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 "tabulka pro zobrazení a výběr aktuálního rozsahu času"
 
 #. 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:151 ../a11y/calendar/ea-week-view.c:150
+#: ../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."
@@ -132,14 +132,14 @@ msgstr[2] "Má %d událostí."
 
 #. 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:155 ../a11y/calendar/ea-week-view.c:152
+#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
 msgid "It has no events."
 msgstr "Nemá události."
 
 #. 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:162
+#: ../a11y/calendar/ea-day-view.c:159
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Zobrazení pracovního týdne: %s. %s"
@@ -147,21 +147,21 @@ msgstr "Zobrazení pracovního týdne: %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:168
+#: ../a11y/calendar/ea-day-view.c:165
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Zobrazení dne: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:199
+#: ../a11y/calendar/ea-day-view.c:196
 msgid "calendar view for a work week"
-msgstr "pohled na kalendář pro pracovní týden"
+msgstr "zobrazení kalendáře na pracovní týden"
 
-#: ../a11y/calendar/ea-day-view.c:201
+#: ../a11y/calendar/ea-day-view.c:198
 msgid "calendar view for one or more days"
-msgstr "pohled na kalendář pro jeden nebo více dnů"
+msgstr "zobrazení kalendáře na jeden nebo více dnů"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:758
+#: ../a11y/calendar/ea-gnome-calendar.c:186
+#: ../calendar/gui/calendar-component.c:757
 msgid "%A %d %b %Y"
 msgstr "%a %d. %b %Y"
 
@@ -171,30 +171,30 @@ 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:191
-#: ../calendar/gui/calendar-component.c:761
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1540
-#: ../calendar/gui/e-week-view-main-item.c:340
+#: ../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/e-week-view-main-item.c:335
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:193
+#: ../a11y/calendar/ea-gnome-calendar.c:191
+#: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:763
-#: ../calendar/gui/calendar-component.c:768
-#: ../calendar/gui/calendar-component.c:770
+#: ../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:217
-#: ../a11y/calendar/ea-gnome-calendar.c:223
+#: ../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
-#: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:782
-#: ../calendar/gui/calendar-component.c:789
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/calendar-component.c:797
+#: ../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"
 
@@ -203,76 +203,76 @@ 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:221
-#: ../calendar/gui/calendar-component.c:787
-#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1556
-#: ../calendar/gui/e-week-view-main-item.c:354
+#: ../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/e-week-view-main-item.c:349
 msgid "%d %b"
 msgstr "%d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:247
-#: ../a11y/calendar/ea-gnome-calendar.c:255
+#: ../a11y/calendar/ea-gnome-calendar.c:245
+#: ../a11y/calendar/ea-gnome-calendar.c:253
 #: ../calendar/importers/icalendar-importer.c:766
 msgid "Gnome Calendar"
-msgstr "Kalendář Gnome"
+msgstr "Kalendář GNOME"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:288
 msgid "search bar"
 msgstr "lišta hledání"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:289
 msgid "evolution calendar search bar"
 msgstr "lišta hledání kalendáře evolution"
 
-#: ../a11y/calendar/ea-jump-button.c:149
+#: ../a11y/calendar/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "Tlačítko skoku"
 
-#: ../a11y/calendar/ea-jump-button.c:158
+#: ../a11y/calendar/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "Další události můžete hledat kliknutím sem."
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:154
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Zobrazení měsíce: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Zobrazení týdne: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:189
 msgid "calendar view for a month"
-msgstr "pohled na kalendář pro měsíc"
+msgstr "zobrazení kalendáře na měsíc"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:191
 msgid "calendar view for one or more weeks"
-msgstr "pohled na kalendář pro jeden nebo více týdnů"
+msgstr "zobrazení kalendáře na jeden nebo více týdnů"
 
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
 msgid "popup"
 msgstr "kontextová nabídka"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:125
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
 msgid "popup a child"
 msgstr "zobrazit kontextovou nabídku"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
 msgid "edit"
 msgstr "upravit"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
 msgid "begin editing this cell"
 msgstr "začít editovat tuto buňku"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
 msgid "toggle"
 msgstr "přepnout"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:152
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
 msgid "toggle the cell"
 msgstr "přepnout buňku"
 
@@ -292,67 +292,66 @@ msgstr "sbalit"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "sbalí řádek v ETree obsahující tuto buňku"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:107
+#: ../a11y/e-table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "Buňka tabulky"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:581
+#: ../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 "přidejte kliknutím"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
 msgid "click"
 msgstr "kliknout"
 
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
+#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
 msgid "sort"
 msgstr "řadit"
 
-#: ../a11y/widgets/ea-calendar-item.c:298
-#: ../a11y/widgets/ea-calendar-item.c:304
+#: ../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:306
+#: ../a11y/widgets/ea-calendar-item.c:303
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Kalendář: od %s do %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:341
+#: ../a11y/widgets/ea-calendar-item.c:338
 msgid "evolution calendar item"
 msgstr "položka kalendáře evolution"
 
-#: ../a11y/widgets/ea-combo-button.c:39
+#: ../a11y/widgets/ea-combo-button.c:56
 msgid "Combo Button"
 msgstr "Kombinované tlačítko"
 
-#: ../a11y/widgets/ea-combo-button.c:49
+#: ../a11y/widgets/ea-combo-button.c:66
 msgid "Activate Default"
-msgstr "Aktivovat implicitní"
+msgstr "Aktivovat výchozí"
 
-#: ../a11y/widgets/ea-combo-button.c:51
+#: ../a11y/widgets/ea-combo-button.c:68
 msgid "Popup Menu"
 msgstr "Kontextová nabídka"
 
-#: ../a11y/widgets/ea-expander.c:39
+#: ../a11y/widgets/ea-expander.c:40
 msgid "Toggle Attachment Bar"
 msgstr "Přepnout lištu příloh"
 
-#: ../a11y/widgets/ea-expander.c:49
+#: ../a11y/widgets/ea-expander.c:50
 msgid "activate"
 msgstr "aktivovat"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
-#, fuzzy
 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."
 msgstr ""
-"'{0}' je zdroj adresáře pouze pro čtení. Přepněte na náhled kontaktů a "
-"zvýrazněte adresář, který může kontakty přijmout."
+"'{0}' je adresář pouze pro čtení a nemůže být změněn. Vyberte prosím v "
+"bočním panelu v zobrazení kontaktů jiný adresář."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -393,26 +392,25 @@ msgid "Could not get schema information for LDAP server."
 msgstr "Nemohu získat od serveru LDAP informace o schématu."
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid "Could not remove addressbook."
+msgid "Could not remove address book."
 msgstr "Nemohu odstranit adresář."
 
 #: ../addressbook/addressbook.error.xml.h:11
-#, fuzzy
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
 "Frequent Contacts and GroupWise Personal Contacts folders."
 msgstr ""
-"Nyní můžete z Evolution přistupovat pouze k adresáři GroupWise. Použijte "
-"prosím některého jiného poštovního klienta GroupWise k vytvoření složek "
-"sebraných kontaktů GroupWise a osobních kontaktů Groupwise."
+"Nyní můžete z Evolution přistupovat pouze k systémovému adresáři GroupWise. "
+"Použijte prosím některého jiného poštovního klienta GroupWise k získání "
+"složek častých kontaktů GroupWise a osobních kontaktů Groupwise."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
 msgstr "Odstranit adresář '{0}?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading addressbook."
+msgid "Error loading address book."
 msgstr "Chyba při načítání adresáře."
 
 #: ../addressbook/addressbook.error.xml.h:14
@@ -425,7 +423,7 @@ msgstr "Nemohu se autentizovat u serveru LDAP."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1734
 msgid "Failed to delete contact"
 msgstr "Selhalo smazání kontaktu"
 
@@ -447,7 +445,7 @@ msgstr ""
 "Některé funkce možná nebudou pracovat správně s vaším aktuálním serverem"
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "The Evolution addressbook has quit unexpectedly."
+msgid "The Evolution address book has quit unexpectedly."
 msgstr "Adresář Evolution neočekávaně skončil."
 
 #: ../addressbook/addressbook.error.xml.h:22
@@ -468,32 +466,32 @@ msgstr ""
 "podporované základy vyhledávání."
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "This address book will be removed permanently."
-msgstr "Tento adresář bude natrvalo odstraněn."
-
-#: ../addressbook/addressbook.error.xml.h:25
-msgid "This addressbook could not be opened."
+msgid "This address book could not be opened."
 msgstr "Tento adresář nelze otevřít."
 
-#: ../addressbook/addressbook.error.xml.h:26
-msgid "This addressbook server does not have any suggested search bases."
+#: ../addressbook/addressbook.error.xml.h:25
+msgid "This address book server does not have any suggested search bases."
 msgstr "Tento server adresáře nenavrhuje žádný základ vyhledávání."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:26
 msgid ""
-"This addressbook server might be unreachable or the server name may be "
+"This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr ""
 "Server adresáře možná není dostupný, nebo by v názvu serveru mohl být "
 "překlep, nebo možná nefunguje vaše připojení k síti."
 
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "This address book will be removed permanently."
+msgstr "Tento adresář bude natrvalo odstraněn."
+
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Tento server nepodporuje informace o schématu LDAPv3."
 
 #: ../addressbook/addressbook.error.xml.h:29
-msgid "Unable to open addressbook"
-msgstr "Nemohu otevřít adresář"
+msgid "Unable to open address book"
+msgstr "Nelze otevřít adresář"
 
 #: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
@@ -509,10 +507,10 @@ msgstr "Chcete uložit změny?"
 
 #: ../addressbook/addressbook.error.xml.h:33
 msgid ""
-"You are attempting to move a contact from one addressbook to another but it "
+"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?"
 msgstr ""
-"Přesouváte kontakt z jednoho adresáře do jiného, ale nelze jej odstranit ze "
+"Přesouváte kontakt z jednoho adresáře do druhého, ale nelze jej odstranit ze "
 "zdroje. Chcete místo toho uložit kopii?"
 
 #: ../addressbook/addressbook.error.xml.h:34
@@ -526,9 +524,8 @@ msgstr ""
 "aktualizován na podporovanou verzi"
 
 #: ../addressbook/addressbook.error.xml.h:35
-#, fuzzy
 msgid "You do not have permission to delete contacts in this address book."
-msgstr "Nemáte dostatečná oprávnění pro smazání této pošty."
+msgstr "Nemáte dostatečná oprávnění pro smazání kontaktů v tomto adresáři."
 
 #: ../addressbook/addressbook.error.xml.h:36
 msgid ""
@@ -543,7 +540,7 @@ msgstr ""
 "Vaše kontakty pro {0} nebudou k dispozici, dokud nebude Evolution znovu "
 "spuštěna."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:512
+#: ../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
@@ -566,7 +563,7 @@ msgstr "_Změnit velikost"
 msgid "_Use as it is"
 msgstr "Po_užít jak je"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
+#. 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}"
@@ -583,8 +580,8 @@ msgstr "Standardní adresa pro synchronizaci:"
 
 #: ../addressbook/conduit/address-conduit.c:1320
 #: ../addressbook/conduit/address-conduit.c:1321
-msgid "Could not load addressbook"
-msgstr "Nemohu načíst adresář"
+msgid "Could not load address book"
+msgstr "Nelze načíst adresář"
 
 #: ../addressbook/conduit/address-conduit.c:1398
 #: ../addressbook/conduit/address-conduit.c:1401
@@ -609,10 +606,10 @@ msgstr "Zde nastavte automatické dokončování"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1334
-#: ../calendar/gui/calendar-component.c:300 ../calendar/gui/migration.c:396
+#: ../addressbook/gui/component/addressbook-view.c:1326
+#: ../calendar/gui/calendar-component.c:299 ../calendar/gui/migration.c:396
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/exchange-operations/exchange-folder.c:582
 msgid "Contacts"
 msgstr "Kontakty"
 
@@ -621,7 +618,6 @@ msgid "Evolution Address Book"
 msgstr "Adresář Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
 msgid "Evolution Address Book address popup"
 msgstr "Kontextová nabídka adresy adresáře Evolution"
 
@@ -638,8 +634,8 @@ msgid "Evolution Address Book component"
 msgstr "Komponenta adresáře Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Ovládací prvek správy certifikátů S/Mime Evolution"
+msgid "Evolution S/MIME Certificate Management Control"
+msgstr "Ovládání správy certifikátů S/Mime Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution folder settings configuration control"
@@ -651,15 +647,15 @@ msgstr "Zde spravujte své certifikáty S/MIME"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:144
-#: ../addressbook/gui/component/addressbook-migrate.c:499
-#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:475
+#: ../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:196 ../mail/em-folder-tree-model.c:200
+#: ../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:312 ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1456
+#: ../mail/message-list.c:1457
 msgid "On This Computer"
 msgstr "V tomto počítači"
 
@@ -668,25 +664,26 @@ msgstr "V tomto počítači"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:152
-#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../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/widgets/eab-contact-display.c:660
-#: ../calendar/gui/calendar-component.c:248 ../calendar/gui/caltypes.xml.h:29
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memotypes.xml.h:27
+#: ../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:205
+#: ../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 "Osobní"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:163
-#: ../addressbook/gui/component/addressbook-migrate.c:517
+#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-migrate.c:518
 msgid "On LDAP Servers"
 msgstr "Na serverech LDAP"
 
 #: ../addressbook/gui/component/addressbook-component.c:229
+msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
@@ -695,6 +692,7 @@ msgid "Create a new contact"
 msgstr "Vytvořit nový kontakt"
 
 #: ../addressbook/gui/component/addressbook-component.c:237
+msgctxt "New"
 msgid "Contact _List"
 msgstr "Seznam kon_taktů"
 
@@ -703,11 +701,12 @@ msgid "Create a new contact list"
 msgstr "Vytvořit nový seznam kontaktů"
 
 #: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1192
+#: ../addressbook/gui/component/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "Nový adresář"
 
 #: ../addressbook/gui/component/addressbook-component.c:245
+msgctxt "New"
 msgid "Address _Book"
 msgstr "_Adresář"
 
@@ -719,85 +718,85 @@ msgstr "Vytvořit nový adresář"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Nemohu aktualizovat nastavení nebo složky adresáře."
 
-#: ../addressbook/gui/component/addressbook-config.c:315
+#: ../addressbook/gui/component/addressbook-config.c:316
 msgid "Base"
 msgstr "Základ"
 
-#: ../addressbook/gui/component/addressbook-config.c:516
-#: ../calendar/gui/dialogs/calendar-setup.c:169
+#: ../addressbook/gui/component/addressbook-config.c:517
+#: ../calendar/gui/dialogs/calendar-setup.c:170
 msgid "_Type:"
 msgstr "_Typ:"
 
-#: ../addressbook/gui/component/addressbook-config.c:618
+#: ../addressbook/gui/component/addressbook-config.c:619
 msgid "Copy _book content locally for offline operation"
 msgstr "_Zkopírovat obsah adresáře lokálně pro práci při odpojení"
 
-#: ../addressbook/gui/component/addressbook-config.c:967
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../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:366
-#: ../calendar/gui/dialogs/calendar-setup.c:377
-#: ../calendar/gui/dialogs/calendar-setup.c:388
-#: ../mail/em-folder-properties.c:280 ../mail/mail-config.glade.h:89
-#: ../plugins/itip-formatter/itip-formatter.c:2368
+#: ../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:2367
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Obecné"
 
-#: ../addressbook/gui/component/addressbook-config.c:968
-#: ../addressbook/gui/widgets/e-addressbook-view.c:556
-#: ../mail/importers/pine-importer.c:385
+#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:555
+#: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Adresář"
 
-#: ../addressbook/gui/component/addressbook-config.c:972
+#: ../addressbook/gui/component/addressbook-config.c:987
 msgid "Server Information"
 msgstr "Informace o serveru"
 
-#: ../addressbook/gui/component/addressbook-config.c:974
+#: ../addressbook/gui/component/addressbook-config.c:989
 msgid "Authentication"
 msgstr "Autentizace"
 
-#: ../addressbook/gui/component/addressbook-config.c:977
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
+#: ../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 "Podrobnosti"
 
-#: ../addressbook/gui/component/addressbook-config.c:978
-#: ../mail/em-folder-browser.c:965
+#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../mail/em-folder-browser.c:983
 msgid "Searching"
 msgstr "Vyhledávání"
 
-#: ../addressbook/gui/component/addressbook-config.c:980
+#: ../addressbook/gui/component/addressbook-config.c:995
 msgid "Downloading"
 msgstr "Stahování"
 
-#: ../addressbook/gui/component/addressbook-config.c:1190
+#: ../addressbook/gui/component/addressbook-config.c:1205
 #: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "Address Book Properties"
 msgstr "Vlastnosti adresáře"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../addressbook/gui/component/addressbook-migrate.c:74
 #: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
 msgid "Migrating..."
 msgstr "Převádím..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:195
+#: ../addressbook/gui/component/addressbook-migrate.c:126
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
 #, c-format
-msgid "Migrating `%s':"
+msgid "Migrating '%s':"
 msgstr "Převádím `%s':"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:645
+#: ../addressbook/gui/component/addressbook-migrate.c:646
 msgid "LDAP Servers"
 msgstr "Servery LDAP"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:760
+#: ../addressbook/gui/component/addressbook-migrate.c:761
 msgid "Autocompletion Settings"
 msgstr "Nastavení automatického dokončování"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1136
+#: ../addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -809,7 +808,7 @@ msgstr ""
 "\n"
 "Počkejte prosím, než Evolution převede vaše složky..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1150
+#: ../addressbook/gui/component/addressbook-migrate.c:1151
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -819,7 +818,7 @@ msgstr ""
 "\n"
 "Počkejte prosím, než Evolution převede vaše složky..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1159
+#: ../addressbook/gui/component/addressbook-migrate.c:1160
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -829,7 +828,7 @@ msgstr ""
 "\n"
 "Počkejte prosím, než Evolution převede vaše složky..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1169
+#: ../addressbook/gui/component/addressbook-migrate.c:1170
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -839,70 +838,76 @@ msgstr ""
 "\n"
 "Počkejte prosím, než Evolution převede vaše data pro synchronizaci s Palm..."
 
-#: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:503
+#: ../addressbook/gui/component/addressbook-view.c:425
+#: ../mail/em-folder-utils.c:501
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Přejmenovat složku \"%s\" na:"
 
-#: ../addressbook/gui/component/addressbook-view.c:433
-#: ../mail/em-folder-utils.c:505
+#: ../addressbook/gui/component/addressbook-view.c:428
+#: ../mail/em-folder-utils.c:503
 msgid "Rename Folder"
 msgstr "Přejmenovat složku"
 
-#: ../addressbook/gui/component/addressbook-view.c:438
-#: ../mail/em-folder-utils.c:511
+#: ../addressbook/gui/component/addressbook-view.c:433
+#: ../mail/em-folder-utils.c:509
 msgid "Folder names cannot contain '/'"
 msgstr "Název složky nesmí obsahovat '/'"
 
-#: ../addressbook/gui/component/addressbook-view.c:950
+#: ../addressbook/gui/component/addressbook-view.c:942
 msgid "_New Address Book"
 msgstr "_Nový adresář"
 
-#: ../addressbook/gui/component/addressbook-view.c:951
+#: ../addressbook/gui/component/addressbook-view.c:943
 msgid "Save As vCard..."
 msgstr "Uložit jako Vcard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
-#: ../calendar/gui/calendar-component.c:620
-#: ../calendar/gui/e-calendar-table.c:1588
-#: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/e-memo-table.c:941
-#: ../calendar/gui/memos-component.c:469 ../calendar/gui/tasks-component.c:460
-#: ../mail/em-folder-tree.c:2095 ../mail/em-folder-view.c:1347
+#: ../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
+#: ../calendar/gui/e-calendar-view.c:1693 ../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 "_Odstranit"
 
-#: ../addressbook/gui/component/addressbook-view.c:957
-msgid "_Properties..."
-msgstr "_Vlastnosti..."
+#: ../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
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "_Vlastnosti"
 
-#: ../addressbook/gui/component/addressbook-view.c:1345
+#: ../addressbook/gui/component/addressbook-view.c:1337
 msgid "Contact Source Selector"
 msgstr "Výběr zdroje kontaktů"
 
-#: ../addressbook/gui/component/addressbook.c:99
+#: ../addressbook/gui/component/addressbook.c:102
 msgid "Accessing LDAP Server anonymously"
 msgstr "K serveru LDAP se přistupuje anonymně"
 
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:536
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
 msgid "Failed to authenticate.\n"
 msgstr "Nemohu se autentizovat.\n"
 
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:516
+#: ../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 "Zadejte heslo pro %s (uživatel %s)"
 
-#: ../addressbook/gui/component/addressbook.c:215
+#: ../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:50
+#: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Zadejte heslo"
 
@@ -996,7 +1001,7 @@ msgid "Add Address Book"
 msgstr "Přidat adresář"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:760
 msgid "Always"
 msgstr "Vždy"
 
@@ -1004,73 +1009,78 @@ msgstr "Vždy"
 msgid "Anonymously"
 msgstr "Anonymně"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#. 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 "P_rohlížet tento adresář, dokud není dosaženo limitu"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "Základní"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Distinguished name"
 msgstr "Distinguished name"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
 msgstr "E-mailová adresa"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution bude používat tuto e-mailovou adresu k vaší autentizaci u serveru."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
 msgstr "Hledat možné základy vyhledávání"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
 msgstr "_Přihlášení:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../mail/em-account-editor.c:760
+#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../mail/em-account-editor.c:759
 msgid "Never"
 msgstr "Nikdy"
 
 #. 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:23
-#: ../mail/em-account-editor.c:288
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:287
 msgid "No encryption"
 msgstr "Bez šifrování"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "Jeden"
 
 #. 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:25
-#: ../mail/em-account-editor.c:296
+#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../mail/em-account-editor.c:295
 msgid "SSL encryption"
 msgstr "SSL šifrování"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
 msgstr "Filtr hledání"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search _base:"
 msgstr "Základ _vyhledávání:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search _filter:"
 msgstr "_Filtr hledání:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Search filter"
 msgstr "Filtr hledání"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../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 "
@@ -1080,7 +1090,7 @@ msgstr ""
 "upravovány, vyhledávání bude prováděno s pomocí výchozí typu objectclass "
 "\"person\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../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."
@@ -1088,7 +1098,7 @@ msgstr ""
 "Po výběru této volby se Evolution k serveru LDAP připojí pouze tehdy, pokud "
 "LDAP server podporuje SSL."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../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."
@@ -1096,7 +1106,7 @@ msgstr ""
 "Po výběru této volby se Evolution k serveru LDAP připojí pouze tehdy, pokud "
 "LDAP server podporuje TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../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 "
@@ -1106,23 +1116,23 @@ msgstr ""
 "že vaše spojení nebude zabezpečené a můžete se stát terčem bezpečnostního "
 "útoku."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
 msgstr "Sub"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
 msgstr "Podporované základy vyhledávání"
 
 #. 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:36
-#: ../mail/em-account-editor.c:292
+#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../mail/em-account-editor.c:291
 msgid "TLS encryption"
 msgstr "TLS šifrování"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../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 "
@@ -1132,7 +1142,7 @@ msgstr ""
 "hledání. Pokud je ponecháte prázdné, prohledávání začne v kořeni "
 "adresářového stromu."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../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 "
@@ -1144,14 +1154,14 @@ msgstr ""
 "Rozsah vyhledávání \"jeden\" zahrnuje záznamy jednu úroveň pod základem "
 "vyhledávání."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Toto je plný název vašeho LDAP serveru. Například  \"ldap.mycompany.com\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../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."
@@ -1159,7 +1169,7 @@ msgstr ""
 "Toto je maximální počet stahovaných položek. Pokud nastavíte toto číslo "
 "příliš vysoké, zpomalí se váš adresář."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../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 "
@@ -1169,7 +1179,7 @@ msgstr ""
 "že použití volby \"E-mailová adresa\" vyžaduje anonymní přístup k vašemu "
 "serveru ldap."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../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. "
@@ -1177,7 +1187,7 @@ msgstr ""
 "Toto je jméno pro tento server, které se objeví ve vašem seznamu složek "
 "Evolution. Je pouze pro zobrazování. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../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 "
@@ -1187,75 +1197,76 @@ msgstr ""
 "standardních portů je předvyplněn. Váš správce systému vám sdělí, které "
 "číslo portu máte zadat."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr "Použít distinguished name (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
 msgstr "Použít e-mailovou adresu"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "Kdykoliv je možné"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
 msgstr "_Přidat adresář"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "_Omezení stahování:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
 msgstr "_Hledat možné základy vyhledávání"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Login method:"
 msgstr "_Metoda přihlašování:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
-#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../calendar/gui/dialogs/calendar-setup.c:227
 #: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Název:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
 msgstr "_Rozsah vyhledávání:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 #: ../mail/mail-config.glade.h:184
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "S_erver:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
 msgstr "Č_asový limit:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "Používat za_bezpečené připojení:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "karty"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../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:401
+#: ../plugins/google-account-setup/google-source.c:662
+#: ../plugins/google-account-setup/google-contacts-source.c:328
 msgid "minutes"
 msgstr "minut"
 
@@ -1296,7 +1307,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Práce</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
@@ -1308,16 +1319,16 @@ msgid "Ca_tegories..."
 msgstr "Ka_tegorie..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../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:542
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:557
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2422
+#: ../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
 msgid "Contact Editor"
 msgstr "Editor kontaktů"
 
@@ -1357,8 +1368,8 @@ msgstr "Telefon"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:229
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
 #: ../addressbook/gui/widgets/eab-contact-display.c:643
 #: ../mail/em-migrate.c:1057
@@ -1383,9 +1394,9 @@ msgid "_Birthday:"
 msgstr "Na_rozeniny:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:788
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1848
+#: ../calendar/gui/dialogs/event-page.c:787
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "Ka_lendář:"
 
@@ -1440,7 +1451,7 @@ msgstr "_Povolání:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Spouse:"
-msgstr "_Partner/-ka:"
+msgstr "_Partner(ka):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
@@ -1482,15 +1493,15 @@ msgstr "Adresa"
 #: ../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:293
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:130
-#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../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:179
+#: ../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
 msgid "Editable"
@@ -1626,7 +1637,7 @@ msgstr "Britské teritorium v Indickém oceánu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Brunei Darussalam"
-msgstr "Brunejský Darussalam"
+msgstr "Brunejský sultanát"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bulgaria"
@@ -1682,7 +1693,7 @@ msgstr "Vánoční ostrov"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Cocos (Keeling) Islands"
-msgstr "Kokosové ostrovy (Keeling)"
+msgstr "Kokosové a Keelingovy ostrovy"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Colombia"
@@ -1861,7 +1872,6 @@ msgid "Guinea"
 msgstr "Guinea"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
-#, fuzzy
 msgid "Guinea-Bissau"
 msgstr "Guinea-Bissau"
 
@@ -1887,7 +1897,7 @@ msgstr "Honduras"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Hong Kong"
-msgstr "Hong Kong"
+msgstr "Hongkong"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Hungary"
@@ -2227,7 +2237,7 @@ msgstr "Rwanda"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Kitts And Nevis"
-msgstr "Svatý Kitts a Nevis"
+msgstr "Svatý Kryštof a Nevis"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Saint Lucia"
@@ -2235,7 +2245,7 @@ msgstr "Svatá Lucie"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Saint Vincent And The Grenadines"
-msgstr "Svatý Vincent a Grenadines"
+msgstr "Svatý Vincenc a Grenadiny"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Samoa"
@@ -2323,7 +2333,7 @@ msgstr "Surinam"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Svalbard And Jan Mayen Islands"
-msgstr "Ostrovy Svalbard a Jan Mayen"
+msgstr "Špicberky a Jan Mayen"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Swaziland"
@@ -2347,7 +2357,7 @@ msgstr "Tchaj-wan"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tajikistan"
-msgstr "Tadžikistán"
+msgstr "Tádžikistán"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tanzania, United Republic Of"
@@ -2466,13 +2476,13 @@ msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:86
-#: ../mail/em-mailer-prefs.c:466
-#: ../plugins/exchange-operations/exchange-delegates.c:952
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:709
-#: ../plugins/plugin-manager/plugin-manager.c:41
+#: ../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:350
 #: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 #: ../widgets/menus/gal-view-new-dialog.c:63
 msgid "Name"
 msgstr "Jméno"
@@ -2482,7 +2492,7 @@ msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
@@ -2496,7 +2506,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:181
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
@@ -2509,7 +2519,7 @@ msgstr "Služba"
 #: ../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:375
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "Místo"
 
@@ -2517,78 +2527,78 @@ msgstr "Místo"
 msgid "Username"
 msgstr "Jméno uživatele"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:225
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Domů"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:233
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 #: ../addressbook/gui/widgets/eab-contact-display.c:528
 msgid "Other"
 msgstr "Další"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:249
 msgid "Source Book"
 msgstr "Zdrojový adresář"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
 msgid "Target Book"
 msgstr "Cílový adresář"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Is New Contact"
 msgstr "Je nový kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
 msgid "Writable Fields"
 msgstr "Zapisovatelná pole"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
 msgid "Required Fields"
 msgstr "Vyžadovaná pole"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 msgid "Changed"
 msgstr "Změněno"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2415
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor kontaktů - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2813
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
 msgid "Please select an image for this contact"
 msgstr "Zvolte prosím obrázek pro tento kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
 msgid "_No image"
 msgstr "Žád_ný obrázek"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3085
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2596,23 +2606,23 @@ msgstr ""
 "Data kontaktu nejsou platná:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3091
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' je v neplatném formátu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' je v neplatném formátu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3111
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3122
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' je prázdný"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3137
 msgid "Invalid contact."
 msgstr "Neplatný kontakt."
 
@@ -2636,7 +2646,7 @@ msgstr "E-_mail"
 msgid "_Select Address Book"
 msgstr "Vybrat nový adre_sář"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:321
+#: ../addressbook/gui/contact-editor/eab-editor.c:323
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2645,7 +2655,7 @@ msgstr ""
 "Opravdu chcete odstranit\n"
 "seznam kontaktů (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:324
+#: ../addressbook/gui/contact-editor/eab-editor.c:326
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2653,7 +2663,7 @@ msgstr ""
 "Opravdu chcete odstranit\n"
 "tyto seznamy kontaktů?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:329
+#: ../addressbook/gui/contact-editor/eab-editor.c:331
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2662,7 +2672,7 @@ msgstr ""
 "Opravdu chcete\n"
 "odstranit kontakt (%s)?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:332
+#: ../addressbook/gui/contact-editor/eab-editor.c:334
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2770,7 +2780,7 @@ msgstr "Služba _IM:"
 #: ../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:242
+#: ../plugins/exchange-operations/exchange-calendar.c:243
 #: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "_Místo:"
@@ -2780,7 +2790,7 @@ msgid "<b>Members</b>"
 msgstr "<b>Členové:</b>"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
 msgid "Contact List Editor"
 msgstr "Editor seznamu kontaktů"
 
@@ -2800,25 +2810,25 @@ msgstr "Název _seznamu:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Napište e-mailovou adresu nebo přetáhněte kontakt do seznamu níže:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
 msgid "Contact List Members"
 msgstr "Členové seznamu kontaktů"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:898
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
+#: ../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 "Č_lenové"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
 #: ../addressbook/gui/widgets/e-addressbook-model.c:298
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:213
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:116
-#: ../addressbook/gui/widgets/e-minicard-view.c:530
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-view.c:212
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
+#: ../addressbook/gui/widgets/e-minicard-view.c:531
 msgid "Book"
 msgstr "Kniha"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
 msgid "Is New List"
 msgstr "Nový seznam"
 
@@ -2859,15 +2869,16 @@ msgstr ""
 "Jméno nebo e-mail tohoto kontaktu již v tomto souboru existuje.\n"
 "Přejete si jej přesto přidat?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:185
-msgid "Merge Contact"
-msgstr "Sloučit kontakt"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:200
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:214
 msgid "_Merge"
 msgstr "_Sloučit"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:253
+#: ../addressbook/gui/merging/eab-contact-merging.c:199
+msgid "Merge Contact"
+msgstr "Sloučit kontakt"
+
+#: ../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
@@ -2878,21 +2889,20 @@ msgid "Email"
 msgstr "E-mail"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:162
-#: ../calendar/gui/cal-search-bar.c:77 ../calendar/gui/caltypes.xml.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../calendar/gui/cal-search-bar.c:76 ../calendar/gui/caltypes.xml.h:3
 #: ../calendar/gui/memotypes.xml.h:3 ../calendar/gui/tasktypes.xml.h:5
 msgid "Any field contains"
 msgstr "Jakékoliv políčko obsahuje"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:161
+#: ../addressbook/gui/widgets/e-addressbook-view.c:160
 msgid "Email begins with"
 msgstr "E-mail začíná na"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#, fuzzy
 msgid "Name contains"
-msgstr "obsahuje"
+msgstr "Jméno obsahuje"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
@@ -2907,10 +2917,10 @@ msgstr[1] "%d kontakty"
 msgstr[2] "%d kontaktů"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
-#: ../addressbook/gui/widgets/e-addressbook-view.c:227
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:123
-#: ../addressbook/gui/widgets/e-minicard-view.c:537
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-view.c:226
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
+#: ../addressbook/gui/widgets/e-minicard-view.c:538
 msgid "Query"
 msgstr "Dotaz"
 
@@ -2918,28 +2928,28 @@ msgstr "Dotaz"
 msgid "Error getting book view"
 msgstr "Chyba při získávání zobrazení knihy"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
-#: ../widgets/table/e-table-click-to-add.c:510
-#: ../widgets/table/e-table-selection-model.c:303
+#: ../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:821 ../widgets/text/e-text.c:3551
+#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3551
 #: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "Model"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Chyba při úpravě karty"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
 msgid "Name begins with"
 msgstr "Jméno začíná na"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:220
+#: ../addressbook/gui/widgets/e-addressbook-view.c:219
 msgid "Source"
 msgstr "Zdroj"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:234
+#: ../addressbook/gui/widgets/e-addressbook-view.c:233
 #: ../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
@@ -2947,96 +2957,90 @@ msgstr "Zdroj"
 msgid "Type"
 msgstr "Typ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:813
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:812
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1953
 msgid "Save as vCard..."
 msgstr "Uložit jako VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
-#: ../calendar/gui/dialogs/comp-editor.c:2032
-#: ../calendar/gui/e-calendar-table.c:1566
-#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:924
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
+#: ../calendar/gui/dialogs/comp-editor.c:2033
+#: ../calendar/gui/e-calendar-table.c:1573
+#: ../calendar/gui/e-calendar-view.c:1671 ../calendar/gui/e-memo-table.c:923
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Otevřít"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "_New Contact..."
 msgstr "_Nový kontakt..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
 msgid "New Contact _List..."
 msgstr "Nový _seznam kontaktů..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Save as vCard..."
 msgstr "_Uložit jako VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contact"
 msgstr "_Přeposlat kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "_Forward Contacts"
 msgstr "_Přeposlat kontakty"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contact"
 msgstr "Poslat kontaktu _zprávu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to List"
 msgstr "Poslat seznamu _zprávu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contacts"
 msgstr "Poslat kontaktům _zprávu"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "_Print"
 msgstr "_Tisknout"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Cop_y to Address Book..."
 msgstr "_Zkopírovat do adresáře..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "Mo_ve to Address Book..."
 msgstr "Př_esunout do adresáře..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Cu_t"
 msgstr "_Vyjmout"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/dialogs/comp-editor.c:479
-#: ../calendar/gui/e-calendar-table.c:1574
-#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:932
-#: ../composer/e-msg-composer.c:2058 ../mail/em-folder-tree.c:996
-#: ../mail/em-folder-view.c:1332 ../mail/message-list.c:2046
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:480
+#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-view.c:1678 ../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
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopírovat"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "P_aste"
 msgstr "V_ložit"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1517
-#: ../calendar/gui/cal-search-bar.c:618 ../calendar/gui/cal-search-bar.c:661
-#: ../calendar/gui/cal-search-bar.c:680
+#: ../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
 msgid "Any Category"
 msgstr "Jakákoliv kategorie"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1727
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
-msgid "Other error"
-msgstr "Jiná chyba"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
@@ -3171,14 +3175,14 @@ msgstr "Rádio"
 #: ../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:713
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
 msgid "Role"
 msgstr "Funkce"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 #: ../addressbook/gui/widgets/eab-contact-display.c:658
 msgid "Spouse"
-msgstr "Partner/-ka"
+msgstr "Partner(ka)"
 
 #. Translators: This is a vcard standard and stands for the type of
 #. phone used by the hearing impaired. TTY stands for "teletype"
@@ -3208,13 +3212,13 @@ msgstr "WWW stránka"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
+#: ../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:524
+#: ../widgets/table/e-table-click-to-add.c:523
 #: ../widgets/table/e-table-col.c:99
-#: ../widgets/table/e-table-field-chooser-item.c:655
+#: ../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-container.c:994
 #: ../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
@@ -3224,12 +3228,12 @@ msgstr "Šířka"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
+#: ../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:531
-#: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../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-container.c:987
 #: ../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
@@ -3258,12 +3262,11 @@ msgstr "Textový model"
 msgid "Max field name length"
 msgstr "Maximální délka názvu pole"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:137
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
 msgid "Column Width"
 msgstr "Šířka sloupce"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
-#, fuzzy
+#: ../addressbook/gui/widgets/e-minicard-view.c:178
 msgid ""
 "\n"
 "\n"
@@ -3271,9 +3274,9 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Hledat kontakt."
+"Hledat kontakt..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -3287,7 +3290,7 @@ msgstr ""
 "\n"
 "nebo dvakrát klikněte sem k vytvoření nového kontaktu."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3301,7 +3304,7 @@ msgstr ""
 "\n"
 "K vytvoření nového kontaktu dvakrát klikněte sem."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -3311,7 +3314,7 @@ msgstr ""
 "\n"
 "Hledat kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -3321,7 +3324,7 @@ msgstr ""
 "\n"
 "V tomto zobrazení nejsou viditelné žádné položky."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:523
+#: ../addressbook/gui/widgets/e-minicard-view.c:524
 msgid "Adapter"
 msgstr "Adaptér"
 
@@ -3346,16 +3349,16 @@ msgstr "Vybráno"
 msgid "Has Cursor"
 msgstr "Má kurzor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:627
 msgid "_Open Link in Browser"
 msgstr "_Otevřít odkaz v prohlížeči"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2810
+#: ../mail/em-folder-view.c:2795
 msgid "_Copy Link Location"
 msgstr "_Kopírovat umístění odkazu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:628
 msgid "_Send New Message To..."
 msgstr "_Odeslat novou zprávu..."
 
@@ -3399,23 +3402,22 @@ msgstr "Video chat"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:636
 #: ../calendar/gui/calendar-commands.c:92
-#: ../calendar/gui/calendar-component.c:806
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/gnome-cal.c:2376
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/gnome-cal.c:2451
 #: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:574
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
-#: ../plugins/hula-account-setup/camel-hula-listener.c:378
-#: ../plugins/hula-account-setup/camel-hula-listener.c:407
+#: ../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 "Kalendář"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:114
+#: ../calendar/gui/dialogs/event-editor.c:115
 msgid "Free/Busy"
 msgstr "Volno/obsazeno"
 
@@ -3437,13 +3439,13 @@ msgid "Web Log"
 msgstr "Weblog"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:656
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2352
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/e-calendar-view.c:2343
 #: ../calendar/gui/memotypes.xml.h:5 ../calendar/gui/tasktypes.xml.h:8
 msgid "Birthday"
 msgstr "Narozeniny"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:657
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2353
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-view.c:2344
 #: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:3
 msgid "Anniversary"
 msgstr "Výročí"
@@ -3513,10 +3515,10 @@ msgstr "Protokol není podporován"
 #: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:240
-#: ../calendar/gui/e-calendar-table.c:635 ../calendar/gui/print.c:2523
+#: ../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 "Zrušeno"
 
@@ -3527,7 +3529,7 @@ msgstr "Nemohu zrušit"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:71
-#: ../calendar/gui/comp-editor-factory.c:423
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Authentication Failed"
 msgstr "Autentizace selhala"
 
@@ -3552,120 +3554,134 @@ msgstr "Takový zdroj neexistuje"
 msgid "Not available in offline mode"
 msgstr "Není k dispozici v režimu off-line"
 
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
+msgid "Other error"
+msgstr "Jiná chyba"
+
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
 #: ../addressbook/gui/widgets/eab-gui-util.c:78
 msgid "Invalid server version"
 msgstr "Neplatná verze serveru"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
+#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
+#: ../addressbook/gui/widgets/eab-gui-util.c:79
+msgid "Unsupported authentication method"
+msgstr "Nepodporovaná metoda autentizace"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
-"We were unable to open this addressbook. This either means this book is not "
+"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 "
-"load the addressbook once in online mode to download its contents"
+"load the address book once in online mode to download its contents"
 msgstr ""
 "Nemohli jsme otevřít tento adresář. To buď znamená, že adresář není označen "
-"pro použivání off-line, nebo ještě nebyl stažen pro používání off-line. Pro "
+"pro používání off-line, nebo ještě nebyl stažen pro používání off-line. Pro "
 "načtení obsahu adresáře jej prosím načtěte jednou v režimu on-line"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:118
 #, c-format
 msgid ""
-"We were unable to open this addressbook.  Please check that the path %s "
+"We were unable to open this address book.  Please check that the path %s "
 "exists and that you have permission to access it."
 msgstr ""
 "Nemohli jsme otevřít tento adresář. Ověřte prosím, že cesta %s existuje a že "
 "máte oprávnění k němu přistupovat."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#: ../addressbook/gui/widgets/eab-gui-util.c:127
 msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
+"We were unable to open this address book.  This either means you have "
+"entered an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
-"Nemohu otevřít tento adresář. To znamená, že jste buď zadali nesprávné URI "
-"nebo že server LDAP není dostupný."
+"Nemohli jsme otevřít tento adresář. To znamená, že jste buď zadali nesprávné "
+"URI, nebo že server LDAP není dostupný."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
+#: ../addressbook/gui/widgets/eab-gui-util.c:133
 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 "
 "Evolution package."
 msgstr ""
 "Tato verze Evolution v sobě nemá zakompilovanou podporu LDAP. Pokud chcete "
-"LDAP v Evolution používat, nainstalovar balíček Evolution, ve kterém je "
-"povolen LDAP."
+"LDAP v Evolution používat, je nutné nainstalovat balíček Evolution, ve "
+"kterém je povolen LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
+"We were unable to open this address book.  This either means you have "
+"entered an incorrect URI, or the server is unreachable."
 msgstr ""
-"Nemohu otevřít tento adresář. To znamená, že jste buď zadali nesprávné URI "
-"nebo že server LDAP není dostupný."
+"Nemohli jsme otevřít tento adresář. To znamená, že jste buď zadali nesprávné "
+"URI, nebo že server LDAP není dostupný."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+msgid "Detailed error:"
+msgstr "Podrobnosti chyby:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
 "Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
+"the directory server preferences for this address book."
 msgstr ""
 "Dotazu odpovídá více karet, než je maximální počet nastavený\n"
 "na serveru, který může server vrátit, nebo než je maximální počet,\n"
-"který může Evolution zobrazit. Zkuste dotaz zadat přesněji nebo\n"
-"zvyšte omezení maximálního počtu vrácených karet v nastavení\n"
-"adresářového serveru pro tento adresář."
+"který může Evolution zobrazit. Zkuste dotaz zadat přesněji nebo zvyšte "
+"omezení maximálního počtu vrácených karet\n"
+"v nastavení adresářového serveru pro tento adresář."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
+"you have configured for this address book.  Please make your search\n"
 "more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
+"preferences for this address book."
 msgstr ""
 "Čas potřebný ke spuštění tohoto dotazu překročil omezení na serveru\n"
 "nebo limit nastavený pro tento adresář. Zkuste dotaz zadat přesněji\n"
 "nebo zvyšte časový limit v nastavení adresářového serveru pro tento\n"
 "adresář."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
-msgid "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
+msgid "The backend for this address book was unable to parse this query."
 msgstr "Obsluha tohoto adresáře nebyla schopna zpracovat tento dotaz."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:169
-msgid "The backend for this addressbook refused to perform this query."
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
+msgid "The backend for this address book refused to perform this query."
 msgstr "Obsluha tohoto adresáře odmítla provést tento dotaz."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
 msgid "This query did not complete successfully."
 msgstr "Tento dotaz nebyl úspěšně dokončen."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
 msgid "Error adding list"
 msgstr "Chyba při přidávání seznamu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:194
-#: ../addressbook/gui/widgets/eab-gui-util.c:670
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:687
 msgid "Error adding contact"
 msgstr "Chyba při přidávání kontaktu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying list"
 msgstr "Chyba při úpravě seznamu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:205
+#: ../addressbook/gui/widgets/eab-gui-util.c:222
 msgid "Error modifying contact"
 msgstr "Chyba při úpravě kontaktu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Error removing list"
 msgstr "Chyba při odstraňování seznamu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
-#: ../addressbook/gui/widgets/eab-gui-util.c:620
+#: ../addressbook/gui/widgets/eab-gui-util.c:234
+#: ../addressbook/gui/widgets/eab-gui-util.c:637
 msgid "Error removing contact"
 msgstr "Chyba při odstraňování kontaktu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:299
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3683,16 +3699,16 @@ msgstr[2] ""
 "Otevření %d kontaktů otevře také %d nových oken.\n"
 "Opravdu chcete zobrazit všechny tyto kontakty?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:307
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
 msgid "_Don't Display"
 msgstr "_Nezobrazovat"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:308
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
 msgid "Display _All Contacts"
 msgstr "Zobrazit _všechny kontakty"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:334
+#: ../addressbook/gui/widgets/eab-gui-util.c:351
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3702,15 +3718,15 @@ msgstr ""
 "\"%s již existuje.\n"
 "Chcete jej přepsat?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:338
+#: ../addressbook/gui/widgets/eab-gui-util.c:355
 msgid "Overwrite"
 msgstr "Přepsat"
 
 #. 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:379
-#: ../addressbook/gui/widgets/eab-gui-util.c:382
+#: ../addressbook/gui/widgets/eab-gui-util.c:396
+#: ../addressbook/gui/widgets/eab-gui-util.c:399
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "kontakt"
@@ -3718,55 +3734,55 @@ msgstr[1] "kontakty"
 msgstr[2] "kontaktů"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:465
+#: ../addressbook/gui/widgets/eab-gui-util.c:482
 msgid "Select Address Book"
 msgstr "Vybrat adresář"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:579
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "seznam"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Move contact to"
 msgstr "Přesunout kontakt do"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:733
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
 msgid "Copy contact to"
 msgstr "Kopírovat kontakt do"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Move contacts to"
 msgstr "Přesunout kontakty do"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:738
+#: ../addressbook/gui/widgets/eab-gui-util.c:755
 msgid "Copy contacts to"
 msgstr "Kopírovat kontakty do"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:883
+#: ../addressbook/gui/widgets/eab-gui-util.c:900
 msgid "Multiple vCards"
 msgstr "Více VCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:890
+#: ../addressbook/gui/widgets/eab-gui-util.c:907
 #, c-format
 msgid "vCard for %s"
 msgstr "VCard pro %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:902
-#: ../addressbook/gui/widgets/eab-gui-util.c:928
+#: ../addressbook/gui/widgets/eab-gui-util.c:919
+#: ../addressbook/gui/widgets/eab-gui-util.c:945
 #, c-format
 msgid "Contact information"
 msgstr "Informace o kontaktu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:930
+#: ../addressbook/gui/widgets/eab-gui-util.c:947
 #, c-format
 msgid "Contact information for %s"
 msgstr "Informace o kontaktu na %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:301
+#: ../addressbook/gui/widgets/eab-popup-control.c:293
 msgid "Querying Address Book..."
 msgstr "Hledám v adresáři..."
 
@@ -3788,14 +3804,14 @@ msgid "Show Compact vCard"
 msgstr "Zobrazit kompaktní VCard"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:284
-msgid "Save in addressbook"
+msgid "Save in address book"
 msgstr "Uložit do adresáře"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Zobrazení karty"
 
-#: ../addressbook/importers/evolution-csv-importer.c:658
+#: ../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
@@ -3803,27 +3819,27 @@ msgstr "Zobrazení karty"
 msgid "Importing..."
 msgstr "Importuji..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:860
+#: ../addressbook/importers/evolution-csv-importer.c:863
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV nebo Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:861
+#: ../addressbook/importers/evolution-csv-importer.c:864
 msgid "Outlook CSV and Tab Importer"
 msgstr "Importér Outlook CSV a Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:869
+#: ../addressbook/importers/evolution-csv-importer.c:872
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV nebo Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:870
+#: ../addressbook/importers/evolution-csv-importer.c:873
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Importér Mozilla CSV a Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:878
+#: ../addressbook/importers/evolution-csv-importer.c:881
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV nebo Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:879
+#: ../addressbook/importers/evolution-csv-importer.c:882
 msgid "Evolution CSV and Tab Importer"
 msgstr "Importér Evolution CVS a Tab"
 
@@ -3884,12 +3900,12 @@ msgid "Format"
 msgstr "Formát"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:432 ../widgets/table/e-table-click-to-add.c:503
+#: ../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:648
-#: ../widgets/table/e-table-field-chooser.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:310
+#: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Záhlaví"
 
@@ -3991,8 +4007,8 @@ msgstr "Stínování"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1055
-#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../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 "Velikost:"
@@ -4010,7 +4026,7 @@ msgid "Top:"
 msgstr "Nahoře:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:153
+#: ../calendar/gui/dialogs/calendar-setup.c:154
 msgid "Type:"
 msgstr "Typ:"
 
@@ -4022,36 +4038,36 @@ msgstr "šířka"
 msgid "_Font..."
 msgstr "_Písmo..."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:53
+#: ../addressbook/printing/test-contact-print-style-editor.c:54
 msgid "Contact Print Style Editor Test"
 msgstr "Test editoru kompaktního stylu tisku"
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:54
-#: ../addressbook/printing/test-print.c:44
+#: ../addressbook/printing/test-contact-print-style-editor.c:55
+#: ../addressbook/printing/test-print.c:45
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Copyright © 2000, Ximian, Inc."
 
-#: ../addressbook/printing/test-contact-print-style-editor.c:56
+#: ../addressbook/printing/test-contact-print-style-editor.c:57
 msgid "This should test the contact print style editor widget"
 msgstr "Toto by mělo otestovat widget editoru kompaktního stylu tisku"
 
-#: ../addressbook/printing/test-print.c:43
+#: ../addressbook/printing/test-print.c:44
 msgid "Contact Print Test"
 msgstr "Test tisku kontaktů"
 
-#: ../addressbook/printing/test-print.c:46
+#: ../addressbook/printing/test-print.c:47
 msgid "This should test the contact print code"
 msgstr "Toto by mělo otestovat kód tisknutí kontaktů"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:668
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
+#: ../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 "Nemohu otevřít soubor"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
-msgid "Couldn't get list of addressbooks"
-msgstr "Nemohu získat seznam adresářů"
+msgid "Couldn't get list of address books"
+msgstr "Nelze získat seznam adresářů"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
 msgid "failed to open book"
@@ -4066,7 +4082,7 @@ msgid "OUTPUTFILE"
 msgstr "SOUBORVÝSTUPU"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:53
-msgid "List local addressbook folders"
+msgid "List local address book folders"
 msgstr "Vypsat místní složky adresáře"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
@@ -4086,8 +4102,8 @@ msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr ""
-"Počet karet v jednom souboru výstupu v asynchronním režimu, implicitní "
-"velikost 100."
+"Počet karet v jednom souboru výstupu v asynchronním režimu, výchozí velikost "
+"100."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "NUMBER"
@@ -4122,16 +4138,17 @@ msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar from the side bar in the Calendar view."
 msgstr ""
+"'{0}' je kalendář pouze pro čtení a nemůže být změněn. Vyberte prosím jiný "
+"kalendář z postranního panelu v zobrazení kalendáře."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
-#, fuzzy
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
 msgstr ""
-"'{0}' je zdroj kalendáře pouze pro čtení. Přepněte na náhled kalendáře a "
-"zvýrazněte kalendář, který může přijmout události."
+"'{0}' je kalendář pouze pro čtení a nemůže být změněn. Vyberte prosím jiný "
+"kalendář, který může přijmout události."
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
@@ -4225,19 +4242,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Opravdu chcete odstranit tuto událost?"
 
 #: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:179
+#: ../calendar/gui/dialogs/delete-comp.c:178
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Opravdu chcete odstranit tuto schůzku?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:185
+#: ../calendar/gui/dialogs/delete-comp.c:184
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Opravdu chcete odstranit tuto poznámku?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:182
+#: ../calendar/gui/dialogs/delete-comp.c:181
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Opravdu chcete odstranit tento úkol?"
@@ -4259,9 +4276,8 @@ msgid "Cannot create a new event"
 msgstr "Nemohu vytvořit novou událost"
 
 #: ../calendar/calendar.error.xml.h:29
-#, fuzzy
 msgid "Cannot save event"
-msgstr "Nemohu vytvořit novou událost"
+msgstr "Nelze uložit událost"
 
 #: ../calendar/calendar.error.xml.h:30
 msgid "Delete calendar '{0}'?"
@@ -4395,9 +4411,8 @@ msgid "The calendar is not marked for offline usage."
 msgstr "Kalendář nebyl označen pro práci off-line."
 
 #: ../calendar/calendar.error.xml.h:54
-#, fuzzy
 msgid "The memo list is not marked for offline usage."
-msgstr "Tento seznam poznámek nebyl označen pro používání off-line"
+msgstr "Tento seznam poznámek není označen pro používání off-line."
 
 #: ../calendar/calendar.error.xml.h:55
 msgid "The task list is not marked for offline usage."
@@ -4488,11 +4503,11 @@ msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Vaše úkoly nebudou k dispozici, dokud nebude Evolution znovu spuštěna."
 
 #: ../calendar/calendar.error.xml.h:75
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Discard Changes"
 msgstr "Za_hodit změny"
 
-#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:500
+#: ../calendar/calendar.error.xml.h:76 ../composer/e-composer-actions.c:499
 msgid "_Save"
 msgstr "_Uložit"
 
@@ -4501,7 +4516,7 @@ msgid "_Save Changes"
 msgstr "_Uložit změny"
 
 #: ../calendar/calendar.error.xml.h:78
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
+#: ../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 "_Odeslat"
@@ -4544,7 +4559,7 @@ msgstr "Nemohu zapsat blok aplikace Poznámky pilota"
 
 #: ../calendar/conduits/todo/todo-conduit.c:240
 msgid "Default Priority:"
-msgstr "Implicitní priorita:"
+msgstr "Výchozí priorita:"
 
 #: ../calendar/conduits/todo/todo-conduit.c:1102
 #: ../calendar/conduits/todo/todo-conduit.c:1105
@@ -4557,12 +4572,13 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Nemohu zapsat blok aplikace ToDo pilota"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2359
+#: ../plugins/itip-formatter/itip-formatter.c:2358
 msgid "Calendar and Tasks"
 msgstr "Kalendář a úkoly"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1403
+#: ../calendar/gui/calendar-component.c:805
+#: ../calendar/gui/calendar-component.c:1402
 msgid "Calendars"
 msgstr "Kalendáře"
 
@@ -4603,25 +4619,25 @@ msgid "Memo_s"
 msgstr "P_oznámky"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1120
-#: ../calendar/gui/gnome-cal.c:1702 ../calendar/gui/memos-component.c:549
-#: ../calendar/gui/memos-component.c:1102 ../calendar/gui/memos-control.c:353
-#: ../calendar/gui/memos-control.c:369
+#: ../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 "Poznámky"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:696 ../calendar/gui/e-tasks.c:1429
-#: ../calendar/gui/gnome-cal.c:1574 ../calendar/gui/print.c:1966
-#: ../calendar/gui/tasks-component.c:540
-#: ../calendar/gui/tasks-component.c:1091 ../calendar/gui/tasks-control.c:492
+#: ../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:76
-#: ../plugins/exchange-operations/exchange-folder.c:586
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
+#: ../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 "Úkoly"
@@ -4639,20 +4655,21 @@ msgstr "Ú_koly"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Služba upozornění na alarm kalendáře Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:104
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuta"
 msgstr[1] "minuty"
 msgstr[2] "minut"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../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:402
+#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-contacts-source.c:329
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "hodina"
@@ -4670,10 +4687,10 @@ msgstr "Události"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
 #: ../calendar/gui/e-itip-control.c:1172
-#: ../plugins/itip-formatter/itip-view.c:1002
+#: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Místo:"
 
@@ -4682,14 +4699,14 @@ msgid "Snooze _time:"
 msgstr "_Doba odložení:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/comp-editor.c:1331
+#: ../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:167
 #: ../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:41
+#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Upravit"
@@ -4702,32 +4719,32 @@ msgstr "Od_ložit"
 msgid "location of appointment"
 msgstr "umístění události"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "Souhrn není k dispozici."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1465
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "Popis není dostupný."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1473
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "Informace o místě nejsou k dispozici."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1517
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1521
 #, c-format
 msgid "You have %d alarms"
 msgstr "Máte %d alarmů"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1677
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1705
-#: ../mail/mail-component.c:1585
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1683
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../mail/mail-component.c:1597
 msgid "Warning"
 msgstr "Varování"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1681
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1687
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4739,7 +4756,7 @@ msgstr ""
 "vytvořena k poslání e-mailu. Evolution namísto toho\n"
 "zobrazí dialogové okno pro běžnou připomínku."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1711
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4756,27 +4773,27 @@ msgstr ""
 "\n"
 "Opravdu chcete spustit tento program?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Do not ask me about this program again."
 msgstr "Příště se neptat na tento program."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:138
+#: ../calendar/gui/alarm-notify/notify-main.c:141
 msgid "Could not initialize Bonobo"
 msgstr "Nemohu inicializovat Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:151
+#: ../calendar/gui/alarm-notify/notify-main.c:154
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
 msgstr "Nemohu vytvořit továrnu ke službě hlášení alarmu, možná už běží..."
 
-#: ../calendar/gui/alarm-notify/util.c:41
+#: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "neplatný čas"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:404
-#: ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:404
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4785,8 +4802,8 @@ msgstr[1] "%d hodiny"
 msgstr[2] "%d hodin"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:410
-#: ../calendar/gui/misc.c:119
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:410
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4797,8 +4814,8 @@ msgstr[2] "%d minut"
 #. 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:76 ../calendar/gui/e-alarm-list.c:416
-#: ../calendar/gui/misc.c:123
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -4832,8 +4849,7 @@ msgstr "Kalendáře, pro které spouštět alarmy"
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
-"Barva, kterou kreslit čáru Marca Bainse v liště času (prázdné pro "
-"implicitní)."
+"Barva, kterou kreslit čáru Marca Bainse v liště času (prázdné pro výchozí)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
 msgid "Color to draw the Marcus Bains line in the Day View."
@@ -4853,15 +4869,15 @@ msgstr "Dny, kdy má být označen začátek a konec pracovní doby."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Default appointment reminder"
-msgstr "Implicitní připomínka události"
+msgstr "Výchozí připomínka události"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Default reminder units"
-msgstr "Implicitní jednotka připomínky"
+msgstr "Výchozí jednotka připomínky"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default reminder value"
-msgstr "Implicitní hodnota připomínky"
+msgstr "Výchozí hodnota připomínky"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Directory for saving alarm audio files"
@@ -4885,7 +4901,7 @@ msgstr "Šablona URL volno/obsazeno"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Gradient of the events in calendar views."
-msgstr "Přechod událostí v pohledech na kalendář."
+msgstr "Přechod událostí v zobrazeních kalendáře."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
@@ -4955,7 +4971,7 @@ msgstr "Umístění svislého panelu v zobrazení měsíce"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Number of units for determining a default reminder."
-msgstr "Počet jednotek pro implicitní připomínku."
+msgstr "Počet jednotek pro výchozí připomínku."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Number of units for determining when to hide tasks."
@@ -5046,12 +5062,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Zobrazovat pole stavu v editoru události/úkolu/schůzky"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Show the \"Preview\" pane"
 msgstr "Zobrazovat panel \"Náhled\""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Show the \"Preview\" pane."
 msgstr "Zobrazovat panel \"Náhled\"."
 
@@ -5081,15 +5097,15 @@ msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
 msgstr ""
-"Šablona URL, kterou používat jako implicitní data volno/obsazeno, %u je "
-"nahrazeno uživatelskou částí e-mailové adresy a %d je nahrazeno doménou."
+"Šablona URL, kterou používat jako data volno/obsazeno, %u je nahrazeno "
+"uživatelskou částí e-mailové adresy a %d je nahrazeno doménou."
 
 #: ../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\"."
 msgstr ""
-"Implicitní časové pásmo, kterou používat pro data a časy v kalendáři, jako "
+"Výchozí časové pásmo, které se má používat pro data a časy v kalendáři, jako "
 "nepřeložené umístění z Olsenovy databáze časových pásem, např. \"America/New "
 "York\"."
 
@@ -5102,7 +5118,7 @@ msgid "Time the last alarm ran, in time_t."
 msgstr "Čas, kdy běžel poslední alarm, v time_t."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:108
+#: ../plugins/startup-wizard/startup-wizard.c:107
 msgid "Timezone"
 msgstr "Časové pásmo"
 
@@ -5111,7 +5127,7 @@ msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
 msgstr ""
-"Půhlednost událostí v pohledech na kalendář, hodnota mezi 0 (průhledné) a 1 "
+"Průhlednost událostí v zobrazení kalendáře, hodnota mezi 0 (průhledné) a 1 "
 "(neprůhledné)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
@@ -5120,7 +5136,7 @@ msgstr "Dvacetičtyřhodinový formát času"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "Jednotky implicitní připomínky, \"minutes\", \"hours\" nebo \"days\"."
+msgstr "Jednotky výchozí připomínky, \"minutes\", \"hours\" nebo \"days\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid ""
@@ -5235,56 +5251,56 @@ msgstr "Minuta začátku pracovního dne"
 msgid "daylight savings time"
 msgstr "letní čas"
 
-#: ../calendar/gui/cal-search-bar.c:72
+#: ../calendar/gui/cal-search-bar.c:71
 msgid "Summary contains"
 msgstr "Přehled obsahuje"
 
-#: ../calendar/gui/cal-search-bar.c:73
+#: ../calendar/gui/cal-search-bar.c:72
 msgid "Description contains"
 msgstr "Popis obsahuje"
 
-#: ../calendar/gui/cal-search-bar.c:74
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Category is"
 msgstr "Kategorie je"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Comment contains"
 msgstr "Komentář obsahuje"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Location contains"
 msgstr "Umístění obsahuje"
 
-#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
-#: ../calendar/gui/cal-search-bar.c:684
+#: ../calendar/gui/cal-search-bar.c:629 ../calendar/gui/cal-search-bar.c:672
+#: ../calendar/gui/cal-search-bar.c:691
 msgid "Unmatched"
 msgstr "Nepřiřazené"
 
-#: ../calendar/gui/cal-search-bar.c:630
+#: ../calendar/gui/cal-search-bar.c:637
 msgid "Next 7 Days' Tasks"
 msgstr "Úkoly v příštích 7 dnech"
 
-#: ../calendar/gui/cal-search-bar.c:634
+#: ../calendar/gui/cal-search-bar.c:641
 msgid "Active Tasks"
 msgstr "Aktivní úkol"
 
-#: ../calendar/gui/cal-search-bar.c:638
+#: ../calendar/gui/cal-search-bar.c:645
 msgid "Overdue Tasks"
 msgstr "Úkoly ve zpoždění"
 
-#: ../calendar/gui/cal-search-bar.c:642
+#: ../calendar/gui/cal-search-bar.c:649
 msgid "Completed Tasks"
 msgstr "Dokončené úkoly"
 
-#: ../calendar/gui/cal-search-bar.c:646
+#: ../calendar/gui/cal-search-bar.c:653
 msgid "Tasks with Attachments"
 msgstr "Úkoly s přílohami"
 
-#: ../calendar/gui/cal-search-bar.c:692
+#: ../calendar/gui/cal-search-bar.c:699
 msgid "Active Appointments"
 msgstr "Aktivní události"
 
-#: ../calendar/gui/cal-search-bar.c:696
+#: ../calendar/gui/cal-search-bar.c:703
 msgid "Next 7 Days' Appointments"
 msgstr "Události v následujících 7 dnech"
 
@@ -5311,7 +5327,8 @@ msgstr "Vyčistit události starší než"
 #: ../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:403
+#: ../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 "dnů"
@@ -5320,55 +5337,47 @@ msgstr "dnů"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:274
-#: ../calendar/gui/memos-component.c:236 ../calendar/gui/migration.c:505
+#: ../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:232
+#: ../calendar/gui/tasks-component.c:231
 msgid "On The Web"
 msgstr "Na WWW"
 
-#: ../calendar/gui/calendar-component.c:311 ../calendar/gui/migration.c:399
+#: ../calendar/gui/calendar-component.c:310 ../calendar/gui/migration.c:399
 msgid "Birthdays & Anniversaries"
 msgstr "Narozeniny a výročí"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:324
+#: ../calendar/gui/calendar-component.c:323
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "Počasí"
 
-#: ../calendar/gui/calendar-component.c:616
+#: ../calendar/gui/calendar-component.c:615
 msgid "_New Calendar"
 msgstr "_Nový kalendář"
 
-#: ../calendar/gui/calendar-component.c:617
-#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
-#: ../mail/em-folder-tree.c:2090
+#: ../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 "_Kopírovat..."
 
-#: ../calendar/gui/calendar-component.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:2034
-#: ../calendar/gui/memos-component.c:472 ../calendar/gui/tasks-component.c:463
-#: ../composer/e-msg-composer.c:1047 ../mail/em-folder-tree.c:2104
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "_Vlastnosti"
-
-#: ../calendar/gui/calendar-component.c:950
+#: ../calendar/gui/calendar-component.c:949
 msgid "Failed upgrading calendars."
 msgstr "Nemohu aktualizovat kalendáře."
 
-#: ../calendar/gui/calendar-component.c:1249
+#: ../calendar/gui/calendar-component.c:1248
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Nemohu otevřít kalendář '%s' pro tvorbu událostí a schůzek"
 
-#: ../calendar/gui/calendar-component.c:1265
+#: ../calendar/gui/calendar-component.c:1264
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Není k dispozici kalendář pro tvorbu událostí a schůzek"
 
-#: ../calendar/gui/calendar-component.c:1378
+#: ../calendar/gui/calendar-component.c:1377
 msgid "Calendar Source Selector"
 msgstr "Výběr zdroje kalendáře"
 
@@ -5377,6 +5386,7 @@ msgid "New appointment"
 msgstr "Nová událost"
 
 #: ../calendar/gui/calendar-component.c:1597
+msgctxt "New"
 msgid "_Appointment"
 msgstr "_Událost"
 
@@ -5389,6 +5399,7 @@ msgid "New meeting"
 msgstr "Nová schůzka"
 
 #: ../calendar/gui/calendar-component.c:1605
+msgctxt "New"
 msgid "M_eeting"
 msgstr "_Schůzka"
 
@@ -5401,6 +5412,7 @@ msgid "New all day appointment"
 msgstr "Nová celodenní událost"
 
 #: ../calendar/gui/calendar-component.c:1613
+msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Celodenní událost"
 
@@ -5413,6 +5425,7 @@ msgid "New calendar"
 msgstr "Nový kalendář"
 
 #: ../calendar/gui/calendar-component.c:1621
+msgctxt "New"
 msgid "Cale_ndar"
 msgstr "_Kalendář"
 
@@ -5420,27 +5433,26 @@ msgstr "_Kalendář"
 msgid "Create a new calendar"
 msgstr "Vytvořit nový kalendář"
 
-#: ../calendar/gui/calendar-view-factory.c:109
+#: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
 msgstr "Zobrazení dne"
 
-#: ../calendar/gui/calendar-view-factory.c:112
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Work Week View"
 msgstr "Zobrazení pracovního týdne"
 
-#: ../calendar/gui/calendar-view-factory.c:115
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Week View"
 msgstr "Zobrazení týdne"
 
-#: ../calendar/gui/calendar-view-factory.c:118
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Month View"
 msgstr "Zobrazení měsíce"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#, fuzzy
 msgid "Any Field"
-msgstr "Pole"
+msgstr "Libovolné pole"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/memotypes.xml.h:4
 #: ../calendar/gui/tasktypes.xml.h:6 ../mail/em-filter-i18n.h:5
@@ -5455,15 +5467,13 @@ msgstr "Účastník"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:6
 #: ../calendar/gui/tasktypes.xml.h:9
-#, fuzzy
 msgid "Business"
-msgstr "Fax - práce"
+msgstr "Práce"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:11
-#, fuzzy
 msgid "Category"
-msgstr "Kategorie je"
+msgstr "Kategorie"
 
 #: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
 #: ../widgets/misc/e-send-options.glade.h:6
@@ -5472,19 +5482,18 @@ msgstr "Klasifikace"
 
 #: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
 #: ../calendar/gui/tasktypes.xml.h:12
-#, fuzzy
 msgid "Competition"
-msgstr "Datum dokončení"
+msgstr "Soutěž"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:255
-#: ../calendar/gui/e-cal-model.c:329 ../calendar/gui/e-calendar-table.c:539
+#: ../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 "Důvěrné"
 
 #: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:11
 #: ../calendar/gui/tasktypes.xml.h:14
-#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../plugins/plugin-manager/plugin-manager.c:59
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "Popis"
@@ -5506,65 +5515,57 @@ msgstr "Existují"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:15
 #: ../calendar/gui/tasktypes.xml.h:18
-#, fuzzy
 msgid "Favourites"
-msgstr "Mauricius"
+msgstr "Oblíbené"
 
 #: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:16
 #: ../calendar/gui/tasktypes.xml.h:19
 msgid "Gifts"
-msgstr ""
+msgstr "Dary"
 
 #: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:17
 #: ../calendar/gui/tasktypes.xml.h:20
 msgid "Goals/Objectives"
-msgstr ""
+msgstr "Cíle/plány"
 
 #: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:18
 #: ../calendar/gui/tasktypes.xml.h:22
-#, fuzzy
 msgid "Holiday"
-msgstr "Dnes"
+msgstr "Dovolená"
 
 #: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:23
 msgid "Holiday Cards"
-msgstr ""
+msgstr "Blahopřání"
 
 #: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:20
 #: ../calendar/gui/tasktypes.xml.h:24
-#, fuzzy
 msgid "Hot Contacts"
-msgstr "Kontakty"
+msgstr "Důležité kontakty"
 
 #: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:21
 #: ../calendar/gui/tasktypes.xml.h:25
-#, fuzzy
 msgid "Ideas"
-msgstr "dnů"
+msgstr "Nápady"
 
 #: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:22
 #: ../calendar/gui/tasktypes.xml.h:27
-#, fuzzy
 msgid "International"
-msgstr "tradiční"
+msgstr "Mezinárodní"
 
 #: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:23
 #: ../calendar/gui/tasktypes.xml.h:28
-#, fuzzy
 msgid "Key Customer"
-msgstr "Přizpůsobit"
+msgstr "Klíčový zákazník"
 
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:24
 #: ../calendar/gui/tasktypes.xml.h:30
-#, fuzzy
 msgid "Miscellaneous"
 msgstr "Různé"
 
 #: ../calendar/gui/caltypes.xml.h:27 ../calendar/gui/tasktypes.xml.h:31
-#, fuzzy
 msgid "Next 7 days"
-msgstr "Úkoly v příštích 7 dnech"
+msgstr "Příštích 7 dnů"
 
 #: ../calendar/gui/caltypes.xml.h:28
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
@@ -5574,24 +5575,23 @@ msgstr "Organizátor"
 
 #: ../calendar/gui/caltypes.xml.h:30 ../calendar/gui/memotypes.xml.h:28
 #: ../calendar/gui/tasktypes.xml.h:36
-#, fuzzy
 msgid "Phone Calls"
-msgstr "Telefon"
+msgstr "Telefonní hovory"
 
-#: ../calendar/gui/caltypes.xml.h:31 ../calendar/gui/e-cal-list-view.c:254
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-calendar-table.c:538
+#: ../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 "Soukromé"
 
-#: ../calendar/gui/caltypes.xml.h:32 ../calendar/gui/e-cal-list-view.c:253
-#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:537 ../calendar/gui/memotypes.xml.h:30
+#: ../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 "Veřejné"
 
 #: ../calendar/gui/caltypes.xml.h:33
-#: ../calendar/gui/dialogs/event-editor.c:298
+#: ../calendar/gui/dialogs/event-editor.c:299
 msgid "Recurrence"
 msgstr "Opakování"
 
@@ -5606,16 +5606,15 @@ msgstr "Stav"
 
 #: ../calendar/gui/caltypes.xml.h:35 ../calendar/gui/memotypes.xml.h:32
 #: ../calendar/gui/tasktypes.xml.h:39
-#, fuzzy
 msgid "Strategies"
-msgstr "Kategorie"
+msgstr "Strategie"
 
 #: ../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 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../calendar/gui/tasktypes.xml.h:40
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "Summary"
 msgstr "Přehled"
 
@@ -5626,25 +5625,23 @@ msgstr "Přehled obsahuje"
 
 #: ../calendar/gui/caltypes.xml.h:38 ../calendar/gui/memotypes.xml.h:35
 #: ../calendar/gui/tasktypes.xml.h:42
-#, fuzzy
 msgid "Suppliers"
-msgstr "Odpovědi"
+msgstr "Dodavatelé"
 
 #: ../calendar/gui/caltypes.xml.h:39 ../calendar/gui/memotypes.xml.h:36
 #: ../calendar/gui/tasktypes.xml.h:43
 msgid "Time &amp; Expenses"
-msgstr ""
+msgstr "Čas a výdaje"
 
 #: ../calendar/gui/caltypes.xml.h:40 ../calendar/gui/memotypes.xml.h:37
 #: ../calendar/gui/tasktypes.xml.h:45
 msgid "VIP"
-msgstr ""
+msgstr "VIP"
 
 #: ../calendar/gui/caltypes.xml.h:41 ../calendar/gui/memotypes.xml.h:38
 #: ../calendar/gui/tasktypes.xml.h:46
-#, fuzzy
 msgid "Waiting"
-msgstr "Čekám..."
+msgstr "Čekám"
 
 #: ../calendar/gui/caltypes.xml.h:42 ../calendar/gui/memotypes.xml.h:39
 #: ../calendar/gui/tasktypes.xml.h:47 ../mail/em-filter-i18n.h:10
@@ -5666,23 +5663,23 @@ msgstr "je"
 msgid "is not"
 msgstr "není"
 
-#: ../calendar/gui/comp-editor-factory.c:405
+#: ../calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Chyba při otevírání kalendáře"
 
-#: ../calendar/gui/comp-editor-factory.c:411
+#: ../calendar/gui/comp-editor-factory.c:415
 msgid "Method not supported when opening the calendar"
 msgstr "Metoda nepodporována při otevírání kalendáře"
 
-#: ../calendar/gui/comp-editor-factory.c:417
+#: ../calendar/gui/comp-editor-factory.c:421
 msgid "Permission denied to open the calendar"
 msgstr "Přístup zamítnut při otevírání kalendáře"
 
-#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1288
+#: ../calendar/gui/comp-editor-factory.c:433 ../shell/e-shell.c:1308
 msgid "Unknown error"
 msgstr "Neznámá chyba"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:602
+#: ../calendar/gui/dialogs/alarm-dialog.c:601
 msgid "Edit Alarm"
 msgstr "Upravit alarm"
 
@@ -5786,7 +5783,6 @@ msgid "hour(s)"
 msgstr "hodin"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: ../plugins/google-account-setup/google-contacts-source.c:242
 msgid "minute(s)"
 msgstr "minut"
 
@@ -5794,7 +5790,7 @@ msgstr "minut"
 msgid "start of appointment"
 msgstr "začátkem (začátku) události"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "Akce/spuštění"
 
@@ -5808,12 +5804,12 @@ msgstr "_Přidat"
 msgid "Alarms"
 msgstr "Alarmy"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:84
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:82
 #: ../composer/e-composer-actions.c:64
 msgid "_Suggest automatic display of attachment"
 msgstr "_Navrhnout automatické zobrazovaní příloh"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:150
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:143
 msgid "Attach file(s)"
 msgstr "Připojit soubory"
 
@@ -5849,7 +5845,7 @@ msgstr "<span weight=\"bold\">Výstrahy</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgstr "<span weight=\"bold\">Implicitní volný/obsazený server</span>"
+msgstr "<span weight=\"bold\">Výchozí volný/obsazený server</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #: ../mail/mail-config.glade.h:17
@@ -5922,7 +5918,7 @@ msgstr ""
 "Neděle"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pick a color"
 msgstr "Vyberte barvu"
 
@@ -5975,7 +5971,7 @@ msgid "Thursday"
 msgstr "čtvrtek"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "Časové pás_mo:"
 
@@ -6069,135 +6065,132 @@ msgstr "_stř"
 msgid "before every appointment"
 msgstr "před každou událostí"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:269
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Z_kopírovat obsah kalendáře lokálně pro práci při odpojení"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:271
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "Z_kopírovat obsah seznamu úkolů lokálně pro práci při odpojení"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:273
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Z_kopírovat obsah seznamu poznámek lokálně pro práci při odpojení"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
-#, fuzzy
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
 msgstr "_Barva:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "Seznam úkolů"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "Seznam poznámek"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:474
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "Vlastnosti kalendáře"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:474
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "Nový kalendář"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:530
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "Vlastnosti seznamů úkolů"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:530
-#, fuzzy
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "New Task List"
-msgstr "_Nový seznam úkolů"
+msgstr "Nový seznam úkolů"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:586
-#, fuzzy
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "Memo List Properties"
-msgstr "Vlastnosti seznamů úkolů"
+msgstr "Vlastnosti seznamu poznámek"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:586
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "Nový seznam poznámek"
 
-#: ../calendar/gui/dialogs/changed-comp.c:58
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Tato událost byla odstraněna."
 
-#: ../calendar/gui/dialogs/changed-comp.c:62
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Tento úkol byl odstraněn."
 
-#: ../calendar/gui/dialogs/changed-comp.c:66
+#: ../calendar/gui/dialogs/changed-comp.c:68
 msgid "This memo has been deleted."
 msgstr "Tato poznámka byla odstraněna."
 
-#: ../calendar/gui/dialogs/changed-comp.c:75
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s Provedli jste změny. Opominout tyto změny a zavřít editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Neprovedli jste žádné změny. Zavřít editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:82
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Tato událost byla změněna."
 
-#: ../calendar/gui/dialogs/changed-comp.c:86
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Tento úkol byl změněn."
 
-#: ../calendar/gui/dialogs/changed-comp.c:90
+#: ../calendar/gui/dialogs/changed-comp.c:92
 msgid "This memo has been changed."
 msgstr "Tato poznámka byla změněna."
 
-#: ../calendar/gui/dialogs/changed-comp.c:99
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s Provedli jste změny. Opominout tyto změny a aktualizovat editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Neprovedli jste změny, aktualizovat editor?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:443
+#: ../calendar/gui/dialogs/comp-editor-page.c:448
 #, c-format
 msgid "Validation error: %s"
 msgstr "Chyba ověření: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:182 ../calendar/gui/print.c:2340
+#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2358
 msgid " to "
 msgstr " do "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2344
+#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2362
 msgid " (Completed "
 msgstr " (Dokončený "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2346
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2364
 msgid "Completed "
 msgstr "Dokončený "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2351
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2369
 msgid " (Due "
 msgstr " (Termín dokončení "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2371
 msgid "Due "
 msgstr "Termín dokončení "
 
-#: ../calendar/gui/dialogs/comp-editor.c:231
+#: ../calendar/gui/dialogs/comp-editor.c:232
 #, c-format
 msgid "Attached message - %s"
 msgstr "Připojená zpráva - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:236
-#: ../calendar/gui/dialogs/comp-editor.c:409 ../composer/e-msg-composer.c:1772
-#: ../composer/e-msg-composer.c:1991
+#: ../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
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
@@ -6205,217 +6198,211 @@ msgstr[0] "Připojená zpráva"
 msgstr[1] "%d připojené zprávy"
 msgstr[2] "%d připojených zpráv"
 
-#: ../calendar/gui/dialogs/comp-editor.c:480 ../composer/e-msg-composer.c:2059
-#: ../mail/em-folder-tree.c:997 ../mail/em-folder-utils.c:366
-#: ../mail/em-folder-view.c:1193 ../mail/message-list.c:2047
+#: ../calendar/gui/dialogs/comp-editor.c:481 ../composer/e-msg-composer.c:2056
+#: ../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 "_Přesunout"
 
-#: ../calendar/gui/dialogs/comp-editor.c:482 ../composer/e-msg-composer.c:2061
-#: ../mail/em-folder-tree.c:999 ../mail/message-list.c:2049
+#: ../calendar/gui/dialogs/comp-editor.c:483 ../composer/e-msg-composer.c:2058
+#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2047
 msgid "Cancel _Drag"
 msgstr "Zrušit _tažení"
 
-#: ../calendar/gui/dialogs/comp-editor.c:615
-#: ../calendar/gui/dialogs/comp-editor.c:3253 ../mail/em-utils.c:371
-#: ../plugins/prefer-plain/prefer-plain.c:74
+#: ../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 "příloha"
 
-#: ../calendar/gui/dialogs/comp-editor.c:841
+#: ../calendar/gui/dialogs/comp-editor.c:842
 msgid "Could not update object"
 msgstr "Nemohu aktualizovat objekt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:929
+#: ../calendar/gui/dialogs/comp-editor.c:930
 msgid "Edit Appointment"
 msgstr "Upravit událost"
 
-#: ../calendar/gui/dialogs/comp-editor.c:936
+#: ../calendar/gui/dialogs/comp-editor.c:937
 #, c-format
 msgid "Meeting - %s"
 msgstr "Schůzka - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:939
 #, c-format
 msgid "Appointment - %s"
 msgstr "Událost - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:944
+#: ../calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Přidělený úkol - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946
+#: ../calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Task - %s"
 msgstr "Úkol - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:951
+#: ../calendar/gui/dialogs/comp-editor.c:952
 #, c-format
 msgid "Memo - %s"
 msgstr "Poznámka - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:967
-#, fuzzy
+#: ../calendar/gui/dialogs/comp-editor.c:968
 msgid "No Summary"
-msgstr "Není shrnutí"
+msgstr "Žádné shrnutí"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1261
+#: ../calendar/gui/dialogs/comp-editor.c:1262
 msgid "Click here to close the current window"
 msgstr "Kliknutím zde uzavřete aktuální okno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1268
+#: ../calendar/gui/dialogs/comp-editor.c:1269
 msgid "Copy selected text to the clipboard"
 msgstr "Kopírovat vybraný text do schránky"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1275
+#: ../calendar/gui/dialogs/comp-editor.c:1276
 msgid "Cut selected text to the clipboard"
 msgstr "Vyjmout vybraný text do schránky"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1282
+#: ../calendar/gui/dialogs/comp-editor.c:1283
 msgid "Click here to view help available"
 msgstr "Kliknutím zde zobrazíte dostupnou nápovědu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1289
+#: ../calendar/gui/dialogs/comp-editor.c:1290
 msgid "Paste text from the clipboard"
 msgstr "Vložit text ze schránky"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1310
+#: ../calendar/gui/dialogs/comp-editor.c:1311
 msgid "Click here to save the current window"
 msgstr "Kliknutím sem uložíte aktuální okno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1317
+#: ../calendar/gui/dialogs/comp-editor.c:1318
 msgid "Select all text"
 msgstr "Vybrat všechen text"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1324
+#: ../calendar/gui/dialogs/comp-editor.c:1325
 msgid "_Classification"
 msgstr "Klasi_fikace"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1338
+#: ../calendar/gui/dialogs/comp-editor.c:1339
 #: ../mail/mail-signature-editor.c:208
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:42
+#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Soubor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1345
-#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:45
+#: ../calendar/gui/dialogs/comp-editor.c:1346
+#: ../ui/evolution-mail-global.xml.h:24 ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "Nápo_věda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1352
-#, fuzzy
+#: ../calendar/gui/dialogs/comp-editor.c:1353
 msgid "_Insert"
 msgstr "_Vložit"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1359
+#: ../calendar/gui/dialogs/comp-editor.c:1360
 msgid "_Options"
 msgstr "V_olby"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1366 ../mail/em-folder-tree.c:2082
+#: ../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:54
+#: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_Zobrazit"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1376
-#: ../composer/e-composer-actions.c:472
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:471
 msgid "_Attachment..."
 msgstr "_Přílohu..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1378
+#: ../calendar/gui/dialogs/comp-editor.c:1379
 msgid "Click here to attach a file"
 msgstr "Kliknutím zde vyberete soubor pro přílohu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1386
+#: ../calendar/gui/dialogs/comp-editor.c:1387
 msgid "_Categories"
 msgstr "_Kategorie"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1388
+#: ../calendar/gui/dialogs/comp-editor.c:1389
 msgid "Toggles whether to display categories"
 msgstr "Přepne zobrazení kategorií"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1394
+#: ../calendar/gui/dialogs/comp-editor.c:1395
 msgid "Time _Zone"
 msgstr "Časové pás_mo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1397
 msgid "Toggles whether the time zone is displayed"
 msgstr "Přepne zobrazení pole pro časovou zónu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1405
+#: ../calendar/gui/dialogs/comp-editor.c:1406
 msgid "Pu_blic"
 msgstr "Veř_ejné"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1407
+#: ../calendar/gui/dialogs/comp-editor.c:1408
 msgid "Classify as public"
 msgstr "Zařadit mezi veřejné"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
+#: ../calendar/gui/dialogs/comp-editor.c:1413
 msgid "_Private"
 msgstr "Soukro_mé"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1414
-#, fuzzy
+#: ../calendar/gui/dialogs/comp-editor.c:1415
 msgid "Classify as private"
 msgstr "Zařadit mezi soukromé"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1419
+#: ../calendar/gui/dialogs/comp-editor.c:1420
 msgid "_Confidential"
 msgstr "_Důvěrné"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1421
-#, fuzzy
+#: ../calendar/gui/dialogs/comp-editor.c:1422
 msgid "Classify as confidential"
 msgstr "Zařadit mezi důvěrné"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "R_ole Field"
 msgstr "S_loupce Funkce"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1431
+#: ../calendar/gui/dialogs/comp-editor.c:1432
 msgid "Toggles whether the Role field is displayed"
 msgstr "Přepne zobrazení pole pro funkce"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1438
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1440
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Přepne zobrazení pole RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1446
 msgid "_Status Field"
 msgstr "Sloupe_c Stav"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1448
 msgid "Toggles whether the Status field is displayed"
 msgstr "Přepne zobrazení pole stavu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1453
+#: ../calendar/gui/dialogs/comp-editor.c:1454
 msgid "_Type Field"
 msgstr "Sloupec T_yp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1455
-#, fuzzy
+#: ../calendar/gui/dialogs/comp-editor.c:1456
 msgid "Toggles whether the Attendee Type is displayed"
-msgstr "Přepne zobrazení pole účastníka"
+msgstr "Přepíná, zda se má typ účastníka zobrazovat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1765
-#: ../widgets/misc/e-attachment-bar.c:1381
-#, fuzzy
-msgid "Recent Docu_ments"
-msgstr "Dokončeno procent"
+#: ../calendar/gui/dialogs/comp-editor.c:1766
+#: ../composer/e-composer-private.c:65 ../widgets/misc/e-attachment-bar.c:1381
+msgid "Recent _Documents"
+msgstr "_Nedávné dokumenty"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1784
-#: ../composer/e-composer-actions.c:700
+#: ../calendar/gui/dialogs/comp-editor.c:1785
+#: ../composer/e-composer-actions.c:699
 msgid "Attach"
 msgstr "Příloha"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1879
+#: ../calendar/gui/dialogs/comp-editor.c:1880
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -6423,112 +6410,112 @@ msgstr[0] "<b>%d</b> příloha"
 msgstr[1] "<b>%d</b> přílohy"
 msgstr[2] "<b>%d</b> příloh"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1911
+#: ../calendar/gui/dialogs/comp-editor.c:1912
 msgid "Hide Attachment _Bar"
 msgstr "Skrýt lištu _příloh"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1914
-#: ../calendar/gui/dialogs/comp-editor.c:2222
+#: ../calendar/gui/dialogs/comp-editor.c:1915
+#: ../calendar/gui/dialogs/comp-editor.c:2223
 msgid "Show Attachment _Bar"
 msgstr "_Zobrazit lištu příloh"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2033
-#: ../calendar/gui/dialogs/event-page.c:1872
-#: ../calendar/gui/dialogs/task-page.c:1193 ../composer/e-msg-composer.c:1046
+#: ../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
 #: ../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 "_Odstranit"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2036
-#: ../composer/e-msg-composer.c:1049
+#: ../calendar/gui/dialogs/comp-editor.c:2037
+#: ../composer/e-msg-composer.c:1046
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Add attachment..."
 msgstr "_Přidat přílohu..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2244
-#: ../mail/em-format-html-display.c:2196
+#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../mail/em-format-html-display.c:2201
 msgid "Show Attachments"
 msgstr "Zobrazit přílohy"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2245
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 msgid "Press space key to toggle attachment bar"
 msgstr "Přepne lištu příloh stisknutím klávesy mezery"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2394
-#: ../calendar/gui/dialogs/comp-editor.c:2441
-#: ../calendar/gui/dialogs/comp-editor.c:3286
+#: ../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 ""
 "Změny provedené v této položce mohou být ztraceny, pokud dorazí aktualizace"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3315
+#: ../calendar/gui/dialogs/comp-editor.c:3311
 msgid "Unable to use current version!"
 msgstr "Nemohu používat aktuální verzi!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:60
+#: ../calendar/gui/dialogs/copy-source-dialog.c:64
 msgid "Could not open source"
 msgstr "Nemohu otevřít zdroj"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:68
+#: ../calendar/gui/dialogs/copy-source-dialog.c:72
 msgid "Could not open destination"
 msgstr "Nemohu otevřít cíl"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:77
+#: ../calendar/gui/dialogs/copy-source-dialog.c:81
 msgid "Destination is read only"
 msgstr "Cíl je jen pro čtení"
 
-#: ../calendar/gui/dialogs/delete-comp.c:202
+#: ../calendar/gui/dialogs/delete-comp.c:201
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "S_mazat tuto položku ve všech ostatních poštovních schránkách příjemce?"
 
-#: ../calendar/gui/dialogs/delete-error.c:53
+#: ../calendar/gui/dialogs/delete-error.c:56
 msgid "The event could not be deleted due to a corba error"
 msgstr "Událost nemohla být odstraněna kvůli chybě corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:56
+#: ../calendar/gui/dialogs/delete-error.c:59
 msgid "The task could not be deleted due to a corba error"
 msgstr "Úkol nemohl být odstraněn kvůli chybě corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:59
+#: ../calendar/gui/dialogs/delete-error.c:62
 msgid "The memo could not be deleted due to a corba error"
 msgstr "Poznámka nemohla být odstraněna kvůli chybě corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:62
+#: ../calendar/gui/dialogs/delete-error.c:65
 msgid "The item could not be deleted due to a corba error"
 msgstr "Položka nemohla být odstraněna kvůli chybě corba"
 
-#: ../calendar/gui/dialogs/delete-error.c:69
+#: ../calendar/gui/dialogs/delete-error.c:72
 msgid "The event could not be deleted because permission was denied"
 msgstr "Událost nemohla být odstraněna, protože přístup byl zamítnut"
 
-#: ../calendar/gui/dialogs/delete-error.c:72
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The task could not be deleted because permission was denied"
 msgstr "Úkol nemohl být odstraněn, protože přístup byl zamítnut"
 
-#: ../calendar/gui/dialogs/delete-error.c:75
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Poznámka nemohla být odstraněna, protože přístup byl zamítnut"
 
-#: ../calendar/gui/dialogs/delete-error.c:78
+#: ../calendar/gui/dialogs/delete-error.c:81
 msgid "The item could not be deleted because permission was denied"
 msgstr "Položka nemohla být odstraněna, protože přístup byl zamítnut"
 
-#: ../calendar/gui/dialogs/delete-error.c:85
+#: ../calendar/gui/dialogs/delete-error.c:88
 msgid "The event could not be deleted due to an error"
 msgstr "Událost nemohla být odstraněna kvůli chybě"
 
-#: ../calendar/gui/dialogs/delete-error.c:88
+#: ../calendar/gui/dialogs/delete-error.c:91
 msgid "The task could not be deleted due to an error"
 msgstr "Úkol nemohl být odstraněn kvůli chybě"
 
-#: ../calendar/gui/dialogs/delete-error.c:91
+#: ../calendar/gui/dialogs/delete-error.c:94
 msgid "The memo could not be deleted due to an error"
 msgstr "Poznámka nemohla být odstraněna kvůli chybě"
 
-#: ../calendar/gui/dialogs/delete-error.c:94
+#: ../calendar/gui/dialogs/delete-error.c:97
 msgid "The item could not be deleted due to an error"
 msgstr "Položka nemohla být odstraněna kvůli chybě"
 
@@ -6537,7 +6524,7 @@ msgid "Contacts..."
 msgstr "Kontakty..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:415
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To:"
 msgstr "Postoupit komu:"
 
@@ -6545,143 +6532,142 @@ msgstr "Postoupit komu:"
 msgid "Enter Delegate"
 msgstr "Zapsat postoupení"
 
-#: ../calendar/gui/dialogs/event-editor.c:195
+#: ../calendar/gui/dialogs/event-editor.c:196
 msgid "_Alarms"
 msgstr "_Alarmy"
 
-#: ../calendar/gui/dialogs/event-editor.c:197
+#: ../calendar/gui/dialogs/event-editor.c:198
 msgid "Click here to set or unset alarms for this event"
 msgstr "Kliknutím sem nastavíte nebo zrušíte alarmy pro tuto událost"
 
-#: ../calendar/gui/dialogs/event-editor.c:202
+#: ../calendar/gui/dialogs/event-editor.c:203
 msgid "_Recurrence"
 msgstr "Opaková_ní"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "Make this a recurring event"
 msgstr "Vytvoří opakující se událost"
 
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../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 "Možnosti odesílání"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/task-editor.c:125
 msgid "Insert advanced send options"
 msgstr "Vložit pokročilé možnosti odesílání"
 
-#: ../calendar/gui/dialogs/event-editor.c:219
+#: ../calendar/gui/dialogs/event-editor.c:220
 msgid "All _Day Event"
 msgstr "Celo_denní událost"
 
-#: ../calendar/gui/dialogs/event-editor.c:221
+#: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Toggles whether to have All Day Event"
 msgstr "Přepne událost na celodenní"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
-#, fuzzy
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Show Time as _Busy"
 msgstr "Zobrazovat čas jako _obsazený"
 
-#: ../calendar/gui/dialogs/event-editor.c:229
+#: ../calendar/gui/dialogs/event-editor.c:230
 msgid "Toggles whether to show time as busy"
 msgstr "Přepne čas jako obsazený"
 
-#: ../calendar/gui/dialogs/event-editor.c:238
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "_Free/Busy"
 msgstr "V_olno/obsazeno"
 
-#: ../calendar/gui/dialogs/event-editor.c:240
+#: ../calendar/gui/dialogs/event-editor.c:241
 msgid "Query free / busy information for the attendees"
 msgstr "Informace o volném/obsazeném čase pro tuto schůzku"
 
-#: ../calendar/gui/dialogs/event-editor.c:295
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "_Událost"
 
-#: ../calendar/gui/dialogs/event-page.c:732
-#: ../calendar/gui/dialogs/event-page.c:2715
+#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Tato událost má nastaveny alarmy"
 
-#: ../calendar/gui/dialogs/event-page.c:795
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.c:794
+#: ../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 "_Organizátor:"
 
-#: ../calendar/gui/dialogs/event-page.c:841
+#: ../calendar/gui/dialogs/event-page.c:840
 msgid "_Delegatees"
 msgstr "_Delegáti"
 
-#: ../calendar/gui/dialogs/event-page.c:843
+#: ../calendar/gui/dialogs/event-page.c:842
 msgid "Atte_ndees"
 msgstr "Úča_stníci"
 
-#: ../calendar/gui/dialogs/event-page.c:1027
+#: ../calendar/gui/dialogs/event-page.c:1026
 msgid "Event with no start date"
 msgstr "Událost bez počátečního data"
 
-#: ../calendar/gui/dialogs/event-page.c:1030
+#: ../calendar/gui/dialogs/event-page.c:1029
 msgid "Event with no end date"
 msgstr "Událost bez konečného data"
 
-#: ../calendar/gui/dialogs/event-page.c:1199
+#: ../calendar/gui/dialogs/event-page.c:1198
 #: ../calendar/gui/dialogs/memo-page.c:636
 #: ../calendar/gui/dialogs/task-page.c:808
 msgid "Start date is wrong"
 msgstr "Počáteční datum je chybné"
 
-#: ../calendar/gui/dialogs/event-page.c:1209
+#: ../calendar/gui/dialogs/event-page.c:1208
 msgid "End date is wrong"
 msgstr "Konečné datum je chybné"
 
-#: ../calendar/gui/dialogs/event-page.c:1232
+#: ../calendar/gui/dialogs/event-page.c:1231
 msgid "Start time is wrong"
 msgstr "Počáteční čas je chybný"
 
-#: ../calendar/gui/dialogs/event-page.c:1239
+#: ../calendar/gui/dialogs/event-page.c:1238
 msgid "End time is wrong"
 msgstr "Konečný čas je chybný"
 
-#: ../calendar/gui/dialogs/event-page.c:1402
+#: ../calendar/gui/dialogs/event-page.c:1401
 #: ../calendar/gui/dialogs/memo-page.c:677
 #: ../calendar/gui/dialogs/task-page.c:868
 msgid "The organizer selected no longer has an account."
 msgstr "Vybraný organizátor už nemá účet."
 
-#: ../calendar/gui/dialogs/event-page.c:1408
+#: ../calendar/gui/dialogs/event-page.c:1407
 #: ../calendar/gui/dialogs/memo-page.c:683
 #: ../calendar/gui/dialogs/task-page.c:874
 msgid "An organizer is required."
 msgstr "Je požadován organizátor."
 
-#: ../calendar/gui/dialogs/event-page.c:1433
+#: ../calendar/gui/dialogs/event-page.c:1432
 #: ../calendar/gui/dialogs/task-page.c:898
 msgid "At least one attendee is required."
 msgstr "Je požadován alespoň jeden účastník."
 
-#: ../calendar/gui/dialogs/event-page.c:1873
+#: ../calendar/gui/dialogs/event-page.c:1872
 #: ../calendar/gui/dialogs/task-page.c:1194
 msgid "_Add "
 msgstr "Př_idat "
 
-#: ../calendar/gui/dialogs/event-page.c:2591
+#: ../calendar/gui/dialogs/event-page.c:2590
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nemohu otevřít kalendář '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/event-page.c:2634
 #: ../calendar/gui/dialogs/memo-page.c:886
 #: ../calendar/gui/dialogs/task-page.c:1793
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Jednáte v zastoupení %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2915
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -6689,7 +6675,7 @@ msgstr[0] "%d den před událostí"
 msgstr[1] "%d dny před událostí"
 msgstr[2] "%d dnů před událostí"
 
-#: ../calendar/gui/dialogs/event-page.c:2921
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6697,7 +6683,7 @@ msgstr[0] "%d hodinu před událostí"
 msgstr[1] "%d hodiny před událostí"
 msgstr[2] "%d hodin před událostí"
 
-#: ../calendar/gui/dialogs/event-page.c:2927
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -6705,25 +6691,25 @@ msgstr[0] "%d minutu před událostí"
 msgstr[1] "%d minuty před událostí"
 msgstr[2] "%d minut před událostí"
 
-#: ../calendar/gui/dialogs/event-page.c:2940
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "Přizpůsobit"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2945
+#: ../calendar/gui/dialogs/event-page.c:2944
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:669
-#: ../calendar/gui/e-itip-control.c:1158 ../filter/filter-rule.c:943
-#: ../mail/em-account-editor.c:685 ../mail/em-account-editor.c:1409
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:94
+#: ../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:193
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2022
-#: ../widgets/misc/e-cell-date-edit.c:307 ../widgets/misc/e-dateedit.c:1517
+#: ../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:69
+#: ../widgets/misc/e-signature-combo-box.c:70
 msgid "None"
 msgstr "žádný"
 
@@ -6748,23 +6734,25 @@ msgid "Custom Alarm:"
 msgstr "Vlastní alarm:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-msgid "D_escription:"
-msgstr "_Popis:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Popis události"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../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 "_Shrnutí:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../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 "_Popis:"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "Ča_s:"
@@ -6800,7 +6788,7 @@ msgstr "Ko_ntakty..."
 msgid "Organizer:"
 msgstr "Organizátor:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2448
+#: ../calendar/gui/dialogs/memo-editor.c:141 ../calendar/gui/print.c:2478
 msgid "Memo"
 msgstr "Poznámka"
 
@@ -6811,7 +6799,7 @@ msgstr "Nemohu otevřít poznámky v '%s'."
 
 #: ../calendar/gui/dialogs/memo-page.c:1002 ../mail/em-format-html.c:1562
 #: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "Komu"
@@ -6825,49 +6813,45 @@ msgstr "_Začátek:"
 msgid "T_o:"
 msgstr "_Komu:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "_Popis:"
-
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
 #: ../calendar/gui/dialogs/task-page.c:360
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Skupina:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:50
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Měníte opakující se událost. Co chcete změnit?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Delegujete opakující se událost. Co chcete delegovat?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Měníte opakující se úkol. Co chcete změnit?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Měníte opakující se poznámku. Co chcete změnit?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:85
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This Instance Only"
 msgstr "Jen tuto instanci"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:93
 msgid "This and Prior Instances"
 msgstr "Tuto a předchozí instance"
 
-#: ../calendar/gui/dialogs/recur-comp.c:95
+#: ../calendar/gui/dialogs/recur-comp.c:99
 msgid "This and Future Instances"
 msgstr "Tuto a budoucí instance"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:104
 msgid "All Instances"
 msgstr "Všechny instance"
 
@@ -7042,12 +7026,12 @@ msgstr "týdnů"
 msgid "year(s)"
 msgstr "let"
 
-#: ../calendar/gui/dialogs/task-details-page.c:373
-#: ../calendar/gui/dialogs/task-details-page.c:393
+#: ../calendar/gui/dialogs/task-details-page.c:377
+#: ../calendar/gui/dialogs/task-details-page.c:397
 msgid "Completed date is wrong"
 msgstr "Čas dokončení je chybný"
 
-#: ../calendar/gui/dialogs/task-details-page.c:478
+#: ../calendar/gui/dialogs/task-details-page.c:482
 msgid "Web Page"
 msgstr "WWW stránka"
 
@@ -7063,53 +7047,53 @@ msgstr "<span weight=\"bold\">Stav</span>"
 #. 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:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:238
-#: ../calendar/gui/e-calendar-table.c:634 ../calendar/gui/e-itip-control.c:946
+#: ../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:2520 ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/print.c:2554 ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Completed"
 msgstr "Dokončeno"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:272
-#: ../calendar/gui/e-calendar-table.c:559 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1065
 msgid "High"
 msgstr "Vysoká"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:356
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-cal-model-tasks.c:750
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:633 ../calendar/gui/print.c:2517
+#: ../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 "Probíhá"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:276
-#: ../calendar/gui/e-calendar-table.c:561 ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/message-list.c:1062
+#: ../calendar/gui/e-calendar-table.c:568 ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/message-list.c:1063
 msgid "Low"
 msgstr "Nízká"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:560
-#: ../calendar/gui/tasktypes.xml.h:32 ../mail/message-list.c:1063
+#: ../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
 msgid "Normal"
 msgstr "Normální"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
 #: ../calendar/gui/e-cal-component-preview.c:260
-#: ../calendar/gui/e-cal-model-tasks.c:354
-#: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:632 ../calendar/gui/print.c:2514
+#: ../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 "Nezačato"
@@ -7123,7 +7107,7 @@ msgid "Stat_us:"
 msgstr "_Stav:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:562 ../calendar/gui/tasktypes.xml.h:44
+#: ../calendar/gui/e-calendar-table.c:569 ../calendar/gui/tasktypes.xml.h:44
 msgid "Undefined"
 msgstr "Nedefinováno"
 
@@ -7140,26 +7124,24 @@ msgstr "_Naléhavost:"
 msgid "_Web Page:"
 msgstr "_WWW stránka:"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:113
 msgid "_Status Details"
 msgstr "Podrobno_sti o úkolu"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
-#, fuzzy
+#: ../calendar/gui/dialogs/task-editor.c:115
 msgid "Click to change or view the status details of the task"
-msgstr "Kliknutím změníte / zobrazíte stav úkolu"
+msgstr "Kliknutím změníte nebo zobrazíte detaily stavu úkolu"
 
-#: ../calendar/gui/dialogs/task-editor.c:122
-#: ../composer/e-composer-actions.c:528
+#: ../calendar/gui/dialogs/task-editor.c:123
+#: ../composer/e-composer-actions.c:527
 msgid "_Send Options"
 msgstr "Možno_sti odesílání"
 
-#: ../calendar/gui/dialogs/task-editor.c:317
-#: ../calendar/gui/tasks-component.c:1326
+#: ../calendar/gui/dialogs/task-editor.c:318
 msgid "_Task"
 msgstr "Ú_kol"
 
-#: ../calendar/gui/dialogs/task-editor.c:320
+#: ../calendar/gui/dialogs/task-editor.c:321
 msgid "Task Details"
 msgstr "Podrobnosti úkolů"
 
@@ -7186,17 +7168,13 @@ msgid "Categor_ies..."
 msgstr "Kat_egorie..."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "De_scription:"
-msgstr "_Popis:"
+msgid "D_ue date:"
+msgstr "_Termín dokončení:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Časové pásmo:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-msgid "_Due date:"
-msgstr "_Termín dokončení:"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:392
 #, c-format
@@ -7276,13 +7254,13 @@ msgid "%s for an unknown trigger type"
 msgstr "%s pro neznámý typ spouštění"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:75
-#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3330
+#: ../calendar/gui/e-cal-component-preview.c:73 ../mail/em-folder-view.c:3315
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknutím sem otevřete %s"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:135
-#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:856
+#: ../calendar/gui/e-cal-component-preview.c:177 ../filter/filter-rule.c:857
 msgid "Untitled"
 msgstr "Bez názvu"
 
@@ -7320,7 +7298,7 @@ msgstr "Termín dokončení:"
 #: ../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:1027
+#: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Stav:"
 
@@ -7337,18 +7315,18 @@ msgstr "Konečné datum"
 msgid "Start Date"
 msgstr "Začátek"
 
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:611
+#: ../calendar/gui/e-cal-model-calendar.c:187
+#: ../calendar/gui/e-calendar-table.c:618
 msgid "Free"
 msgstr "Volný"
 
-#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:612
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../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 "Obsazený"
 
-#: ../calendar/gui/e-cal-model-tasks.c:623
+#: ../calendar/gui/e-cal-model-tasks.c:627
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7358,7 +7336,7 @@ msgstr ""
 "\"\\n\"\n"
 "\"45.436845,125.862501\""
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
+#: ../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
@@ -7366,7 +7344,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Ano"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
+#: ../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
@@ -7374,212 +7352,209 @@ msgid "No"
 msgstr "Ne"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:105
-#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:177
+#: ../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:969
-#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1340
-#: ../plugins/itip-formatter/itip-formatter.c:410
-#: ../plugins/itip-formatter/itip-formatter.c:2047
-#: ../plugins/plugin-manager/plugin-manager.c:73
+#: ../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:55
+#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Neznámá"
 
-#: ../calendar/gui/e-cal-model.c:968
+#: ../calendar/gui/e-cal-model.c:987
 msgid "Recurring"
 msgstr "Opakovaný"
 
-#: ../calendar/gui/e-cal-model.c:970
+#: ../calendar/gui/e-cal-model.c:989
 msgid "Assigned"
 msgstr "Přiřazeno"
 
-#: ../calendar/gui/e-cal-popup.c:183 ../mail/em-popup.c:417
+#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:416
 msgid "Save As..."
 msgstr "Uložit jako..."
 
-#: ../calendar/gui/e-cal-popup.c:199 ../mail/em-format-html-display.c:2030
+#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2035
 msgid "Select folder to save selected attachments..."
 msgstr "Zvolte adresář pro uložení vybraných příloh..."
 
-#: ../calendar/gui/e-cal-popup.c:231 ../mail/em-popup.c:445
+#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:444
 #, c-format
 msgid "untitled_image.%s"
 msgstr "nepojmenovany_obrazek.%s"
 
-#: ../calendar/gui/e-cal-popup.c:285 ../calendar/gui/e-calendar-table.c:1568
-#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
-#: ../mail/em-folder-view.c:1343 ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1575
+#: ../calendar/gui/e-calendar-view.c:1672 ../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 "_Uložit jako..."
 
-#: ../calendar/gui/e-cal-popup.c:286 ../mail/em-popup.c:563
-#: ../mail/em-popup.c:574
+#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:562
+#: ../mail/em-popup.c:573
 msgid "Set as _Background"
 msgstr "Nastavit jako _pozadí"
 
-#: ../calendar/gui/e-cal-popup.c:287
+#: ../calendar/gui/e-cal-popup.c:288
 msgid "_Save Selected"
 msgstr "_Uložit vybrané"
 
-#: ../calendar/gui/e-cal-popup.c:434 ../mail/em-popup.c:838
+#: ../calendar/gui/e-cal-popup.c:429 ../mail/em-popup.c:831
 #, c-format
 msgid "Open in %s..."
 msgstr "Otevřít v %s..."
 
-#: ../calendar/gui/e-calendar-table.c:330
-#, fuzzy
+#: ../calendar/gui/e-calendar-table.c:337
 msgid "* No Summary *"
-msgstr "Není shrnutí"
+msgstr "* Žádné shrnutí *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:366
-#: ../calendar/gui/e-calendar-view.c:2224
+#: ../calendar/gui/e-calendar-table.c:373
+#: ../calendar/gui/e-calendar-view.c:2215
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizátor: %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:369
-#: ../calendar/gui/e-calendar-view.c:2228
+#: ../calendar/gui/e-calendar-table.c:376
+#: ../calendar/gui/e-calendar-view.c:2219
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizátor: %s"
 
-#: ../calendar/gui/e-calendar-table.c:400
-#, fuzzy
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "Start: "
-msgstr "Začátek"
+msgstr "Začátek: "
 
-#: ../calendar/gui/e-calendar-table.c:412
-#, fuzzy
+#: ../calendar/gui/e-calendar-table.c:419
 msgid "Due: "
-msgstr "Termín dokončení "
+msgstr "Dokončení: "
 
-#: ../calendar/gui/e-calendar-table.c:581
+#: ../calendar/gui/e-calendar-table.c:588
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:582
+#: ../calendar/gui/e-calendar-table.c:589
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:583
+#: ../calendar/gui/e-calendar-table.c:590
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:584
+#: ../calendar/gui/e-calendar-table.c:591
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:585
+#: ../calendar/gui/e-calendar-table.c:592
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:586
+#: ../calendar/gui/e-calendar-table.c:593
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:587
+#: ../calendar/gui/e-calendar-table.c:594
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:588
+#: ../calendar/gui/e-calendar-table.c:595
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:589
+#: ../calendar/gui/e-calendar-table.c:596
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:590
+#: ../calendar/gui/e-calendar-table.c:597
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:591
+#: ../calendar/gui/e-calendar-table.c:598
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:871
-#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:439
+#: ../calendar/gui/e-calendar-table.c:878
+#: ../calendar/gui/e-calendar-view.c:665 ../calendar/gui/e-memo-table.c:438
 msgid "Deleting selected objects"
 msgstr "Odstraňuji vybrané objekty"
 
-#: ../calendar/gui/e-calendar-table.c:1155
-#: ../calendar/gui/e-calendar-view.c:804 ../calendar/gui/e-memo-table.c:645
+#: ../calendar/gui/e-calendar-table.c:1162
+#: ../calendar/gui/e-calendar-view.c:795 ../calendar/gui/e-memo-table.c:644
 msgid "Updating objects"
 msgstr "Aktualizuji objekty"
 
-#: ../calendar/gui/e-calendar-table.c:1340
-#: ../calendar/gui/e-calendar-view.c:1230 ../calendar/gui/e-memo-table.c:821
-#: ../composer/e-composer-actions.c:278
+#: ../calendar/gui/e-calendar-table.c:1347
+#: ../calendar/gui/e-calendar-view.c:1221 ../calendar/gui/e-memo-table.c:820
+#: ../composer/e-composer-actions.c:277
 msgid "Save as..."
 msgstr "Uložit jako..."
 
-#: ../calendar/gui/e-calendar-table.c:1563
-#: ../calendar/gui/e-calendar-view.c:1663
+#: ../calendar/gui/e-calendar-table.c:1570
+#: ../calendar/gui/e-calendar-view.c:1654
 msgid "New _Task"
 msgstr "Nový ú_kol"
 
-#: ../calendar/gui/e-calendar-table.c:1567 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-table.c:1574 ../calendar/gui/e-memo-table.c:924
 msgid "Open _Web Page"
 msgstr "Otevřít _WWW stránku"
 
-#: ../calendar/gui/e-calendar-table.c:1569
-#: ../calendar/gui/e-calendar-view.c:1666 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1576
+#: ../calendar/gui/e-calendar-view.c:1657 ../calendar/gui/e-memo-table.c:926
 msgid "P_rint..."
 msgstr "_Tisknout..."
 
-#: ../calendar/gui/e-calendar-table.c:1573
-#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1580
+#: ../calendar/gui/e-calendar-view.c:1677 ../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 "_Vyjmout"
 
-#: ../calendar/gui/e-calendar-table.c:1575
-#: ../calendar/gui/e-calendar-view.c:1669
-#: ../calendar/gui/e-calendar-view.c:1688 ../calendar/gui/e-memo-table.c:933
+#: ../calendar/gui/e-calendar-table.c:1582
+#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1679 ../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 "V_ložit"
 
-#: ../calendar/gui/e-calendar-table.c:1579 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1586 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "Př_edat úkol"
 
-#: ../calendar/gui/e-calendar-table.c:1580 ../calendar/gui/e-memo-table.c:937
+#: ../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 "_Odeslat jako iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1581
+#: ../calendar/gui/e-calendar-table.c:1588
 msgid "_Mark as Complete"
 msgstr "Označit jako _dokončené"
 
-#: ../calendar/gui/e-calendar-table.c:1582
+#: ../calendar/gui/e-calendar-table.c:1589
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Označit _vybrané úkoly jako dokončené"
 
-#: ../calendar/gui/e-calendar-table.c:1583
+#: ../calendar/gui/e-calendar-table.c:1590
 msgid "_Mark as Incomplete"
 msgstr "Označit jako _nedokončené"
 
-#: ../calendar/gui/e-calendar-table.c:1584
+#: ../calendar/gui/e-calendar-table.c:1591
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "Označit _vybrané úkoly jako nedokončené"
 
-#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-table.c:1596
 msgid "_Delete Selected Tasks"
 msgstr "_Odstranit vybrané úkoly"
 
-#: ../calendar/gui/e-calendar-table.c:1826
+#: ../calendar/gui/e-calendar-table.c:1833
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Úkol přidáte kliknutím zde"
@@ -7603,7 +7578,7 @@ msgstr "Termín dokončení"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
 #: ../calendar/gui/tasktypes.xml.h:37
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Priority"
 msgstr "Naléhavost"
 
@@ -7611,108 +7586,108 @@ msgstr "Naléhavost"
 msgid "Start date"
 msgstr "Začátek"
 
-#: ../calendar/gui/e-calendar-view.c:1349
+#: ../calendar/gui/e-calendar-view.c:1340
 msgid "Moving items"
 msgstr "Přesunuji položky"
 
-#: ../calendar/gui/e-calendar-view.c:1351
+#: ../calendar/gui/e-calendar-view.c:1342
 msgid "Copying items"
 msgstr "Kopíruji položky"
 
-#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1651
 msgid "New _Appointment..."
 msgstr "Nová _událost..."
 
-#: ../calendar/gui/e-calendar-view.c:1661
+#: ../calendar/gui/e-calendar-view.c:1652
 msgid "New All Day _Event"
 msgstr "Nová _celodenní událost"
 
-#: ../calendar/gui/e-calendar-view.c:1662
+#: ../calendar/gui/e-calendar-view.c:1653
 msgid "New _Meeting"
 msgstr "Nová _schůzka"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1673
+#: ../calendar/gui/e-calendar-view.c:1664
 msgid "_Current View"
 msgstr "_Aktuální zobrazení"
 
-#: ../calendar/gui/e-calendar-view.c:1675
+#: ../calendar/gui/e-calendar-view.c:1666
 msgid "Select T_oday"
 msgstr "Vybrat _dnešek"
 
-#: ../calendar/gui/e-calendar-view.c:1676
+#: ../calendar/gui/e-calendar-view.c:1667
 msgid "_Select Date..."
 msgstr "_Vybrat datum..."
 
-#: ../calendar/gui/e-calendar-view.c:1682
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "Pri_nt..."
 msgstr "_Tisknout..."
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1683
 msgid "Cop_y to Calendar..."
 msgstr "_Kopírovat do kalendáře..."
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1684
 msgid "Mo_ve to Calendar..."
 msgstr "Pře_sunout do kalendáře..."
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1685
 msgid "_Delegate Meeting..."
 msgstr "_Delegovat schůzku..."
 
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1686
 msgid "_Schedule Meeting..."
 msgstr "_Naplánovat schůzku..."
 
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1687
 msgid "_Forward as iCalendar..."
 msgstr "_Odeslat jako iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1688
 msgid "_Reply"
 msgstr "_Odpovědět"
 
-#: ../calendar/gui/e-calendar-view.c:1698 ../mail/em-folder-view.c:1337
-#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
+#: ../calendar/gui/e-calendar-view.c:1689 ../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 "Odpovědět _všem"
 
-#: ../calendar/gui/e-calendar-view.c:1703
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Make this Occurrence _Movable"
 msgstr "Učinit tento výskyt _přesouvatelným"
 
-#: ../calendar/gui/e-calendar-view.c:1704 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1695 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Odstranit tento vý_skyt"
 
-#: ../calendar/gui/e-calendar-view.c:1705
+#: ../calendar/gui/e-calendar-view.c:1696
 msgid "Delete _All Occurrences"
 msgstr "Odstranit _všechny výskyty"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2244 ../calendar/gui/print.c:2477
+#: ../calendar/gui/e-calendar-view.c:2235 ../calendar/gui/print.c:2510
 #, c-format
 msgid "Location: %s"
 msgstr "Místo: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2278
+#: ../calendar/gui/e-calendar-view.c:2269
 #, c-format
 msgid "Time: %s %s"
 msgstr "Datum: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:116
+#: ../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:119
+#: ../calendar/gui/e-cell-date-edit-text.c:114
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:127
+#: ../calendar/gui/e-cell-date-edit-text.c:122
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7725,7 +7700,7 @@ 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:589
+#: ../calendar/gui/e-day-view-time-item.c:583
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i rozdělení minuty"
@@ -7736,20 +7711,20 @@ msgstr "%02i rozdělení minuty"
 #. 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:1523
-#: ../calendar/gui/e-week-view-main-item.c:331 ../calendar/gui/print.c:1656
+#: ../calendar/gui/e-day-view-top-item.c:852 ../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:767 ../calendar/gui/e-week-view.c:505
-#: ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:806 ../calendar/gui/e-week-view.c:542
+#: ../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:770 ../calendar/gui/e-week-view.c:508
-#: ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:809 ../calendar/gui/e-week-view.c:545
+#: ../calendar/gui/print.c:833
 msgid "pm"
 msgstr "pm"
 
@@ -7836,7 +7811,7 @@ msgid "Ends"
 msgstr "Končí"
 
 #: ../calendar/gui/e-itip-control.c:961
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "Termín dokončení"
 
@@ -7851,12 +7826,12 @@ msgstr "Chyba iCalendar"
 
 #: ../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:346
+#: ../plugins/itip-formatter/itip-view.c:432
 #: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:520
 #: ../plugins/itip-formatter/itip-view.c:521
-#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "Neznámá osoba"
 
@@ -7873,12 +7848,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:2035
+#: ../plugins/itip-formatter/itip-formatter.c:2034
 msgid "Accepted"
 msgstr "Akceptováno"
 
 #: ../calendar/gui/e-itip-control.c:1195 ../calendar/gui/itip-utils.c:667
-#: ../plugins/itip-formatter/itip-formatter.c:2038
+#: ../plugins/itip-formatter/itip-formatter.c:2037
 msgid "Tentatively Accepted"
 msgstr "Předběžně akceptováno"
 
@@ -7886,7 +7861,7 @@ msgstr "Předběžně akceptováno"
 #: ../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:2041
+#: ../plugins/itip-formatter/itip-formatter.c:2040
 msgid "Declined"
 msgstr "Zamítnuto"
 
@@ -8011,7 +7986,7 @@ msgstr "<b>%s</b> si přeje získat nejnovější informace o úkolu."
 
 #: ../calendar/gui/e-itip-control.c:1462
 msgid "Task Update Request"
-msgstr "Požadavek na aktualizaci úkolu."
+msgstr "Požadavek na aktualizaci úkolu"
 
 #: ../calendar/gui/e-itip-control.c:1469
 #, c-format
@@ -8105,7 +8080,7 @@ msgid "Attendee status updated\n"
 msgstr "Stav účastníka byl zaktualizován\n"
 
 #: ../calendar/gui/e-itip-control.c:2080
-#: ../plugins/itip-formatter/itip-formatter.c:1254
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Stav účastníka nemůže být aktualizován, protože položka již neexistuje"
 
@@ -8126,7 +8101,7 @@ msgid "Update"
 msgstr "Zaktualizovat"
 
 #: ../calendar/gui/e-itip-control.c:2355
-#: ../plugins/groupwise-features/process-meeting.c:48
+#: ../plugins/groupwise-features/process-meeting.c:51
 msgid "Accept"
 msgstr "Akceptovat"
 
@@ -8135,7 +8110,7 @@ msgid "Tentatively accept"
 msgstr "Předběžně akceptovat"
 
 #: ../calendar/gui/e-itip-control.c:2357
-#: ../plugins/groupwise-features/process-meeting.c:50
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Decline"
 msgstr "Odmítnout"
 
@@ -8202,49 +8177,49 @@ msgstr "Účastníci"
 
 #: ../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:965
+#: ../calendar/gui/e-meeting-store.c:740 ../calendar/gui/print.c:983
 msgid "Individual"
 msgstr "Jednotlivec"
 
 #: ../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:966 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/print.c:984 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Skupina"
 
 #: ../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:967
+#: ../calendar/gui/print.c:985
 msgid "Resource"
 msgstr "Zdroj"
 
 #: ../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:968
+#: ../calendar/gui/print.c:986
 msgid "Room"
 msgstr "Místnost"
 
 #: ../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:982
+#: ../calendar/gui/print.c:1000
 msgid "Chair"
 msgstr "Předseda"
 
 #: ../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:983
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:1001
 msgid "Required Participant"
 msgstr "Vyžadovaný účastník"
 
 #: ../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:984
+#: ../calendar/gui/print.c:1002
 msgid "Optional Participant"
 msgstr "Nepovinný účastník"
 
 #: ../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:985
+#: ../calendar/gui/print.c:1003
 msgid "Non-Participant"
 msgstr "Bez účasti"
 
@@ -8256,14 +8231,14 @@ msgstr "Potřeba akce"
 
 #: ../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:397
+#: ../calendar/gui/e-meeting-time-sel.c:395
 msgid "Tentative"
 msgstr "Předběžné"
 
 #: ../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:2044
+#: ../plugins/itip-formatter/itip-formatter.c:2043
 msgid "Delegated"
 msgstr "Delegováno"
 
@@ -8284,8 +8259,8 @@ msgstr "Probíhá"
 
 #. 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:473
-#: ../calendar/gui/e-meeting-time-sel.c:2122
+#: ../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"
 
@@ -8293,78 +8268,78 @@ 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:477
-#: ../calendar/gui/e-meeting-time-sel.c:2153
+#: ../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:481
+#: ../calendar/gui/e-meeting-time-sel-item.c:475
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-meeting-time-sel.c:397
 msgid "Out of Office"
 msgstr "Mimo kancelář"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:398
 msgid "No Information"
 msgstr "Žádné informace"
 
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "A_ttendees..."
 msgstr "Úča_stníci..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:436
+#: ../calendar/gui/e-meeting-time-sel.c:434
 msgid "O_ptions"
 msgstr "_Možnosti"
 
-#: ../calendar/gui/e-meeting-time-sel.c:453
+#: ../calendar/gui/e-meeting-time-sel.c:451
 msgid "Show _only working hours"
 msgstr "Zobrazovat pouze _pracovní hodiny"
 
-#: ../calendar/gui/e-meeting-time-sel.c:463
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _zoomed out"
 msgstr "Zobrazovat z_menšené"
 
-#: ../calendar/gui/e-meeting-time-sel.c:478
+#: ../calendar/gui/e-meeting-time-sel.c:476
 msgid "_Update free/busy"
 msgstr "_Aktualizovat volný/obsazený čas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:493
+#: ../calendar/gui/e-meeting-time-sel.c:491
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:511
+#: ../calendar/gui/e-meeting-time-sel.c:509
 msgid "_Autopick"
 msgstr "_Automatický výběr"
 
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-meeting-time-sel.c:524
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-time-sel.c:541
 msgid "_All people and resources"
 msgstr "_Všichni lidé a zdroje"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:550
 msgid "All _people and one resource"
 msgstr "Všichni _lidé a jeden zdroj"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:559
 msgid "_Required people"
 msgstr "_Nezbytní lidé"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:568
 msgid "Required people and _one resource"
 msgstr "Nezbytní lidé a _jeden zdroj"
 
-#: ../calendar/gui/e-meeting-time-sel.c:606
+#: ../calendar/gui/e-meeting-time-sel.c:604
 msgid "_Start time:"
 msgstr "_Začátek:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:633
+#: ../calendar/gui/e-meeting-time-sel.c:631
 msgid "_End time:"
 msgstr "_Konec:"
 
@@ -8392,16 +8367,16 @@ msgstr "Jazyk"
 msgid "Member"
 msgstr "Člen"
 
-#: ../calendar/gui/e-memo-table.c:942
+#: ../calendar/gui/e-memo-table.c:941
 msgid "_Delete Selected Memos"
 msgstr "_Odstranit vybrané poznámky"
 
-#: ../calendar/gui/e-memo-table.c:1093 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1092 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Poznámku přidáte kliknutím zde"
 
 #: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
-#: ../calendar/gui/gnome-cal.c:2864
+#: ../calendar/gui/gnome-cal.c:2961
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8440,54 +8415,50 @@ msgstr "Dokončuji úkoly..."
 msgid "Expunging"
 msgstr "Čistím"
 
-#: ../calendar/gui/e-timezone-entry.c:130
+#: ../calendar/gui/e-timezone-entry.c:128
 msgid "Select Timezone"
 msgstr "Vybrat časové pásmo"
 
 #. 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:348 ../calendar/gui/print.c:1637
+#: ../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:830
-msgid "Updating query"
-msgstr "Aktualizuji dotaz"
-
-#: ../calendar/gui/gnome-cal.c:2501
+#: ../calendar/gui/gnome-cal.c:2576
 msgid "_Custom View"
 msgstr "_Vlastní zobrazení"
 
-#: ../calendar/gui/gnome-cal.c:2502
+#: ../calendar/gui/gnome-cal.c:2577
 msgid "_Save Custom View"
 msgstr "Uložit vla_stní zobrazení"
 
-#: ../calendar/gui/gnome-cal.c:2507
+#: ../calendar/gui/gnome-cal.c:2582
 msgid "_Define Views..."
 msgstr "Definovat _zobrazení..."
 
-#: ../calendar/gui/gnome-cal.c:2688
+#: ../calendar/gui/gnome-cal.c:2791
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Načítám události v %s"
 
-#: ../calendar/gui/gnome-cal.c:2707
+#: ../calendar/gui/gnome-cal.c:2806
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Načítám úkoly v %s"
 
-#: ../calendar/gui/gnome-cal.c:2716
+#: ../calendar/gui/gnome-cal.c:2815
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Načítám poznámky na %s"
 
-#: ../calendar/gui/gnome-cal.c:2823
+#: ../calendar/gui/gnome-cal.c:2920
 #, c-format
 msgid "Opening %s"
 msgstr "Otevírám %s"
 
-#: ../calendar/gui/gnome-cal.c:3779
+#: ../calendar/gui/gnome-cal.c:3874
 msgid "Purging"
 msgstr "Čistím"
 
@@ -8601,11 +8572,11 @@ msgstr "Informace iCalendar"
 msgid "You must be an attendee of the event."
 msgstr "Musíte být účastníkem události."
 
-#: ../calendar/gui/memos-component.c:465
+#: ../calendar/gui/memos-component.c:464
 msgid "_New Memo List"
 msgstr "_Nový seznam poznámek"
 
-#: ../calendar/gui/memos-component.c:545
+#: ../calendar/gui/memos-component.c:544
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -8613,7 +8584,7 @@ msgstr[0] "%d poznámka"
 msgstr[1] "%d poznámky"
 msgstr[2] "%d poznámek"
 
-#: ../calendar/gui/memos-component.c:547 ../calendar/gui/tasks-component.c:538
+#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8621,20 +8592,20 @@ msgstr[0] ", %d vybráno"
 msgstr[1] ", %d vybrány"
 msgstr[2] ", %d vybráno"
 
-#: ../calendar/gui/memos-component.c:594
+#: ../calendar/gui/memos-component.c:593
 msgid "Failed upgrading memos."
 msgstr "Nemohu aktualizovat poznámky."
 
-#: ../calendar/gui/memos-component.c:954
+#: ../calendar/gui/memos-component.c:953
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "Nemohu otevřít seznam poznámek '%s' pro tvorbu událostí a schůzek"
 
-#: ../calendar/gui/memos-component.c:967
+#: ../calendar/gui/memos-component.c:966
 msgid "There is no calendar available for creating memos"
 msgstr "Není k dispozici kalendář pro tvorbu poznámek"
 
-#: ../calendar/gui/memos-component.c:1077
+#: ../calendar/gui/memos-component.c:1076
 msgid "Memo Source Selector"
 msgstr "Výběr zdroje poznámky"
 
@@ -8643,6 +8614,7 @@ msgid "New memo"
 msgstr "Nová poznámka"
 
 #: ../calendar/gui/memos-component.c:1261
+msgctxt "New"
 msgid "Mem_o"
 msgstr "_Poznámka"
 
@@ -8655,6 +8627,7 @@ msgid "New shared memo"
 msgstr "Nová sdílená poznámka"
 
 #: ../calendar/gui/memos-component.c:1269
+msgctxt "New"
 msgid "_Shared memo"
 msgstr "_Sdílená poznámka"
 
@@ -8667,6 +8640,7 @@ msgid "New memo list"
 msgstr "Nový seznam poznámek"
 
 #: ../calendar/gui/memos-component.c:1277
+msgctxt "New"
 msgid "Memo li_st"
 msgstr "Sez_nam poznámek"
 
@@ -8674,14 +8648,13 @@ msgstr "Sez_nam poznámek"
 msgid "Create a new memo list"
 msgstr "Vytvořit nový seznam poznámek"
 
-#: ../calendar/gui/memos-control.c:353 ../calendar/gui/memos-control.c:369
+#: ../calendar/gui/memos-control.c:354 ../calendar/gui/memos-control.c:370
 msgid "Print Memos"
 msgstr "Tisknout poznámky"
 
 #: ../calendar/gui/memotypes.xml.h:25
-#, fuzzy
-msgid "Next 7 Days'"
-msgstr "Úkoly v příštích 7 dnech"
+msgid "Next 7 Days"
+msgstr "Příštích 7 dnů"
 
 #: ../calendar/gui/migration.c:157
 msgid ""
@@ -8725,221 +8698,216 @@ msgid "Unable to migrate tasks `%s'"
 msgstr "Nemohu převést úkoly `%s'"
 
 #: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:458
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:571
+#: ../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 "Poznámky"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:522
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:521
+#: ../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:596
+#: ../calendar/gui/print.c:598
 msgid "Su"
 msgstr "Ne"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "Mo"
 msgstr "Po"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "Tu"
 msgstr "Út"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:598
 msgid "We"
 msgstr "St"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:599
 msgid "Th"
 msgstr "Čt"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:599
 msgid "Fr"
 msgstr "Pá"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:599
 msgid "Sa"
 msgstr "So"
 
-#: ../calendar/gui/print.c:2444
+#: ../calendar/gui/print.c:2474
 msgid "Appointment"
 msgstr "Událost"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2476
 msgid "Task"
 msgstr "Úkol"
 
-#: ../calendar/gui/print.c:2468
+#: ../calendar/gui/print.c:2501
 #, c-format
 msgid "Summary: %s"
 msgstr "Shrnutí: %s"
 
-#: ../calendar/gui/print.c:2490
+#: ../calendar/gui/print.c:2524
 msgid "Attendees: "
-msgstr "Účastníci:"
+msgstr "Účastníci: "
 
-#: ../calendar/gui/print.c:2530
+#: ../calendar/gui/print.c:2564
 #, c-format
 msgid "Status: %s"
 msgstr "Stav: %s"
 
-#: ../calendar/gui/print.c:2547
+#: ../calendar/gui/print.c:2581
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorita: %s"
 
-#: ../calendar/gui/print.c:2559
+#: ../calendar/gui/print.c:2593
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Dokončeno procent: %i"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2605
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2618
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorie: %s"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2629
 msgid "Contacts: "
 msgstr "Kontakty: "
 
-#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2697
-msgid "Upcoming Appointments"
-msgstr "Nadcházející události"
-
-#: ../calendar/gui/tasks-component.c:456
+#: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "_Nový seznam úkolů"
 
-#: ../calendar/gui/tasks-component.c:536
+#: ../calendar/gui/tasks-component.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -8947,20 +8915,20 @@ msgstr[0] "%d úkol"
 msgstr[1] "%d úkoly"
 msgstr[2] "%d úkolů"
 
-#: ../calendar/gui/tasks-component.c:585
+#: ../calendar/gui/tasks-component.c:584
 msgid "Failed upgrading tasks."
 msgstr "Nemohu aktualizovat úkoly."
 
-#: ../calendar/gui/tasks-component.c:942
+#: ../calendar/gui/tasks-component.c:941
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Nemohu otevřít seznam úkolů '%s' pro tvorbu událostí a schůzek"
 
-#: ../calendar/gui/tasks-component.c:955
+#: ../calendar/gui/tasks-component.c:954
 msgid "There is no calendar available for creating tasks"
 msgstr "Není k dispozici kalendář pro tvorbu úkolů"
 
-#: ../calendar/gui/tasks-component.c:1066
+#: ../calendar/gui/tasks-component.c:1065
 msgid "Task Source Selector"
 msgstr "Výběr zdroje úkolu"
 
@@ -8968,6 +8936,11 @@ msgstr "Výběr zdroje úkolu"
 msgid "New task"
 msgstr "Nový úkol"
 
+#: ../calendar/gui/tasks-component.c:1326
+msgctxt "New"
+msgid "_Task"
+msgstr "Ú_kol"
+
 #: ../calendar/gui/tasks-component.c:1327
 msgid "Create a new task"
 msgstr "Vytvořit nový úkol"
@@ -8977,6 +8950,7 @@ msgid "New assigned task"
 msgstr "Nový přidělený úkol"
 
 #: ../calendar/gui/tasks-component.c:1334
+msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "_Přidělený úkol"
 
@@ -8989,6 +8963,7 @@ msgid "New task list"
 msgstr "Nový seznam úkolů"
 
 #: ../calendar/gui/tasks-component.c:1342
+msgctxt "New"
 msgid "Tas_k list"
 msgstr "Seznam ú_kolů"
 
@@ -9008,7 +8983,7 @@ msgstr ""
 "\n"
 "Opravdu odstranit tyto úkoly?"
 
-#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1133
+#: ../calendar/gui/tasks-control.c:455 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "Příště se neptat."
 
@@ -9017,17 +8992,15 @@ msgid "Print Tasks"
 msgstr "Tisknout úkoly"
 
 #: ../calendar/gui/tasktypes.xml.h:2
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "% Completed"
 msgstr "% hotovo"
 
 #: ../calendar/gui/tasktypes.xml.h:10
-#, fuzzy
 msgid "Cancelled"
 msgstr "Zrušeno"
 
 #: ../calendar/gui/tasktypes.xml.h:26
-#, fuzzy
 msgid "In progress"
 msgstr "Probíhá"
 
@@ -9045,7 +9018,7 @@ msgstr "Události a schůzky"
 
 #: ../calendar/importers/icalendar-importer.c:331
 #: ../calendar/importers/icalendar-importer.c:614
-#: ../plugins/itip-formatter/itip-formatter.c:1578
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 msgid "Opening calendar"
 msgstr "Otevírám kalendář"
 
@@ -9078,1539 +9051,1557 @@ msgid "Evolution Calendar intelligent importer"
 msgstr "Inteligentní importér kalendáře Evolution"
 
 #.
+#. *
+#. * 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)
+#. *
+#.
+#.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: ../calendar/zones.h:7
+#: ../calendar/zones.h:26
 msgid "Africa/Abidjan"
 msgstr "Afrika/Abidjan"
 
-#: ../calendar/zones.h:8
+#: ../calendar/zones.h:27
 msgid "Africa/Accra"
 msgstr "Afrika/Accra"
 
-#: ../calendar/zones.h:9
+#: ../calendar/zones.h:28
 msgid "Africa/Addis_Ababa"
 msgstr "Afrika/Addis_Abeba"
 
-#: ../calendar/zones.h:10
+#: ../calendar/zones.h:29
 msgid "Africa/Algiers"
-msgstr "Afrika/Algiers"
+msgstr "Afrika/Alžír"
 
-#: ../calendar/zones.h:11
+#: ../calendar/zones.h:30
 msgid "Africa/Asmera"
 msgstr "Afrika/Asmera"
 
-#: ../calendar/zones.h:12
+#: ../calendar/zones.h:31
 msgid "Africa/Bamako"
 msgstr "Afrika/Bamako"
 
-#: ../calendar/zones.h:13
+#: ../calendar/zones.h:32
 msgid "Africa/Bangui"
 msgstr "Afrika/Bangui"
 
-#: ../calendar/zones.h:14
+#: ../calendar/zones.h:33
 msgid "Africa/Banjul"
 msgstr "Afrika/Banjul"
 
-#: ../calendar/zones.h:15
+#: ../calendar/zones.h:34
 msgid "Africa/Bissau"
 msgstr "Afrika/Bissau"
 
-#: ../calendar/zones.h:16
+#: ../calendar/zones.h:35
 msgid "Africa/Blantyre"
 msgstr "Afrika/Blantyre"
 
-#: ../calendar/zones.h:17
+#: ../calendar/zones.h:36
 msgid "Africa/Brazzaville"
 msgstr "Afrika/Brazzaville"
 
-#: ../calendar/zones.h:18
+#: ../calendar/zones.h:37
 msgid "Africa/Bujumbura"
 msgstr "Afrika/Bujumbura"
 
-#: ../calendar/zones.h:19
+#: ../calendar/zones.h:38
 msgid "Africa/Cairo"
 msgstr "Afrika/Káhira"
 
-#: ../calendar/zones.h:20
+#: ../calendar/zones.h:39
 msgid "Africa/Casablanca"
 msgstr "Afrika/Casablanca"
 
-#: ../calendar/zones.h:21
+#: ../calendar/zones.h:40
 msgid "Africa/Ceuta"
 msgstr "Afrika/Ceuta"
 
-#: ../calendar/zones.h:22
+#: ../calendar/zones.h:41
 msgid "Africa/Conakry"
 msgstr "Afrika/Conakry"
 
-#: ../calendar/zones.h:23
+#: ../calendar/zones.h:42
 msgid "Africa/Dakar"
 msgstr "Afrika/Dakar"
 
-#: ../calendar/zones.h:24
+#: ../calendar/zones.h:43
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afrika/Dar_es_Salaam"
 
-#: ../calendar/zones.h:25
+#: ../calendar/zones.h:44
 msgid "Africa/Djibouti"
 msgstr "Afrika/Džibuti"
 
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:45
 msgid "Africa/Douala"
 msgstr "Afrika/Douala"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:46
 msgid "Africa/El_Aaiun"
 msgstr "Afrika/El_Aaiun"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:47
 msgid "Africa/Freetown"
 msgstr "Afrika/Freetown"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:48
 msgid "Africa/Gaborone"
 msgstr "Afrika/Gaborone"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:49
 msgid "Africa/Harare"
 msgstr "Afrika/Harare"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:50
 msgid "Africa/Johannesburg"
 msgstr "Afrika/Johannesburg"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:51
 msgid "Africa/Kampala"
 msgstr "Afrika/Kampala"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:52
 msgid "Africa/Khartoum"
-msgstr "Afrika/Khartoum"
+msgstr "Afrika/Chartúm"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:53
 msgid "Africa/Kigali"
 msgstr "Afrika/Kigali"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:54
 msgid "Africa/Kinshasa"
 msgstr "Afrika/Kinshasa"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:55
 msgid "Africa/Lagos"
 msgstr "Afrika/Lagos"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:56
 msgid "Africa/Libreville"
 msgstr "Afrika/Libreville"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:57
 msgid "Africa/Lome"
 msgstr "Afrika/Lome"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:58
 msgid "Africa/Luanda"
 msgstr "Afrika/Luanda"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:59
 msgid "Africa/Lubumbashi"
 msgstr "Afrika/Lubumbashi"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:60
 msgid "Africa/Lusaka"
 msgstr "Afrika/Lusaka"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:61
 msgid "Africa/Malabo"
 msgstr "Afrika/Malabo"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:62
 msgid "Africa/Maputo"
 msgstr "Afrika/Maputo"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:63
 msgid "Africa/Maseru"
 msgstr "Afrika/Maseru"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:64
 msgid "Africa/Mbabane"
 msgstr "Afrika/Mbabane"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
-msgstr "Afrika/Mogadishu"
+msgstr "Afrika/Mogadišo"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
 msgstr "Afrika/Monrovia"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
 msgstr "Afrika/Nairobi"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
 msgstr "Afrika/Ndjamena"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:69
 msgid "Africa/Niamey"
 msgstr "Afrika/Niamey"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:70
 msgid "Africa/Nouakchott"
 msgstr "Afrika/Nouakchott"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
 msgstr "Afrika/Ouagadougou"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
 msgstr "Afrika/Porto-Novo"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:73
 msgid "Africa/Sao_Tome"
 msgstr "Afrika/Sao_Tome"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:74
 msgid "Africa/Timbuktu"
 msgstr "Afrika/Timbuktu"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:75
 msgid "Africa/Tripoli"
-msgstr "Afrika/Tripoli"
+msgstr "Afrika/Tripolis"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:76
 msgid "Africa/Tunis"
 msgstr "Afrika/Tunis"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
 msgstr "Afrika/Windhoek"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:78
 msgid "America/Adak"
 msgstr "Amerika/Adak"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:79
 msgid "America/Anchorage"
 msgstr "Amerika/Anchorage"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:80
 msgid "America/Anguilla"
 msgstr "Amerika/Anguilla"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:81
 msgid "America/Antigua"
 msgstr "Amerika/Antigua"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:82
 msgid "America/Araguaina"
 msgstr "Amerika/Araguaina"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:83
 msgid "America/Aruba"
 msgstr "Amerika/Aruba"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:84
 msgid "America/Asuncion"
 msgstr "Amerika/Asuncion"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:85
 msgid "America/Barbados"
 msgstr "Amerika/Barbados"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:86
 msgid "America/Belem"
 msgstr "Amerika/Belem"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:87
 msgid "America/Belize"
 msgstr "Amerika/Belize"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:88
 msgid "America/Boa_Vista"
 msgstr "Amerika/Boa_Vista"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:89
 msgid "America/Bogota"
 msgstr "Amerika/Bogota"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:90
 msgid "America/Boise"
 msgstr "Amerika/Boise"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
 msgstr "Amerika/Buenos_Aires"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:92
 msgid "America/Cambridge_Bay"
 msgstr "Amerika/Cambridge_Bay"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:93
 msgid "America/Cancun"
 msgstr "Amerika/Cancun"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:94
 msgid "America/Caracas"
 msgstr "Amerika/Caracas"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:95
 msgid "America/Catamarca"
 msgstr "Amerika/Catamarca"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:96
 msgid "America/Cayenne"
 msgstr "Amerika/Cayenne"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:97
 msgid "America/Cayman"
 msgstr "Amerika/Cayman"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:98
 msgid "America/Chicago"
 msgstr "Amerika/Chicago"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:99
 msgid "America/Chihuahua"
 msgstr "Amerika/Chihuahua"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:100
 msgid "America/Cordoba"
 msgstr "Amerika/Cordoba"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:101
 msgid "America/Costa_Rica"
 msgstr "Amerika/Kostarika"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:102
 msgid "America/Cuiaba"
 msgstr "Amerika/Cuiaba"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:103
 msgid "America/Curacao"
 msgstr "Amerika/Curacao"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:104
 msgid "America/Danmarkshavn"
 msgstr "Amerika/Danmarkshavn"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:105
 msgid "America/Dawson"
 msgstr "Amerika/Dawson"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:106
 msgid "America/Dawson_Creek"
 msgstr "Amerika/Dawson_Creek"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:107
 msgid "America/Denver"
 msgstr "Amerika/Denver"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:108
 msgid "America/Detroit"
 msgstr "Amerika/Detroit"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:109
 msgid "America/Dominica"
 msgstr "Amerika/Dominica"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:110
 msgid "America/Edmonton"
 msgstr "Amerika/Edmonton"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:111
 msgid "America/Eirunepe"
 msgstr "Amerika/Eirunepe"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:112
 msgid "America/El_Salvador"
 msgstr "Amerika/El_Salvador"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:113
 msgid "America/Fortaleza"
 msgstr "Amerika/Fortaleza"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:114
 msgid "America/Glace_Bay"
 msgstr "Amerika/Glace_Bay"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:115
 msgid "America/Godthab"
 msgstr "Amerika/Godthab"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:116
 msgid "America/Goose_Bay"
 msgstr "Amerika/Goose_Bay"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:117
 msgid "America/Grand_Turk"
 msgstr "Amerika/Grand_Turk"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:118
 msgid "America/Grenada"
 msgstr "Amerika/Grenada"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
 msgstr "Amerika/Guadeloupe"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:120
 msgid "America/Guatemala"
 msgstr "Amerika/Guatemala"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:121
 msgid "America/Guayaquil"
 msgstr "Amerika/Guayaquil"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:122
 msgid "America/Guyana"
 msgstr "Amerika/Guayana"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:123
 msgid "America/Halifax"
 msgstr "Amerika/Halifax"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:124
 msgid "America/Havana"
 msgstr "Amerika/Havana"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:125
 msgid "America/Hermosillo"
 msgstr "Amerika/Hermosillo"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Indianapolis"
 msgstr "Amerika/Indiana/Indianapolis"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Knox"
 msgstr "Amerika/Indiana/Knox"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Marengo"
 msgstr "Amerika/Indiana/Marengo"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:129
 msgid "America/Indiana/Vevay"
 msgstr "Amerika/Indiana/Vevay"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:130
 msgid "America/Indianapolis"
 msgstr "Amerika/Indianapolis"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:131
 msgid "America/Inuvik"
 msgstr "Amerika/Inuvik"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:132
 msgid "America/Iqaluit"
 msgstr "Amerika/Iqaluit"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:133
 msgid "America/Jamaica"
 msgstr "Amerika/Jamajka"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:134
 msgid "America/Jujuy"
 msgstr "Amerika/Jujuy"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:135
 msgid "America/Juneau"
 msgstr "Amerika/Juneau"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Louisville"
 msgstr "Amerika/Kentucky/Louisville"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:137
 msgid "America/Kentucky/Monticello"
 msgstr "Amerika/Kentucky/Monticello"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:138
 msgid "America/La_Paz"
 msgstr "Amerika/La_Paz"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:139
 msgid "America/Lima"
 msgstr "Amerika/Lima"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:140
 msgid "America/Los_Angeles"
 msgstr "Amerika/Los_Angeles"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:141
 msgid "America/Louisville"
 msgstr "Amerika/Louisville"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:142
 msgid "America/Maceio"
 msgstr "Amerika/Maceio"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:143
 msgid "America/Managua"
 msgstr "Amerika/Managua"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:144
 msgid "America/Manaus"
 msgstr "Amerika/Manaus"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:145
 msgid "America/Martinique"
 msgstr "Amerika/Martinik"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:146
 msgid "America/Mazatlan"
 msgstr "Amerika/Mazatlan"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:147
 msgid "America/Mendoza"
 msgstr "Amerika/Mendoza"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:148
 msgid "America/Menominee"
 msgstr "Amerika/Menominee"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:149
 msgid "America/Merida"
 msgstr "Amerika/Merida"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:150
 msgid "America/Mexico_City"
 msgstr "Amerika/Mexico_City"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:151
 msgid "America/Miquelon"
 msgstr "Amerika/Miquelon"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:152
 msgid "America/Monterrey"
 msgstr "Amerika/Monterrey"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:153
 msgid "America/Montevideo"
 msgstr "Amerika/Montevideo"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:154
 msgid "America/Montreal"
 msgstr "Amerika/Montreal"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:155
 msgid "America/Montserrat"
 msgstr "Amerika/Montserrat"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:156
 msgid "America/Nassau"
 msgstr "Amerika/Nassau"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:157
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "Amerika/New_York"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:158
 msgid "America/Nipigon"
 msgstr "Amerika/Nipigon"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:159
 msgid "America/Nome"
 msgstr "Amerika/Nome"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:160
 msgid "America/Noronha"
 msgstr "Amerika/Noronha"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:161
 msgid "America/North_Dakota/Center"
 msgstr "Amerika/North_Dakota/Center"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:162
 msgid "America/Panama"
 msgstr "Amerika/Panama"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:163
 msgid "America/Pangnirtung"
 msgstr "Amerika/Pangnirtung"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:164
 msgid "America/Paramaribo"
 msgstr "Amerika/Paramaribo"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:165
 msgid "America/Phoenix"
 msgstr "Amerika/Phoenix"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:166
 msgid "America/Port-au-Prince"
 msgstr "Amerika/Port-au-Prince"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:167
 msgid "America/Port_of_Spain"
 msgstr "Amerika/Port_of_Spain"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:168
 msgid "America/Porto_Velho"
 msgstr "Amerika/Porto_Velho"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:169
 msgid "America/Puerto_Rico"
 msgstr "Amerika/Portoriko"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:170
 msgid "America/Rainy_River"
 msgstr "Amerika/Rainy_River"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:171
 msgid "America/Rankin_Inlet"
 msgstr "Amerika/Rankin_Inlet"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:172
 msgid "America/Recife"
 msgstr "Amerika/Recife"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:173
 msgid "America/Regina"
 msgstr "Amerika/Regina"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:174
 msgid "America/Rio_Branco"
 msgstr "Amerika/Rio_Branco"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:175
 msgid "America/Rosario"
 msgstr "Amerika/Rosario"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:176
 msgid "America/Santiago"
 msgstr "Amerika/Santiago"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:177
 msgid "America/Santo_Domingo"
 msgstr "Amerika/Santo_Domingo"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:178
 msgid "America/Sao_Paulo"
 msgstr "Amerika/Sao_Paulo"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:179
 msgid "America/Scoresbysund"
 msgstr "Amerika/Scoresbysund"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:180
 msgid "America/Shiprock"
 msgstr "Amerika/Shiprock"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:181
 msgid "America/St_Johns"
 msgstr "Amerika/St_Johns"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:182
 msgid "America/St_Kitts"
 msgstr "Amerika/St_Kitts"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:183
 msgid "America/St_Lucia"
 msgstr "Amerika/St_Lucia"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:184
 msgid "America/St_Thomas"
 msgstr "Amerika/St_Thomas"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:185
 msgid "America/St_Vincent"
 msgstr "Amerika/St_Vincent"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:186
 msgid "America/Swift_Current"
 msgstr "Amerika/Swift_Current"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:187
 msgid "America/Tegucigalpa"
 msgstr "Amerika/Tegucigalpa"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:188
 msgid "America/Thule"
 msgstr "Amerika/Thule"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:189
 msgid "America/Thunder_Bay"
 msgstr "Amerika/Thunder_Bay"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:190
 msgid "America/Tijuana"
 msgstr "Amerika/Tijuana"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:191
 msgid "America/Tortola"
 msgstr "Amerika/Tortola"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:192
 msgid "America/Vancouver"
 msgstr "Amerika/Vancouver"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:193
 msgid "America/Whitehorse"
 msgstr "Amerika/Whitehorse"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:194
 msgid "America/Winnipeg"
 msgstr "Amerika/Winnipeg"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:195
 msgid "America/Yakutat"
 msgstr "Amerika/Yakutat"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:196
 msgid "America/Yellowknife"
 msgstr "Amerika/Yellowknife"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:197
 msgid "Antarctica/Casey"
 msgstr "Antarktida/Casey"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:198
 msgid "Antarctica/Davis"
 msgstr "Antarktida/Davis"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:199
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarktida/DumontDUrville"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:200
 msgid "Antarctica/Mawson"
 msgstr "Antarktida/Mawson"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:201
 msgid "Antarctica/McMurdo"
 msgstr "Antarktida/McMurdo"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:202
 msgid "Antarctica/Palmer"
 msgstr "Antarktida/Palmer"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:203
 msgid "Antarctica/South_Pole"
 msgstr "Antarktida/Jižní_pól"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:204
 msgid "Antarctica/Syowa"
 msgstr "Antarktida/Syowa"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:205
 msgid "Antarctica/Vostok"
 msgstr "Antarktida/Vostok"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:206
 msgid "Arctic/Longyearbyen"
 msgstr "Arktida/Longyearbyen"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:207
 msgid "Asia/Aden"
 msgstr "Asie/Aden"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:208
 msgid "Asia/Almaty"
-msgstr "Asie/Almaty"
+msgstr "Asie/Alma-Ata"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:209
 msgid "Asia/Amman"
 msgstr "Asie/Amman"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:210
 msgid "Asia/Anadyr"
 msgstr "Asie/Anadyr"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtau"
 msgstr "Asie/Aqtau"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:212
 msgid "Asia/Aqtobe"
 msgstr "Asie/Aqtobe"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:213
 msgid "Asia/Ashgabat"
 msgstr "Asie/Ashgabat"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:214
 msgid "Asia/Baghdad"
 msgstr "Asie/Bagdád"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:215
 msgid "Asia/Bahrain"
 msgstr "Asie/Bahrajn"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:216
 msgid "Asia/Baku"
 msgstr "Asie/Baku"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:217
 msgid "Asia/Bangkok"
 msgstr "Asie/Bangkok"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:218
 msgid "Asia/Beirut"
 msgstr "Asie/Bejrút"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:219
 msgid "Asia/Bishkek"
 msgstr "Asie/Biškek"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:220
 msgid "Asia/Brunei"
-msgstr "Asie/Brunei"
+msgstr "Asie/Brunej"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:221
 msgid "Asia/Calcutta"
 msgstr "Asie/Kalkata"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:222
 msgid "Asia/Choibalsan"
 msgstr "Asie/Choibalsan"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:223
 msgid "Asia/Chongqing"
 msgstr "Asie/Chongqing"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:224
 msgid "Asia/Colombo"
 msgstr "Asie/Colombo"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:225
 msgid "Asia/Damascus"
 msgstr "Asie/Damašek"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:226
 msgid "Asia/Dhaka"
 msgstr "Asie/Dháka"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:227
 msgid "Asia/Dili"
 msgstr "Asie/Dilí"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:228
 msgid "Asia/Dubai"
-msgstr "Asie/Dubai"
+msgstr "Asie/Dubaj"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:229
 msgid "Asia/Dushanbe"
 msgstr "Asie/Dušanbe"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:230
 msgid "Asia/Gaza"
 msgstr "Asie/Gaza"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:231
 msgid "Asia/Harbin"
 msgstr "Asie/Harbin"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:232
 msgid "Asia/Hong_Kong"
-msgstr "Asie/Hong_Kong"
+msgstr "Asie/Hongkong"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:233
 msgid "Asia/Hovd"
 msgstr "Asie/Hovd"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:234
 msgid "Asia/Irkutsk"
 msgstr "Asie/Irkutsk"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:235
 msgid "Asia/Istanbul"
 msgstr "Asie/Istanbul"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:236
 msgid "Asia/Jakarta"
 msgstr "Asie/Jakarta"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:237
 msgid "Asia/Jayapura"
 msgstr "Asie/Jayapura"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:238
 msgid "Asia/Jerusalem"
 msgstr "Asie/Jeruzalém"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:239
 msgid "Asia/Kabul"
 msgstr "Asie/Kábul"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:240
 msgid "Asia/Kamchatka"
 msgstr "Asie/Kamčatka"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:241
 msgid "Asia/Karachi"
 msgstr "Asie/Karáčí"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:242
 msgid "Asia/Kashgar"
 msgstr "Asie/Kašgar"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:243
 msgid "Asia/Katmandu"
-msgstr "Asie/Katmandu"
+msgstr "Asie/Káthmándú"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:244
 msgid "Asia/Krasnoyarsk"
 msgstr "Asie/Krasnojarsk"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:245
 msgid "Asia/Kuala_Lumpur"
 msgstr "Asie/Kuala_Lumpur"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:246
 msgid "Asia/Kuching"
 msgstr "Asie/Kuching"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:247
 msgid "Asia/Kuwait"
 msgstr "Asie/Kuvajt"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:248
 msgid "Asia/Macao"
 msgstr "Asie/Macao"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:249
 msgid "Asia/Macau"
 msgstr "Asie/Macau"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:250
 msgid "Asia/Magadan"
 msgstr "Asie/Magadan"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:251
 msgid "Asia/Makassar"
 msgstr "Asie/Magadan"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:252
 msgid "Asia/Manila"
 msgstr "Asie/Manila"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:253
 msgid "Asia/Muscat"
 msgstr "Asie/Muscat"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:254
 msgid "Asia/Nicosia"
 msgstr "Asie/Nicosia"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:255
 msgid "Asia/Novosibirsk"
 msgstr "Asie/Novosibirsk"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:256
 msgid "Asia/Omsk"
 msgstr "Asie/Omsk"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:257
 msgid "Asia/Oral"
 msgstr "Asie/Oral"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:258
 msgid "Asia/Phnom_Penh"
 msgstr "Asie/Phnem_Penh"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:259
 msgid "Asia/Pontianak"
 msgstr "Asie/Pontianak"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:260
 msgid "Asia/Pyongyang"
 msgstr "Asie/Pchjongjang"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:261
 msgid "Asia/Qatar"
 msgstr "Asie/Katar"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:262
 msgid "Asia/Qyzylorda"
 msgstr "Asie/Qyzylorda"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:263
 msgid "Asia/Rangoon"
 msgstr "Asie/Rangoon"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:264
 msgid "Asia/Riyadh"
 msgstr "Asie/Rijád"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:265
 msgid "Asia/Saigon"
 msgstr "Asie/Saigon"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:266
 msgid "Asia/Sakhalin"
 msgstr "Asie/Sachalin"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:267
 msgid "Asia/Samarkand"
 msgstr "Asie/Samarkand"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:268
 msgid "Asia/Seoul"
 msgstr "Asie/Soul"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
 msgstr "Asie/Šanghaj"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:270
 msgid "Asia/Singapore"
 msgstr "Asie/Singapur"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:271
 msgid "Asia/Taipei"
 msgstr "Asie/Taipei"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:272
 msgid "Asia/Tashkent"
 msgstr "Asie/Taškent"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:273
 msgid "Asia/Tbilisi"
 msgstr "Asie/Tbilisi"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:274
 msgid "Asia/Tehran"
 msgstr "Asie/Teherán"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:275
 msgid "Asia/Thimphu"
 msgstr "Asie/Thimphu"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:276
 msgid "Asia/Tokyo"
 msgstr "Asie/Tokio"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:277
 msgid "Asia/Ujung_Pandang"
 msgstr "Asie/Ujung_Pandang"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:278
 msgid "Asia/Ulaanbaatar"
 msgstr "Asie/Ulanbátár"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:279
 msgid "Asia/Urumqi"
-msgstr "Asie/Urumqi"
+msgstr "Asie/Urumči"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:280
 msgid "Asia/Vientiane"
 msgstr "Asie/Vientiane"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:281
 msgid "Asia/Vladivostok"
 msgstr "Asie/Vladivostok"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:282
 msgid "Asia/Yakutsk"
 msgstr "Asie/Jakutsk"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:283
 msgid "Asia/Yekaterinburg"
 msgstr "Asie/Jekatěrinburg"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:284
 msgid "Asia/Yerevan"
 msgstr "Asie/Jerevan"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:285
 msgid "Atlantic/Azores"
 msgstr "Atlantik/Azorské ostrovy"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:286
 msgid "Atlantic/Bermuda"
 msgstr "Atlantik/Bermudy"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:287
 msgid "Atlantic/Canary"
 msgstr "Atlantik/Kanárské ostrovy"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:288
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantik/Kapverdy"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:289
 msgid "Atlantic/Faeroe"
 msgstr "Atlantik/Faerské ostrovy"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:290
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantik/Jan_Mayen"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:291
 msgid "Atlantic/Madeira"
 msgstr "Atlantik/Madeira"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:292
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantik/Rejkjavík"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:293
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantik/Jižní_Georgia"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:294
 msgid "Atlantic/St_Helena"
 msgstr "Atlantik/Svatá_Helena"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:295
 msgid "Atlantic/Stanley"
 msgstr "Atlantik/Stanley"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:296
 msgid "Australia/Adelaide"
 msgstr "Austrálie/Adelaide"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:297
 msgid "Australia/Brisbane"
 msgstr "Austrálie/Brisbane"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:298
 msgid "Australia/Broken_Hill"
 msgstr "Austrálie/Broken_Hill"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:299
 msgid "Australia/Darwin"
 msgstr "Austrálie/Darwin"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:300
 msgid "Australia/Hobart"
 msgstr "Austrálie/Hobart"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:301
 msgid "Australia/Lindeman"
 msgstr "Austrálie/Lindeman"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:302
 msgid "Australia/Lord_Howe"
 msgstr "Austrálie/Lord_Howe"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:303
 msgid "Australia/Melbourne"
 msgstr "Austrálie/Melbourne"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:304
 msgid "Australia/Perth"
 msgstr "Austrálie/Perth"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:305
 msgid "Australia/Sydney"
 msgstr "Austrálie/Sydney"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:306
 msgid "Europe/Amsterdam"
 msgstr "Evropa/Amsterodam"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:307
 msgid "Europe/Andorra"
 msgstr "Evropa/Andorra"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:308
 msgid "Europe/Athens"
 msgstr "Evropa/Atény"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:309
 msgid "Europe/Belfast"
 msgstr "Evropa/Belfast"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:310
 msgid "Europe/Belgrade"
 msgstr "Evropa/Bělehrad"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:311
 msgid "Europe/Berlin"
 msgstr "Evropa/Berlín"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:312
 msgid "Europe/Bratislava"
 msgstr "Evropa/Bratislava"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:313
 msgid "Europe/Brussels"
 msgstr "Evropa/Brusel"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:314
 msgid "Europe/Bucharest"
 msgstr "Evropa/Bukurešť"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:315
 msgid "Europe/Budapest"
 msgstr "Evropa/Budapešť"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:316
 msgid "Europe/Chisinau"
-msgstr "Evropa/Chisinau"
+msgstr "Evropa/Kišiněv"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:317
 msgid "Europe/Copenhagen"
 msgstr "Evropa/Kodaň"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:318
 msgid "Europe/Dublin"
 msgstr "Evropa/Dublin"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:319
 msgid "Europe/Gibraltar"
 msgstr "Evropa/Gibraltar"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:320
 msgid "Europe/Helsinki"
 msgstr "Evropa/Helsinky"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:321
 msgid "Europe/Istanbul"
 msgstr "Evropa/Istanbul"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:322
 msgid "Europe/Kaliningrad"
 msgstr "Evropa/Kaliningrad"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:323
 msgid "Europe/Kiev"
 msgstr "Evropa/Kyjev"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:324
 msgid "Europe/Lisbon"
 msgstr "Evropa/Lisabon"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:325
 msgid "Europe/Ljubljana"
 msgstr "Evropa/Lublaň"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:326
 msgid "Europe/London"
 msgstr "Evropa/Londýn"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:327
 msgid "Europe/Luxembourg"
 msgstr "Evropa/Lucembursko"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:328
 msgid "Europe/Madrid"
 msgstr "Evropa/Madrid"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:329
 msgid "Europe/Malta"
 msgstr "Evropa/Malta"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:330
 msgid "Europe/Minsk"
 msgstr "Evropa/Minsk"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:331
 msgid "Europe/Monaco"
 msgstr "Evropa/Monako"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:332
 msgid "Europe/Moscow"
 msgstr "Evropa/Moskva"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:333
 msgid "Europe/Nicosia"
 msgstr "Evropa/Nicosia"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:334
 msgid "Europe/Oslo"
 msgstr "Evropa/Oslo"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:335
 msgid "Europe/Paris"
 msgstr "Evropa/Paříž"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:336
 msgid "Europe/Prague"
 msgstr "Evropa/Praha"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:337
 msgid "Europe/Riga"
 msgstr "Evropa/Riga"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:338
 msgid "Europe/Rome"
 msgstr "Evropa/Řím"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:339
 msgid "Europe/Samara"
 msgstr "Evropa/Samara"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:340
 msgid "Europe/San_Marino"
 msgstr "Evropa/San_Marino"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:341
 msgid "Europe/Sarajevo"
 msgstr "Evropa/Sarajevo"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:342
 msgid "Europe/Simferopol"
 msgstr "Evropa/Simferopol"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:343
 msgid "Europe/Skopje"
 msgstr "Evropa/Skopje"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:344
 msgid "Europe/Sofia"
 msgstr "Evropa/Sofia"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:345
 msgid "Europe/Stockholm"
 msgstr "Evropa/Stockholm"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:346
 msgid "Europe/Tallinn"
 msgstr "Evropa/Talin"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:347
 msgid "Europe/Tirane"
 msgstr "Evropa/Tirana"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:348
 msgid "Europe/Uzhgorod"
 msgstr "Evropa/Užgorod"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:349
 msgid "Europe/Vaduz"
 msgstr "Evropa/Vadúz"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:350
 msgid "Europe/Vatican"
 msgstr "Evropa/Vatikán"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:351
 msgid "Europe/Vienna"
 msgstr "Evropa/Vídeň"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:352
 msgid "Europe/Vilnius"
 msgstr "Evropa/Vilnius"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:353
 msgid "Europe/Warsaw"
 msgstr "Evropa/Varšava"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:354
 msgid "Europe/Zagreb"
 msgstr "Evropa/Záhřeb"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
-msgstr "Evropa/Zaporozhye"
+msgstr "Evropa/Záporoží"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:356
 msgid "Europe/Zurich"
 msgstr "Evropa/Curych"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:357
 msgid "Indian/Antananarivo"
 msgstr "Indický oceán/Antananarivo"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:358
 msgid "Indian/Chagos"
 msgstr "Indický oceán/Chagos"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:359
 msgid "Indian/Christmas"
 msgstr "Indický oceán/Vánoční ostrovy"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:360
 msgid "Indian/Cocos"
 msgstr "Indický oceán/Kokosové ostrovy"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:361
 msgid "Indian/Comoro"
 msgstr "Indický oceán/Komory"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:362
 msgid "Indian/Kerguelen"
 msgstr "Indický oceán/Kerguelen"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:363
 msgid "Indian/Mahe"
 msgstr "Indický oceán/Mahe"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:364
 msgid "Indian/Maldives"
 msgstr "Indický oceán/Maledivy"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:365
 msgid "Indian/Mauritius"
 msgstr "Indický oceán/Mauritius"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:366
 msgid "Indian/Mayotte"
 msgstr "Indický oceán/Mayotte"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:367
 msgid "Indian/Reunion"
 msgstr "Indický oceán/Reunion"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:368
 msgid "Pacific/Apia"
 msgstr "Tichý oceán/Apia"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:369
 msgid "Pacific/Auckland"
 msgstr "Tichý oceán/Auckland"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:370
 msgid "Pacific/Chatham"
 msgstr "Tichý oceán/Chatham"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:371
 msgid "Pacific/Easter"
 msgstr "Tichý oceán/Velikonoční ostrovy"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:372
 msgid "Pacific/Efate"
 msgstr "Tichý oceán/Efate"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:373
 msgid "Pacific/Enderbury"
 msgstr "Tichý oceán/Enderbury"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:374
 msgid "Pacific/Fakaofo"
 msgstr "Tichý oceán/Fakaofo"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:375
 msgid "Pacific/Fiji"
 msgstr "Tichý oceán/Fidži"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:376
 msgid "Pacific/Funafuti"
 msgstr "Tichý oceán/Funafuti"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:377
 msgid "Pacific/Galapagos"
 msgstr "Tichý oceán/Galapágy"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:378
 msgid "Pacific/Gambier"
 msgstr "Tichý oceán/Gambír"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:379
 msgid "Pacific/Guadalcanal"
 msgstr "Tichý oceán/Guadalcanal"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:380
 msgid "Pacific/Guam"
 msgstr "Tichý oceán/Guam"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:381
 msgid "Pacific/Honolulu"
 msgstr "Tichý oceán/Honolulu"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:382
 msgid "Pacific/Johnston"
 msgstr "Tichý oceán/Johnston"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:383
 msgid "Pacific/Kiritimati"
 msgstr "Tichý oceán/Kiritimati"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:384
 msgid "Pacific/Kosrae"
 msgstr "Tichý oceán/Kosrae"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:385
 msgid "Pacific/Kwajalein"
 msgstr "Tichý oceán/Kwajalein"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:386
 msgid "Pacific/Majuro"
 msgstr "Tichý oceán/Majuro"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:387
 msgid "Pacific/Marquesas"
 msgstr "Tichý oceán/Marquesas"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:388
 msgid "Pacific/Midway"
 msgstr "Tichý oceán/Midway"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:389
 msgid "Pacific/Nauru"
 msgstr "Tichý oceán/Nauru"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:390
 msgid "Pacific/Niue"
 msgstr "Tichý oceán/Niue"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:391
 msgid "Pacific/Norfolk"
 msgstr "Tichý oceán/Norfolk"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:392
 msgid "Pacific/Noumea"
 msgstr "Tichý oceán/Noumea"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:393
 msgid "Pacific/Pago_Pago"
 msgstr "Tichý oceán/Pago_Pago"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:394
 msgid "Pacific/Palau"
 msgstr "Tichý oceán/Palau"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:395
 msgid "Pacific/Pitcairn"
 msgstr "Tichý oceán/Pitcairn"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:396
 msgid "Pacific/Ponape"
 msgstr "Tichý oceán/Ponape"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:397
 msgid "Pacific/Port_Moresby"
 msgstr "Tichý oceán/Port_Moresby"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:398
 msgid "Pacific/Rarotonga"
 msgstr "Tichý oceán/Rarotonga"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:399
 msgid "Pacific/Saipan"
 msgstr "Tichý oceán/Saipan"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:400
 msgid "Pacific/Tahiti"
 msgstr "Tichý oceán/Tahiti"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:401
 msgid "Pacific/Tarawa"
 msgstr "Tichý oceán/Tarawa"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:402
 msgid "Pacific/Tongatapu"
 msgstr "Tichý oceán/Tongatapu"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:403
 msgid "Pacific/Truk"
 msgstr "Tichý oceán/Truk"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:404
 msgid "Pacific/Wake"
 msgstr "Tichý oceán/Wake"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:405
 msgid "Pacific/Wallis"
 msgstr "Tichý oceán/Wallis"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:406
 msgid "Pacific/Yap"
 msgstr "Tichý oceán/Yap"
 
 #: ../composer/e-composer-autosave.c:275
-#, fuzzy
 msgid "Could not open autosave file"
-msgstr "Nemohu otevřít soubor"
+msgstr "Nelze otevřít soubor"
 
 #: ../composer/e-composer-autosave.c:282
 msgid "Unable to retrieve message from editor"
@@ -10624,191 +10615,185 @@ msgstr "Vložit přílohu"
 msgid "A_ttach"
 msgstr "_Přiložit"
 
-#: ../composer/e-composer-actions.c:143
+#: ../composer/e-composer-actions.c:142
 msgid "Untitled Message"
 msgstr "Nepojmenovaná zpráva"
 
-#: ../composer/e-composer-actions.c:474
+#: ../composer/e-composer-actions.c:473
 msgid "Attach a file"
 msgstr "Připojit soubor"
 
-#: ../composer/e-composer-actions.c:479 ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:478 ../mail/mail-signature-editor.c:194
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "_Zavřít"
 
-#: ../composer/e-composer-actions.c:481
+#: ../composer/e-composer-actions.c:480
 msgid "Close the current file"
 msgstr "Uzavřít aktuální soubor"
 
-#: ../composer/e-composer-actions.c:486 ../mail/em-folder-view.c:1344
+#: ../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:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "_Tisknout..."
 
-#: ../composer/e-composer-actions.c:493 ../ui/evolution-addressbook.xml.h:27
+#: ../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 "_Náhled před tiskem"
 
-#: ../composer/e-composer-actions.c:502
+#: ../composer/e-composer-actions.c:501
 msgid "Save the current file"
 msgstr "Uložit aktuální soubor"
 
-#: ../composer/e-composer-actions.c:507
+#: ../composer/e-composer-actions.c:506
 msgid "Save _As..."
 msgstr "Uložit _jako..."
 
-#: ../composer/e-composer-actions.c:509
+#: ../composer/e-composer-actions.c:508
 msgid "Save the current file with a different name"
 msgstr "Uložit aktuální soubor pod jiným jménem"
 
-#: ../composer/e-composer-actions.c:514
+#: ../composer/e-composer-actions.c:513
 msgid "Save _Draft"
 msgstr "Uložit _koncept"
 
-#: ../composer/e-composer-actions.c:516
+#: ../composer/e-composer-actions.c:515
 msgid "Save as draft"
 msgstr "Uložit jako koncept"
 
-#: ../composer/e-composer-actions.c:521
+#: ../composer/e-composer-actions.c:520
 msgid "S_end"
 msgstr "P_oslat"
 
-#: ../composer/e-composer-actions.c:523
+#: ../composer/e-composer-actions.c:522
 msgid "Send this message"
 msgstr "Poslat tuto zprávu"
 
-#: ../composer/e-composer-actions.c:530
+#: ../composer/e-composer-actions.c:529
 msgid "Insert Send options"
 msgstr "Vložit možnosti odesílání"
 
-#: ../composer/e-composer-actions.c:535
-#, fuzzy
+#: ../composer/e-composer-actions.c:534
 msgid "New _Message"
-msgstr "_Zpráva"
+msgstr "Nová _zpráva"
 
-#: ../composer/e-composer-actions.c:537
-#, fuzzy
+#: ../composer/e-composer-actions.c:536
 msgid "Open New Message window"
-msgstr "_Odeslat novou zprávu..."
+msgstr "Otevřít okno nové zprávy"
 
-#: ../composer/e-composer-actions.c:544
-#, fuzzy
+#: ../composer/e-composer-actions.c:543
 msgid "Character _Encoding"
-msgstr "Kódování znaků"
+msgstr "_Kódování znaků"
 
-#: ../composer/e-composer-actions.c:551
+#: ../composer/e-composer-actions.c:550
 msgid "_Security"
 msgstr "_Zabezpečení"
 
-#: ../composer/e-composer-actions.c:561
+#: ../composer/e-composer-actions.c:560
 msgid "PGP _Encrypt"
 msgstr "Ši_frování PGP"
 
-#: ../composer/e-composer-actions.c:563
+#: ../composer/e-composer-actions.c:562
 msgid "Encrypt this message with PGP"
 msgstr "Zašifrovat tuto zprávu pomocí PGP"
 
-#: ../composer/e-composer-actions.c:569
+#: ../composer/e-composer-actions.c:568
 msgid "PGP _Sign"
 msgstr "Pod_pis PGP"
 
-#: ../composer/e-composer-actions.c:571
+#: ../composer/e-composer-actions.c:570
 msgid "Sign this message with your PGP key"
 msgstr "Podepsat tuto zprávu vaším klíčem PGP"
 
-#: ../composer/e-composer-actions.c:577
+#: ../composer/e-composer-actions.c:576
 msgid "_Prioritize Message"
 msgstr "_Důležitost zprávy"
 
-#: ../composer/e-composer-actions.c:579
+#: ../composer/e-composer-actions.c:578
 msgid "Set the message priority to high"
 msgstr "Nastavit vysokou prioritu zprávy"
 
-#: ../composer/e-composer-actions.c:585
-#, fuzzy
+#: ../composer/e-composer-actions.c:584
 msgid "Re_quest Read Receipt"
 msgstr "Žáda_t o doručenku o čtení"
 
-#: ../composer/e-composer-actions.c:587
+#: ../composer/e-composer-actions.c:586
 msgid "Get delivery notification when your message is read"
 msgstr "Doručit oznámení, že vaše zpráva byla přečtena"
 
-#: ../composer/e-composer-actions.c:593
+#: ../composer/e-composer-actions.c:592
 msgid "S/MIME En_crypt"
 msgstr "Šif_rování S/MIME"
 
-#: ../composer/e-composer-actions.c:595
+#: ../composer/e-composer-actions.c:594
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Zašifrovat tuto zprávu vaším šifrovacím certifikátem S/MIME"
 
-#: ../composer/e-composer-actions.c:601
+#: ../composer/e-composer-actions.c:600
 msgid "S/MIME Sig_n"
 msgstr "Po_dpis S/MIME"
 
-#: ../composer/e-composer-actions.c:603
+#: ../composer/e-composer-actions.c:602
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Podepsat tuto zprávu podpisovým certifikátem S/MIME"
 
-#: ../composer/e-composer-actions.c:609
+#: ../composer/e-composer-actions.c:608
 msgid "_Bcc Field"
 msgstr "_Skrytá kopie:"
 
-#: ../composer/e-composer-actions.c:611
+#: ../composer/e-composer-actions.c:610
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Přepne zobrazení pole BCC"
 
-#: ../composer/e-composer-actions.c:617
+#: ../composer/e-composer-actions.c:616
 msgid "_Cc Field"
 msgstr "_Kopie"
 
-#: ../composer/e-composer-actions.c:619
+#: ../composer/e-composer-actions.c:618
 msgid "Toggles whether the CC field is displayed"
 msgstr "Přepne zobrazení pole CC"
 
-#: ../composer/e-composer-actions.c:625
+#: ../composer/e-composer-actions.c:624
 msgid "_From Field"
 msgstr "_Od:"
 
-#: ../composer/e-composer-actions.c:627
+#: ../composer/e-composer-actions.c:626
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Přepne zobrazení pole pro výběr odesílatele"
 
-#: ../composer/e-composer-actions.c:633
+#: ../composer/e-composer-actions.c:632
 msgid "_Post-To Field"
 msgstr "_Poslat-komu"
 
-#: ../composer/e-composer-actions.c:635
+#: ../composer/e-composer-actions.c:634
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Přepne zobrazení pole Poslat-komu"
 
-#: ../composer/e-composer-actions.c:641
+#: ../composer/e-composer-actions.c:640
 msgid "_Reply-To Field"
 msgstr "Odpovědět-_komu:"
 
-#: ../composer/e-composer-actions.c:643
+#: ../composer/e-composer-actions.c:642
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Přepne zobrazení pole Odpověď-kam"
 
-#: ../composer/e-composer-actions.c:649
-#, fuzzy
+#: ../composer/e-composer-actions.c:648
 msgid "_Subject Field"
-msgstr "_Kopie"
+msgstr "_Pole předmětu"
 
-#: ../composer/e-composer-actions.c:651
-#, fuzzy
+#: ../composer/e-composer-actions.c:650
 msgid "Toggles whether the Subject field is displayed"
-msgstr "Přepne zobrazení pole stavu"
+msgstr "Přepíná, zda má být pole předmětu zobrazeno"
 
-#: ../composer/e-composer-actions.c:657
+#: ../composer/e-composer-actions.c:656
 msgid "_To Field"
 msgstr "_Komu"
 
-#: ../composer/e-composer-actions.c:659
+#: ../composer/e-composer-actions.c:658
 msgid "Toggles whether the To field is displayed"
 msgstr "Přepne zobrazení pole Komu"
 
@@ -10860,39 +10845,34 @@ msgstr "_Předmět:"
 msgid "Si_gnature:"
 msgstr "_Podpis:"
 
-#: ../composer/e-composer-name-header.c:114
+#: ../composer/e-composer-name-header.c:115
 msgid "Click here for the address book"
 msgstr "Kliknutím zobrazíte adresář"
 
-#: ../composer/e-composer-post-header.c:136
+#: ../composer/e-composer-post-header.c:137
 msgid "Posting destination"
 msgstr "Cíl odeslání"
 
-#: ../composer/e-composer-post-header.c:137
+#: ../composer/e-composer-post-header.c:138
 msgid "Choose folders to post the message to."
 msgstr "Zvolte složky, kam poslat zprávu."
 
-#: ../composer/e-composer-post-header.c:171
+#: ../composer/e-composer-post-header.c:172
 msgid "Click here to select folders to post to"
 msgstr "Kliknutím sem vyberte složky, kam uložit"
 
-#: ../composer/e-composer-private.c:65
-#, fuzzy
-msgid "Recent _Documents"
-msgstr "Dokončeno procent"
-
-#: ../composer/e-composer-private.c:173 ../composer/e-msg-composer.c:1559
+#: ../composer/e-composer-private.c:180 ../composer/e-msg-composer.c:1556
 msgid "Show _Attachment Bar"
 msgstr "Zobrazit lištu _příloh"
 
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:870
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Nemohu podepsat odchozí zprávu: Pro tento účet nebyl nastaven podpisový "
 "certifikát"
 
-#: ../composer/e-msg-composer.c:880
+#: ../composer/e-msg-composer.c:877
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10900,25 +10880,24 @@ msgstr ""
 "Nemohu zašifrovat odchozí zprávu: Pro tento účet nebyl nastaven šifrovací "
 "certifikát"
 
-#: ../composer/e-msg-composer.c:1501 ../mail/em-format-html-display.c:1914
-#: ../mail/em-format-html-display.c:2404 ../mail/mail-config.glade.h:45
+#: ../composer/e-msg-composer.c:1498 ../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
-#, fuzzy
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Příloha"
-msgstr[1] "Příloha"
-msgstr[2] "Příloha"
+msgstr[1] "Přílohy"
+msgstr[2] "Příloh"
 
-#: ../composer/e-msg-composer.c:1557
+#: ../composer/e-msg-composer.c:1554
 msgid "Hide _Attachment Bar"
 msgstr "Skrýt lištu _příloh"
 
-#: ../composer/e-msg-composer.c:1574 ../composer/e-msg-composer.c:2781
+#: ../composer/e-msg-composer.c:1571 ../composer/e-msg-composer.c:2778
 msgid "Compose Message"
 msgstr "Napsat zprávu"
 
-#: ../composer/e-msg-composer.c:4056
+#: ../composer/e-msg-composer.c:4053
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -11061,23 +11040,27 @@ msgstr "K této zprávě nemůžete přiložit soubor `${0}'."
 msgid "You need to configure an account before you can compose mail."
 msgstr "Než budete moci psát zprávu, musíte nastavit účet."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Continue Editing"
+msgstr "_Pokračovat v editaci"
+
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Do not Recover"
 msgstr "_Neobnovovat"
 
-#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:306
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Recover"
 msgstr "_Obnovit"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Message"
-msgstr "_Uložit zprávu"
+#: ../composer/mail-composer.error.xml.h:33
+msgid "_Save Draft"
+msgstr "_Uložit koncept"
 
 #: ../data/evolution.desktop.in.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "Pošta a Kalendář Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:738
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
 msgid "Groupware Suite"
 msgstr "Sada groupware"
 
@@ -11093,85 +11076,79 @@ msgstr "karta adresáře"
 msgid "calendar information"
 msgstr "informace kalendáře"
 
-#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
+#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "Chyba Evolution"
 
-#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
+#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
 msgid "Evolution Warning"
 msgstr "Varování Evolution"
 
-#: ../e-util/e-error.c:117
+#: ../e-util/e-error.c:118
 msgid "Evolution Information"
 msgstr "Informace Evolution"
 
-#: ../e-util/e-error.c:119
+#: ../e-util/e-error.c:120
 msgid "Evolution Query"
 msgstr "Dotaz Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:449
+#: ../e-util/e-error.c:450
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Interní chyba, žádáno o neznámou chybu '%s'"
 
-#: ../e-util/e-logger.c:154
-#, fuzzy
+#: ../e-util/e-logger.c:156
 msgid "Component"
-msgstr "Dokončeno"
+msgstr "Komponenta"
 
-#: ../e-util/e-logger.c:155
+#: ../e-util/e-logger.c:157
 msgid "Name of the component being logged"
-msgstr ""
+msgstr "Název právě přihlášené komponenty"
 
 #: ../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:339
+#: ../plugins/plugin-manager/plugin-manager.c:355
 #: ../plugins/publish-calendar/publish-calendar.c:689
 msgid "Enabled"
 msgstr "Povoleno"
 
 #: ../e-util/e-plugin.c:309
-#, fuzzy
 msgid "Whether the plugin is enabled"
-msgstr "Jestli je rozbalovač rozbalen"
+msgstr "Jestli je zásuvný modul povolený"
 
-#: ../e-util/e-print.c:158
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "Během tisku se vyskytla chyba"
 
-#: ../e-util/e-print.c:165
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "Tiskový systém nahlásil následující detaily o chybě:"
 
-#: ../e-util/e-print.c:171
+#: ../e-util/e-print.c:173
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "Tiskový systém nenahlásil žádné další detaily o chybě."
 
 #: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
-#, fuzzy
 msgid "Because \"{1}\"."
-msgstr "Protože &quot;{1}&quot;."
+msgstr "Protože \"{1}\"."
 
 #: ../e-util/e-system.error.xml.h:2
-#, fuzzy
 msgid "Cannot open file \"{0}\"."
-msgstr "Nemohu otevřít soubor"
+msgstr "Nelze otevřít soubor \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:3
-#, fuzzy
 msgid "Cannot save file \"{0}\"."
-msgstr "Nemohu uložit soubor &quot;{0}&quot;."
+msgstr "Nelze uložit soubor \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
 msgstr "Chcete jej přepsat?"
 
 #: ../e-util/e-system.error.xml.h:5
-#, fuzzy
 msgid "File exists \"{0}\"."
-msgstr "Soubor existuje &quot;{0}&quot;."
+msgstr "Soubor existuje \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
@@ -11181,6 +11158,10 @@ msgstr "Přepsat soubor?"
 msgid "_Overwrite"
 msgstr "_Přepsat"
 
+#: ../e-util/e-util.c:97
+msgid "Could not display help for Evolution."
+msgstr "Nelze zobrazit nápovědu pro Evolution."
+
 #: ../e-util/e-util-labels.c:37
 msgid "I_mportant"
 msgstr "Dů_ležité"
@@ -11222,21 +11203,21 @@ msgid "Label name cannot be empty."
 msgstr "Název nemůže být prázdný."
 
 #: ../e-util/e-util-labels.c:356
-#, fuzzy
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
 msgstr ""
-"Štítek se stejnou značkou již existuje. Přejmenujte prosím svůj štítek."
+"Štítek se stejnou značkou již na serveru existuje. Přejmenujte prosím svůj "
+"štítek."
 
 #: ../e-util/gconf-bridge.c:1218
-#, fuzzy, c-format
+#, c-format
 msgid "GConf error: %s"
-msgstr "Chyba ověření: %s"
+msgstr "Chyba GConf: %s"
 
 #: ../e-util/gconf-bridge.c:1228
 msgid "All further errors shown only on terminal."
-msgstr ""
+msgstr "Všechny další chyby jsou zobrazeny pouze v terminálu."
 
 #: ../filter/filter-datespec.c:80
 #, c-format
@@ -11377,56 +11358,56 @@ msgstr "Vybrat soubor"
 msgid "Test"
 msgstr "Test"
 
-#: ../filter/filter-rule.c:851
+#: ../filter/filter-rule.c:852
 msgid "R_ule name:"
 msgstr "Ná_zev pravidla:"
 
-#: ../filter/filter-rule.c:879
+#: ../filter/filter-rule.c:880
 msgid "Find items that meet the following criteria"
 msgstr "Hledat položky s následujícími kritérii"
 
-#: ../filter/filter-rule.c:913
+#: ../filter/filter-rule.c:914
 msgid "A_dd Filter Criteria"
 msgstr "_Přidat pravidlo filtru"
 
-#: ../filter/filter-rule.c:919
+#: ../filter/filter-rule.c:920
 msgid "If all criteria are met"
 msgstr "Pokud souhlasí všechna kritéria"
 
-#: ../filter/filter-rule.c:919
+#: ../filter/filter-rule.c:920
 msgid "If any criteria are met"
 msgstr "Pokud souhlasí některá kritéria"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "_Find items:"
 msgstr "_Najít položky:"
 
-#: ../filter/filter-rule.c:943
+#: ../filter/filter-rule.c:944
 msgid "All related"
 msgstr "Vše související"
 
-#: ../filter/filter-rule.c:943
+#: ../filter/filter-rule.c:944
 msgid "Replies"
 msgstr "Odpovědi"
 
-#: ../filter/filter-rule.c:943
+#: ../filter/filter-rule.c:944
 msgid "Replies and parents"
 msgstr "Odpovědi a rodiče"
 
-#: ../filter/filter-rule.c:943
+#: ../filter/filter-rule.c:944
 msgid "No reply or parent"
 msgstr "Bez odpovědi nebo rodič"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:946
 msgid "I_nclude threads"
 msgstr "Z_ahrnout vlákna"
 
-#: ../filter/filter-rule.c:1043 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:1044 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Příchozí"
 
-#: ../filter/filter-rule.c:1043 ../mail/em-utils.c:309
+#: ../filter/filter-rule.c:1044 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Odchozí"
 
@@ -11540,7 +11521,8 @@ msgstr "s časem, který určíte"
 
 #: ../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:404
+#: ../plugins/google-account-setup/google-source.c:665
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "weeks"
 msgstr "týdnů"
 
@@ -11578,9 +11560,8 @@ msgid "Configure your email accounts here"
 msgstr "Zde nastavte své účty e-mailu"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
 msgid "Configure your network connection settings here"
-msgstr "Zde nastavte své účty e-mailu"
+msgstr "Zde nastavte své internetové připojení"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
@@ -11607,14 +11588,13 @@ msgid "Evolution Mail preferences control"
 msgstr "Ovládací prvek nastavení pošty Evolution"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#, fuzzy
 msgid "Evolution Network configuration control"
-msgstr "Ovládací prvek nastavení kalendáře Evolution"
+msgstr "Ovládání nastavení sítě v Evolutionu"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:612
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:380
+#: ../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:593 ../mail/mail-component.c:594
-#: ../mail/mail-component.c:758
+#: ../mail/mail-component.c:763
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Pošta"
@@ -11630,20 +11610,19 @@ msgid "Mail Preferences"
 msgstr "Nastavení pošty"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
-#, fuzzy
 msgid "Network Preferences"
-msgstr "Nastavení editoru"
+msgstr "Nastavení sítě"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
 msgid "_Mail"
 msgstr "_Pošta"
 
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:386
 #, c-format
 msgid "%s License Agreement"
 msgstr "Licenční smlouva %s"
 
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:393
 #, c-format
 msgid ""
 "\n"
@@ -11656,71 +11635,71 @@ msgstr ""
 "pro %s zobrazenou níže\n"
 "a přijměte ji zaškrtnutím pole\n"
 
-#: ../mail/em-account-editor.c:466 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:512
+#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:239
+#: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Vybrat složku"
 
-#: ../mail/em-account-editor.c:590 ../mail/em-account-editor.c:635
-#: ../mail/em-account-editor.c:702 ../widgets/misc/e-signature-combo-box.c:97
+#: ../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 "automatický"
 
-#: ../mail/em-account-editor.c:762
+#: ../mail/em-account-editor.c:761
 msgid "Ask for each message"
 msgstr "Ptát se u každé zprávy"
 
-#: ../mail/em-account-editor.c:1810 ../mail/mail-config.glade.h:94
+#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:94
 msgid "Identity"
 msgstr "Identita"
 
-#: ../mail/em-account-editor.c:1859 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:124
 msgid "Receiving Email"
 msgstr "Příjem pošty"
 
-#: ../mail/em-account-editor.c:2041
+#: ../mail/em-account-editor.c:2130
 msgid "Check for _new messages every"
 msgstr "_Automaticky kontrolovat novou poštu každých"
 
-#: ../mail/em-account-editor.c:2049
+#: ../mail/em-account-editor.c:2138
 msgid "minu_tes"
 msgstr "minu_t"
 
-#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:135
+#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:136
 msgid "Sending Email"
 msgstr "Posílání pošty"
 
-#: ../mail/em-account-editor.c:2282 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
 msgid "Defaults"
-msgstr "Implicitní hodnoty"
+msgstr "Výchozí hodnoty"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2348 ../mail/mail-config.glade.h:130
+#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:131
 #: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "Zabezpečení"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2385 ../mail/em-account-editor.c:2476
+#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
 msgid "Receiving Options"
 msgstr "Možnosti příjmu"
 
-#: ../mail/em-account-editor.c:2386 ../mail/em-account-editor.c:2477
+#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
 msgid "Checking for New Messages"
 msgstr "Kontrola nové pošty"
 
-#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Editor účtu"
 
-#: ../mail/em-account-editor.c:2828 ../mail/mail-config.glade.h:83
+#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Asistent pro účet Evolution"
 
 #. translators: default account indicator
 #: ../mail/em-account-prefs.c:429
 msgid "[Default]"
-msgstr "[Implicitní]"
+msgstr "[Výchozí]"
 
 #: ../mail/em-account-prefs.c:488
 msgid "Account name"
@@ -11747,18 +11726,18 @@ msgstr "Přidat skript podpisu"
 msgid "Signature(s)"
 msgstr "Podpisy"
 
-#: ../mail/em-composer-utils.c:1148 ../mail/em-format-quote.c:415
+#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Přeposlaná zpráva --------"
 
-#: ../mail/em-composer-utils.c:1960
+#: ../mail/em-composer-utils.c:1962
 msgid "an unknown sender"
 msgstr "neznámý odesílatel"
 
 #. 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:2007
+#: ../mail/em-composer-utils.c:2009
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11766,7 +11745,7 @@ msgstr ""
 "${Sender} píše v ${AbbrevWeekdayName} ${Day}. ${Month}. ${Year} v ${24Hour}:"
 "${Minute} ${TimeZone}:"
 
-#: ../mail/em-composer-utils.c:2150
+#: ../mail/em-composer-utils.c:2152
 msgid "-----Original Message-----"
 msgstr "-------- Původní zpráva --------"
 
@@ -12018,9 +11997,9 @@ msgstr "začíná na"
 msgid "Stop Processing"
 msgstr "Zastavit zpracování"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:341
+#: ../mail/em-filter-i18n.h:72 ../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:318
+#: ../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"
@@ -12031,64 +12010,64 @@ msgid "Unset Status"
 msgstr "Odnastavit stav"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:521
+#: ../mail/em-filter-rule.c:522
 msgid "Then"
 msgstr "Dále"
 
-#: ../mail/em-filter-rule.c:549
+#: ../mail/em-filter-rule.c:550
 msgid "Add Ac_tion"
 msgstr "Přidat _akci"
 
-#: ../mail/em-folder-browser.c:189
+#: ../mail/em-folder-browser.c:190
 msgid "C_reate Search Folder From Search..."
 msgstr "Vytvořit složku _hledání z vyhledávání..."
 
-#: ../mail/em-folder-browser.c:214
+#: ../mail/em-folder-browser.c:215
 msgid "All Messages"
 msgstr "Všechny zprávy"
 
-#: ../mail/em-folder-browser.c:215
+#: ../mail/em-folder-browser.c:216
 msgid "Unread Messages"
 msgstr "Nepřečtené zprávy"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:218
 msgid "No Label"
 msgstr "Bez štítku"
 
-#: ../mail/em-folder-browser.c:224
+#: ../mail/em-folder-browser.c:225
 msgid "Read Messages"
 msgstr "Přečtené zprávy"
 
-#: ../mail/em-folder-browser.c:225
+#: ../mail/em-folder-browser.c:226
 msgid "Recent Messages"
 msgstr "Nedávné zprávy"
 
-#: ../mail/em-folder-browser.c:226
+#: ../mail/em-folder-browser.c:227
 msgid "Last 5 Days' Messages"
 msgstr "Zpráva za posledních 5 dní"
 
-#: ../mail/em-folder-browser.c:227
+#: ../mail/em-folder-browser.c:228
 msgid "Messages with Attachments"
 msgstr "Zprávy s přílohami"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Important Messages"
 msgstr "Důležité zprávy"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Messages Not Junk"
 msgstr "Zprávy nejsou nevyžádané"
 
-#: ../mail/em-folder-browser.c:1153
+#: ../mail/em-folder-browser.c:1171
 msgid "Account Search"
 msgstr "Vyhledávání účtu"
 
-#: ../mail/em-folder-browser.c:1206
+#: ../mail/em-folder-browser.c:1224
 msgid "All Account Search"
 msgstr "Vyhledávání všech účtů"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:173
+#: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Nepřečtená zpráva:"
@@ -12097,19 +12076,33 @@ msgstr[2] "Nepřečtených zpráv:"
 
 #. 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:177
+#: ../mail/em-folder-properties.c:178
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Celkem zpráva:"
 msgstr[1] "Celkem zprávy:"
 msgstr[2] "Celkem zpráv:"
 
-#: ../mail/em-folder-properties.c:193 ../mail/em-folder-properties.c:195
-#, fuzzy
+#: ../mail/em-folder-properties.c:196
+#, c-format
+msgid "Quota usage (%s):"
+msgstr "Kvóta využití (%s):"
+
+#: ../mail/em-folder-properties.c:198
+#, c-format
 msgid "Quota usage"
-msgstr "Celkem zpráva:"
+msgstr "Kvóta využití"
 
-#: ../mail/em-folder-properties.c:385
+#. 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:160
+#: ../mail/mail-component.c:581
+#: ../plugins/exchange-operations/exchange-delegates-user.c:76
+#: ../plugins/exchange-operations/exchange-folder.c:594
+msgid "Inbox"
+msgstr "Příchozí"
+
+#: ../mail/em-folder-properties.c:389
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Vlastnosti složky"
@@ -12126,9 +12119,9 @@ msgstr "V_ytvořit"
 msgid "Folder _name:"
 msgstr "_Název složky:"
 
-#. load store to mail component at the end, when everything is loaded
+#. load store to mail component
 #: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:970 ../mail/mail-vfolder.c:1027
+#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1027
 msgid "Search Folders"
 msgstr "Složky hledání"
 
@@ -12137,27 +12130,19 @@ msgstr "Složky hledání"
 msgid "UNMATCHED"
 msgstr "NEPŘIŘAZENÉ"
 
-#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:161
+#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:161
 msgid "Drafts"
 msgstr "Koncepty"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:503 ../mail/em-folder-tree.c:2540
-#: ../mail/mail-component.c:160
-#: ../plugins/exchange-operations/exchange-delegates-user.c:76
-#: ../plugins/exchange-operations/exchange-folder.c:592
-msgid "Inbox"
-msgstr "Příchozí"
-
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:162
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:162
 msgid "Outbox"
 msgstr "K odeslání"
 
-#: ../mail/em-folder-tree-model.c:508 ../mail/mail-component.c:163
+#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:163
 msgid "Sent"
 msgstr "Odeslané"
 
-#: ../mail/em-folder-tree-model.c:530 ../mail/em-folder-tree-model.c:837
+#: ../mail/em-folder-tree-model.c:534 ../mail/em-folder-tree-model.c:841
 msgid "Loading..."
 msgstr "Načítám..."
 
@@ -12176,338 +12161,344 @@ msgstr "Načítám..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:371
+#: ../mail/em-folder-tree.c:380
 #, c-format
-msgid "folder-display|%s (%u)"
+msgctxt "folder-display"
+msgid "%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:732
+#: ../mail/em-folder-tree.c:741
 msgid "Mail Folder Tree"
 msgstr "Strom složek pošty"
 
-#: ../mail/em-folder-tree.c:891
+#: ../mail/em-folder-tree.c:900
 #, c-format
 msgid "Moving folder %s"
 msgstr "Přesouvám složku %s"
 
-#: ../mail/em-folder-tree.c:893
+#: ../mail/em-folder-tree.c:902
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopíruji složku %s"
 
-#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1955
+#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:1953
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Přesouvám zprávy do složky %s"
 
-#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1957
+#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:1955
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopíruji zprávy do složky %s"
 
-#: ../mail/em-folder-tree.c:917
+#: ../mail/em-folder-tree.c:926
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nelze upustit zprávy do úložiště nejvyšší úrovně"
 
-#: ../mail/em-folder-tree.c:994 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
 msgstr "_Kopírovat do složky"
 
-#: ../mail/em-folder-tree.c:995 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
 msgid "_Move to Folder"
 msgstr "_Přesunout do složky"
 
-#: ../mail/em-folder-tree.c:1709 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Procházím složky v \"%s\""
 
-#: ../mail/em-folder-tree.c:2083
+#: ../mail/em-folder-tree.c:2099
 msgid "Open in _New Window"
 msgstr "Otevřít v _novém okně"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2088
+#: ../mail/em-folder-tree.c:2104
 msgid "_New Folder..."
 msgstr "_Nová složka..."
 
-#: ../mail/em-folder-tree.c:2091
+#: ../mail/em-folder-tree.c:2107
 msgid "_Move..."
 msgstr "_Přesunout..."
 
-#: ../mail/em-folder-tree.c:2098 ../ui/evolution-mail-list.xml.h:39
+#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Přejmenovat..."
 
-#: ../mail/em-folder-tree.c:2099
+#: ../mail/em-folder-tree.c:2115
 msgid "Re_fresh"
 msgstr "_Obnovit"
 
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2116
 msgid "Fl_ush Outbox"
 msgstr "Odeslat zpráv_y ve složce \"K odeslání\""
 
-#: ../mail/em-folder-tree.c:2106 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "Vyprázdnit _koš"
 
-#: ../mail/em-folder-utils.c:103
+#: ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Kopíruji `%s' do `%s'"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1193
-#: ../mail/em-folder-view.c:1208
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../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 "Vyberte složku"
 
-#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1208
+#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "_Kopírovat"
 
-#: ../mail/em-folder-utils.c:587
-#: ../plugins/groupwise-features/share-folder-common.c:143
+#: ../mail/em-folder-utils.c:585
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Vytvářím složku `%s'"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Vytvořit složku"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:743
 #: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Upřesněte, kde chcete vytvořit složku:"
 
-#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Selhalo mazání pošty"
 
-#: ../mail/em-folder-view.c:1098 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Nemáte dostatečná oprávnění pro smazání této pošty."
 
-#: ../mail/em-folder-view.c:1336 ../ui/evolution-mail-message.xml.h:128
+#: ../mail/em-folder-view.c:1329 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Odpovědět odesílateli"
 
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:569 ../mail/em-popup.c:580
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../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 "_Přeposlat"
 
 #. 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:1342 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "_Upravit jako novou zprávu..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "Obnovit _odstraněné"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "Pře_sunout do složky..."
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "_Kopírovat do složky..."
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "Označit jako _přečtené"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "Označit jako _nepřečtené"
 
-#: ../mail/em-folder-view.c:1355
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "Označit jako _důležité"
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "Označit jako nedůlež_ité"
 
-#: ../mail/em-folder-view.c:1357
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "Označit jako _nevyžádaná"
 
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "Označit že není _nevyžádaná"
 
-#: ../mail/em-folder-view.c:1359
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "Označit k _vyřízení..."
 
-#: ../mail/em-folder-view.c:1361
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "Š_títek"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1362 ../widgets/misc/e-dateedit.c:484
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:484
 msgid "_None"
 msgstr "Žá_dný"
 
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "_Nový štítek"
 
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "Označit jako _dokončeno"
 
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "Zrušit _značku"
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "Vy_tvořit pravidlo ze zprávy"
 
 #. 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:1375
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "Složka hledání podle _předmětu"
 
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "Složka hledání podle _odesílatele"
 
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "Složka hledání podle příje_mců"
 
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "Složka hledání podle poštovní _konference"
 
 #. 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:1383
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "Filtr podle _předmětu"
 
-#: ../mail/em-folder-view.c:1384
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "Filtr podle _odesílatele"
 
-#: ../mail/em-folder-view.c:1385
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "Filtr podle příje_mců"
 
-#: ../mail/em-folder-view.c:1386
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "Filtr podle poštovní _konference"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2269 ../mail/em-folder-view.c:2313
+#. 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 "Implicitní"
+msgstr "Výchozí"
 
-#: ../mail/em-folder-view.c:2531
+#: ../mail/em-folder-view.c:2516
 msgid "Unable to retrieve message"
 msgstr "Nemohu získat zprávu"
 
-#: ../mail/em-folder-view.c:2550
+#: ../mail/em-folder-view.c:2535
 msgid "Retrieving Message..."
 msgstr "Získávám zprávu..."
 
-#: ../mail/em-folder-view.c:2809
+#: ../mail/em-folder-view.c:2794
 msgid "C_all To..."
 msgstr "_Volat..."
 
-#: ../mail/em-folder-view.c:2812
+#: ../mail/em-folder-view.c:2797
 msgid "Create _Search Folder"
 msgstr "Vytvořit složku _hledání"
 
-#: ../mail/em-folder-view.c:2813
+#: ../mail/em-folder-view.c:2798
 msgid "_From this Address"
 msgstr "_Z této adresy"
 
-#: ../mail/em-folder-view.c:2814
+#: ../mail/em-folder-view.c:2799
 msgid "_To this Address"
 msgstr "_Na tuto adresu"
 
-#: ../mail/em-folder-view.c:3311
+#: ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknutím sem pošlete e-mail %s"
 
-#: ../mail/em-folder-view.c:3323
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to call %s"
 msgstr "Kliknutím zavoláte %s"
 
-#: ../mail/em-folder-view.c:3328
+#: ../mail/em-folder-view.c:3313
 msgid "Click to hide/unhide addresses"
 msgstr "Skrýt/odkrýt adresy"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:472
+#: ../mail/em-format-html-display.c:471
 #, c-format
 msgid "Matches: %d"
 msgstr "Nalezeno: %d"
 
-#: ../mail/em-format-html-display.c:616
+#: ../mail/em-format-html-display.c:615
 msgid "Fin_d:"
 msgstr "_Hledat:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:640
+#: ../mail/em-format-html-display.c:639
 msgid "_Previous"
 msgstr "_Předchozí"
 
-#: ../mail/em-format-html-display.c:645
+#: ../mail/em-format-html-display.c:644
 msgid "_Next"
 msgstr "_Další"
 
-#: ../mail/em-format-html-display.c:650
+#: ../mail/em-format-html-display.c:649
 msgid "M_atch case"
 msgstr "Rozlišov_at velikost písmen"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:650
 msgid "Unsigned"
 msgstr "Nepodepsána"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:948
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Zpráva není podepsána. Není zaručeno, že je tato zpráva pravá."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:651
 msgid "Valid signature"
 msgstr "Platný podpis"
 
-#: ../mail/em-format-html-display.c:950
+#: ../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."
 msgstr ""
 "Tato zpráva je podepsána a je platná, takže je velmi pravděpodobně pravá."
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:652
 msgid "Invalid signature"
 msgstr "Neplatný podpis"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:950
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "Podpis této zprávy nemůže být ověřen, možná byla při přenosu změněna."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:653
 msgid "Valid signature, but cannot verify sender"
 msgstr "Platný podpis, ale nemohu ověřit odesílatele"
 
-#: ../mail/em-format-html-display.c:952
+#: ../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."
@@ -12515,11 +12506,11 @@ msgstr ""
 "Tato zpráva je podepsána platným podpisem, ale odesílatel zprávy nemůže být "
 "ověřen."
 
-#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:654
 msgid "Signature exists, but need public key"
 msgstr "Podpis existuje, ale potřebuje veřejný klíč"
 
-#: ../mail/em-format-html-display.c:953
+#: ../mail/em-format-html-display.c:952
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12527,11 +12518,11 @@ msgstr ""
 "Tato zpráva je podepsána platným podpisem, ale neexistuje žádný odpovídající "
 "veřejný klíč."
 
-#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:959 ../mail/em-format-html.c:660
 msgid "Unencrypted"
 msgstr "Nešifrována"
 
-#: ../mail/em-format-html-display.c:960
+#: ../mail/em-format-html-display.c:959
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12539,11 +12530,11 @@ msgstr ""
 "Tato zpráva není šifrována. Její obsah může být prohlížen při přenosu přes "
 "Internet."
 
-#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:960 ../mail/em-format-html.c:661
 msgid "Encrypted, weak"
 msgstr "Šifrována slabě"
 
-#: ../mail/em-format-html-display.c:961
+#: ../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 "
@@ -12553,11 +12544,11 @@ msgstr ""
 "zvenku by bylo těžké, ale ne nemožné zobrazit obsah této zprávy v rozumném "
 "čase."
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:961 ../mail/em-format-html.c:662
 msgid "Encrypted"
 msgstr "Šifrována"
 
-#: ../mail/em-format-html-display.c:962
+#: ../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."
@@ -12565,11 +12556,11 @@ msgstr ""
 "Tato zpráva je šifrována. Pro člověka zvenku by bylo těžké zobrazit obsah "
 "této zprávy."
 
-#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:663
 msgid "Encrypted, strong"
 msgstr "Šifrována, silně"
 
-#: ../mail/em-format-html-display.c:963
+#: ../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 "
@@ -12578,56 +12569,56 @@ msgstr ""
 "Tato zpráva je šifrována. Pro člověka zvenku by bylo velmi těžké zobrazit "
 "obsah této zprávy v rozumném čase."
 
-#: ../mail/em-format-html-display.c:1064 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1063 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Zobrazit certifikát"
 
-#: ../mail/em-format-html-display.c:1079
+#: ../mail/em-format-html-display.c:1078
 msgid "This certificate is not viewable"
 msgstr "Tento certifikát nelze zobrazit"
 
-#: ../mail/em-format-html-display.c:1372
+#: ../mail/em-format-html-display.c:1377
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Dokončeno dne %d. %B %Y, %k:%M"
 
-#: ../mail/em-format-html-display.c:1380
+#: ../mail/em-format-html-display.c:1385
 msgid "Overdue:"
 msgstr "Již mělo být splněno:"
 
-#: ../mail/em-format-html-display.c:1383
+#: ../mail/em-format-html-display.c:1388
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "do %d. %B %Y, %k:%M"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1466
 msgid "_View Inline"
 msgstr "_Zobrazit v textu"
 
-#: ../mail/em-format-html-display.c:1462
+#: ../mail/em-format-html-display.c:1467
 msgid "_Hide"
 msgstr "_Skrýt"
 
-#: ../mail/em-format-html-display.c:1463
+#: ../mail/em-format-html-display.c:1468
 msgid "_Fit to Width"
 msgstr "_Přizpůsobit šířku"
 
-#: ../mail/em-format-html-display.c:1464
+#: ../mail/em-format-html-display.c:1469
 msgid "Show _Original Size"
 msgstr "Zobrazit _původní velikost"
 
-#: ../mail/em-format-html-display.c:1984
+#: ../mail/em-format-html-display.c:1989
 msgid "Save attachment as"
 msgstr "Uložit přílohu jako"
 
-#: ../mail/em-format-html-display.c:1988
+#: ../mail/em-format-html-display.c:1993
 msgid "Select folder to save all attachments"
 msgstr "Zvolte adresář, kam uložit všechny přílohy"
 
-#: ../mail/em-format-html-display.c:2039
+#: ../mail/em-format-html-display.c:2044
 msgid "_Save Selected..."
 msgstr "Uložit _vybrané..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2106
+#: ../mail/em-format-html-display.c:2111
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
@@ -12635,32 +12626,31 @@ msgstr[0] "%d přílo_ha"
 msgstr[1] "%d přílo_hy"
 msgstr[2] "%d přílo_h"
 
-#: ../mail/em-format-html-display.c:2113 ../mail/em-format-html-display.c:2202
+#: ../mail/em-format-html-display.c:2118 ../mail/em-format-html-display.c:2207
 msgid "S_ave"
 msgstr "_Uložit"
 
-#: ../mail/em-format-html-display.c:2124
+#: ../mail/em-format-html-display.c:2129
 msgid "S_ave All"
 msgstr "Uložit _vše"
 
-#: ../mail/em-format-html-display.c:2198
+#: ../mail/em-format-html-display.c:2203
 msgid "No Attachment"
 msgstr "Žádná příloha"
 
-#: ../mail/em-format-html-display.c:2339 ../mail/em-format-html-display.c:2377
+#: ../mail/em-format-html-display.c:2344 ../mail/em-format-html-display.c:2383
 msgid "View _Unformatted"
 msgstr "Zobrazit _nezformátované"
 
-#: ../mail/em-format-html-display.c:2341
+#: ../mail/em-format-html-display.c:2346
 msgid "Hide _Unformatted"
 msgstr "Skrýt _nezformátované"
 
-#: ../mail/em-format-html-display.c:2396
+#: ../mail/em-format-html-display.c:2403
 msgid "O_pen With"
 msgstr "_Otevřít pomocí"
 
-#: ../mail/em-format-html-display.c:2467
-#, fuzzy
+#: ../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."
@@ -12720,20 +12710,20 @@ msgid "Formatting Message..."
 msgstr "Formátuji zprávu..."
 
 #: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
-#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:209
+#: ../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 "Kopie"
 
 #: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
-#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../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 "Skrytá kopie"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:352
-#: ../mail/em-mailer-prefs.c:1450
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
+#: ../mail/em-mailer-prefs.c:1451
 msgid "Mailer"
 msgstr "Program elektronické pošty"
 
@@ -12755,13 +12745,13 @@ msgstr " (%R %Z)"
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Tato zpráva byla odeslána <b>%s</b> jménem <b>%s</b>"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:884
+#: ../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:314
+#: ../mail/message-tag-followup.c:308
 msgid "From"
 msgstr "Od"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:885
+#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
 #: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "Odpovědět-komu"
@@ -12776,99 +12766,104 @@ msgstr "Datum"
 msgid "Newsgroups"
 msgstr "Diskusní skupiny"
 
-#: ../mail/em-format.c:1157
+#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:83
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "Obličej"
+
+#: ../mail/em-format.c:1158
 #, c-format
 msgid "%s attachment"
 msgstr "%s příloha"
 
-#: ../mail/em-format.c:1198
+#: ../mail/em-format.c:1200
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Nemohu zpracovat zprávu S/MIME: Neznámá chyba"
 
-#: ../mail/em-format.c:1335 ../mail/em-format.c:1491
+#: ../mail/em-format.c:1337 ../mail/em-format.c:1493
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nemohu zpracovat zprávu MIME. Zobrazím ji jako zdrojový kód."
 
-#: ../mail/em-format.c:1343
+#: ../mail/em-format.c:1345
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Nepodporovaný typ šifrování pro multipart/encrypted"
 
-#: ../mail/em-format.c:1353
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message"
 msgstr "Nemohu zpracovat zprávu PGP/MIME"
 
-#: ../mail/em-format.c:1353
+#: ../mail/em-format.c:1355
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Nemohu zpracovat zprávu PGP/MIME: Neznámá chyba"
 
-#: ../mail/em-format.c:1510
+#: ../mail/em-format.c:1512
 msgid "Unsupported signature format"
 msgstr "Nepodporovaný formát podpisu"
 
-#: ../mail/em-format.c:1518 ../mail/em-format.c:1589
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1591
 msgid "Error verifying signature"
 msgstr "Chyba při ověřování podpisu"
 
-#: ../mail/em-format.c:1518 ../mail/em-format.c:1580 ../mail/em-format.c:1589
+#: ../mail/em-format.c:1520 ../mail/em-format.c:1582 ../mail/em-format.c:1591
 msgid "Unknown error verifying signature"
 msgstr "Neznámá chyba při ověřování podpisu"
 
-#: ../mail/em-format.c:1661
+#: ../mail/em-format.c:1663
 msgid "Could not parse PGP message"
 msgstr "Nemohu zpracovat zprávu PGP"
 
-#: ../mail/em-format.c:1661
+#: ../mail/em-format.c:1663
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Nemohu zpracovat zprávu PGP: Neznámá chyba"
 
-#: ../mail/em-mailer-prefs.c:93
+#: ../mail/em-mailer-prefs.c:94
 msgid "Every time"
 msgstr "Pokaždé"
 
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
 msgid "Once per day"
 msgstr "Jednou za den"
 
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per week"
 msgstr "Jednou za týden"
 
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per month"
 msgstr "Jednou za měsíc"
 
-#: ../mail/em-mailer-prefs.c:326
+#: ../mail/em-mailer-prefs.c:327
 msgid "Add Custom Junk Header"
 msgstr "Přidat vlastní hlavičku nevyžádané pošty"
 
-#: ../mail/em-mailer-prefs.c:330
+#: ../mail/em-mailer-prefs.c:331
 msgid "Header Name:"
 msgstr "Název hlavičky:"
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:332
 msgid "Header Value Contains:"
 msgstr "Hodnota hlavičky obsahuje:"
 
-#: ../mail/em-mailer-prefs.c:436
+#: ../mail/em-mailer-prefs.c:437
 msgid "Contains Value"
 msgstr "Obsahuje hodnotu"
 
-#: ../mail/em-mailer-prefs.c:458
+#: ../mail/em-mailer-prefs.c:459
 msgid "Color"
 msgstr "Barva"
 
-#: ../mail/em-mailer-prefs.c:461
+#: ../mail/em-mailer-prefs.c:462
 msgid "Tag"
 msgstr "Značka"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1078 ../mail/em-mailer-prefs.c:1132
+#: ../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 "Zásuvný modul %s je dostupný a binární soubor je nainstalován."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1141
+#: ../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."
@@ -12876,7 +12871,7 @@ msgstr ""
 "Zásuvný modul %s není dostupný. Prosím zkontrolujte, zdali je balíček "
 "nainstalován."
 
-#: ../mail/em-mailer-prefs.c:1107
+#: ../mail/em-mailer-prefs.c:1108
 msgid "No Junk plugin available"
 msgstr "Žádný zásuvný modul pro nevyžádanou poštu není dostupný"
 
@@ -12890,11 +12885,6 @@ msgstr "Udělat"
 msgid "Later"
 msgstr "Později"
 
-#: ../mail/em-migrate.c:1247
-#, fuzzy, c-format
-msgid "Migrating '%s':"
-msgstr "Převádím `%s':"
-
 #: ../mail/em-migrate.c:1652
 #, c-format
 msgid "Unable to create new folder `%s': %s"
@@ -12943,15 +12933,13 @@ msgid "Failed to create local mail storage `%s': %s"
 msgstr "Nemohu vytvořit místní úložiště pošty `%s': %s"
 
 #: ../mail/em-migrate.c:2898
-#, fuzzy
 msgid ""
 "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..."
 msgstr ""
-"Umístění a hierarchie složek poštovních schránek Evolution se od Evolution 1."
-"x změnilo.\n"
+"Formát shrnutí složek v Evolutionu byl  od verze 2.24 převeden do sqlite.\n"
 "\n"
 "Počkejte prosím, než Evolution převede vaše složky..."
 
@@ -12968,38 +12956,38 @@ msgstr ""
 "Nemohu číst nastavení z předchozí instalace Evolution, `evolution/config."
 "xmldb' neexistuje nebo je poškozen."
 
-#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
+#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
 msgid "_Reply to sender"
 msgstr "_Odpovědět odesílateli"
 
-#: ../mail/em-popup.c:566 ../mail/em-popup.c:577
+#: ../mail/em-popup.c:565 ../mail/em-popup.c:576
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Odpovědět _do konference"
 
 #. make it first item
-#: ../mail/em-popup.c:630 ../mail/em-popup.c:859
+#: ../mail/em-popup.c:629 ../mail/em-popup.c:852
 msgid "_Add to Address Book"
 msgstr "_Přidat do adresáře"
 
-#: ../mail/em-subscribe-editor.c:583
+#: ../mail/em-subscribe-editor.c:582
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Toto úložiště nepodporuje přihlášení nebo přihlášení nejsou povolena."
 
-#: ../mail/em-subscribe-editor.c:616
+#: ../mail/em-subscribe-editor.c:615
 msgid "Subscribed"
 msgstr "Přihlášeno"
 
-#: ../mail/em-subscribe-editor.c:620
+#: ../mail/em-subscribe-editor.c:619
 msgid "Folder"
 msgstr "Složka"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:822
+#: ../mail/em-subscribe-editor.c:821
 msgid "Please select a server."
 msgstr "Vyberte prosím server."
 
-#: ../mail/em-subscribe-editor.c:843
+#: ../mail/em-subscribe-editor.c:842
 msgid "No server has been selected"
 msgstr "Nebyl vybrán žádný server"
 
@@ -13031,27 +13019,25 @@ msgstr "Přidat adresu"
 msgid "Messages from %s"
 msgstr "Zprávy z %s"
 
-#: ../mail/em-vfolder-editor.c:112
+#: ../mail/em-vfolder-editor.c:115
 msgid "Search _Folders"
 msgstr "Složky _hledání"
 
-#: ../mail/em-vfolder-rule.c:592
+#: ../mail/em-vfolder-rule.c:593
 msgid "Search Folder source"
 msgstr "Zdroj složky hledání"
 
 #: ../mail/evolution-mail.schemas.in.h:1
-#, fuzzy
 msgid "\"Send and Receive Mail\" window height"
-msgstr "Odeslat a přijmout poštu"
+msgstr "Výška okna \"Odeslat a přijmout poštu\""
 
 #: ../mail/evolution-mail.schemas.in.h:2
 msgid "\"Send and Receive Mail\" window maximize state"
-msgstr ""
+msgstr "Maximalizace okna \"Odeslat a přijmout poštu\""
 
 #: ../mail/evolution-mail.schemas.in.h:3
-#, fuzzy
 msgid "\"Send and Receive Mail\" window width"
-msgstr "Odeslat a přijmout poštu"
+msgstr "Šířka okna \"Odeslat a přijmout poštu\""
 
 #: ../mail/evolution-mail.schemas.in.h:4
 msgid "Allows evolution to display text part of limited size"
@@ -13088,11 +13074,11 @@ msgstr "Barva zvýraznění citace."
 
 #: ../mail/evolution-mail.schemas.in.h:12
 msgid "Composer Window default height"
-msgstr "Implicitní výška okna pro psaní zpráv"
+msgstr "Výchozí výška okna pro psaní zpráv"
 
 #: ../mail/evolution-mail.schemas.in.h:13
 msgid "Composer Window default width"
-msgstr "Implicitní šířka okna pro psaní zpráv"
+msgstr "Výchozí šířka okna pro psaní zpráv"
 
 #: ../mail/evolution-mail.schemas.in.h:14
 msgid "Composer load/attach directory"
@@ -13111,99 +13097,106 @@ msgstr ""
 "address_count."
 
 #: ../mail/evolution-mail.schemas.in.h:17
-#, fuzzy
-msgid "Custom headers to use while checking for junk."
-msgstr "Určuje hlavičky pro kontrolu nevyžádané pošty."
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+"Řídí, jak často se mají místní změny synchronizovat se vzdáleným poštovním "
+"serverem. Interval musí být aspoň 30 sekund."
 
 #: ../mail/evolution-mail.schemas.in.h:18
-#, fuzzy
+msgid "Custom headers to use while checking for junk."
+msgstr "Vlastní hlavičky určené pro kontrolu nevyžádané pošty."
+
+#: ../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\"."
 msgstr ""
-"Určuje hlavičky pro kontrolu nevyžádané pošty. Formát je headername=value v "
-"gconf."
-
-#: ../mail/evolution-mail.schemas.in.h:19
-msgid "Default charset in which to compose messages"
-msgstr "Implicitní znaková sada, ve které psát zprávy"
+"Vlastní hlavičky určené pro kontrolu nevyžádané pošty. Seznam elementů jsou "
+"řetězce ve formátu \"headername=value\"."
 
 #: ../mail/evolution-mail.schemas.in.h:20
-msgid "Default charset in which to compose messages."
-msgstr "Implicitní znaková sada, ve které psát zprávy."
+msgid "Default charset in which to compose messages"
+msgstr "Výchozí znaková sada, ve které psát zprávy"
 
 #: ../mail/evolution-mail.schemas.in.h:21
-msgid "Default charset in which to display messages"
-msgstr "Implicitní znaková sada, ve které zobrazovat zprávy"
+msgid "Default charset in which to compose messages."
+msgstr "Výchozí znaková sada, ve které psát zprávy."
 
 #: ../mail/evolution-mail.schemas.in.h:22
-msgid "Default charset in which to display messages."
-msgstr "Implicitní znaková sada, ve které zobrazovat zprávy."
+msgid "Default charset in which to display messages"
+msgstr "Výchozí znaková sada, ve které zobrazovat zprávy"
 
 #: ../mail/evolution-mail.schemas.in.h:23
-msgid "Default forward style"
-msgstr "Implicitní styl přeposílání"
+msgid "Default charset in which to display messages."
+msgstr "Výchozí znaková sada, ve které zobrazovat zprávy."
 
 #: ../mail/evolution-mail.schemas.in.h:24
-msgid "Default height of the Composer Window."
-msgstr "Implicitní výška okna pro psaní zpráv."
+msgid "Default forward style"
+msgstr "Výchozí styl přeposílání"
 
 #: ../mail/evolution-mail.schemas.in.h:25
-msgid "Default height of the message window."
-msgstr "Implicitní výška okna zprávy."
+msgid "Default height of the Composer Window."
+msgstr "Výchozí výška okna pro psaní zpráv."
 
 #: ../mail/evolution-mail.schemas.in.h:26
-msgid "Default height of the subscribe dialog."
-msgstr "Implicitní výška dialogu přihlašování."
+msgid "Default height of the message window."
+msgstr "Výchozí výška okna zprávy."
 
 #: ../mail/evolution-mail.schemas.in.h:27
-msgid "Default reply style"
-msgstr "Implicitní styl odpovědí"
+msgid "Default height of the subscribe dialog."
+msgstr "Výchozí výška dialogu přihlašování."
 
 #: ../mail/evolution-mail.schemas.in.h:28
-msgid "Default value for thread expand state"
-msgstr "Implicitní hodnota pro rozbalené vlákno"
+msgid "Default reply style"
+msgstr "Výchozí styl odpovědí"
 
 #: ../mail/evolution-mail.schemas.in.h:29
-msgid "Default width of the Composer Window."
-msgstr "Implicitní šířka okna pro psaní zpráv."
+msgid "Default value for thread expand state"
+msgstr "Výchozí hodnota pro rozbalené vlákno"
 
 #: ../mail/evolution-mail.schemas.in.h:30
-msgid "Default width of the message window."
-msgstr "Implicitní šířka okna zprávy."
+msgid "Default width of the Composer Window."
+msgstr "Výchozí šířka okna pro psaní zpráv."
 
 #: ../mail/evolution-mail.schemas.in.h:31
-msgid "Default width of the subscribe dialog."
-msgstr "Implicitní šířka dialogu přihlašování."
+msgid "Default width of the message window."
+msgstr "Výchozí šířka okna zprávy."
 
 #: ../mail/evolution-mail.schemas.in.h:32
-#, fuzzy
-msgid ""
-"Determines whether to look up addresses for junk filtering in local "
-"addressbook only"
-msgstr "Určuje, zdali se má e-mail odesílatele hledat v adresáři"
+msgid "Default width of the subscribe dialog."
+msgstr "Výchozí šířka dialogu přihlašování."
 
 #: ../mail/evolution-mail.schemas.in.h:33
-msgid "Determines whether to lookup in addressbook for sender email"
-msgstr "Určuje, zdali se má e-mail odesílatele hledat v adresáři"
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+msgstr ""
+"Určuje, zdali se mají adresy pro filtrování nevyžádaného obsahu hledat pouze "
+"v místním adresáři."
 
 #: ../mail/evolution-mail.schemas.in.h:34
+msgid "Determines whether to lookup in address book for sender email"
+msgstr "Určuje, zdali se má v adresáři hledat e-mail odesílatele"
+
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid ""
-"Determines whether to loopup the sender email in addressbook. If found, it "
+"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 "
-"can be slow, if remote addressbooks (like ldap) are marked for "
+"can be slow, if remote address books (like LDAP) are marked for "
 "autocompletion."
 msgstr ""
 "Určuje, zdali hledat e-mail odesílatele v adresáři. Pokud je nalezen, neměl "
 "by to být spam. Vyhledává v adresářích označených pro automatické "
 "doplňování. Může být pomalý, pokud je pro automatické doplňování označen "
-"vzdálený adresář."
+"vzdálený adresář (jako LDAP)."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "Určuje, zda použít vlastní hlavičky pro kontrolu nevyžádané pošty"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../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 "
@@ -13213,67 +13206,67 @@ msgstr ""
 "tato volba zapnutá a hlavičky jsou uvedeny, zrychlí to kontrolu nevyžádané "
 "pošty."
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../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 ""
-"Určuje, zda použít stejné písma jak pro řaděk \"Od\" tak pro řádek \"Předmět"
+"Určuje, zda použít stejná písma jak pro řádek \"Od\", tak pro řádek \"Předmět"
 "\" ve sloupci  \"Zprávy\" při vertikálním zobrazení."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Directory for loading/attaching files to composer."
 msgstr "Adresář pro načítání/přikládání souborů do editoru."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Directory for saving mail component files."
 msgstr "Adresář pro ukládání souborů komponent zpráv."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Disable or enable ellipsizing of folder names in folder tree"
-msgstr ""
+msgstr "Zakázat nebo povolit zkracování názvů složek ve stromu složek"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Kreslit indikaci překlepů ve slovech, když píšete."
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Empty Junk folders on exit"
-msgstr "Vyprázdňovat složky Koš při ukončení"
+msgstr "Vyprazdňovat složky Koš při ukončení"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Empty Trash folders on exit"
 msgstr "Vyprazdňovat složky Koš při ukončení"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Vyprazdňovat všechny složky Koš při ukončení Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Vyprazdňovat všechny složky Koš při ukončování Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Povolit režim kurzoru, takže při čtení pošty vidíte kurzor."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Enable or disable magic space bar"
 msgstr "Povolit a zakázat lištu magického mezerníku"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable type ahead search feature"
 msgstr "Zapnout nebo vypnout funkci automatického doplňování vyhledávání"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable search folders"
 msgstr "Povolit složky hledání"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders on startup."
 msgstr "Zapnout vyhledávání složek při startu."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../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 "
@@ -13285,7 +13278,7 @@ msgstr ""
 "složku v bočním panelu jen tím, že napíšete název složky a výběr automaticky "
 "skočí do oné složky."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -13293,27 +13286,27 @@ msgstr ""
 "Zapnutím se použije mezerník k posouvání v náhledu zprávy, seznamu zpráv a "
 "složek."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Enable to render message text part of limited size."
 msgstr "Povolit vykreslení části textu zprávy o omezené velikosti."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable/disable caret mode"
 msgstr "Povolit/zakázat režim kurzoru"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Height of the message-list pane"
 msgstr "Výška panelu seznamu zpráv"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Height of the message-list pane."
 msgstr "Výška panelu seznamu zpráv."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Skryje náhled po složkách a odstraní výběr"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../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."
@@ -13321,7 +13314,7 @@ msgstr ""
 "Pokud se uživatel pokusí otevřít 10 nebo více zpráv najednou, zeptat se "
 "uživatele, jestli to opravdu chce udělat."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -13329,7 +13322,7 @@ msgstr ""
 "Pokud je panel \"Náhled\" zapnutý, potom se zobrazí vedle sebe místo "
 "vertikálně."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../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 "
@@ -13339,13 +13332,15 @@ msgstr ""
 "pro zobrazení obsahu použity všechny typy mime, které jsou v tomto seznamu a "
 "v databázi typů mime GNOME jim odpovídá komponenta bonobo prohlížeče."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../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."
 msgstr ""
+"Počáteční výška okna \"Odeslat a přijmout poštu\". Hodnota se aktualizuje "
+"podle toho, jak uživatel mění výšku okna."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../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 "
@@ -13353,18 +13348,25 @@ msgid ""
 "\" window cannot be maximized. This key exists only as an implementation "
 "detail."
 msgstr ""
+"Počáteční maximalizace okna \"Odeslat a přijmout poštu\". Hodnota se "
+"aktualizuje, když uživatel maximalizuje nebo ruší maximalizaci okna. "
+"Všimněte si, že tato konkrétní hodnota není Evolutionem používána od doby, "
+"kdy okno \"Odeslat a přijmout poštu\" nemůže být maximalizováno. Tento klíč "
+"existuje pouze jako implementační detail."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../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."
 msgstr ""
+"Počáteční šířka okna \"Odeslat a přijmout poštu\". Hodnota se aktualizuje "
+"podle toho, jak uživatel roztahuje okno."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "Vypíná/zapíná výzvu během označování více zpráv."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../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,7 +13374,7 @@ msgstr ""
 "Vypíná/zapíná opakované výzvy, zdali je vyžadována synchronizace off-line "
 "před přepnutím do režimu off-line."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../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 "
@@ -13382,31 +13384,31 @@ msgstr ""
 "vyhledávání vymaže zprávu natrvalo, ne jen jednoduše vymazat zprávu z "
 "výsledků vyhledávání."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Last time empty junk was run"
 msgstr "Datum, kdy bylo naposledy spuštěno vyprázdnění koše"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Last time empty trash was run"
 msgstr "Datum, kdy bylo naposledy spuštěno vyprázdnění koše"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Level beyond which the message should be logged."
 msgstr "Úroveň, nad kterou by měla být zpráva přihlášena."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "List of Labels and their associated colors"
 msgstr "Seznam štítků a jim přiřazených barev"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "List of accepted licenses"
 msgstr "Seznam přijatých licencí"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "List of accounts"
 msgstr "Seznam účtů"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13414,15 +13416,15 @@ msgstr ""
 "Seznam účtů, které zná komponenta pošty Evolution. Seznam obsahuje řetězce "
 "určující podadresáře relativně k /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of custom headers and whether they are enabled."
 msgstr "Seznam vlastních hlaviček a toho, jestli jsou povoleny."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of dictionary language codes used for spell checking."
-msgstr ""
+msgstr "Seznam jazykových kódů používaných pro kontrolu pravopisu."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 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."
@@ -13430,127 +13432,127 @@ msgstr ""
 "Seznam štítků, které zná komponenta pošty Evolution. Seznam obsahuje řetězce "
 "tvaru název:barva, kde barva používá kódování HTML hex."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Seznam typů mime, pro které hledat komponenty bonobo prohlížečů"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of protocol names whose license has been accepted."
 msgstr "Seznam názvů protokolů, jejichž licence byla přijata."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Load images for HTML messages over http"
 msgstr "Načítat obrázky pro zprávy v HTML přes http"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../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 contacts. 2 - "
-"Always load images off the net."
+"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 ""
-"Načítat obrázky pro zprávy v HTML přes http(s). Možné hodnoty jsou: 0 - "
-"nikdy nenačítat obrázky ze sítě, 1 - načítat obrázky ve zprávách od "
-"kontaktů, 2 - vždy načítat obrázky ze sítě."
+"Načítat obrázky pro zprávy v HTML přes http(s). Možné hodnoty jsou: \"0\" - "
+"nikdy nenačítat obrázky ze sítě, \"1\" - načítat obrázky ve zprávách od "
+"kontaktů, \"2\" - vždy načítat obrázky ze sítě."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Log filter actions"
 msgstr "Zaznamenávat akce filtrů"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Log filter actions to the specified log file."
 msgstr "Zaznamenávat akce filtrů do určeného souboru záznamů."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Logfile to log filter actions"
 msgstr "Soubor, kam zaznamenávat akce filtrů"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Logfile to log filter actions."
 msgstr "Soubor, kam zaznamenávat akce filtrů."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "Označit jako přečtené po určeném čase"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Označit jako přečtené po určeném čase."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Mark citations in the message \"Preview\""
 msgstr "Označit citace v \"náhledu\" zprávy"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Označit citace v \"náhledu\" zprávy."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Message Window default height"
-msgstr "Implicitní výška okna zprávy"
+msgstr "Výchozí výška okna zprávy"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Message Window default width"
-msgstr "Implicitní šířka okna zprávy"
+msgstr "Výchozí šířka okna zprávy"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Styl zobrazování zprávy (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Minimum days between emptying the junk on exit"
-msgstr "Minimum dní mezi vyprázdňováním koše při ukončení"
+msgstr "Minimum dní mezi vyprazdňováním koše při ukončení"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Minimum days between emptying the trash on exit"
-msgstr "Minimum dní mezi vyprázdňováním koše při ukončení"
+msgstr "Minimum dní mezi vyprazdňováním koše při ukončení"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Minimum time between emptying the junk on exit, in days."
-msgstr "Minimum dní mezi vyprázdňováním koše při ukončení ve dnech."
+msgstr "Minimum dní mezi vyprazdňováním koše při ukončení ve dnech."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum time between emptying the trash on exit, in days."
-msgstr "Minimum dní mezi vyprázdňováním koše při ukončení ve dnech."
+msgstr "Minimum dní mezi vyprazdňováním koše při ukončení ve dnech."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Počet adres zobrazených v polích TO/CC/BCC"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Prompt on empty subject"
 msgstr "Upozorňovat při prázdném předmětu"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Upozorňovat uživatele, když se pokusí vyčistit složku."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Upozorňovat uživatele, když se pokusí odeslat zprávu bez předmětu."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "Vyzvat ke kontrole, pokud chce uživatel okamžitě přejít do off-line"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt when deleting messages in search folder"
 msgstr "Upozorňovat, když mažu zprávu ze složky hledání"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Prompt when user expunges"
 msgstr "Upozorňovat, když uživatel čistí"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt when user only fills Bcc"
 msgstr "Upozorňovat, když uživatel vyplní jen Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Upozorňovat, když se uživatel pokusí otevřít najednou 10 nebo více zpráv"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../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."
@@ -13558,152 +13560,154 @@ msgstr ""
 "Upozorňovat, když se uživatel pokusí poslat zprávu v HTML příjemcům, kteří "
 "možná nechtějí přijímat poštu v HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Upozorňovat, když se uživatel pokusí odeslat zprávu bez příjemců Komu a "
 "Kopie."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Upozorňovat, když se uživatel pokusí odeslat nechtěné HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Prompt while marking multiple messages"
 msgstr "Upozorňovat na označení více zpráv"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Rozpoznávat v textu emotikony a nahrazovat je obrázky."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Recognize links in text and replace them."
 msgstr "Rozpoznávat v textu odkazy a nahrazovat je."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Run junk test on incoming mail."
 msgstr "Spouštět na příchozí e-maily test na nevyžádanou poštu."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Save directory"
 msgstr "Uložit adresář"
 
-#: ../mail/evolution-mail.schemas.in.h:113
-msgid "Search for the sender photo in local addressbooks"
-msgstr "Hledat fotografii odesílatele v lokálním adresáři."
-
 #: ../mail/evolution-mail.schemas.in.h:114
+msgid "Search for the sender photo in local address books"
+msgstr "Hledat fotografii odesílatele v místním adresáři"
+
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Send HTML mail by default"
 msgstr "Odesílat poštu implicitně v HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Send HTML mail by default."
 msgstr "Odesílat poštu implicitně v HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Sender email-address column in the message list"
 msgstr "Sloupec e-mailových adres odesílatelů v seznamu zpráv"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Server synchronization interval"
+msgstr "Interval pro synchronizaci serveru"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Show Animations"
 msgstr "Zobrazovat animace"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Show animated images as animations."
 msgstr "Zobrazovat animované obrázky jako animace."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Zobrazovat odstraněné zprávy v seznamu zpráv (přeškrtnutě)."
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Show deleted messages in the message-list"
 msgstr "Zobrazovat odstraněné zprávy v seznamu zpráv"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Show photo of the sender"
 msgstr "Zobrazit fotografii odesílatele"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr ""
 "Zobrazovat e-mailové adresy odesílatelů v odděleném sloupci v seznamu zpráv."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Zobrazovat fotografii odesílatele v panelu pro čtení zpráv."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Spell check inline"
 msgstr "Hledat překlepy průběžně"
 
-#: ../mail/evolution-mail.schemas.in.h:127
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Spell checking color"
-msgstr "Hledání překlepů"
+msgstr "Barva pro hledání překlepů"
 
-#: ../mail/evolution-mail.schemas.in.h:128
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Spell checking languages"
-msgstr "Hledat překlepy průběžně"
+msgstr "Jazyky pro hledání překlepů"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Subscribe dialog default height"
-msgstr "Implicitní výška dialogu přihlašování"
+msgstr "Výchozí výška dialogu přihlašování"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Subscribe dialog default width"
-msgstr "Implicitní šířka dialogu přihlašování"
+msgstr "Výchozí šířka dialogu přihlašování"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Terminal font"
 msgstr "Písmo terminálu"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Text message part limit"
 msgstr "Limit pro část textové zprávy"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "The default plugin for Junk hook"
 msgstr "Výchozí zásuvný modul pro Junk hook"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr ""
-"Datum, kdy bylo naposledy spuštěno vyprázdňování koše ve dnech od epoch."
+"Datum, kdy bylo naposledy spuštěno vyprazdňování koše ve dnech od epoch."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
-"Datum, kdy bylo naposledy spuštěno vyprázdňování koše ve dnech od epoch."
+"Datum, kdy bylo naposledy spuštěno vyprazdňování koše ve dnech od epoch."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "The terminal font for mail display."
 msgstr "Písmo terminálu pro zobrazování pošty."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "The variable width font for mail display."
 msgstr "Písmo s proměnnou šířkou pro zobrazování pošty."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
 msgstr ""
-"Toto může mít tři možné hodnoty. 0 pro chyby. 1 pro varování a 2 pro ladicí "
-"zprávy."
+"Toto může mít tři možné hodnoty. \"0\" pro chyby. \"1\" pro varování a \"2\" "
+"pro ladicí zprávy."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../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 interms of KB."
 msgstr ""
 "Toto rozhoduje o maximální velikosti části textu, která může být formátována "
-"v Evolutionu. Vychozí hodnota je 4MB/4096 KB a je určena jednotkách KB."
+"v Evolutionu. Výchozí hodnota je 4MB/4096 KB a je určena jednotkách KB."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../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 "
@@ -13713,15 +13717,15 @@ msgstr ""
 "více zásuvných modulů. Pokud je výchozí zásuvný modul vypnutý, potom se "
 "uchýlí k ostatním zásuvným modulům."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../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."
+"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 ""
-"Tento klíč se čte pouze jednou a po přečtení se stane neplatným. Toto ruší "
-"výběr pošty v seznamu a odstraňuje náhled této složky."
+"Tento klíč se čte pouze jednou a po přečtení se stane \"neplatným\". Toto "
+"ruší výběr pošty v seznamu a odstraňuje náhled této složky."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../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;"
@@ -13730,29 +13734,32 @@ msgid ""
 msgstr ""
 "Tento klíč by měl obsahovat seznam struktur XML určující vlastní hlavičky a "
 "to, jestli se mají zobrazovat. Formát struktury XML je &lt;header "
-"enabled&gt; - nastavte enabled, pokud se má hlavička zobrazovat v pohledu na "
-"poštu."
+"enabled&gt; - nastavte enabled, pokud se má hlavička zobrazovat v zobrazení "
+"pošty."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../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 addressbook only to exclude "
+"determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
+"Tato volba souvisí s klíčem lookup_addressbook a používá se k určení, zda se "
+"mají v místním adresáři hledat adresy, které se používají pro vyloučení "
+"pošty od známých kontaktů z filtrování nevyžádané pošty."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "This option would help in improving the speed of fetching."
 msgstr "Tato volba pomůže zrychlit stahování."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../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."
 msgstr ""
-"Toto nastavuje počet adres, které se zobrazí ve výchozím náhledu seznamu "
+"Toto nastavuje počet adres, které se zobrazí ve výchozím zobrazení seznamu "
 "zpráv, za nimž se zobrazí \"...\"."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../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."
@@ -13760,7 +13767,7 @@ msgstr ""
 "Toto nastavení určuje, zdali se mají být vlákna ve výchozím stavu rozbalena "
 "nebo sbalena. Evolution vyžaduje restart."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../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 "
@@ -13769,28 +13776,18 @@ msgstr ""
 "Toto nastavení určuje, zdali mají být vlákna seřazena podle poslední zprávy "
 "vlákna místo data zprávy. Evolution vyžaduje restart."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Thread the message list."
 msgstr "Seskupovat vlákna v seznamu zpráv."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Thread the message-list"
 msgstr "Seskupovat vlákna v seznamu zpráv"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Thread the message-list based on Subject"
 msgstr "Seskupovat vlákna v seznamu zpráv podle předmětu"
 
-#: ../mail/evolution-mail.schemas.in.h:151
-msgid "Time interval, in seconds, how often upload store changes to server."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:152
-msgid ""
-"Time interval, in seconds, how often upload store changes to server. The "
-"actual value cannot be less than 30 seconds."
-msgstr ""
-
 #: ../mail/evolution-mail.schemas.in.h:153
 msgid "Timeout for marking message as seen"
 msgstr "Časový limit pro označení zprávy jako přečtené"
@@ -13801,11 +13798,13 @@ msgstr "Časový limit pro označení zprávy jako přečtené."
 
 #: ../mail/evolution-mail.schemas.in.h:155
 msgid "UID string of the default account."
-msgstr "Řetězec UID implicitního účtu."
+msgstr "Řetězec UID výchozího účtu."
 
 #: ../mail/evolution-mail.schemas.in.h:156
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
+"Barva pro podtrhávání chybně napsaných slov, když se používá kontrola "
+"pravopisu během psaní."
 
 #: ../mail/evolution-mail.schemas.in.h:157
 msgid "Use SpamAssassin daemon and client"
@@ -13885,7 +13884,7 @@ msgstr "Zdali standardně přidávat ke každé zprávě žádost o doručenku."
 
 #: ../mail/evolution-mail.schemas.in.h:176
 msgid "Whether disable ellipsizing feature of folder names in folder tree."
-msgstr ""
+msgstr "Zdali zakázat funkci zkracování názvů adresářů ve stromu adresářů."
 
 #: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
@@ -13919,19 +13918,19 @@ msgstr "Importér Evolution z Elm"
 msgid "Import mail from Elm."
 msgstr "Importovat poštu z Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:80
+#: ../mail/importers/evolution-mbox-importer.c:79
 msgid "Destination folder:"
 msgstr "Cílová složka:"
 
-#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-mbox-importer.c:82
 msgid "Select folder to import into"
 msgstr "Vyberte složku, kam importovat"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:219
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:221
+#: ../mail/importers/evolution-mbox-importer.c:220
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importér složek ve formátu Berkeley Mailbox"
 
@@ -13939,7 +13938,7 @@ msgstr "Importér složek ve formátu Berkeley Mailbox"
 msgid "Importing mailbox"
 msgstr "Importuji mailbox"
 
-#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:515
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:512
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importuji `%s'"
@@ -13949,50 +13948,49 @@ msgstr "Importuji `%s'"
 msgid "Scanning %s"
 msgstr "Prohledávám %s"
 
-#: ../mail/importers/pine-importer.c:227
+#: ../mail/importers/pine-importer.c:225
 msgid "Importing Pine data"
 msgstr "Importuji data Pine"
 
-#: ../mail/importers/pine-importer.c:426
+#: ../mail/importers/pine-importer.c:424
 msgid "Evolution Pine importer"
 msgstr "Importér Evolution z Pine"
 
-#: ../mail/importers/pine-importer.c:427
+#: ../mail/importers/pine-importer.c:425
 msgid "Import mail from Pine."
 msgstr "Importovat poštu z Pine."
 
-#: ../mail/mail-autofilter.c:79
+#: ../mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
 msgstr "Poslat %s"
 
-#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
+#: ../mail/mail-autofilter.c:239 ../mail/mail-autofilter.c:278
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: ../mail/mail-autofilter.c:266
+#: ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Subject is %s"
 msgstr "Předmět je %s"
 
-#: ../mail/mail-autofilter.c:301
+#: ../mail/mail-autofilter.c:297
 #, c-format
 msgid "%s mailing list"
 msgstr "%s konferencí"
 
-#: ../mail/mail-autofilter.c:372
+#: ../mail/mail-autofilter.c:368
 msgid "Add Filter Rule"
 msgstr "Přidat pravidlo filtru"
 
-#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:521
-#: ../plugins/templates/templates.c:691 ../plugins/templates/templates.c:726
+#: ../mail/mail-component.c:164 ../plugins/templates/templates.c:519
+#: ../plugins/templates/templates.c:689 ../plugins/templates/templates.c:724
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#, fuzzy
 msgid "Templates"
-msgstr "Šablona:"
+msgstr "Šablony"
 
-#: ../mail/mail-component.c:548
+#: ../mail/mail-component.c:546
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -14000,7 +13998,7 @@ msgstr[0] "%d vybráno, "
 msgstr[1] "%d vybrány, "
 msgstr[2] "%d vybráno, "
 
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -14008,7 +14006,7 @@ msgstr[0] "%d odstraněna"
 msgstr[1] "%d odstraněny"
 msgstr[2] "%d odstraněno"
 
-#: ../mail/mail-component.c:559
+#: ../mail/mail-component.c:557
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -14016,7 +14014,7 @@ msgstr[0] "%d nevyžádaná pošta"
 msgstr[1] "%d nevyžádaný pošty"
 msgstr[2] "%d nevyžádaných pošt"
 
-#: ../mail/mail-component.c:562
+#: ../mail/mail-component.c:560
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -14024,7 +14022,7 @@ msgstr[0] "%d koncept"
 msgstr[1] "%d koncepty"
 msgstr[2] "%d konceptů"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:562
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -14032,7 +14030,7 @@ msgstr[0] "%d odeslána"
 msgstr[1] "%d odeslány"
 msgstr[2] "%d odesláno"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:564
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -14040,7 +14038,7 @@ msgstr[0] "%d neodeslána"
 msgstr[1] "%d neodeslány"
 msgstr[2] "%d neodesláno"
 
-#: ../mail/mail-component.c:572
+#: ../mail/mail-component.c:570
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -14048,7 +14046,7 @@ msgstr[0] "%d nepřečtena, "
 msgstr[1] "%d nepřečteny, "
 msgstr[2] "%d nepřečteno, "
 
-#: ../mail/mail-component.c:573
+#: ../mail/mail-component.c:571
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -14056,87 +14054,88 @@ msgstr[0] "%d celkem"
 msgstr[1] "%d celkem"
 msgstr[2] "%d celkem"
 
-#: ../mail/mail-component.c:914
+#: ../mail/mail-component.c:923
 msgid "New Mail Message"
 msgstr "Nová zpráva"
 
-#: ../mail/mail-component.c:915
+#: ../mail/mail-component.c:924
+msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Zpráva"
 
-#: ../mail/mail-component.c:916
+#: ../mail/mail-component.c:925
 msgid "Compose a new mail message"
 msgstr "Napsat novou zprávu"
 
-#: ../mail/mail-component.c:922
+#: ../mail/mail-component.c:931
 msgid "New Mail Folder"
 msgstr "Nová složka pošty"
 
-#: ../mail/mail-component.c:923
+#: ../mail/mail-component.c:932
+msgctxt "New"
 msgid "Mail _Folder"
-msgstr "_Složka pošty"
+msgstr "Sl_ožka pošty"
 
-#: ../mail/mail-component.c:924
+#: ../mail/mail-component.c:933
 msgid "Create a new mail folder"
 msgstr "Vytvořit novou složku pošty"
 
-#: ../mail/mail-component.c:1071
+#: ../mail/mail-component.c:1080
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Nemohu aktualizovat nastavení nebo složky pošty."
 
-#: ../mail/mail-component.c:1584
+#: ../mail/mail-component.c:1596
 msgid "Error"
 msgstr "Chyba"
 
-#: ../mail/mail-component.c:1584
+#: ../mail/mail-component.c:1596
 msgid "Errors"
 msgstr "Chyby"
 
-#: ../mail/mail-component.c:1585
+#: ../mail/mail-component.c:1597
 msgid "Warnings and Errors"
 msgstr "Varování a chyby"
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1598
 msgid "Debug"
 msgstr "Ladění"
 
-#: ../mail/mail-component.c:1586
+#: ../mail/mail-component.c:1598
 msgid "Error, Warnings and Debug messages"
-msgstr "Chybé, varující a ladicí zprávy"
+msgstr "Chybové, varovné a ladicí zprávy"
 
-#: ../mail/mail-component.c:1713
+#: ../mail/mail-component.c:1725
 msgid "Debug Logs"
 msgstr "Ladicí protokol"
 
-#: ../mail/mail-component.c:1727
+#: ../mail/mail-component.c:1739
 msgid "Show _errors in the status bar for"
 msgstr "_Zobrazit chyby ve stavovém řádku"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../mail/mail-component.c:1743
-#, fuzzy
+#: ../mail/mail-component.c:1755
 msgid "second(s)."
 msgstr "sekundách."
 
-#: ../mail/mail-component.c:1749
+#: ../mail/mail-component.c:1761
 msgid "Log Messages:"
 msgstr "Zprávy protokolu:"
 
-#: ../mail/mail-component.c:1790
+#: ../mail/mail-component.c:1802
 msgid "Log Level"
 msgstr "Úroveň protokolování"
 
-#: ../mail/mail-component.c:1799 ../widgets/misc/e-dateedit.c:395
+#: ../mail/mail-component.c:1811 ../widgets/misc/e-dateedit.c:395
 msgid "Time"
 msgstr "Čas"
 
-#: ../mail/mail-component.c:1809 ../mail/message-list.c:2430
+#: ../mail/mail-component.c:1821 ../mail/message-list.c:2454
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Zprávy"
 
-#: ../mail/mail-component.c:1818 ../ui/evolution-mail-messagedisplay.xml.h:2
+#: ../mail/mail-component.c:1830 ../ui/evolution-mail-messagedisplay.xml.h:2
 #: ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Zavřít toto okno"
@@ -14154,7 +14153,6 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>Toto sestavení evolution nepodporuje SSL</b>"
 
 #: ../mail/mail-config.glade.h:5
-#, fuzzy
 msgid "<b>Sender Photograph</b>"
 msgstr "<b>Fotografie odesílatele</b>"
 
@@ -14188,7 +14186,7 @@ msgstr "<span weight=\"bold\">Nastavení</span>"
 
 #: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
-msgstr "<span weight=\"bold\">Implicitní chování</span>"
+msgstr "<span weight=\"bold\">Výchozí chování</span>"
 
 #: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
@@ -14236,9 +14234,8 @@ msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Písma pro tisk</span>"
 
 #: ../mail/mail-config.glade.h:27
-#, fuzzy
 msgid "<span weight=\"bold\">Proxy Settings</span>"
-msgstr "<span weight=\"bold\">Stav</span>"
+msgstr "<span weight=\"bold\">Nastavení proxy</span>"
 
 #: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
@@ -14302,7 +14299,7 @@ msgstr "Vždy ši_frovat sobě při odesílání šifrované zprávy"
 
 #: ../mail/mail-config.glade.h:44
 msgid "Always request rea_d receipt"
-msgstr "Vždy požadovat_t doručenku o čtení"
+msgstr "Vždy požadova_t doručenku o čtení"
 
 #: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _emoticon images"
@@ -14325,7 +14322,6 @@ msgid "Ch_eck for Supported Types "
 msgstr "Zjistit podporované _typy "
 
 #: ../mail/mail-config.glade.h:51
-#, fuzzy
 msgid "Check cu_stom headers for junk"
 msgstr "K_ontrolovat nevyžádanou poštu ve vlastních hlavičkách"
 
@@ -14375,11 +14371,11 @@ msgstr ""
 
 #: ../mail/mail-config.glade.h:65
 msgid "De_fault"
-msgstr "_Implicitní"
+msgstr "_Výchozí"
 
 #: ../mail/mail-config.glade.h:66
 msgid "Default character e_ncoding:"
-msgstr "Implicitní kódování _znaků:"
+msgstr "Výchozí kódování _znaků:"
 
 #: ../mail/mail-config.glade.h:68
 msgid "Delete junk messages on e_xit"
@@ -14390,20 +14386,18 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Digitálně _podepisovat odchozí zprávy (implicitně)"
 
 #: ../mail/mail-config.glade.h:71
-msgid "Do not format text contents in messages if the text si_ze exceeds"
+msgid "Do not format messages when text si_ze exceeds"
 msgstr "Neformátovat textový obsah zpráv, pokud _velikost textu překročí"
 
 #: ../mail/mail-config.glade.h:72
-#, fuzzy
-msgid "Do not mar_k messages as junk if sender is in my addressbook"
+msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "_Neoznačovat zprávy jako nevyžádanou poštu, pokud je odesílatel v mém "
 "adresáři"
 
 #: ../mail/mail-config.glade.h:73
-#, fuzzy
 msgid "Do not quote"
-msgstr "Neodstranit"
+msgstr "Necitovat"
 
 #: ../mail/mail-config.glade.h:74
 msgid "Done"
@@ -14466,9 +14460,8 @@ msgid "HTML Messages"
 msgstr "HTML zprávy"
 
 #: ../mail/mail-config.glade.h:91
-#, fuzzy
 msgid "H_TTP Proxy:"
-msgstr "PO _Box:"
+msgstr "H_TTP Proxy:"
 
 #: ../mail/mail-config.glade.h:92
 msgid "Headers"
@@ -14483,7 +14476,6 @@ msgid "Inline"
 msgstr "Vložené"
 
 #: ../mail/mail-config.glade.h:96
-#, fuzzy
 msgid "Inline (Outlook style)"
 msgstr "Vložit původní zprávu (způsob Outlooku)"
 
@@ -14517,7 +14509,7 @@ msgstr "Editor zpráv"
 
 #: ../mail/mail-config.glade.h:106
 msgid "No _Proxy for:"
-msgstr ""
+msgstr "Žádná _proxy pro:"
 
 #: ../mail/mail-config.glade.h:107
 msgid ""
@@ -14534,19 +14526,24 @@ msgstr ""
 "Poznámka: na heslo budete dotázáni, až když se pokusíte poprvé připojit"
 
 #: ../mail/mail-config.glade.h:109
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr ""
+"Volba bude ignorována, pokud bude nalezen odpovídající výraz pro vlastní "
+"hlavičky nevyžádané pošty."
+
+#: ../mail/mail-config.glade.h:110
 msgid "Or_ganization:"
 msgstr "Or_ganizace:"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid "PGP/GPG _Key ID:"
 msgstr "ID PGP/GPG _klíče:"
 
-#: ../mail/mail-config.glade.h:111
-#, fuzzy
+#: ../mail/mail-config.glade.h:112
 msgid "Pass_word:"
 msgstr "_Heslo:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../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."
@@ -14554,7 +14551,7 @@ msgstr ""
 "Zadejte prosím popisný název tohoto účtu do místa níže.\n"
 "Tento název se bude používat jen pro zobrazování."
 
-#: ../mail/mail-config.glade.h:115
+#: ../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."
@@ -14562,7 +14559,7 @@ msgstr ""
 "Zadejte prosím informace o způsobu odesílání pošty. Pokud si nejste jisti, "
 "kontaktujte svého správce nebo poskytovatele připojení k Internetu."
 
-#: ../mail/mail-config.glade.h:116
+#: ../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 "
@@ -14572,125 +14569,124 @@ msgstr ""
 "být vyplněna, ledaže byste si přáli, aby byly tyto informace obsaženy v "
 "odesílaných e-mailech."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Please select among the following options"
 msgstr "Vyberte si prosím z následujících možností"
 
-#: ../mail/mail-config.glade.h:118
-#, fuzzy
+#: ../mail/mail-config.glade.h:119
 msgid "Port:"
-msgstr "_Port:"
+msgstr "Port:"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Up_ozorňovat, když posílám zprávu, kde jsou uvedeni jen příjemci ve skryté "
 "kopii"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Quoted"
 msgstr "Citace"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Re_member password"
 msgstr "Za_pamatovat si heslo"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "Re_ply-To:"
 msgstr "O_dpovědět-komu:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Remember _password"
 msgstr "Za_pamatovat si heslo"
 
-#: ../mail/mail-config.glade.h:125
-msgid "S_OCKS Host:"
-msgstr ""
-
 #: ../mail/mail-config.glade.h:126
-msgid "S_earch for sender photograph only in local addressbooks"
-msgstr "V_yhledávat fotografii odesílatele pouze v místním adresáři"
+msgid "S_OCKS Host:"
+msgstr "S_OCKS server:"
 
 #: ../mail/mail-config.glade.h:127
+msgid "S_earch for sender photograph only in local address books"
+msgstr "V_yhledávat fotografii odesílatele pouze v místních adresářích"
+
+#: ../mail/mail-config.glade.h:128
 msgid "S_elect..."
 msgstr "_Vybrat..."
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_end message receipts:"
 msgstr "Od_eslat doručenky zpráv:"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_tandard Font:"
 msgstr "_Standardní písmo:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Select HTML fixed width font"
 msgstr "Vyberte písmo s pevnou šířkou pro HTML"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Select HTML fixed width font for printing"
 msgstr "Vyberte písmo s pevnou šířkou pro tisk HTML"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Select HTML variable width font"
 msgstr "Vyberte písmo s proměnlivou šířkou pro HTML"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Select HTML variable width font for printing"
 msgstr "Vyberte písmo s proměnlivou šířkou pro tisk HTML"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Sending Mail"
 msgstr "Odesílání pošty"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Sent _Messages Folder:"
 msgstr "Složka pro _odeslané zprávy:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Ser_ver requires authentication"
 msgstr "Server _vyžaduje autentizaci"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Server _Type: "
 msgstr "_Typ serveru: "
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "Sig_ning certificate:"
 msgstr "_Podpisový certifikát:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid "Signat_ure:"
 msgstr "_Podpis:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid "Signatures"
 msgstr "Podpisy"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
 msgid "Signatures Table"
 msgstr "Tabulka podpisů"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
 msgid "Spell Checking"
 msgstr "Hledání překlepů"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
 msgid "Start _typing at the bottom on replying"
-msgstr ""
+msgstr "Z_ačít psát při odpovědi dole"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:147
 msgid "T_ype: "
 msgstr "_Typ: "
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:148
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Seznam jazyků zde obsahuje jen jazyky, pro které máte nainstalován slovník."
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:149
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14700,13 +14696,6 @@ msgstr ""
 "váš podpis. Název, který zadáte, bude použit\n"
 "pouze pro zobrazení. "
 
-#: ../mail/mail-config.glade.h:151
-msgid ""
-"This option will be overridden if a match for custom junk headers is found."
-msgstr ""
-"Tato volba bude přepsána, pokud bude nalezen odpovídající výraz pro vlastní "
-"hlavičky nevyžádané pošty."
-
 #: ../mail/mail-config.glade.h:152
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
@@ -14716,17 +14705,17 @@ msgstr ""
 "Například \"Práce\" nebo \"Osobní\""
 
 #: ../mail/mail-config.glade.h:154
-#, fuzzy
 msgid "Us_ername:"
 msgstr "_Jméno uživatele:"
 
 #: ../mail/mail-config.glade.h:155
-#, fuzzy
 msgid "Use Authe_ntication"
-msgstr "Autentizace"
+msgstr "Použít a_utentizaci"
 
-#: ../mail/mail-config.glade.h:156 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:364
+#: ../mail/mail-config.glade.h:156 ../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 "_Jméno uživatele:"
 
@@ -14742,7 +14731,7 @@ msgid ""
 msgstr ""
 "Vítejte v Asistentovi pro nastavení pošty Evolution.\n"
 "\n"
-"Začněte kliknutím na \"Vpřed\"."
+"Začněte kliknutím na \"Vpřed\". "
 
 #: ../mail/mail-config.glade.h:161
 msgid "_Add Signature"
@@ -14753,9 +14742,8 @@ msgid "_Always load images from the Internet"
 msgstr "_Vždy načítat obrázky z Internetu"
 
 #: ../mail/mail-config.glade.h:163
-#, fuzzy
 msgid "_Automatic proxy configuration URL:"
-msgstr "Automatické rozpoznávání odkazů"
+msgstr "URL pro _automatické nastavení proxy:"
 
 #: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
@@ -14763,7 +14751,7 @@ msgstr "_Výchozí zásuvný modul pro nevyžádanou poštu:"
 
 #: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
-msgstr ""
+msgstr "Přímé připojení _do internetu"
 
 #: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
@@ -14782,18 +14770,16 @@ msgid "_Load images in messages from contacts"
 msgstr "_Načítat obrázky ve zprávách od kontaktů"
 
 #: ../mail/mail-config.glade.h:171
-#, fuzzy
-msgid "_Lookup in local addressbook only"
-msgstr "Vypsat místní složky adresáře"
+msgid "_Lookup in local address book only"
+msgstr "_Hledat pouze v místním adresáři"
 
 #: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
-msgstr "Používat tento účet jako _implicitní"
+msgstr "Používat tento účet jako _výchozí"
 
 #: ../mail/mail-config.glade.h:173
-#, fuzzy
 msgid "_Manual proxy configuration:"
-msgstr "Nastavení pošty"
+msgstr "_Ruční nastavení proxy:"
 
 #: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
@@ -14808,9 +14794,9 @@ msgid "_Path:"
 msgstr "_Cesta:"
 
 #: ../mail/mail-config.glade.h:178
-msgid "_Prompt when sending HTML messages to contacts that do not want them"
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
-"_Upozorňovat, když posílám zprávu v HTML formátu kontaktům, které si to "
+"Upo_zorňovat, když posílám zprávu v HTML formátu kontaktům, které si to "
 "nepřejí"
 
 #: ../mail/mail-config.glade.h:179
@@ -14827,7 +14813,7 @@ msgstr "_Skript:"
 
 #: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
-msgstr ""
+msgstr "Proxy _zabezpečeného HTTP:"
 
 #: ../mail/mail-config.glade.h:183
 msgid "_Select..."
@@ -14851,9 +14837,8 @@ msgid "_Use Secure Connection:"
 msgstr "Používat za_bezpečené připojení:"
 
 #: ../mail/mail-config.glade.h:190
-#, fuzzy
 msgid "_Use system defaults"
-msgstr "Použít _implicitní"
+msgstr "Použít _výchozí"
 
 #: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
@@ -14907,43 +14892,43 @@ msgstr "_Rozlišovat velikost písmen"
 msgid "Co_mpleted"
 msgstr "_Dokončeno"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:10
 msgid "F_ind:"
 msgstr "_Hledat:"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Find in Message"
 msgstr "Hledat ve zprávě"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:279
+#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:277
 msgid "Flag to Follow Up"
 msgstr "Označit k vyřízení"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Folder Subscriptions"
 msgstr "Přihlášené složky"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "License Agreement"
 msgstr "Licenční smlouva"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "None Selected"
 msgstr "Žádná nevybrána"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:16
 msgid "S_erver:"
 msgstr "S_erver:"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:17
 msgid "Security Information"
 msgstr "Informace o zabezpečení"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Specific folders"
 msgstr "Určité složky"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../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."
@@ -14952,19 +14937,19 @@ msgstr ""
 "seznamu.\n"
 "Vyberte prosím plánovanou akci pro tyto zprávy z nabídky \"Značka\"."
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:21
 msgid "_Accept License"
 msgstr "_Přijmout licenci"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Due By:"
 msgstr "Termín _dokončení:"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Flag:"
 msgstr "_Značka:"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Tick this to accept the license agreement"
 msgstr "Zaškrtnutím _tohoto přijmete licenční smlouvu"
 
@@ -15015,90 +15000,90 @@ msgstr "Posílám zprávu %d z %d"
 msgid "Failed to send %d of %d messages"
 msgstr "Nemohu odeslat %d z %d zpráv"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:693
 msgid "Canceled."
 msgstr "Zrušeno."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:695
 msgid "Complete."
 msgstr "Dokončeno."
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:871
 msgid "Saving message to folder"
 msgstr "Ukládám zprávu do složky"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Přesouvám zprávy do %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:949
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopíruji zprávy do %s"
 
-#: ../mail/mail-ops.c:1164
+#: ../mail/mail-ops.c:1166
 msgid "Forwarded messages"
 msgstr "Přeposlané zprávy"
 
-#: ../mail/mail-ops.c:1205
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otevírám složku %s"
 
-#: ../mail/mail-ops.c:1270
-#, fuzzy, c-format
+#: ../mail/mail-ops.c:1272
+#, c-format
 msgid "Retrieving quota information for folder %s"
-msgstr "Informace o kontaktu na %s"
+msgstr "Získávám informaci o kvótě pro složku %s"
 
-#: ../mail/mail-ops.c:1339
+#: ../mail/mail-ops.c:1341
 #, c-format
 msgid "Opening store %s"
 msgstr "Otevírám úložiště %s"
 
-#: ../mail/mail-ops.c:1410
+#: ../mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstraňuji složku %s"
 
-#: ../mail/mail-ops.c:1499
+#: ../mail/mail-ops.c:1501
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ukládám složku '%s'"
 
-#: ../mail/mail-ops.c:1562
+#: ../mail/mail-ops.c:1564
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Čistím a ukládám účet '%s'"
 
-#: ../mail/mail-ops.c:1563
+#: ../mail/mail-ops.c:1565
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Ukládám účet '%s'"
 
-#: ../mail/mail-ops.c:1617
+#: ../mail/mail-ops.c:1619
 msgid "Refreshing folder"
 msgstr "Obnovuji složku"
 
-#: ../mail/mail-ops.c:1657 ../mail/mail-ops.c:1707
+#: ../mail/mail-ops.c:1659 ../mail/mail-ops.c:1709
 msgid "Expunging folder"
 msgstr "Čistím složku"
 
-#: ../mail/mail-ops.c:1704
+#: ../mail/mail-ops.c:1706
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vyprazdňuji koš v '%s'"
 
-#: ../mail/mail-ops.c:1705
+#: ../mail/mail-ops.c:1707
 msgid "Local Folders"
 msgstr "Místní složky"
 
-#: ../mail/mail-ops.c:1786
+#: ../mail/mail-ops.c:1788
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Získávám zprávu %s"
 
-#: ../mail/mail-ops.c:1893
+#: ../mail/mail-ops.c:1895
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -15106,15 +15091,15 @@ msgstr[0] "Získávám %d zprávu"
 msgstr[1] "Získávám %d zprávy"
 msgstr[2] "Získávám %d zpráv"
 
-#: ../mail/mail-ops.c:1978
+#: ../mail/mail-ops.c:1980
 #, c-format
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
-msgstr[0] "Ukládám %d zprávu"
-msgstr[1] "Ukládám %d zprávy"
-msgstr[2] "Ukládám %d zpráv"
+msgid_plural "Saving %d messages"
+msgstr[0] "Ukládání %d zprávy"
+msgstr[1] "Ukládání %d zpráv"
+msgstr[2] "Ukládání %d zpráv"
 
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2058
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15123,11 +15108,11 @@ msgstr ""
 "Chyba při ukládání zpráv do: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2128
+#: ../mail/mail-ops.c:2130
 msgid "Saving attachment"
 msgstr "Ukládám přílohu"
 
-#: ../mail/mail-ops.c:2146 ../mail/mail-ops.c:2154
+#: ../mail/mail-ops.c:2148 ../mail/mail-ops.c:2156
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15136,92 +15121,89 @@ msgstr ""
 "Nemohu vytvořit soubor výstupu: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2169
+#: ../mail/mail-ops.c:2171
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nemohu zapisovat data: %s"
 
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odpojuji se od %s"
 
-#: ../mail/mail-ops.c:2315
+#: ../mail/mail-ops.c:2317
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znovu se připojuji na %s"
 
-#: ../mail/mail-ops.c:2411
+#: ../mail/mail-ops.c:2413
 #, c-format
 msgid "Preparing account '%s' for offline"
-msgstr "Připrava účtu \"%s\" pro off-line"
+msgstr "Příprava účtu \"%s\" pro off-line"
 
-#: ../mail/mail-ops.c:2497
+#: ../mail/mail-ops.c:2499
 msgid "Checking Service"
 msgstr "Kontroluji službu"
 
-#: ../mail/mail-send-recv.c:182
+#: ../mail/mail-send-recv.c:181
 msgid "Canceling..."
 msgstr "Ruší se..."
 
-#: ../mail/mail-send-recv.c:385
+#: ../mail/mail-send-recv.c:383
 msgid "Send & Receive Mail"
 msgstr "Odeslat a přijmout poštu"
 
-#: ../mail/mail-send-recv.c:396
+#: ../mail/mail-send-recv.c:394
 msgid "Cancel _All"
 msgstr "Zrušit _vše"
 
-#: ../mail/mail-send-recv.c:505
+#: ../mail/mail-send-recv.c:498
 msgid "Updating..."
 msgstr "Aktualizuje se..."
 
-#: ../mail/mail-send-recv.c:505 ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:498 ../mail/mail-send-recv.c:573
 msgid "Waiting..."
 msgstr "Čekám..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:799
 #, c-format
 msgid "Checking for new mail"
 msgstr "Kontroluji novou poštu"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:207
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Zadat heslo pro %s"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
 msgid "Enter Passphrase"
 msgstr "Zadejte heslo"
 
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:711
+#: ../mail/mail-session.c:212
+#: ../plugins/exchange-operations/exchange-config-listener.c:708
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Zadat heslo pro %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 msgid "Enter Password"
 msgstr "Zadat heslo"
 
-#: ../mail/mail-session.c:254
+#: ../mail/mail-session.c:256
 msgid "User canceled operation."
 msgstr "Uživatel zrušil operaci."
 
 #: ../mail/mail-signature-editor.c:201
-#, fuzzy
 msgid "_Save and Close"
-msgstr "Uložit a zavřít"
+msgstr "_Uložit a zavřít"
 
 #: ../mail/mail-signature-editor.c:355
-#, fuzzy
 msgid "Edit Signature"
 msgstr "Upravit podpis"
 
 #: ../mail/mail-signature-editor.c:370
-#, fuzzy
 msgid "_Signature Name:"
-msgstr "Tabulka podpisů"
+msgstr "_Název podpisu:"
 
 #: ../mail/mail-tools.c:120
 #, c-format
@@ -15271,45 +15253,36 @@ msgid "New Search Folder"
 msgstr "Nová složka hledání"
 
 #: ../mail/mail.error.xml.h:1
-#, fuzzy
 msgid "A folder named \"{0}\" already exists. Please use a different name."
-msgstr ""
-"Složka nazvaná &quot;{0}&quot; již existuje. Použijte prosím jiný název."
+msgstr "Složka nazvaná \"{0}\" již existuje. Použijte prosím jiný název."
 
 #: ../mail/mail.error.xml.h:2
-#, fuzzy
 msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
-"Složka nazvaná &quot;{1}&quot; již existuje. Použijte prosím jiný název."
+msgstr "Složka nazvaná \"{1}\" již existuje. Použijte prosím jiný název."
 
 #: ../mail/mail.error.xml.h:3
-#, fuzzy
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit."
 msgstr ""
-"V &quot;{1}&quot; již existuje neprázdná složka.\n"
+"V \"{1}\" již existuje neprázdná složka.\n"
 "\n"
 "Můžete tuto složku ignorovat, přepsat ji, připojit k jejímu obsahu nebo "
 "skončit."
 
 #: ../mail/mail.error.xml.h:6
-#, fuzzy
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
-msgstr ""
-"Bylo žádáno o doručenku o čtení &quot;{1}&quot;. Odeslat doručenku {0}?"
+msgstr "Bylo žádáno o doručenku o čtení \"{1}\". Odeslat doručenku {0}?"
 
 #: ../mail/mail.error.xml.h:7
-#, fuzzy
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
-msgstr ""
-"Podpis nazvaný &quot;{0}&quot; již existuje. Použijte prosím jiný název."
+msgstr "Podpis nazvaný \"{0}\" již existuje. Použijte prosím jiný název."
 
 #: ../mail/mail.error.xml.h:8
 msgid ""
@@ -15344,12 +15317,12 @@ msgstr ""
 "Opravdu chcete natrvalo odstranit všechny odstraněné zprávy ze všech složek?"
 
 #: ../mail/mail.error.xml.h:14
-#, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
 msgstr ""
-"Opravdu chcete natrvalo odstranit všechny odstraněné zprávy ze všech složek?"
+"Opravdu chcete natrvalo odstranit všechny odstraněné zprávy ze složky \"{0}"
+"\"?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
@@ -15364,121 +15337,100 @@ msgid "Are you sure you want to send a message without a subject?"
 msgstr "Opravdu chcete odeslat zprávu bez předmětu?"
 
 #: ../mail/mail.error.xml.h:18
-#, fuzzy
 msgid "Because \"{0}\"."
-msgstr "Protože &quot;{0}&quot;."
+msgstr "Protože \"{0}\"."
 
 #: ../mail/mail.error.xml.h:20
-#, fuzzy
 msgid "Because \"{2}\"."
-msgstr "Protože &quot;{2}&quot;."
+msgstr "Protože \"{2}\"."
 
 #: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "Bianko podpis"
 
 #: ../mail/mail.error.xml.h:22
-#, fuzzy
 msgid "Cannot add Search Folder \"{0}\"."
-msgstr "Nemohu přidat složku hledání &quot;{0}&quot;."
+msgstr "Nemohu přidat složku hledání \"{0}\"."
 
 #: ../mail/mail.error.xml.h:23
-#, fuzzy
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Nemohu zkopírovat složku &quot;{0}&quot; do &quot;{1}&quot;."
+msgstr "Nemohu zkopírovat složku \"{0}\" do \"{1}\"."
 
 #: ../mail/mail.error.xml.h:24
-#, fuzzy
 msgid "Cannot create folder \"{0}\"."
-msgstr "Nemohu vytvořit složku &quot;{0}&quot;."
+msgstr "Nemohu vytvořit složku \"{0}\"."
 
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "Nemohu vytvořit dočasný adresář pro ukládání."
 
 #: ../mail/mail.error.xml.h:26
-#, fuzzy
 msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Nemohu vytvořit adresář pro ukládání, protože &quot;{1}&quot;"
+msgstr "Nemohu vytvořit adresář pro ukládání, protože \"{1}\""
 
 #: ../mail/mail.error.xml.h:27
-#, fuzzy
 msgid "Cannot delete folder \"{0}\"."
-msgstr "Nemohu odstranit složku &quot;{0}&quot;."
+msgstr "Nemohu odstranit složku \"{0}\"."
 
 #: ../mail/mail.error.xml.h:28
-#, fuzzy
 msgid "Cannot delete system folder \"{0}\"."
-msgstr "Nemohu odstranit systémovou složku &quot;{0}&quot;."
+msgstr "Nemohu odstranit systémovou složku \"{0}\"."
 
 #: ../mail/mail.error.xml.h:29
-#, fuzzy
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
-msgstr "Nemohu upravovat složku hledání &quot;{0}&quot;, protože neexistuje."
+msgstr "Nemohu upravovat složku hledání \"{0}\", protože neexistuje."
 
 #: ../mail/mail.error.xml.h:30
-#, fuzzy
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Nemohu přesunout složku &quot;{0}&quot; do &quot;{1}&quot;."
+msgstr "Nemohu přesunout složku \"{0}\" do \"{1}\"."
 
 #: ../mail/mail.error.xml.h:31
-#, fuzzy
 msgid "Cannot open source \"{1}\""
-msgstr "Nemohu otevřít zdroj &quot;{1}&quot;"
+msgstr "Nemohu otevřít zdroj \"{1}\""
 
 #: ../mail/mail.error.xml.h:32
-#, fuzzy
 msgid "Cannot open source \"{2}\"."
-msgstr "Nemohu otevřít zdroj &quot;{2}&quot;."
+msgstr "Nemohu otevřít zdroj \"{2}\"."
 
 #: ../mail/mail.error.xml.h:33
-#, fuzzy
 msgid "Cannot open target \"{2}\"."
-msgstr "Nemohu otevřít cíl &quot;{2}&quot;."
+msgstr "Nemohu otevřít cíl \"{2}\"."
 
 #: ../mail/mail.error.xml.h:34
-#, fuzzy
 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."
 msgstr ""
-"Nemohu číst soubor licence &quot;{0}&quot; kvůli problému s instalací. "
-"Nebude možné používat tohoto poskytovatele, dokud nebudete moci přijmout "
-"jeho licenci."
+"Nemohu číst soubor licence \"{0}\" kvůli problému s instalací. Nebude možné "
+"používat tohoto poskytovatele, dokud nebudete moci přijmout jeho licenci."
 
 #: ../mail/mail.error.xml.h:35
-#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "Nemohu přejmenovat &quot;{0}&quot; na &quot;{1}&quot;."
+msgstr "Nemohu přejmenovat \"{0}\" na \"{1}\"."
 
 #: ../mail/mail.error.xml.h:36
-#, fuzzy
 msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Nemohu přejmenovat nebo přesunout systémovou složku &quot;{0}&quot;."
+msgstr "Nemohu přejmenovat nebo přesunout systémovou složku \"{0}\"."
 
 #: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "Nemohu uložit změny účtu."
 
 #: ../mail/mail.error.xml.h:38
-#, fuzzy
 msgid "Cannot save to directory \"{0}\"."
-msgstr "Nemohu uložit do adresáře &quot;{0}&quot;."
+msgstr "Nemohu uložit do adresáře \"{0}\"."
 
 #: ../mail/mail.error.xml.h:39
-#, fuzzy
 msgid "Cannot save to file \"{0}\"."
-msgstr "Nemohu uložit do souboru &quot;{0}&quot;."
+msgstr "Nemohu uložit do souboru \"{0}\"."
 
 #: ../mail/mail.error.xml.h:40
-#, fuzzy
 msgid "Cannot set signature script \"{0}\"."
-msgstr "Nemohu nastavit skript podpisu &quot;{0}&quot;."
+msgstr "Nemohu nastavit skript podpisu \"{0}\"."
 
 #: ../mail/mail.error.xml.h:41
-#, fuzzy
 msgid "Check Junk Failed"
-msgstr "Kontrolovat nev_yžádanou poštu"
+msgstr "Kontrola nevyžádané pošty selhala"
 
 #: ../mail/mail.error.xml.h:42
 msgid ""
@@ -15493,18 +15445,16 @@ msgid "Could not save signature file."
 msgstr "Nemohu uložit soubor podpisu."
 
 #: ../mail/mail.error.xml.h:44
-#, fuzzy
 msgid "Delete \"{0}\"?"
-msgstr "Odstraněno: "
+msgstr "Odstranit \"{0}\"?"
 
 #: ../mail/mail.error.xml.h:45
 msgid "Delete account?"
 msgstr "Odstranit účet?"
 
 #: ../mail/mail.error.xml.h:46
-#, fuzzy
 msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "Odstranit zprávy ve složce hledání?"
+msgstr "Odstranit zprávy ve složce hledání \"{0}\"?"
 
 #: ../mail/mail.error.xml.h:47
 msgid "Delete messages in Search Folder?"
@@ -15678,9 +15628,8 @@ msgid "Please wait."
 msgstr "Čekejte, prosím."
 
 #: ../mail/mail.error.xml.h:85
-#, fuzzy
 msgid "Problem migrating old mail folder \"{0}\"."
-msgstr "Problém při převodu staré složky pošty &quot;{0}&quot;."
+msgstr "Problém při převodu staré složky pošty \"{0}\"."
 
 #: ../mail/mail.error.xml.h:86
 msgid "Querying server"
@@ -15695,18 +15644,16 @@ msgid "Read receipt requested."
 msgstr "Vyžadována doručenka o čtení."
 
 #: ../mail/mail.error.xml.h:89
-#, fuzzy
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Opravdu odstranit složku &quot;{0}&quot; a všechny její podsložky?"
+msgstr "Opravdu odstranit složku \"{0}\" a všechny její podsložky?"
 
 #: ../mail/mail.error.xml.h:90
-#, fuzzy
 msgid "Report Junk Failed"
-msgstr "Importovat soubor"
+msgstr "Nahlášení nevyžádané pošty selhalo"
 
 #: ../mail/mail.error.xml.h:91
 msgid "Report Not Junk Failed"
-msgstr ""
+msgstr "Hlášení Není nevyžádaná selhalo"
 
 #: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
@@ -15754,7 +15701,6 @@ msgstr ""
 "přidat alespoň jednoho příjemce do Komu: nebo Kopie:."
 
 #: ../mail/mail.error.xml.h:101
-#, fuzzy
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -15765,11 +15711,10 @@ msgstr ""
 "Následující složky hledání:\n"
 "{0}\n"
 "Používaly nyní odstraněnou složku:\n"
-"   &quot;{1}&quot;\n"
+"   \"{1}\"\n"
 "A byly aktualizovány."
 
 #: ../mail/mail.error.xml.h:106
-#, fuzzy
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -15780,7 +15725,7 @@ msgstr ""
 "Následující pravidla filtrů:\n"
 "{0}\n"
 "Používala nyní odstraněnou složku:\n"
-"   &quot;{1}&quot;\n"
+"   \"{1}\"\n"
 "A byla aktualizována."
 
 #: ../mail/mail.error.xml.h:111
@@ -15844,11 +15789,11 @@ msgstr "Nemohu číst soubor licence."
 
 #: ../mail/mail.error.xml.h:122
 msgid "Use _Default"
-msgstr "Použít _implicitní"
+msgstr "Použít _výchozí"
 
 #: ../mail/mail.error.xml.h:123
 msgid "Use default drafts folder?"
-msgstr "Použít implicitní složku konceptů?"
+msgstr "Použít výchozí složku konceptů?"
 
 #: ../mail/mail.error.xml.h:124
 msgid ""
@@ -15891,10 +15836,8 @@ msgstr ""
 "všech vzdálených složek nebo obojí."
 
 #: ../mail/mail.error.xml.h:134
-#, fuzzy
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr ""
-"Vaše přihlašování k serveru &quot;{0}&quot; jako &quot;{0}&quot; selhalo."
+msgstr "Vaše přihlašování k serveru \"{0}\" jako \"{0}\" selhalo."
 
 #: ../mail/mail.error.xml.h:135
 msgid "_Append"
@@ -15916,92 +15859,89 @@ msgstr "_Vyčistit"
 msgid "_Open Messages"
 msgstr "_Otevřít zprávy"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1052
 msgid "Unseen"
 msgstr "Nepřečtené"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1053
 msgid "Seen"
 msgstr "Přečtené"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1054
 msgid "Answered"
 msgstr "Odpovězené"
 
-#: ../mail/message-list.c:1054
-#, fuzzy
+#: ../mail/message-list.c:1055
 msgid "Forwarded"
-msgstr "Přeposlat"
+msgstr "Přeposlaný"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "Více nepřečtených zpráv"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1057
 msgid "Multiple Messages"
 msgstr "Více zpráv"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1061
 msgid "Lowest"
 msgstr "Nejnižší"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1062
 msgid "Lower"
 msgstr "Nižší"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1066
 msgid "Higher"
 msgstr "Vyšší"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1067
 msgid "Highest"
 msgstr "Nejvyšší"
 
-#: ../mail/message-list.c:1595 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1596 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1602 ../plugins/itip-formatter/itip-view.c:204
+#: ../mail/message-list.c:1603 ../plugins/itip-formatter/itip-view.c:203
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Dnes %k:%M"
 
-#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1612 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Včera %k:%M"
 
-#: ../mail/message-list.c:1623 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1624 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: ../mail/message-list.c:1631 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1632 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
-#: ../mail/message-list.c:1633 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1634 ../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:3885 ../mail/message-list.c:4321
+#: ../mail/message-list.c:3916 ../mail/message-list.c:4376
 msgid "Generating message list"
 msgstr "Generuji seznam zpráv"
 
-#: ../mail/message-list.c:4176
+#: ../mail/message-list.c:4224
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
+"Žádná zpráva nevyhovuje kritériu hledání. Buďto zrušte hledání pomocí "
+"položky v nabídce Hledat->Vymazat, nebo jej změňte."
 
-#: ../mail/message-list.c:4178
-#, fuzzy
+#: ../mail/message-list.c:4226
 msgid "There are no messages in this folder."
-msgstr ""
-"\n"
-"\n"
-"V tomto zobrazení nejsou viditelné žádné položky."
+msgstr "V této složce nejsou žádné zprávy."
 
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
@@ -16089,6 +16029,10 @@ msgid "Subject contains"
 msgstr "Předmět obsahuje"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Recipients contains"
+msgstr "Předmět nebo Příjemce obsahuje"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Sender contains"
 msgstr "Předmět nebo odesílatel obsahuje"
 
@@ -16117,7 +16061,7 @@ msgstr ""
 "těle zprávy."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:474
-#: ../plugins/templates/templates.c:394
+#: ../plugins/templates/templates.c:392
 msgid "Keywords"
 msgstr "Klíčová slova"
 
@@ -16145,7 +16089,6 @@ msgid "Message has no attachments"
 msgstr "Zpráva nemá žádné přílohy"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
-#, fuzzy
 msgid "_Edit Message"
 msgstr "_Upravit zprávu"
 
@@ -16161,27 +16104,27 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "Zásuvný modul zvuku v textu"
 
-#: ../plugins/backup-restore/backup-restore.c:107
+#: ../plugins/backup-restore/backup-restore.c:127
 msgid "Select name of the Evolution backup file"
 msgstr "Zvolte název záložního souboru Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:136
+#: ../plugins/backup-restore/backup-restore.c:156
 msgid "_Restart Evolution after backup"
 msgstr "_Restartovat Evolution po záloze"
 
-#: ../plugins/backup-restore/backup-restore.c:159
+#: ../plugins/backup-restore/backup-restore.c:179
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Zvolte název záložního souboru Evolution, který má být obnoven"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:203
 msgid "_Restart Evolution after restore"
 msgstr "_Restartovat Evolution po obnovení"
 
-#: ../plugins/backup-restore/backup-restore.c:256
+#: ../plugins/backup-restore/backup-restore.c:276
 msgid "Restore from backup"
 msgstr "Obnovit ze zálohy"
 
-#: ../plugins/backup-restore/backup-restore.c:258
+#: ../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"
@@ -16191,120 +16134,120 @@ msgstr ""
 "kalendáře, úlohy, poznámky a kontakty.\n"
 "Taktéž se obnoví všechna nastavení, filtry pošty atd."
 
-#: ../plugins/backup-restore/backup-restore.c:264
+#: ../plugins/backup-restore/backup-restore.c:284
 msgid "_Restore Evolution from the backup file"
 msgstr "_Obnovit Evolution ze záložního souboru"
 
-#: ../plugins/backup-restore/backup-restore.c:271
+#: ../plugins/backup-restore/backup-restore.c:291
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Zvolte, který archiv Evolution obnovit:"
 
-#: ../plugins/backup-restore/backup-restore.c:274
+#: ../plugins/backup-restore/backup-restore.c:294
 msgid "Choose a file to restore"
 msgstr "Vybrat, který soubor obnovit"
 
-#: ../plugins/backup-restore/backup.c:46
+#: ../plugins/backup-restore/backup.c:66
 msgid "Backup Evolution directory"
 msgstr "Zazálohovat adresář Evolution"
 
-#: ../plugins/backup-restore/backup.c:48
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restore Evolution directory"
 msgstr "Obnovit adresář Evolution"
 
-#: ../plugins/backup-restore/backup.c:50
+#: ../plugins/backup-restore/backup.c:70
 msgid "Check Evolution Backup"
 msgstr "Zkontrolovat zálohu Evolutionu"
 
-#: ../plugins/backup-restore/backup.c:52
+#: ../plugins/backup-restore/backup.c:72
 msgid "Restart Evolution"
 msgstr "Restartovat Evolution"
 
-#: ../plugins/backup-restore/backup.c:54
+#: ../plugins/backup-restore/backup.c:74
 msgid "With Graphical User Interface"
 msgstr "s grafickým uživatelským rozhraním"
 
-#: ../plugins/backup-restore/backup.c:105
-#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:125
+#: ../plugins/backup-restore/backup.c:258
 msgid "Shutting down Evolution"
 msgstr "Ukončuji Evolution"
 
-#: ../plugins/backup-restore/backup.c:112
+#: ../plugins/backup-restore/backup.c:132
 msgid "Backing Evolution accounts and settings"
 msgstr "Zálohování účtů a nastavení Evolutionu"
 
-#: ../plugins/backup-restore/backup.c:116
+#: ../plugins/backup-restore/backup.c:136
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "Zálohování dat Evolutionu (pošta, kontakty, kalendář, úlohy, poznámky)"
 
-#: ../plugins/backup-restore/backup.c:127
+#: ../plugins/backup-restore/backup.c:147
 msgid "Backup complete"
 msgstr "Zálohování dokončeno"
 
-#: ../plugins/backup-restore/backup.c:132
-#: ../plugins/backup-restore/backup.c:319
+#: ../plugins/backup-restore/backup.c:152
+#: ../plugins/backup-restore/backup.c:339
 msgid "Restarting Evolution"
 msgstr "Restartování Evolution"
 
-#: ../plugins/backup-restore/backup.c:242
+#: ../plugins/backup-restore/backup.c:262
 msgid "Backup current Evolution data"
 msgstr "Zazálohovat aktuální data Evolutionu"
 
-#: ../plugins/backup-restore/backup.c:247
+#: ../plugins/backup-restore/backup.c:267
 msgid "Extracting files from backup"
 msgstr "Rozbalování souborů ze zálohy"
 
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:274
 msgid "Loading Evolution settings"
 msgstr "Načítání nastavení Evolutionu"
 
-#: ../plugins/backup-restore/backup.c:258
+#: ../plugins/backup-restore/backup.c:278
 msgid "Removing temporary backup files"
 msgstr "Odstraňuji dočasné soubory zálohy"
 
-#: ../plugins/backup-restore/backup.c:265
+#: ../plugins/backup-restore/backup.c:285
 msgid "Ensuring local sources"
-msgstr ""
+msgstr "Ověřování místních zdrojů"
 
-#: ../plugins/backup-restore/backup.c:435
+#: ../plugins/backup-restore/backup.c:455
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Zálohování do složky %s"
 
-#: ../plugins/backup-restore/backup.c:440
+#: ../plugins/backup-restore/backup.c:460
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Obnova ze složky %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Backup"
 msgstr "Zálohování Evolution"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:479
 msgid "Evolution Restore"
 msgstr "Obnova Evolution"
 
-#: ../plugins/backup-restore/backup.c:494
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:514
 msgid "Backing up Evolution Data"
-msgstr "Zazálohovat aktuální data Evolutionu"
+msgstr "Zálohování dat Evolutionu"
 
-#: ../plugins/backup-restore/backup.c:495
+#: ../plugins/backup-restore/backup.c:515
 msgid "Please wait while Evolution is backing up your data."
-msgstr ""
+msgstr "Prosím počkejte, dokud Evolution nezazálohuje vaše data."
 
-#: ../plugins/backup-restore/backup.c:497
-#, fuzzy
+#: ../plugins/backup-restore/backup.c:517
 msgid "Restoring Evolution Data"
-msgstr "Restartování Evolution"
+msgstr "Obnova dat Evolutionu"
 
-#: ../plugins/backup-restore/backup.c:498
+#: ../plugins/backup-restore/backup.c:518
 msgid "Please wait while Evolution is restoring your data."
-msgstr ""
+msgstr "Prosím počkejte, dokud Evolution neobnoví vaše data."
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:536
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
+"Toto může chvíli trvat v závislosti na tom, jaké množství dat váš účet "
+"obsahuje."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
@@ -16337,9 +16280,8 @@ msgstr ""
 "aktivujte přepínací tlačítko."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
-#, fuzzy
 msgid "Insufficient Permissions"
-msgstr "Oprávnění delegátů"
+msgstr "Nedostatečná oprávnění"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Invalid Evolution backup file"
@@ -16350,9 +16292,8 @@ msgid "Please select a valid backup file to restore."
 msgstr "Prosím vyberte platný záložní soubor pro obnovu."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-#, fuzzy
-msgid "The selected folder does not have enough permissions to create the file"
-msgstr "Nemáte dostatečná oprávnění pro smazání této pošty."
+msgid "The selected folder is not writable."
+msgstr "Do vybrané složky nelze zapisovat."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid ""
@@ -16380,46 +16321,43 @@ msgstr "O_bnovit nastavení..."
 msgid "_Backup Settings..."
 msgstr "Zálo_hovat nastavení..."
 
-#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
+#: ../plugins/bbdb/bbdb.c:543 ../plugins/bbdb/bbdb.c:552
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatické kontakty"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:565
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
+#: ../plugins/bbdb/bbdb.c:567
+msgid "_Auto-create address book entries when replying to messages"
 msgstr "_Automaticky vytvářet položky v adresáři při odpovídání na poštu"
 
-#: ../plugins/bbdb/bbdb.c:571
+#: ../plugins/bbdb/bbdb.c:573
 msgid "Select Address book for Automatic Contacts"
 msgstr "Vybrat adresář pro automatické kontakty"
 
-#: ../plugins/bbdb/bbdb.c:586
+#: ../plugins/bbdb/bbdb.c:588
 msgid "Instant Messaging Contacts"
 msgstr "Kontakty instant messaging"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:601
-msgid ""
-"Periodically synchronize contact information and images from Pidgin buddy "
-"list"
+#: ../plugins/bbdb/bbdb.c:603
+msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
-"Pravidelně synchronizovat informace o kontaktech a obrázky ze seznamu "
-"kamarádů aplikace Pidgin"
+"Synchronizovat informace o kontaktech a obrázky ze seznamu kamarádů aplikace "
+"Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:607
+#: ../plugins/bbdb/bbdb.c:609
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Vybrat adresář pro kontakty ze seznamu kamarádů aplikace Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:618
+#: ../plugins/bbdb/bbdb.c:620
 msgid "Synchronize with _buddy list now"
 msgstr "Synchronizovat se _seznamem kamarádů teď"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid ""
-"Automatically fills your addressbook with names and email addresses as you "
+"Automatically fills your address book with names and email addresses as you "
 "reply to messages. Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
@@ -16432,24 +16370,25 @@ 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
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while spawning %s: %s."
-msgstr "Během tisku se vyskytla chyba"
+msgstr "Během spouštění %s se vyskytla chyba: %s."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:138
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
-msgstr ""
+msgstr "Proces potomka Bogofilteru neodpovídá, zabíjím..."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:140
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr ""
+"Počkejte, dokud nebude proces potomka Bogofilteru přerušen, ukončuji..."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:152
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
-msgstr ""
+msgstr "Roura do Bogofilteru selhala, chybový kód: %d."
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:313
 msgid "Convert message text to _Unicode"
@@ -16472,25 +16411,25 @@ msgid "Bogofilter Options"
 msgstr "Možnosti Bogofilter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-#, fuzzy
 msgid "Bogofilter junk plugin"
-msgstr "Možnosti Bogofilter"
+msgstr "Zásuvný modul pro nevyžádanou poštu Bogofilter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
 msgid "Filters junk messages using Bogofilter."
 msgstr "Filtry nevyžádané pošty používají Bogofilter."
 
-#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:66 ../plugins/caldav/caldav-source.c:70
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/caldav/caldav-source.c:249
 #: ../plugins/calendar-http/calendar-http.c:126
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:357
+#: ../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 "Použít _SSL"
 
@@ -16512,10 +16451,10 @@ msgstr "Poskytuje základní funkce místních kalendářů."
 
 #: ../plugins/calendar-http/calendar-http.c:264
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:381
-#, fuzzy
+#: ../plugins/google-account-setup/google-source.c:642
+#: ../plugins/google-account-setup/google-contacts-source.c:320
 msgid "Re_fresh:"
-msgstr "_Obnovit"
+msgstr "_Obnovit:"
 
 #: ../plugins/calendar-http/calendar-http.c:332
 msgid "_Secure connection"
@@ -16544,7 +16483,7 @@ msgstr "Počasí: Mlha"
 
 #: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Partly Cloudy"
-msgstr "Počasí: Polooblačno"
+msgstr "Počasí: Polojasno"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Rain"
@@ -16600,7 +16539,7 @@ msgstr "Nástroj kopírování"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
-msgstr "Kontrolovat, jestli je Evolution implicitní poštovní program"
+msgstr "Zkontrolovat, jestli je Evolution výchozí poštovní program"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid ""
@@ -16611,65 +16550,59 @@ msgstr ""
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
 msgid "Checks whether Evolution is the default mail client on startup."
-msgstr "Při spouštění kontroluje, jestli je Evolution implicitní klient pošty."
+msgstr "Při spouštění kontroluje, jestli je Evolution výchozí klient pošty."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
 msgid "Default Mail Client "
-msgstr "Implicitní klient pošty "
+msgstr "Výchozí klient pošty "
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
-msgstr "Chcete, aby Evolution byl váš implicitní klient pošty?"
+msgstr "Chcete, aby Evolution byl váš výchozí klient pošty?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:679
+#: ../shell/main.c:585
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../plugins/default-source/default-source.c:81
-#, fuzzy
+#: ../plugins/default-source/default-source.c:82
 msgid "Mark as _default address book"
-msgstr "Označit jako _implicitní složku"
+msgstr "Označit jako _výchozí adresář"
 
-#: ../plugins/default-source/default-source.c:102
-#, fuzzy
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default calendar"
-msgstr "Označit jako _implicitní složku"
+msgstr "Označit jako _výchozí kalendář"
 
-#: ../plugins/default-source/default-source.c:103
-#, fuzzy
+#: ../plugins/default-source/default-source.c:104
 msgid "Mark as _default task list"
-msgstr "Označit jako _implicitní složku"
+msgstr "Označit jako _výchozí seznam úkolů"
 
-#: ../plugins/default-source/default-source.c:104
-#, fuzzy
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default memo list"
-msgstr "Označit jako _implicitní složku"
+msgstr "Označit jako _výchozí seznam poznámek"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
-msgstr "Implicitní zdroje"
+msgstr "Výchozí zdroje"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
 msgid ""
-"Provides functionality for marking a calendar or an addressbook as the "
+"Provides functionality for marking a calendar or an address book as the "
 "default one."
-msgstr "Poskytuje funkce pro označení kalendáře nebo adresáře jako implicitní."
+msgstr "Poskytuje funkce pro označení kalendáře nebo adresáře jako výchozí."
 
-#: ../plugins/email-custom-header/email-custom-header.c:562
-#, fuzzy
+#: ../plugins/email-custom-header/email-custom-header.c:560
 msgid "_Custom Header"
-msgstr "Vlastní hlavičky"
+msgstr "_Vlastní hlavička"
 
-#: ../plugins/email-custom-header/email-custom-header.c:883
-#, fuzzy
+#: ../plugins/email-custom-header/email-custom-header.c:881
 msgid "Key"
-msgstr "Keňa"
+msgstr "Klíč"
 
-#: ../plugins/email-custom-header/email-custom-header.c:894
-#: ../plugins/templates/templates.c:400
+#: ../plugins/email-custom-header/email-custom-header.c:892
+#: ../plugins/templates/templates.c:398
 msgid "Values"
-msgstr ""
+msgstr "Hodnoty"
 
 #. 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
@@ -16677,26 +16610,25 @@ msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
 msgstr ""
+"Formát pro zadání klíčové hodnoty vlastní hlavičky je:\n"
+"Názvy klíčových hodnot vlastní hlavičky jsou odděleny \";\"."
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
-#, fuzzy
 msgid "Email Custom Header"
-msgstr "Vlastní hlavičky"
+msgstr "Vlastní hlavička e-mailu"
 
 #. 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 ""
+msgstr "Přidává vlastní hlavičky odchozím zprávám."
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
-#, fuzzy
 msgid "Custom Header"
-msgstr "Vlastní hlavičky"
+msgstr "Vlastní hlavička"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-#, fuzzy
-msgid "List of Custom Header"
-msgstr "Vlastní hlavičky"
+msgid "List of Custom Headers"
+msgstr "Seznam vlastních hlaviček"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
 msgid ""
@@ -16704,6 +16636,9 @@ msgid ""
 "message. The format for specifying a Header and Header value is: Name of the "
 "custom header followed by \"=\" and the values separated by \";\""
 msgstr ""
+"Klíč udává seznam vlastních hlaviček, které můžete přidat do odchozí zprávy. "
+"Formát, určující hlavičku a hodnotu hlavičky, je: Název vlastní hlavičky "
+"následovaný \"=\" a hodnoty oddělené \";\""
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -16807,40 +16742,39 @@ msgstr "Velikost složek"
 msgid "Exchange Settings"
 msgstr "Nastavení Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:674
+#: ../plugins/exchange-operations/exchange-account-setup.c:688
 msgid "_OWA URL:"
 msgstr "URL _OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:700
+#: ../plugins/exchange-operations/exchange-account-setup.c:714
 msgid "A_uthenticate"
 msgstr "_Autentizovat"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:721
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-account-setup.c:735
 msgid "_Mailbox:"
-msgstr "_Pošta"
+msgstr "_Poštovní schránka:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:922
+#: ../plugins/exchange-operations/exchange-account-setup.c:936
 msgid "_Authentication Type"
 msgstr "Typ _autentizace"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:936
+#: ../plugins/exchange-operations/exchange-account-setup.c:950
 msgid "Ch_eck for Supported Types"
 msgstr "Zjistit podporované _typy"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1048
+#: ../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:1050
+#: ../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:191
+#: ../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"
@@ -16853,7 +16787,7 @@ msgstr ""
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
-#: ../plugins/exchange-operations/exchange-change-password.c:113
+#: ../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"
@@ -16861,7 +16795,7 @@ msgstr ""
 "Současné heslo neodpovídá existujícímu heslu vašeho účtu. Zadejte prosím "
 "správné heslo"
 
-#: ../plugins/exchange-operations/exchange-change-password.c:120
+#: ../plugins/exchange-operations/exchange-change-password.c:121
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr "Zadaná hesla se liší. Zadejte prosím hesla znovu."
 
@@ -16882,13 +16816,13 @@ msgid "Your current password has expired. Please change your password now."
 msgstr ""
 "Vašemu současnému heslu vypršela platnost. Teď prosím změňte své heslo."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#: ../plugins/exchange-operations/exchange-config-listener.c:660
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Platnost vašeho hesla vyprší za %d dní"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:152
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:568
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
 msgid "Custom"
 msgstr "Vlastní"
 
@@ -16913,7 +16847,7 @@ msgid "Delegate Permissions"
 msgstr "Oprávnění delegátů"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:251
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
 #, c-format
 msgid "Permissions for %s"
 msgstr "Oprávnění pro %s"
@@ -16955,43 +16889,43 @@ msgstr "Nicméně vám není dovoleno vidět mé soukromé položky."
 msgid "You have been designated as a delegate for %s"
 msgstr "Byli jste jmenováni delegáty %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:415
+#: ../plugins/exchange-operations/exchange-delegates.c:417
 msgid "Delegate To"
 msgstr "Delegovat komu"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:580
+#: ../plugins/exchange-operations/exchange-delegates.c:582
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "Odstranit delegáta %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:698
+#: ../plugins/exchange-operations/exchange-delegates.c:700
 msgid "Could not access Active Directory"
 msgstr "Nemohu přistupovat k Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:710
+#: ../plugins/exchange-operations/exchange-delegates.c:712
 msgid "Could not find self in Active Directory"
 msgstr "Nemohu se najít v Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:723
+#: ../plugins/exchange-operations/exchange-delegates.c:725
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Nemohu najít delegáta %s v Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:735
+#: ../plugins/exchange-operations/exchange-delegates.c:737
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Nemohu odstranit delegáta %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:795
+#: ../plugins/exchange-operations/exchange-delegates.c:797
 msgid "Could not update list of delegates."
 msgstr "Nemohu aktualizovat seznam delegátů."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:813
+#: ../plugins/exchange-operations/exchange-delegates.c:815
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Nemohu přidat delegáta %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:981
+#: ../plugins/exchange-operations/exchange-delegates.c:983
 msgid "Error reading delegates list."
 msgstr "Chyba při čtení seznamu delegátů."
 
@@ -17039,26 +16973,25 @@ msgstr "_Shrnout oprávnění"
 msgid "_Tasks:"
 msgstr "Úkol_y:"
 
-#: ../plugins/exchange-operations/exchange-folder-permission.c:59
+#: ../plugins/exchange-operations/exchange-folder-permission.c:62
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 msgid "Permissions..."
 msgstr "Oprávnění..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:128
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
 msgid "Folder Name"
 msgstr "Název složky"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:132
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
 msgid "Folder Size"
 msgstr "Velikost složky"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:75
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
 msgid "User"
-msgstr "_Uživatel"
+msgstr "Uživatel"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:318
+#: ../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 "Přihlásit se ke složce jiného uživatele"
@@ -17067,20 +17000,20 @@ msgstr "Přihlásit se ke složce jiného uživatele"
 msgid "Exchange Folder Tree"
 msgstr "Strom složek Exchange"
 
-#: ../plugins/exchange-operations/exchange-folder.c:65
-#: ../plugins/exchange-operations/exchange-folder.c:234
-#: ../plugins/exchange-operations/exchange-folder.c:244
+#: ../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 "Odhlásit složku..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:464
-#: ../plugins/exchange-operations/exchange-folder.c:519
+#: ../plugins/exchange-operations/exchange-folder.c:466
+#: ../plugins/exchange-operations/exchange-folder.c:521
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Opravdu se odhlásit od složky \"%s\"?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:476
-#: ../plugins/exchange-operations/exchange-folder.c:531
+#: ../plugins/exchange-operations/exchange-folder.c:478
+#: ../plugins/exchange-operations/exchange-folder.c:533
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Odhlásit se od \"%s\""
@@ -17145,16 +17078,16 @@ msgstr "Platnost vašeho hesla vyprší za 7 dní..."
 msgid "_Change Password"
 msgstr "_Změnit heslo"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
 msgid "(Permission denied.)"
 msgstr "(Přístup zamítnut.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
 msgid "Add User:"
 msgstr "Přidat uživatele:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:401
-#: ../plugins/exchange-operations/exchange-send-options.c:413
+#: ../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:715
 msgid "Add User"
@@ -17186,7 +17119,7 @@ msgstr "Delegovat všechny položky"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Own Items"
-msgstr "Deletovat vlastní položky"
+msgstr "Smazat vlastní položky"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 msgid "Edit Any Items"
@@ -17274,15 +17207,11 @@ msgstr "_Citlivost: "
 msgid "_User"
 msgstr "_Uživatel"
 
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
-msgid "button-user"
-msgstr "button-user"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:138
+#: ../plugins/exchange-operations/exchange-user-dialog.c:136
 msgid "Select User"
 msgstr "Vybrat uživatele"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:176
+#: ../plugins/exchange-operations/exchange-user-dialog.c:174
 msgid "Address Book..."
 msgstr "Adresář..."
 
@@ -17295,12 +17224,11 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "Přihlásit se ke kalendáři jiného uživatele"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-#, fuzzy
 msgid ""
 "A plugin that manages a collection of Exchange account specific operations "
 "and features."
 msgstr ""
-"Zásuvný modul, jenž zpracuje kolekci činností a funkcí pro Exchange účet."
+"Zásuvný modul, jenž spravuje kolekci operací a funkcí pro Exchange účet."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -17391,6 +17319,8 @@ msgstr "Nemohu aktualizovat stav \"mimo kancelář\""
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid "Evolution requires a restart to load the subscribed user's mailbox"
 msgstr ""
+"Evolution vyžaduje restart, aby načetl poštovní schránku přihlášeného "
+"uživatele."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid "Exchange Account is offline."
@@ -17440,7 +17370,7 @@ msgid "Folder offline"
 msgstr "Složka je off-line"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-#: ../shell/e-shell.c:1286
+#: ../shell/e-shell.c:1306
 msgid "Generic error"
 msgstr "Obecná chyba"
 
@@ -17465,12 +17395,12 @@ msgstr "Zkontrolujte, že je URL správné, a zkuste to znovu."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the server name is spelled correctly and try again."
-msgstr "Zkontrolute, že název serveru je zadán správně, a zkuste to znovu."
+msgstr "Zkontrolujte, že název serveru je zadán správně, a zkuste to znovu."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
-"Zkontrolute, že jméno uživatele a heslo jsou správné, a zkuste to znovu."
+"Zkontrolujte, že jméno uživatele a heslo jsou správné, a zkuste to znovu."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No Global Catalog server configured for this account."
@@ -17539,7 +17469,7 @@ msgid ""
 msgstr ""
 "To pravděpodobně znamená, že váš server vyžaduje, \n"
 "abyste zadali jako součást svého jména uživatele \n"
-"název domény Windows (např. &quot;DOMÉNA\\\\uživatel&quot;).\n"
+"název domény Windows (např. &quot;DOMÉNA\\uživatel&quot;).\n"
 "\n"
 "Nebo jste prostě zadali špatné heslo."
 
@@ -17560,6 +17490,7 @@ msgid "Unknown error looking up {0}"
 msgstr "Neznámá chyba při vyhledávání {0}"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/google-account-setup/google-source.c:543
 msgid "Unknown error."
 msgstr "Neznámá chyba."
 
@@ -17569,7 +17500,7 @@ msgstr "Neznámý typ"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Unsupported operation"
-msgstr "Nepodporovaná operace."
+msgstr "Nepodporovaná operace"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "You are nearing your quota available for storing mail on this server."
@@ -17642,13 +17573,12 @@ msgid "Check folder permissions"
 msgstr "Zkontrolujte oprávnění složky"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
-#, fuzzy
 msgid "Default External Editor"
-msgstr "Externí editor"
+msgstr "Výchozí externí editor"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
 msgid "The default command that must be used as the editor."
-msgstr ""
+msgstr "Výchozí příkaz, který musí být použit jako editor."
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid ""
@@ -17664,53 +17594,58 @@ msgid "External Editor"
 msgstr "Externí editor"
 
 #: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
-#, fuzzy
 msgid "Cannot create Temporary File"
-msgstr "Nemohu vytvořit dočasný adresář pro ukládání."
+msgstr "Nelze vytvořit dočasný soubor"
 
 #: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
 msgid "Editor not launchable"
-msgstr ""
+msgstr "Editor nelze spustit"
 
 #: ../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."
 msgstr ""
+"Evolution není schopen vytvořit dočasný soubor, aby uložil vaši poštu. "
+"Zkuste to znovu později."
 
 #: ../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."
 msgstr ""
+"Externí editor zadaný v nastavení zásuvného modulu nelze spustit. Zkuste "
+"zadat jiný editor."
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in External Editor"
-msgstr "Tvořit zprávu v externím editoru"
+msgid "Compose in _External Editor"
+msgstr "Tvořit zprávu v _externím editoru"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
 msgid "Compose messages using an external editor"
 msgstr "Napsat zprávu s využitím externího editoru"
 
-#: ../plugins/external-editor/external-editor.c:91
+#: ../plugins/external-editor/external-editor.c:112
 msgid "Command to be executed to launch the editor: "
-msgstr ""
+msgstr "Příkaz, který má být vykonán, aby se spustil editor: "
 
-#: ../plugins/external-editor/external-editor.c:92
+#: ../plugins/external-editor/external-editor.c:113
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim\""
 msgstr ""
+"Ke spuštění Emacs použijte \"xemacs\"\n"
+"Ke spuštění  VI použijte \"gvim\""
 
-#: ../plugins/face/face.c:58
+#: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Vyberte png (48x48) o velikosti < 700bajtů"
 
-#: ../plugins/face/face.c:68
+#: ../plugins/face/face.c:69
 msgid "PNG files"
 msgstr "soubory PNG"
 
-#: ../plugins/face/face.c:125
+#: ../plugins/face/face.c:126
 msgid "_Face"
 msgstr "_Obličej"
 
@@ -17724,10 +17659,6 @@ msgstr ""
 "(48x48 png). Je kódován v base64 a uložen v ~/.evolution/faces. Toto bude "
 "použito ve zprávách odeslaných příště."
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "Obličej"
-
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
@@ -17745,39 +17676,56 @@ msgstr "Odhlásit složky"
 msgid "_Unsubscribe"
 msgstr "_Odhlásit se"
 
-#: ../plugins/google-account-setup/google-source.c:73
-#: ../plugins/google-account-setup/google-source.c:80
+#: ../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-contacts-source.c:198
-#, fuzzy
-msgid "<b>Server</b>"
-msgstr "<b>Členové:</b>"
+#: ../plugins/google-account-setup/google-source.c:439
+msgid "Please enter user name first."
+msgstr "Nejdříve prosím vložte jméno uživatele."
 
-#: ../plugins/google-account-setup/google-contacts-source.c:208
-#, fuzzy
-msgid "Username:"
-msgstr "_Jméno uživatele:"
+#: ../plugins/google-account-setup/google-source.c:443
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr ""
+"Vložte heslo pro uživatele %s, abyste získali přístup k seznamu přihlášených "
+"kalendářů."
+
+#: ../plugins/google-account-setup/google-source.c:543
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"Nelze číst data ze serveru Googlu.\n"
+"%s"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:230
-#, fuzzy
-msgid "Update every"
-msgstr "Aktualizuji dotaz"
+#: ../plugins/google-account-setup/google-source.c:693
+msgid "Cal_endar:"
+msgstr "Kal_endář:"
+
+#: ../plugins/google-account-setup/google-source.c:728
+msgid "Retrieve _list"
+msgstr "Získávání se_znamu"
+
+#: ../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
-#, fuzzy
 msgid "A plugin to setup google calendar and contacts."
-msgstr "Zásuvný modul pro nastavení Google Calendar."
+msgstr "Zásuvný modul pro nastavení Google kalendáře a kontaktů."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google sources"
 msgstr "Zdroje Google"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
 msgid "Checklist"
 msgstr "Seznam"
 
@@ -17822,16 +17770,16 @@ msgstr "Nainstalovat sdílenou složku"
 msgid "Shared Folder Installation"
 msgstr "Instalace sdílené složky"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:78
+#: ../plugins/groupwise-features/junk-mail-settings.c:80
 msgid "Junk Settings"
 msgstr "Nastavení nevyžádané pošty"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:91
+#: ../plugins/groupwise-features/junk-mail-settings.c:93
 #: ../plugins/groupwise-features/junk-settings.glade.h:3
 msgid "Junk Mail Settings"
 msgstr "Nastavení nevyžádané pošty"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:115
+#: ../plugins/groupwise-features/junk-mail-settings.c:117
 msgid "Junk Mail Settings..."
 msgstr "Nastavení nevyžádané pošty..."
 
@@ -17857,15 +17805,16 @@ msgid "_Junk List"
 msgstr "_Seznam nevyžádané pošty"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
-#, fuzzy
 msgid "Message Retract"
-msgstr "Stav zprávy"
+msgstr "Stahování zprávy zpět"
 
 #: ../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 ""
+"Stažení zprávy zpět ji může odstranit z poštovní schránky příjemce. Jste si "
+"jisti, že to chcete udělat?"
 
 #: ../plugins/groupwise-features/mail-retract.c:77
 msgid "Message retracted successfully"
@@ -17888,79 +17837,75 @@ msgid "Groupwise Features"
 msgstr "Funkce Groupwise"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
-#, fuzzy
 msgid "Message retract failed"
-msgstr "Zpráva úspěšně stažena zpět"
+msgstr "Stažení zprávy zpět selhalo"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
-#, fuzzy
 msgid "The server did not allow the selected message to be retracted."
-msgstr "Převézt vybranou zprávu na nový úkol"
+msgstr "Server nepovolil, aby byly vybrané zprávy staženy zpět."
 
 #: ../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
-#, fuzzy
 msgid "Invalid user"
-msgstr "Neplatný podpis"
+msgstr "Neplatný uživatel"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:2
-#, fuzzy
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
-msgstr "Nemohu uložit do souboru &quot;{0}&quot;."
+msgstr "Přístup k proxy nemůže být udělen uživateli &quot;{0}&quot;."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
-#, fuzzy
 msgid "Specify User"
-msgstr "Vybrat uživatele"
+msgstr "Zadejte uživatele"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
-#, fuzzy
 msgid "You have already given proxy permissions to this user."
-msgstr "Byla vám udělena následující práva v mých složkách:"
+msgstr "Tomuto uživateli jste již práva k proxy udělili."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:5
 msgid "You have to specify a valid user name to give proxy rights."
-msgstr ""
+msgstr "Musíte zadat platné jméno uživatele, abyste udělili práva k proxy."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
-#, fuzzy
 msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
 msgstr ""
-"Složka nazvaná &quot;{0}&quot; již existuje. Použijte prosím jiný název."
+"Účet nazvaný &quot;{0}&quot; již existuje. Zkontrolujte prosím svůj strom "
+"složek."
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
-#, fuzzy
 msgid "Account Already Exists"
-msgstr "Podpisy již existují"
+msgstr "Účet již existuje"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
 msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and "
-"try again."
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
 msgstr ""
+"Přihlášení k proxy jako &quot;{0}&quot; bylo neúspěšné. Zkontrolujte prosím "
+"svou e-mailovou adresu a zkuste to znovu."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
-#, fuzzy
 msgid "This is a recurring meeting"
-msgstr "Vytvoří opakující se událost"
+msgstr "Toto je opakovaná schůzka"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:4
-#, fuzzy
-msgid "What would you like to {0}?"
-msgstr "Chcete uložit změny?"
+msgid "Would you like to accept it?"
+msgstr "Chcete to přijmout?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
-#, fuzzy
-msgid "You cannot share folder with specified user &quot;{0}&quot;"
-msgstr "Nemohu uložit do souboru automatického ukládání &quot;{0}&quot;."
+msgid "Would you like to decline it?"
+msgstr "Chcete to odmítnout?"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:6
+msgid "You cannot share folder with specified user &quot;{0}&quot;"
+msgstr "Nemůžete sdílet složku se zadaným uživatelem &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"
-msgstr ""
+msgstr "Musíte zadat jméno uživatele, kterého chcete přidat na seznam."
 
-#: ../plugins/groupwise-features/process-meeting.c:49
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept Tentatively"
 msgstr "Předběžně přijmout"
 
@@ -17977,7 +17922,7 @@ msgid "Con_tacts..."
 msgstr "Kon_takty..."
 
 #: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:517
+#: ../widgets/table/e-table-click-to-add.c:516
 msgid "Message"
 msgstr "Zpráva"
 
@@ -17987,7 +17932,7 @@ msgstr "Upozornění na sdílenou složku"
 
 #: ../plugins/groupwise-features/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
-msgstr "Účastníci dosanou následující upozornění.\n"
+msgstr "Účastníci dostanou následující upozornění.\n"
 
 #: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Not Shared"
@@ -18061,7 +18006,7 @@ msgstr "Přihlášení k proxy"
 #: ../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:83
+#: ../plugins/groupwise-features/send-options.c:85
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sZadejte heslo pro %s (uživatel %s)"
@@ -18081,27 +18026,26 @@ msgstr "Záložka Proxy bude dostupná, jen když je účet online."
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Záložka Proxy bude dostupná, jen když je účet povolen."
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:321
 #: ../plugins/groupwise-features/share-folder.c:750
 msgid "Users"
 msgstr "Uživatelé"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Enter the users and set permissions"
 msgstr "Zadejte uživatele a nastavte oprávnění"
 
-#: ../plugins/groupwise-features/share-folder-common.c:339
+#: ../plugins/groupwise-features/share-folder-common.c:341
 msgid "New _Shared Folder..."
 msgstr "Nová _sdílená složka..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:449
 msgid "Sharing"
 msgstr "Sdílení"
 
 #: ../plugins/groupwise-features/share-folder.c:533
-#, fuzzy
 msgid "Custom Notification"
-msgstr "Zarování"
+msgstr "Vlastní upozornění"
 
 #: ../plugins/groupwise-features/share-folder.c:755
 msgid "Add   "
@@ -18250,8 +18194,8 @@ msgstr "Vyberte seznam úkolů"
 msgid "Select Calendar"
 msgstr "Vybrat kalendář"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:259
-#: ../shell/e-shell-importer.c:700
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:696
 msgid "_Import"
 msgstr "_Importovat"
 
@@ -18279,7 +18223,7 @@ msgstr ""
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:68
 msgid "Search for an iPod failed"
-msgstr "Hledáná iPodu selhalo"
+msgstr "Hledáni iPodu selhalo"
 
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:69
 msgid ""
@@ -18289,14 +18233,15 @@ msgstr ""
 "Evolution nemůže najít iPod, aby s ním synchronizoval. Buď není iPod "
 "připojený k systému, nebo není zapnutý."
 
-#: ../plugins/ipod-sync/ical-format.c:118
-#: ../plugins/save-calendar/ical-format.c:163
+#: ../plugins/ipod-sync/ical-format.c:119
+#: ../plugins/save-calendar/ical-format.c:164
 msgid "iCalendar format (.ics)"
 msgstr "Formát iCalendar (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
-msgstr "Synchronizace vybraného úkolu/poznámky/kalendáře/adresáře s Apple iPod"
+msgid ""
+"Synchronize the selected task/memo/calendar/address book with Apple iPod"
+msgstr "Synchronizovat vybraný úkol/poznámku/kalendář/adresář s Apple iPod"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
@@ -18306,143 +18251,143 @@ msgstr "Synchronizovat s iPod"
 msgid "iPod Synchronization"
 msgstr "iPod synchronizace"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:443
+#: ../plugins/itip-formatter/itip-formatter.c:568
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Nemohu otevřít kalendář '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:589
+#: ../plugins/itip-formatter/itip-formatter.c:588
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Událost v kalendáři '%s' koliduje se schůzkou"
 
-#: ../plugins/itip-formatter/itip-formatter.c:615
+#: ../plugins/itip-formatter/itip-formatter.c:614
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Nenalezena událost '%s' v kalendáři"
 
-#: ../plugins/itip-formatter/itip-formatter.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:690
 msgid "Unable to find any calendars"
 msgstr "Nemohu najít žádné kalendáře"
 
-#: ../plugins/itip-formatter/itip-formatter.c:698
+#: ../plugins/itip-formatter/itip-formatter.c:697
 msgid "Unable to find this meeting in any calendar"
 msgstr "Nemohu najít schůzku v kalendáři"
 
-#: ../plugins/itip-formatter/itip-formatter.c:702
+#: ../plugins/itip-formatter/itip-formatter.c:701
 msgid "Unable to find this task in any task list"
 msgstr "Nemohu najít žádný úkol v seznamu úkolů"
 
-#: ../plugins/itip-formatter/itip-formatter.c:706
+#: ../plugins/itip-formatter/itip-formatter.c:705
 msgid "Unable to find this memo in any memo list"
 msgstr "Nemohu najít tuto poznámku v seznamu poznámek"
 
-#: ../plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Searching for an existing version of this appointment"
 msgstr "Vyhledávám událost pro existující verzi"
 
-#: ../plugins/itip-formatter/itip-formatter.c:946
+#: ../plugins/itip-formatter/itip-formatter.c:945
 msgid "Unable to parse item"
 msgstr "Nemohu zpracovat položku"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1004
+#: ../plugins/itip-formatter/itip-formatter.c:1003
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Nemohu odeslat položku kalendáři '%s'. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1016
+#: ../plugins/itip-formatter/itip-formatter.c:1015
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Odesláno kalendáři '%s' jako přijato"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1019
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Odesláno kalendáři '%s' jako předběžné"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Odesláno kalendáři '%s' jako odmítnuto"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1030
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Odesláno kalendáři '%s' jako zrušeno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1124
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizátor odstranil delegáta %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1131
+#: ../plugins/itip-formatter/itip-formatter.c:1130
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Odesláno oznámení o zrušení delegátovi"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Nemohu poslat oznámení o zrušení delegátovi"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1219
+#: ../plugins/itip-formatter/itip-formatter.c:1218
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Stav účastníka nelze aktualizovat, protože stav není platný"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1246
+#: ../plugins/itip-formatter/itip-formatter.c:1245
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Nemohu aktualizovat účastníka. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
+#: ../plugins/itip-formatter/itip-formatter.c:1249
 msgid "Attendee status updated"
 msgstr "Stav účastníka byl aktualizován"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid "Meeting information sent"
 msgstr "Informace o schůzce odeslány"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1279
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "Task information sent"
 msgstr "Informace o úkolu odeslány"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1282
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 msgid "Memo information sent"
 msgstr "Informace o poznámce odeslány"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1291
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Nelze poslat informaci o schůzce, schůzka neexistuje"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "Unable to send task information, the task does not exist"
 msgstr "Nemohu odeslat informace o úkolu, úkol neexistuje"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1296
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Nelze odeslat informace o poznámce, poznámka neexistuje"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1366
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1365
+#: ../plugins/itip-formatter/itip-formatter.c:1376
 msgid "The calendar attached is not valid"
 msgstr "Připojený kalendář není platný"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1367
-#: ../plugins/itip-formatter/itip-formatter.c:1378
+#: ../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."
 msgstr ""
 "Tato zpráva tvrdí, že obsahuje kalendář, ale kalendář není platný iCalendar."
 
-#: ../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: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 "Položka v kalendáři není platná"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
-#: ../plugins/itip-formatter/itip-formatter.c:1437
-#: ../plugins/itip-formatter/itip-formatter.c:1519
+#: ../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"
@@ -18450,11 +18395,11 @@ msgstr ""
 "Zpráva obsahuje kalendář, ale kalendář neobsahuje události, úkoly ani "
 "informace volno/obsazeno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 msgid "The calendar attached contains multiple items"
 msgstr "Připojený kalendář obsahuje několik položek"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18462,227 +18407,227 @@ msgstr ""
 "Pro zpracování všech těchto položek by měl být soubor uložen a kalendář "
 "importován"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2149
+#: ../plugins/itip-formatter/itip-formatter.c:2148
 msgid "This meeting recurs"
 msgstr "Tato schůzka se opakuje"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2152
+#: ../plugins/itip-formatter/itip-formatter.c:2151
 msgid "This task recurs"
 msgstr "Tento úkol se opakuje"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2155
+#: ../plugins/itip-formatter/itip-formatter.c:2154
 msgid "This memo recurs"
 msgstr "Tato poznámka se opakuje"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2384
+#: ../plugins/itip-formatter/itip-formatter.c:2383
 msgid "_Delete message after acting"
 msgstr "_Odstranit zprávu po zpracování"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2394
-#: ../plugins/itip-formatter/itip-formatter.c:2426
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2425
 msgid "Conflict Search"
 msgstr "Hledání konfliktů"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2409
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Zvolte kalendáře, ve kterých hledat konflikty se schůzkou"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:190 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:299
+#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:298
 msgid "Today"
 msgstr "Dnes"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../plugins/itip-formatter/itip-view.c:194
 msgid "Today %H:%M"
 msgstr "Dnes %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:199
+#: ../plugins/itip-formatter/itip-view.c:198
 msgid "Today %H:%M:%S"
 msgstr "Dnes %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:208
+#: ../plugins/itip-formatter/itip-view.c:207
 msgid "Today %l:%M:%S %p"
 msgstr "Dnes %k:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:218
+#: ../plugins/itip-formatter/itip-view.c:217
 msgid "Tomorrow"
 msgstr "Zítra"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:223
+#: ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow %H:%M"
 msgstr "Zítra %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:227
+#: ../plugins/itip-formatter/itip-view.c:226
 msgid "Tomorrow %H:%M:%S"
 msgstr "Zítra %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %l:%M %p"
 msgstr "Zítra %k:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:236
+#: ../plugins/itip-formatter/itip-view.c:235
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Zítra %k:%M:%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:255
+#: ../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:260
+#: ../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:264
+#: ../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:269
+#: ../plugins/itip-formatter/itip-view.c:268
 msgid "%A %l:%M %p"
 msgstr "%A %k:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:273
+#: ../plugins/itip-formatter/itip-view.c:272
 msgid "%A %l:%M:%S %p"
 msgstr "%A %k:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:282
+#: ../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:288
+#: ../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:292
+#: ../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:297
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e. %B %k:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:301
+#: ../plugins/itip-formatter/itip-view.c:300
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e. %B %k:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:307
+#: ../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:312
+#: ../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:316
+#: ../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:321
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e. %B %Y %k:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:325
+#: ../plugins/itip-formatter/itip-view.c:324
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %B %Y %k:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../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 "Prosím odpovězte jménem <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:352
-#: ../plugins/itip-formatter/itip-view.c:440
-#: ../plugins/itip-formatter/itip-view.c:528
+#: ../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 "Přijato jménem <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:357
+#: ../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> pomocí %s zveřejnil(a) následující informace o schůzce:"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> zveřejnil(a) následující informace o schůzce:"
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> vám delegoval(a) následující schůzku:"
 
-#: ../plugins/itip-formatter/itip-view.c:367
+#: ../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> pomocí %s požaduje vaši účast na následující schůzce:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> požaduje vaši účast na následující schůzce:"
 
-#: ../plugins/itip-formatter/itip-view.c:375
+#: ../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> pomocí %s si přeje být přidán(a) na existující schůzku:"
 
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> si přeje být přidán(a) na existující schůzku:"
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:380
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18691,88 +18636,88 @@ msgstr ""
 "<b>%s</b> si pomocí %s přeje získat nejnovější informace o následující "
 "schůzce:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../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> si přeje získat nejnovější informace o následující schůzce:"
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> pomocí %s poslal(a) zpět následující odpověď o schůzce:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> poslal(a) zpět následující odpověď o schůzce:"
 
-#: ../plugins/itip-formatter/itip-view.c:393
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> pomocí %s zrušil(a) následující schůzku:"
 
-#: ../plugins/itip-formatter/itip-view.c:395
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> zrušil(a) následující schůzku."
 
-#: ../plugins/itip-formatter/itip-view.c:399
+#: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> pomocí %s navrhl(a) následující změny schůzky."
 
-#: ../plugins/itip-formatter/itip-view.c:401
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> navrhl(a) následující změny schůzky."
 
-#: ../plugins/itip-formatter/itip-view.c:405
+#: ../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> pomocí %s odmítl(a) následující změny schůzky:"
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> odmítl(a) následující změny schůzky."
 
-#: ../plugins/itip-formatter/itip-view.c:445
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> pomocí %s zveřejnil(a) následující úkol:"
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> zveřejnil(a) následující úkol:"
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../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> požaduje přiřazení %s k následujícímu úkolu:"
 
-#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> vám pomocí %s přiřadil(a) úkol:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> vám přiřadil(a) úkol:"
 
-#: ../plugins/itip-formatter/itip-view.c:463
+#: ../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> pomocí %s si přeje být přidán(a) k existujícímu úkolu:"
 
-#: ../plugins/itip-formatter/itip-view.c:465
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> si přeje být přidán(a) k existujícímu úkolu:"
 
-#: ../plugins/itip-formatter/itip-view.c:469
+#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18781,7 +18726,7 @@ msgstr ""
 "<b>%s</b> si pomocí %s přeje získat nejnovější informace o následujícím "
 "přiřazeném úkolu:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18790,170 +18735,170 @@ msgstr ""
 "<b>%s</b> si přeje získat nejnovější informace o následujícím přiřazeném "
 "úkolu:"
 
-#: ../plugins/itip-formatter/itip-view.c:475
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr ""
 "<b>%s</b> pomocí %s poslal(a) zpět následující odpověď o přiřazeném úkolu:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../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> poslal(a) zpět následující odpověď o přiřazeném úkolu:"
 
-#: ../plugins/itip-formatter/itip-view.c:481
+#: ../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> pomocí %s zrušil(a) následující přiřazený úkol:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> zrušil(a) následující přiřazený úkol:"
 
-#: ../plugins/itip-formatter/itip-view.c:487
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> pomocí %s navrhl(a) následující změny přiřazení úkolu:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> navrhl(a) následující změny přiřazení úkolu:"
 
-#: ../plugins/itip-formatter/itip-view.c:493
+#: ../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> pomocí %s odmítl(a) následující přiřazený úkol:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> odmítl(a) následující přiřazený úkol:"
 
-#: ../plugins/itip-formatter/itip-view.c:533
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> pomocí %s zveřejnil(a) následující poznámku:"
 
-#: ../plugins/itip-formatter/itip-view.c:535
+#: ../plugins/itip-formatter/itip-view.c:534
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> zveřejnil(a) následující poznámku:"
 
-#: ../plugins/itip-formatter/itip-view.c:540
+#: ../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> si pomocí %s přeje být přidán(a) do existující poznámky:"
 
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:541
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> si přeje být přidán(a) do existující poznámky:"
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../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> pomocí %s zrušil(a) následující poznámku:"
 
-#: ../plugins/itip-formatter/itip-view.c:548
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> zrušil(a) následující sdílenou poznámku:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:819
+#: ../plugins/itip-formatter/itip-view.c:818
 msgid "_Open Calendar"
 msgstr "_Otevřít kalendář"
 
-#: ../plugins/itip-formatter/itip-view.c:825
-#: ../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
+#: ../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 "O_dmítnout"
 
-#: ../plugins/itip-formatter/itip-view.c:826
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../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 "_Přijmout"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:828
 msgid "_Decline all"
 msgstr "Od_mítnout vše"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:829
 msgid "_Tentative all"
 msgstr "_Předběžně všechno"
 
-#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:836
-#: ../plugins/itip-formatter/itip-view.c:853
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../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 "_Předběžné"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:830
 msgid "_Accept all"
 msgstr "_Přijmout vše"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Send Information"
 msgstr "Ode_slat informaci"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:845
 msgid "_Update Attendee Status"
 msgstr "_Aktualizovat stav účastníka"
 
-#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update"
 msgstr "_Aktualizovat"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1010
+#: ../plugins/itip-formatter/itip-view.c:1012
 msgid "Start time:"
 msgstr "Čas začátku:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1019
+#: ../plugins/itip-formatter/itip-view.c:1021
 msgid "End time:"
 msgstr "Čas konce:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1035
-#: ../plugins/itip-formatter/itip-view.c:1085
+#: ../plugins/itip-formatter/itip-view.c:1037
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Comment:"
 msgstr "Poznámka:"
 
-#: ../plugins/itip-formatter/itip-view.c:1071
+#: ../plugins/itip-formatter/itip-view.c:1073
 msgid "Send _reply to sender"
 msgstr "_Odpovědět odesílateli"
 
-#: ../plugins/itip-formatter/itip-view.c:1099
+#: ../plugins/itip-formatter/itip-view.c:1101
 msgid "Send _updates to attendees"
 msgstr "Poslat _aktualizace účastníkům"
 
-#: ../plugins/itip-formatter/itip-view.c:1108
+#: ../plugins/itip-formatter/itip-view.c:1110
 msgid "_Apply to all instances"
 msgstr "_Použít na všechny instance"
 
-#: ../plugins/itip-formatter/itip-view.c:1117
+#: ../plugins/itip-formatter/itip-view.c:1119
 msgid "Show time as _free"
 msgstr "Zobrazovat čas jako _volný"
 
-#: ../plugins/itip-formatter/itip-view.c:1850
+#: ../plugins/itip-formatter/itip-view.c:1852
 msgid "_Tasks :"
 msgstr "Úkol_y :"
 
-#: ../plugins/itip-formatter/itip-view.c:1852
+#: ../plugins/itip-formatter/itip-view.c:1854
 msgid "Memos :"
 msgstr "Poznámky :"
 
@@ -18970,7 +18915,7 @@ msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
 "&quot;{1}&quot;?"
 msgstr ""
-"&quot;{0}&quot; delegoval zchůzku. Chcete přidat delegáta &quot;{1}&quot;?"
+"&quot;{0}&quot; delegoval schůzku. Chcete přidat delegáta &quot;{1}&quot;?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
@@ -19017,10 +18962,11 @@ msgstr "Vytvoří zprávu D-BUS, když přijde nová pošta."
 
 #: ../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."
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
 msgstr ""
-"Je-li pravda, potom pípne, jinak bude hrát zvukový soubor, když dorazí nová "
-"zpráva."
+"Platí-li \"true\", potom pípne, jinak bude hrát zvukový soubor, když dorazí "
+"nová zpráva."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
@@ -19069,18 +19015,16 @@ msgstr "Zdali upozornit pouze na nové zprávy ve složce Příchozí."
 msgid "Generate a _D-Bus message"
 msgstr "Vytvořit zprávu _D-Bus"
 
-#: ../plugins/mail-notification/mail-notification.c:361
-#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:378
 msgid "Evolution's Mail Notification"
-msgstr "Upozornění na novou poštu"
+msgstr "Upozornění na novou poštu v Evolutionu"
 
-#: ../plugins/mail-notification/mail-notification.c:382
-#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:399
 msgid "Mail Notification Properties"
-msgstr "Upozornění na novou poštu"
+msgstr "Nastavení Upozornění na novou poštu"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:440
+#: ../plugins/mail-notification/mail-notification.c:458
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19098,7 +19042,7 @@ msgstr[2] ""
 "Přijato %d nových zpráv\n"
 "ve složce %s."
 
-#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:463
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -19106,48 +19050,48 @@ msgstr[0] "Přijata %d nová zpráva."
 msgstr[1] "Přijaty %d nové zprávy."
 msgstr[2] "Přijato %d nových zpráv."
 
-#: ../plugins/mail-notification/mail-notification.c:457
-#: ../plugins/mail-notification/mail-notification.c:462
+#: ../plugins/mail-notification/mail-notification.c:480
+#: ../plugins/mail-notification/mail-notification.c:485
 msgid "New email"
 msgstr "Nový e-mail"
 
-#: ../plugins/mail-notification/mail-notification.c:519
+#: ../plugins/mail-notification/mail-notification.c:544
 msgid "Show icon in _notification area"
 msgstr "Zobrazovat ikonu v _oznamovací oblasti"
 
-#: ../plugins/mail-notification/mail-notification.c:522
+#: ../plugins/mail-notification/mail-notification.c:547
 msgid "B_link icon in notification area"
 msgstr "B_likat s ikonou v oznamovací oblasti"
 
-#: ../plugins/mail-notification/mail-notification.c:524
+#: ../plugins/mail-notification/mail-notification.c:549
 msgid "Popup _message together with the icon"
 msgstr "V_yskakovací zpráva společně s ikonou"
 
-#: ../plugins/mail-notification/mail-notification.c:705
+#: ../plugins/mail-notification/mail-notification.c:730
 msgid "_Play sound when new messages arrive"
 msgstr "Za_hrát zvuk, když přijde nová pošta"
 
-#: ../plugins/mail-notification/mail-notification.c:711
+#: ../plugins/mail-notification/mail-notification.c:736
 msgid "_Beep"
 msgstr "_Pípnout"
 
-#: ../plugins/mail-notification/mail-notification.c:712
+#: ../plugins/mail-notification/mail-notification.c:737
 msgid "Play _sound file"
 msgstr "Přehrát _zvukový soubor"
 
-#: ../plugins/mail-notification/mail-notification.c:723
+#: ../plugins/mail-notification/mail-notification.c:748
 msgid "Specify _filename:"
 msgstr "Zvolte _název souboru:"
 
-#: ../plugins/mail-notification/mail-notification.c:724
+#: ../plugins/mail-notification/mail-notification.c:749
 msgid "Select sound file"
 msgstr "Vyberte zvukový soubor"
 
-#: ../plugins/mail-notification/mail-notification.c:725
+#: ../plugins/mail-notification/mail-notification.c:750
 msgid "Pl_ay"
 msgstr "Pře_hrát"
 
-#: ../plugins/mail-notification/mail-notification.c:782
+#: ../plugins/mail-notification/mail-notification.c:807
 msgid "Notify new messages for _Inbox only"
 msgstr "Upozo_rnit pouze na nové zprávy v Příchozích"
 
@@ -19177,12 +19121,12 @@ msgstr "_Převést na schůzku"
 msgid "Mail to meeting"
 msgstr "Zprávu na schůzku"
 
-#: ../plugins/mail-to-task/mail-to-task.c:270
+#: ../plugins/mail-to-task/mail-to-task.c:287
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Nemohu otevřít kalendář. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:275
+#: ../plugins/mail-to-task/mail-to-task.c:292
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19291,7 +19235,6 @@ msgid "Send e-mail message to mailing list?"
 msgstr "Odeslat e-mail poštovní konferenci?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
-#, fuzzy
 msgid ""
 "The action could not be performed. This means the header for this action did "
 "not contain any action we could process.\n"
@@ -19375,28 +19318,25 @@ msgstr "_Přihlásit se do konference"
 msgid "_Unsubscribe from List"
 msgstr "Od_hlásit se z konference"
 
-#: ../plugins/mark-all-read/mark-all-read.c:37
-msgid "Mark all messages in this folder and subfolders as read?"
-msgstr "Označit všechny zprávy v této složce a podsložkách jako přečtené?"
-
 #: ../plugins/mark-all-read/mark-all-read.c:39
-msgid "Do you want the operation to be performed also in the subfolders?"
-msgstr "Chcete operaci provést také v podsložkách?"
+msgid "Also mark messages in subfolders?"
+msgstr "Označit také zprávy v podsložkách?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:85
-#, fuzzy
-msgid "Mark All Messages as Read"
-msgstr "Označit všechny _zprávy jako přečtené"
+#: ../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?"
+msgstr ""
+"Chcete označit zprávy jako přečtené pouze v aktuální složce nebo také v "
+"podsložkách?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:162
-#, fuzzy
+#: ../plugins/mark-all-read/mark-all-read.c:164
 msgid "Current Folder and _Subfolders"
-msgstr "na aktuální složce a _podsložkách"
+msgstr "Aktuální složka a _podsložky"
 
-#: ../plugins/mark-all-read/mark-all-read.c:174
-#, fuzzy
+#: ../plugins/mark-all-read/mark-all-read.c:176
 msgid "Current _Folder Only"
-msgstr "Aktuální složka"
+msgstr "Pouze _aktuální složka"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
@@ -19442,7 +19382,7 @@ msgstr ""
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:236
+#: ../plugins/plugin-manager/plugin-manager.c:252
 msgid "Plugin Manager"
 msgstr "Správce zásuvných modulů"
 
@@ -19454,24 +19394,24 @@ msgstr "Povolit a zakázat zásuvné moduly"
 msgid "_Plugins"
 msgstr "_Zásuvné moduly"
 
-#: ../plugins/plugin-manager/plugin-manager.c:42
+#: ../plugins/plugin-manager/plugin-manager.c:58
 msgid "Author(s)"
 msgstr "Autoři"
 
-#: ../plugins/plugin-manager/plugin-manager.c:130
+#: ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "Nastavení"
 
-#: ../plugins/plugin-manager/plugin-manager.c:249
+#: ../plugins/plugin-manager/plugin-manager.c:265
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Upozornění: Některé změny budou mít vliv až po restartu"
 
-#: ../plugins/plugin-manager/plugin-manager.c:275
+#: ../plugins/plugin-manager/plugin-manager.c:291
 msgid "Overview"
 msgstr "Přehled"
 
-#: ../plugins/plugin-manager/plugin-manager.c:346
-#: ../plugins/plugin-manager/plugin-manager.c:408
+#: ../plugins/plugin-manager/plugin-manager.c:362
+#: ../plugins/plugin-manager/plugin-manager.c:424
 msgid "Plugin"
 msgstr "Zásuvný modul"
 
@@ -19496,19 +19436,19 @@ msgstr "Čistě textový model"
 msgid "Prefer plain-text"
 msgstr "Dávat přednost prostému textu"
 
-#: ../plugins/prefer-plain/prefer-plain.c:174
+#: ../plugins/prefer-plain/prefer-plain.c:191
 msgid "Show HTML if present"
 msgstr "Zobrazit HTML, je-li přítomno"
 
-#: ../plugins/prefer-plain/prefer-plain.c:175
+#: ../plugins/prefer-plain/prefer-plain.c:192
 msgid "Prefer PLAIN"
 msgstr "Dávat přednost PLAIN"
 
-#: ../plugins/prefer-plain/prefer-plain.c:176
+#: ../plugins/prefer-plain/prefer-plain.c:193
 msgid "Only ever show PLAIN"
 msgstr "Zobrazovat jen PLAIN"
 
-#: ../plugins/prefer-plain/prefer-plain.c:219
+#: ../plugins/prefer-plain/prefer-plain.c:236
 msgid "HTML _Mode"
 msgstr "_Režim HTML"
 
@@ -19625,77 +19565,73 @@ msgstr ""
 "volné/obsazené"
 
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
-#, fuzzy
 msgid "Hello Python"
-msgstr "Telefon domů"
+msgstr "Ahoj, Python"
 
 #: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
 msgid "Python Plugin Loader tests"
-msgstr ""
+msgstr "Testy zavaděče zásuvných modulů v Pythonu"
 
 #: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
 msgid "Python Test Plugin"
-msgstr ""
+msgstr "Zkušební zásuvný modul v Pythonu"
 
 #: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
 msgid "Test Plugin for Python EPlugin loader."
-msgstr ""
+msgstr "Zkušební zásuvný modul pro Python EPlugin."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
 msgid "A plugin which loads other plugins written using python."
-msgstr ""
+msgstr "Zásuvný modul, který zavádí ostatní zásuvné moduly napsané v pythonu."
 
 #: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
-#, fuzzy
 msgid "Python Loader"
-msgstr "Načítač Mono"
+msgstr "Načítač Pythonu"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:108
 msgid "SpamAssassin (built-in)"
 msgstr "SpamAssassin (vestavěn)"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#, fuzzy, c-format
+#, c-format
 msgid "SpamAssassin not found, code: %d"
-msgstr "Zásuvný modul pro nevyžádanou poštu SpamAssassin"
+msgstr "SpamAssassin nebyl nalezen, kód: %d"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:142
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:150
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to create pipe: %s"
-msgstr "Nemohu vytvořit místní úložiště pošty `%s': %s"
+msgstr "Nelze vytvořit rouru: %s"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:189
-#, fuzzy, c-format
+#, c-format
 msgid "Error after fork: %s"
-msgstr ""
-"Chyba na %s:\n"
-" %s"
+msgstr "Chyba po větvení: %s"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:244
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
-msgstr ""
+msgstr "Proces potomka SpamAssassinu neodpovídá, zabíjím..."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:246
 #, c-format
 msgid "Wait for Spamassassin child process interrupted, terminating..."
 msgstr ""
+"Počkejte, dokud nebude proces potomka Spamassassinu přerušen, ukončuji..."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:255
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr ""
+msgstr "Roura do SpamAssassinu selhala, chybový kód: %d"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:498
-#, fuzzy, c-format
+#, c-format
 msgid "SpamAssassin is not available."
-msgstr "Možnosti odesílání nejsou k dispozici."
+msgstr "SpamAssassin není dostupný."
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:865
-#, fuzzy
 msgid "This will make SpamAssassin more reliable, but slower"
-msgstr "SpamAssassin pak bude spolehlivější, ale pomalejší"
+msgstr "Díky tomuto bude SpamAssassin spolehlivější, ale pomalejší"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:871
 msgid "I_nclude remote tests"
@@ -19751,79 +19687,79 @@ msgstr "Uložit"
 #. * 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:162
+#: ../plugins/save-calendar/csv-format.c:163
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:361
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Description List"
 msgstr "Seznam popisů"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Categories List"
 msgstr "Seznam kategorií"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Comment List"
 msgstr "Seznam poznámek"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Created"
 msgstr "Vytvořeno"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Contact List"
 msgstr "Seznam kontaktů"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Start"
 msgstr "Začátek"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "End"
 msgstr "Konec"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "percent Done"
 msgstr "Dokončeno procent"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Attendees List"
 msgstr "Seznam účastníků"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Modified"
 msgstr "Změněno"
 
-#: ../plugins/save-calendar/csv-format.c:531
+#: ../plugins/save-calendar/csv-format.c:532
 msgid "Advanced options for the CSV format"
 msgstr "Pokročilé možnosti pro formát CSV"
 
-#: ../plugins/save-calendar/csv-format.c:538
+#: ../plugins/save-calendar/csv-format.c:539
 msgid "Prepend a header"
-msgstr "Přidat na začáteh záhlaví"
+msgstr "Přidat na začátek záhlaví"
 
-#: ../plugins/save-calendar/csv-format.c:547
+#: ../plugins/save-calendar/csv-format.c:548
 msgid "Value delimiter:"
 msgstr "Oddělovač hodnot:"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:554
 msgid "Record delimiter:"
 msgstr "Oddělovač záznamů:"
 
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "Encapsulate values with:"
 msgstr "Obalit hodnoty s:"
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "Formát hodnot oddělených čárkou (.csv)"
 
@@ -19833,7 +19769,7 @@ msgstr "Uložit vybrané"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
 msgid "Saves selected calendar or tasks list to disk."
-msgstr "Uloží vybraný kalendář nebo senzam úkolů na disk."
+msgstr "Uloží vybraný kalendář nebo seznam úkolů na disk."
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
 msgid "_Save to Disk"
@@ -19844,15 +19780,15 @@ msgstr "Uložit na _disk"
 #. * 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:149
+#: ../plugins/save-calendar/rdf-format.c:150
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:376
+#: ../plugins/save-calendar/rdf-format.c:377
 msgid "RDF format (.rdf)"
 msgstr "Formát RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:160
+#: ../plugins/save-calendar/save-calendar.c:161
 msgid "Select destination file"
 msgstr "Zvolte soubor cíle"
 
@@ -19877,24 +19813,22 @@ msgid "Show _only this Task List"
 msgstr "_Zobrazit jen tento seznam úkolů"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-#, fuzzy
-msgid "A plugin that manages the Startup wizard."
-msgstr "Zásuvný modul, jenž pracuje se spouštěcím průvodcem."
+msgid "Guides you through your initial account setup."
+msgstr "Provádí vás prvotním nastavením účtu."
 
-# GIGO applies here, I think
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Startup wizard"
-msgstr "Spouštěcí průvodce"
+msgid "Setup Assistant"
+msgstr "Asistent pro nastavení"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:83
 msgid "Evolution Setup Assistant"
 msgstr "Asistent Evolution pro nastavení"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:86
 msgid "Welcome"
 msgstr "Vítejte"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 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"
@@ -19907,29 +19841,29 @@ msgstr ""
 "\n"
 "Pokračujte prosím kliknutím na tlačítko Vpřed. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:134
+#: ../plugins/startup-wizard/startup-wizard.c:133
 msgid "Importing files"
 msgstr "Importují se soubory"
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
-#: ../shell/e-shell-importer.c:144
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../shell/e-shell-importer.c:141
 msgid "Please select the information that you would like to import:"
 msgstr "Vyberte prosím informace, které chcete importovat:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:397
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../shell/e-shell-importer.c:394
 #, c-format
 msgid "From %s:"
 msgstr "Z %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:508
+#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../shell/e-shell-importer.c:505
 #, c-format
 msgid "Importing data."
 msgstr "Importuji data."
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../shell/e-shell-importer.c:519
 msgid "Please wait"
 msgstr "Čekejte, prosím"
 
@@ -19946,37 +19880,33 @@ msgid "Thread messages by subject"
 msgstr "Seskupovat zprávy podle předmětu"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:54
+#: ../plugins/subject-thread/subject-thread.c:56
 msgid "F_all back to threading messages by subject"
 msgstr "_Seskupovat zprávy podle předmětu"
 
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
-#, fuzzy
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
 "message body."
 msgstr ""
-"Seznam vodítek pro zásuvný modul připomínající přílohu, které má hledat v "
-"těle zprávy."
+"Seznam dvojic klíčových slov/hodnot pro zásuvný modul Šablony k nahrazování "
+"v těle zprávy."
 
-#: ../plugins/templates/templates.c:614
-#, fuzzy
+#: ../plugins/templates/templates.c:613
 msgid "No title"
-msgstr "Název pozice"
+msgstr "Bez titulku"
 
-#: ../plugins/templates/templates.c:743
-#, fuzzy
+#: ../plugins/templates/templates.c:741
 msgid "Save as _Template"
-msgstr "Uložit jako koncept"
+msgstr "Uložit jako ša_blonu"
 
-#: ../plugins/templates/templates.c:745
-#, fuzzy
+#: ../plugins/templates/templates.c:743
 msgid "Save as Template"
-msgstr "Uložit jako koncept"
+msgstr "Uložit jako šablonu"
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Drafts based template plugin"
-msgstr ""
+msgstr "Koncepty založené na zásuvném modulu šablon"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "A simple plugin which uses ytnef to decode tnef attachments."
@@ -19987,6 +19917,28 @@ msgstr ""
 msgid "TNEF Attachment decoder"
 msgstr "dekodér přílohy TNEF"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
+msgid "A plugin to setup WebDAV contacts."
+msgstr "Zásuvný modul pro nastavení kontaktů WebDAV."
+
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "WebDAV contacts"
+msgstr "Kontakty WebDAV"
+
+#: ../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 "_Vyhnout se IfMatch (potřeba na Apachi < 2.2.8)"
+
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Shell Evolution"
@@ -20005,139 +19957,139 @@ msgstr "Komponenta testů Evolution"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
-msgstr ""
+msgstr "Ověřit připojení přes proxy server"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
-#, fuzzy
 msgid "Automatic proxy configuration URL"
-msgstr "Automatické rozpoznávání odkazů"
+msgstr "URL pro automatické nastavení proxy"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:3
 msgid "Configuration version"
 msgstr "Verze nastavení"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid "Decides whether the crash detection should be run or not."
-msgstr "Určuje, jestli má detekce havárie běžet nebo ne."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default sidebar width"
-msgstr "Implicitní šířka bočního panelu"
+msgstr "Výchozí šířka bočního panelu"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
-msgstr "Implicitní výška okna"
+msgstr "Výchozí výška okna"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
-msgstr "Implicitní stav okna"
+msgstr "Výchozí stav okna"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
-msgstr "Implicitní šířka okna"
+msgstr "Výchozí šířka okna"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
+"Povolit nastavení proxy, když se přistupuje k HTTP/zabezpečenému HTTP přes "
+"internet."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
-msgstr ""
+msgstr "Jméno hostitele HTTP proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "HTTP proxy password"
-msgstr "Zadejte heslo"
+msgstr "Heslo pro HTTP proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy port"
-msgstr ""
+msgstr "Port HTTP proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy username"
-msgstr ""
+msgstr "Jméno uživatele HTTP proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID nebo alias komponenty, kterou implicitně zobrazit po spuštění."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
-"username/password combo is defined by \"/apps/evolution/shell/network_config/"
-"authentication_user\" and locally stored password in .gnome2_private/."
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
+"Pokud platí, připojení do proxy serveru vyžadují autentizaci. Jméno "
+"uživatele je získáno z GConf klíče \"/apps/evolution/shell/network_config/"
+"authentication_user\" a heslo je získáno buď z gnome-keyring nebo ze souboru "
+"hesla ~/.gnome2_private/Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Last upgraded configuration version"
 msgstr "Verze posledního aktualizovaného nastavení"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Seznam cest ke složkám, které synchronizovat na disk pro použití v režimu "
 "odpojení"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Non-proxy hosts"
-msgstr ""
+msgstr "Počítače bez proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Password to pass as authentication when doing HTTP proxying."
-msgstr ""
+msgstr "Heslo pro autentizaci během používání HTTP proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Proxy configuration mode"
-msgstr "Nastavení"
+msgstr "Režim pro nastavení proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "SOCKS proxy host name"
-msgstr ""
+msgstr "Jméno hostitele SOCKS proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "SOCKS proxy port"
-msgstr ""
+msgstr "Port SOCKS proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Secure HTTP proxy host name"
-msgstr ""
+msgstr "Jméno hostitele proxy zabezpečeného HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Secure HTTP proxy port"
-msgstr ""
+msgstr "Port proxy zabezpečeného HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../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 "
 "configuration\" and \"use proxy configuration provided in the autoconfig url"
 "\" respectively."
 msgstr ""
+"Vyberte režim pro nastavení proxy. Podporované hodnoty jsou 0, 1, 2 a 3 "
+"představující \"použít systémové nastavení\", \"žádná proxy\", \"použít "
+"ruční nastavení proxy\" a \"použít nastavení proxy pomocí url pro "
+"automatické nastavení\"."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Sidebar is visible"
 msgstr "Boční panel je viditelný"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Skip development warning dialog"
 msgstr "Přeskakovat dialog varování o vývoji"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
-msgid "Skip recovery warning dialog"
-msgstr "Přeskakovat dialog varování o obnovení"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:29 ../shell/main.c:565
+#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "Spustit v režimu off-line"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Statusbar is visible"
 msgstr "Stavová lišta je viditelná"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -20145,19 +20097,19 @@ msgstr ""
 "Verze nastavení Evolution, jako hlavní/vedlejší/úrovně nastavení (například "
 "\"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "The default height for the main window, in pixels."
-msgstr "Implicitní výška hlavního okna v pixelech."
+msgstr "Výchozí výška hlavního okna v pixelech."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "The default width for the main window, in pixels."
-msgstr "Implicitní šířka hlavního okna v pixelech."
+msgstr "Výchozí šířka hlavního okna v pixelech."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "The default width for the sidebar, in pixels."
-msgstr "Implicitní šířka bočního panelu v pixelech."
+msgstr "Výchozí šířka bočního panelu v pixelech."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../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\")."
@@ -20165,37 +20117,43 @@ msgstr ""
 "Poslední verze aktualizovaného nastavení Evolution, s hlavní/vedlejší/úrovní "
 "nastavení (například \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The machine name to proxy HTTP through."
-msgstr ""
+msgstr "Jméno počítače, který používat jako HTTP proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The machine name to proxy secure HTTP through."
-msgstr ""
+msgstr "Jméno počítače, který používat jako proxy zabezpečeného HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The machine name to proxy socks through."
-msgstr ""
+msgstr "Jméno počítače, který používat jako socks proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../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 ""
+"Port na počítači definovaném v \"/apps/evolution/shell/network_config/"
+"http_host\", který používat pro proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../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 ""
+"Port na počítači definovaném v \"/apps/evolution/shell/network_config/"
+"secure_host\", který používat pro proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../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 ""
+"Port na počítači definovaném v \"/apps/evolution/shell/network_config/"
+"sock_host\", který používat pro proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../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 "
@@ -20205,73 +20163,68 @@ msgstr ""
 "li nastaveno \"toolbar\", styl tlačítek je určen nastavením lišt nástrojů "
 "GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../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 "
 "(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
+"Tento klíč obsahuje seznam počítačů, kteří jsou spojeni přímo, místo pomocí "
+"proxy (pokud je to aktivováno). Hodnoty mohou být jména počítačů, domény "
+"(využívajíce počáteční divokou kartu jako *.foo.com), IP adresy počítačů "
+"(jak IPv4, tak IPv6) a adresy sítí s maskou sítě (něco jako 192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "Toolbar is visible"
 msgstr "Lišta nástrojů je viditelná"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "URL that provides proxy configuration values."
-msgstr "Verze posledního aktualizovaného nastavení"
+msgstr "URL, která poskytuje hodnoty pro nastavení proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "Use HTTP proxy"
-msgstr ""
+msgstr "Použít HTTP proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "User name to pass as authentication when doing HTTP proxying."
-msgstr ""
+msgstr "Jméno uživatele pro autentizaci během používání HTTP proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Jestli se má Evolution spouštět v režimu off-line místo on-line."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid "Whether crash detection should be done or not"
-msgstr "Jestli má být udělána detekce pádu nebo ne"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "Whether or not the window should be maximized."
 msgstr "Jestli mají být okna maximalizovaná."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Whether the sidebar should be visible."
 msgstr "Jestli má být boční panel viditelný."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "Whether the status bar should be visible."
 msgstr "Jestli má být stavový řádek viditelný."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether the toolbar should be visible."
 msgstr "Jestli má být lišta nástrojů viditelná."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Jestli se přeskakuje dialog varování ve vývojových verzích Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "Whether the warning dialog in recovery of Evolution is skipped."
-msgstr "Jestli se přeskakuje dialog varování během obnovení Evolutionu."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the window buttons should be visible."
 msgstr "Jestli mají být tlačítka okna viditelná."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Window button style"
 msgstr "Styl tlačítek okna"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Window buttons are visible"
 msgstr "Tlačítka okna jsou viditelná"
 
@@ -20287,28 +20240,22 @@ msgstr "Aktivní spojení"
 msgid "Click OK to close these connections and go offline"
 msgstr "Pro zavření těchto spojení a práci při odpojení klikněte na Budiž"
 
-#: ../shell/e-shell-importer.c:132
+#: ../shell/e-shell-importer.c:131
 msgid "Choose the type of importer to run:"
 msgstr "Vyberte typ importéru, který chcete spustit:"
 
-#: ../shell/e-shell-importer.c:135
+#: ../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.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
+"of file it is from the list."
 msgstr ""
-"Vyberte soubor, který chcete importovat do Evolution, a jeho typ ze "
-"seznamu.\n"
-"\n"
-"Použijte \"Automaticky\" pokud typ neznáte a Evolution se jej pokusí určit."
+"Vyberte soubor, který chcete importovat do Evolution, a jeho typ ze seznamu."
 
-#: ../shell/e-shell-importer.c:141
+#: ../shell/e-shell-importer.c:138
 msgid "Choose the destination for this import"
 msgstr "Zvolte cíl pro tento import"
 
-#: ../shell/e-shell-importer.c:147
+#: ../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"
@@ -20320,33 +20267,33 @@ msgstr ""
 "nastavení, které by bylo možné importovat. Pokud to chcete\n"
 "zkusit znovu, klikněte prosím na tlačítko \"Zpět\".\n"
 
-#: ../shell/e-shell-importer.c:285
+#: ../shell/e-shell-importer.c:282
 msgid "F_ilename:"
 msgstr "_Název souboru:"
 
-#: ../shell/e-shell-importer.c:290
+#: ../shell/e-shell-importer.c:287
 msgid "Select a file"
 msgstr "Vyberte soubor"
 
-#: ../shell/e-shell-importer.c:299
+#: ../shell/e-shell-importer.c:296
 msgid "File _type:"
 msgstr "_Typ souboru:"
 
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:332
 msgid "Import data and settings from _older programs"
 msgstr "Importovat data a nastavení ze _starších programů"
 
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:335
 msgid "Import a _single file"
 msgstr "Importovat _jeden soubor"
 
-#: ../shell/e-shell-settings-dialog.c:314
+#: ../shell/e-shell-settings-dialog.c:313
 msgid "Evolution Preferences"
 msgstr "Nastavení Evolution"
 
 #. 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:48 ../shell/e-shell-window.c:328
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:332
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
@@ -20371,7 +20318,7 @@ msgstr "Nemohu spustit bug buddy."
 #. 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:729
+#: ../shell/e-shell-window-commands.c:942
 msgid "translator-credits"
 msgstr ""
 "Radka Doulíková <doulikova@centrum.cz>\n"
@@ -20383,93 +20330,92 @@ msgstr ""
 "Jiří Eischmann <jiri@eischmann.cz>\n"
 "Petr Kovář <pknbe@volny.cz>"
 
-#: ../shell/e-shell-window-commands.c:740
+#: ../shell/e-shell-window-commands.c:953
 msgid "Evolution Website"
 msgstr "Webová stránka Evolution"
 
-#: ../shell/e-shell-window-commands.c:758
+#: ../shell/e-shell-window-commands.c:971
 msgid "Error opening the FAQ webpage."
 msgstr "Chyba při otevírání stránky FAQ."
 
-#: ../shell/e-shell-window-commands.c:955
+#: ../shell/e-shell-window-commands.c:1168
 msgid "_Work Online"
 msgstr "Pracovat _on-line"
 
-#: ../shell/e-shell-window-commands.c:968 ../ui/evolution.xml.h:56
+#: ../shell/e-shell-window-commands.c:1181 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "_Pracovat při odpojení"
 
-#: ../shell/e-shell-window-commands.c:981
+#: ../shell/e-shell-window-commands.c:1194
 msgid "Work Offline"
 msgstr "Pracovat při odpojení"
 
-#: ../shell/e-shell-window.c:377
-#, fuzzy
+#: ../shell/e-shell-window.c:381
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
 msgstr ""
-"Evolution je nyní on-line. Stiskem tohoto tlačítka přejdete do režimu off-"
-"line."
+"Evolution je nyní on-line.\n"
+" Stiskem tohoto tlačítka přejdete do režimu off-line."
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:388
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution přechází do režimu off-line."
 
-#: ../shell/e-shell-window.c:391
-#, fuzzy
+#: ../shell/e-shell-window.c:395
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
 msgstr ""
-"Evolution je nyní off-line. Stiskem tohoto tlačítka přejdete do režimu on-"
-"line."
+"Evolution je nyní off-line.\n"
+"Stiskem tohoto tlačítka přejdete do režimu on-line."
 
-#: ../shell/e-shell-window.c:780
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Přepnout na %s"
 
-#: ../shell/e-shell.c:638
+#: ../shell/e-shell.c:641
 msgid "Unknown system error."
 msgstr "Neznámá systémová chyba."
 
-#: ../shell/e-shell.c:836 ../shell/e-shell.c:837
+#: ../shell/e-shell.c:839 ../shell/e-shell.c:840
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1278 ../widgets/misc/e-cell-date-edit.c:315
+#: ../shell/e-shell.c:1298 ../widgets/misc/e-cell-date-edit.c:314
 msgid "OK"
 msgstr "Budiž"
 
-#: ../shell/e-shell.c:1280
+#: ../shell/e-shell.c:1300
 msgid "Invalid arguments"
 msgstr "Neplatné argumenty"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1302
 msgid "Cannot register on OAF"
 msgstr "Nemohu se registrovat u OAF"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1304
 msgid "Configuration Database not found"
 msgstr "Databáze nastavení nebyla nalezena"
 
-#: ../shell/e-user-creatable-items-handler.c:669
-#: ../shell/e-user-creatable-items-handler.c:679
-#: ../shell/e-user-creatable-items-handler.c:684
+#: ../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 "Nový"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "New Test"
 msgstr "Nový text"
 
-#: ../shell/test/evolution-test-component.c:108
+#: ../shell/test/evolution-test-component.c:106
+msgctxt "New"
 msgid "_Test"
 msgstr "_Test"
 
-#: ../shell/test/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:107
 msgid "Create a new test item"
 msgstr "Vytvořit novou položku testu"
 
@@ -20512,7 +20458,7 @@ msgstr ""
 "externího souboru do Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:222
+#: ../shell/main.c:217
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20547,7 +20493,7 @@ msgstr ""
 "Doufáme, že si užijete výsledků naší tvrdé práce a nedočkavě čekáme\n"
 "na vaše přispění!\n"
 
-#: ../shell/main.c:246
+#: ../shell/main.c:241
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20555,66 +20501,43 @@ msgstr ""
 "Děkujeme\n"
 "Tým Evolution\n"
 
-#: ../shell/main.c:253
+#: ../shell/main.c:248
 msgid "Do not tell me again"
 msgstr "Příště mě neupozorňovat"
 
-#: ../shell/main.c:303
-msgid "Evolution Crash Detection"
-msgstr "Detekce pádu Evolution"
-
-#: ../shell/main.c:305
-msgid "Ig_nore"
-msgstr "Ig_norovat"
-
-#: ../shell/main.c:320
-#, no-c-format
-msgid ""
-"Evolution appears to have exited unexpectedly the last time it was\n"
-"run.  As a precautionary measure, all preview panes will be hidden.\n"
-"You can restore the preview panes from the View menu.\n"
-msgstr ""
-"Zdá se, že při posledním běhu byl Evolution neočekávaně ukončen.\n"
-"Jako bezpečnostní opatření budu všechny panely náhledů skryty.\n"
-"Panely náhledů můžete obnovit z nabídky Zobrazit.\n"
-
-#: ../shell/main.c:331
-msgid "_Do not show this message again"
-msgstr "_Příště tuto zprávu nezobrazovat"
-
-#: ../shell/main.c:563
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "Spustit Evolution a aktivovat určenou komponentu"
 
-#: ../shell/main.c:567
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "Spustit v režimu on-line"
 
-#: ../shell/main.c:570
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
 msgstr "Vynuceně ukončit všechny komponenty Evolution"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Vynuceně znovu převést z Evolution 1.4"
 
-#: ../shell/main.c:577
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "Poslat ladicí výstup ze všech komponent do souboru."
 
-#: ../shell/main.c:579
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
 msgstr "Zakázat načítání všech zásuvných modulů."
 
-#: ../shell/main.c:581
+#: ../shell/main.c:487
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Zakázat panel náhledu pošty, kontaktů a úloh."
 
-#: ../shell/main.c:666
+#: ../shell/main.c:572
 msgid "- The Evolution PIM and Email Client"
 msgstr "- PIM a poštovní klient Evolution"
 
-#: ../shell/main.c:694
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20835,27 +20758,27 @@ msgstr "E-mailová adresa"
 msgid "All CA certificate files"
 msgstr "Všechny soubory CA certifikátů"
 
-#: ../smime/gui/certificate-viewer.c:339
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Prohlížeč certifikátu: %s"
 
-#: ../smime/gui/component.c:47
+#: ../smime/gui/component.c:46
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Zadejte heslo pro `%s'"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:69
 msgid "Enter new password for certificate database"
 msgstr "Zadejte nové heslo pro databázi certifikátů"
 
-#: ../smime/gui/component.c:72
+#: ../smime/gui/component.c:71
 msgid "Enter new password"
 msgstr "Zadejte nové heslo"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:115
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -20864,7 +20787,7 @@ msgstr ""
 "Vydán pro:\n"
 "  Předmět: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:116
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20873,7 +20796,7 @@ msgstr ""
 "Vydán od:\n"
 "  Předmět: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:168
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "Zvolte certifikát"
 
@@ -21227,15 +21150,15 @@ msgstr "Jedinečné ID předmětu"
 msgid "Certificate Signature Value"
 msgstr "Hodnota podpisu certifikátu"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "PKCS12 File Password"
 msgstr "Heslo souboru PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:266
+#: ../smime/lib/e-pkcs12.c:244
 msgid "Enter password for PKCS12 file:"
 msgstr "Zadejte heslo pro soubor PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:365
+#: ../smime/lib/e-pkcs12.c:343
 msgid "Imported Certificate"
 msgstr "Importovaný certifikát"
 
@@ -21290,8 +21213,8 @@ msgid "Copy to Folder..."
 msgstr "Kopírovat do složky..."
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new addressbook folder"
-msgstr "Vytvořit novou složku v adresáři"
+msgid "Create a new address book folder"
+msgstr "Vytvořit novou složku adresáře"
 
 #: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
@@ -21444,7 +21367,7 @@ msgstr "Př_esunout kontakt do..."
 msgid "_Move Folder Contacts To"
 msgstr "_Přesunout složku kontaktů do"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
 msgid "_New"
 msgstr "_Nový"
 
@@ -21505,7 +21428,7 @@ msgid "Month"
 msgstr "měsíc"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:196
+#: ../widgets/misc/e-calendar.c:195
 msgid "Next"
 msgstr "Další"
 
@@ -21514,7 +21437,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Náhledy kalendáře k tisku"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:172
+#: ../widgets/misc/e-calendar.c:171
 msgid "Previous"
 msgstr "Předchozí"
 
@@ -21653,7 +21576,7 @@ msgstr "Zobrazit ladicí konzolu pro zprávy protokolu"
 
 #: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
-msgstr "_Klasické zobrazení"
+msgstr "_Klasický náhled"
 
 #: ../ui/evolution-mail-global.xml.h:21
 msgid "_Copy Folder To..."
@@ -21828,7 +21751,7 @@ msgstr "Seznam zpráv dle vláken"
 msgid "_Group By Threads"
 msgstr "_Seskupovat podle vláken"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Zpráva"
@@ -22163,123 +22086,119 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Zobrazovat blikající kurzor v těle zobrazovaných zpráv"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages in the normal style"
-msgstr "Zobrazovat zprávu v normálním stylu"
-
-#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "Zobrazovat zprávu se všemi hlavičkami e-mailu"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "Zobrazovat zdrojový formát poštovní zprávy"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Undelete the selected messages"
 msgstr "Obnovit vybrané odstraněné zprávy"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "_Nepodstatné"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "Z_menšit"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "_Přiložené"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "Režim _kurzoru"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "Zrušit _značku"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "_Odstranit zprávu"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "_Hledat ve zprávě..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "Označit jako _dokončeno"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "_Jít na"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "_Důležité"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "_Vložené"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "Ne_vyžádaná pošta"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "Načíst _obrázky"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "_Zdroj zprávy"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "_následující zprávu"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "_Normální velikost"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "_Není nevyžádaná"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "_Otevřít v novém okně"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "_předchozí zprávu"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "_Citaci"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Read"
 msgstr "_Přečteno"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "_Uložit zprávu..."
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
 msgstr "Zrušit _odstranění zprávy"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
 msgstr "Ne_přečtené"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom"
 msgstr "Z_většit"
 
-#: ../ui/evolution-mail-message.xml.h:133
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom In"
 msgstr "Z_většit"
 
@@ -22519,50 +22438,54 @@ msgid "View/Hide the Status Bar"
 msgstr "Zobrazit/skrýt stavovou lištu"
 
 #: ../ui/evolution.xml.h:39
+msgid "Work _Offline"
+msgstr "_Pracovat při odpojení"
+
+#: ../ui/evolution.xml.h:40
 msgid "_About"
 msgstr "O _aplikaci"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Close Window"
 msgstr "_Zavřít okno"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:44
 msgid "_Forget Passwords"
 msgstr "Zapomenout _hesla"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:45
 msgid "_Frequently Asked Questions"
-msgstr "Č_asto kladené otázky "
+msgstr "Č_asto kladené otázky"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:47
 msgid "_Hide Buttons"
 msgstr "S_krýt tlačítka"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:48
 msgid "_Icons Only"
 msgstr "Jen _ikony"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quick Reference"
 msgstr "_Stručná příručka"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Quit"
 msgstr "U_končit"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Switcher Appearance"
 msgstr "_Vzhled přepínače"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:53
 msgid "_Synchronization Options..."
 msgstr "_Možnosti synchronizace..."
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:54
 msgid "_Text Only"
 msgstr "Jen _text"
 
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:56
 msgid "_Window"
 msgstr "_Okno"
 
@@ -22661,7 +22584,7 @@ msgstr "Vybrat časové pásmo"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Timezone drop-down combination box"
-msgstr ""
+msgstr "Rozbalovací pole časových pásem"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
@@ -22674,7 +22597,7 @@ msgstr ""
 "K oddálení použijte pravé tlačítko myši."
 
 #: ../widgets/menus/gal-define-views-dialog.c:76
-#: ../widgets/menus/gal-define-views-model.c:186
+#: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "Soubor"
 
@@ -22696,16 +22619,16 @@ msgstr "Definovat zobrazení pro \"%s\""
 
 #: ../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
-#: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "Tabulka"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:226
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
 msgid "Instance"
 msgstr "Instance"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:284
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "Uložit aktuální zobrazení"
 
@@ -22719,7 +22642,7 @@ msgstr "_Nahradit existující zobrazení"
 
 #. bonobo displays this string so it must be in locale
 #: ../widgets/menus/gal-view-instance.c:582
-#: ../widgets/menus/gal-view-menus.c:354
+#: ../widgets/menus/gal-view-menus.c:368
 msgid "Custom View"
 msgstr "Vlastní zobrazení"
 
@@ -22728,32 +22651,32 @@ msgid "Save Custom View"
 msgstr "Uložit vlastní zobrazení"
 
 #: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:378
+#: ../widgets/menus/gal-view-menus.c:392
 msgid "Define Views..."
 msgstr "Definovat zobrazení..."
 
-#: ../widgets/menus/gal-view-menus.c:291
+#: ../widgets/menus/gal-view-menus.c:305
 msgid "C_urrent View"
 msgstr "Akt_uální zobrazení"
 
-#: ../widgets/menus/gal-view-menus.c:315
+#: ../widgets/menus/gal-view-menus.c:329
 #, c-format
 msgid "Select View: %s"
 msgstr "Vybrat zobrazení: %s"
 
-#: ../widgets/menus/gal-view-menus.c:359
+#: ../widgets/menus/gal-view-menus.c:373
 msgid "Current view is a customized view"
 msgstr "Současné zobrazení je přizpůsobené zobrazení"
 
-#: ../widgets/menus/gal-view-menus.c:364
+#: ../widgets/menus/gal-view-menus.c:378
 msgid "Save Custom View..."
 msgstr "Uložit vlastní zobrazení..."
 
-#: ../widgets/menus/gal-view-menus.c:369
+#: ../widgets/menus/gal-view-menus.c:383
 msgid "Save current custom view"
 msgstr "Uložit aktuální zobrazení"
 
-#: ../widgets/menus/gal-view-menus.c:383
+#: ../widgets/menus/gal-view-menus.c:397
 msgid "Create or edit views"
 msgstr "Vytvořit nebo upravit zobrazení"
 
@@ -22763,7 +22686,7 @@ msgstr "Factory"
 
 #: ../widgets/menus/gal-view-new-dialog.c:105
 msgid "Define New View"
-msgstr "Definovat nový pohled"
+msgstr "Definovat nové zobrazení"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:1
 msgid "Name of new view:"
@@ -22781,13 +22704,13 @@ msgstr "Typ zobrazení:"
 msgid "Attachment Bar"
 msgstr "Lišta příloh"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
+#: ../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 "Nemohu přiložit soubor %s: %s"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:600
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Nemohu přiložit soubor %s: není to normální soubor"
@@ -22809,11 +22732,11 @@ msgid "Suggest automatic display of attachment"
 msgstr "Navrhnout automatické zobrazovaní příloh"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1273
+#: ../widgets/misc/e-calendar-item.c:1267
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:221
+#: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
 msgstr "Kalendář měsíce"
 
@@ -22858,130 +22781,130 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
-#: ../widgets/table/e-table-group-container.c:1000
+#: ../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 "Minimální šířka"
 
-#: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
-#: ../widgets/table/e-table-group-container.c:1001
+#: ../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 "Minimální šířka"
 
-#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
 #: ../widgets/misc/e-expander.c:204
 msgid "Spacing"
 msgstr "Rozestup"
 
-#: ../widgets/misc/e-cell-date-edit.c:291
+#: ../widgets/misc/e-cell-date-edit.c:290
 msgid "Now"
 msgstr "Nyní"
 
-#: ../widgets/misc/e-cell-date-edit.c:848
+#: ../widgets/misc/e-cell-date-edit.c:847
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Čas musí být ve formátu: %s"
 
-#: ../widgets/misc/e-cell-percent.c:79
+#: ../widgets/misc/e-cell-percent.c:78
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Procentuální hodnota musí být mezi 0 a 100 včetně"
 
-#: ../widgets/misc/e-charset-picker.c:56
+#: ../widgets/misc/e-charset-picker.c:57
 msgid "Arabic"
 msgstr "Arabština"
 
-#: ../widgets/misc/e-charset-picker.c:57
+#: ../widgets/misc/e-charset-picker.c:58
 msgid "Baltic"
 msgstr "Baltské"
 
-#: ../widgets/misc/e-charset-picker.c:58
+#: ../widgets/misc/e-charset-picker.c:59
 msgid "Central European"
 msgstr "Střední Evropa"
 
-#: ../widgets/misc/e-charset-picker.c:59
+#: ../widgets/misc/e-charset-picker.c:60
 msgid "Chinese"
 msgstr "Čínské"
 
-#: ../widgets/misc/e-charset-picker.c:60
+#: ../widgets/misc/e-charset-picker.c:61
 msgid "Cyrillic"
 msgstr "Cyrilice"
 
-#: ../widgets/misc/e-charset-picker.c:61
+#: ../widgets/misc/e-charset-picker.c:62
 msgid "Greek"
 msgstr "Řecké"
 
-#: ../widgets/misc/e-charset-picker.c:62
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Hebrew"
 msgstr "Hebrejština"
 
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Japanese"
 msgstr "Japonské"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Korean"
 msgstr "Korejské"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Thai"
 msgstr "Thajština"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Turkish"
 msgstr "Turecké"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Western European"
 msgstr "Západní Evropa"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Western European, New"
 msgstr "Západní Evropa, nové"
 
-#: ../widgets/misc/e-charset-picker.c:88 ../widgets/misc/e-charset-picker.c:89
-#: ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
+#: ../widgets/misc/e-charset-picker.c:91
 msgid "Traditional"
 msgstr "tradiční"
 
-#: ../widgets/misc/e-charset-picker.c:91 ../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: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 "zjednodušené"
 
-#: ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:98
 msgid "Ukrainian"
 msgstr "Ukrajinské"
 
-#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:101
 msgid "Visual"
 msgstr "vizuální"
 
-#: ../widgets/misc/e-charset-picker.c:169
+#: ../widgets/misc/e-charset-picker.c:170
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Neznámá znaková sada: %s"
 
-#: ../widgets/misc/e-charset-picker.c:214
+#: ../widgets/misc/e-charset-picker.c:215
 msgid "Character Encoding"
 msgstr "Kódování znaků"
 
-#: ../widgets/misc/e-charset-picker.c:229
+#: ../widgets/misc/e-charset-picker.c:230
 msgid "Enter the character set to use"
 msgstr "Zvol jakou znakovou sadu použít"
 
-#: ../widgets/misc/e-charset-picker.c:336
+#: ../widgets/misc/e-charset-picker.c:337
 msgid "Other..."
 msgstr "Jiné..."
 
-#: ../widgets/misc/e-charset-picker.c:598
+#: ../widgets/misc/e-charset-picker.c:599
 msgid "Ch_aracter Encoding"
 msgstr "Kó_dování znaků"
 
@@ -22998,9 +22921,8 @@ msgid "Click this button to show a calendar"
 msgstr "Zobrazte kalendář kliknutím na toto tlačítko"
 
 #: ../widgets/misc/e-dateedit.c:394
-#, fuzzy
 msgid "Drop-down combination box to select time"
-msgstr "Kombinované pole pro zvolení času"
+msgstr "Rozbalovací pole pro zvolení času"
 
 #: ../widgets/misc/e-dateedit.c:470
 msgid "No_w"
@@ -23054,11 +22976,11 @@ msgstr "Widget popisku"
 msgid "A widget to display in place of the usual expander label"
 msgstr "Widget, který zobrazovat místo obvyklého popisku rozbalovače"
 
-#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3369
+#: ../widgets/misc/e-expander.c:221 ../widgets/table/e-tree.c:3390
 msgid "Expander Size"
 msgstr "Velikost rozbalovače"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3370
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3391
 msgid "Size of the expander arrow"
 msgstr "Velikost šipky rozbalovače"
 
@@ -23071,87 +22993,85 @@ msgid "Spacing around expander arrow"
 msgstr "Mezera okolo šipky rozbalovače"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:130 ../widgets/misc/e-filter-bar.c:183
-#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:753
+#: ../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 "Pokročilé vyhledávání"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:234
+#: ../widgets/misc/e-filter-bar.c:230
 msgid "Save Search"
 msgstr "Uložit vyhledávání"
 
-#: ../widgets/misc/e-filter-bar.c:271
+#: ../widgets/misc/e-filter-bar.c:267
 msgid "_Searches"
 msgstr "_Hledání"
 
-#: ../widgets/misc/e-filter-bar.c:273
+#: ../widgets/misc/e-filter-bar.c:269
 msgid "Searches"
 msgstr "Hledání"
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
 msgid "_Save Search..."
 msgstr "_Uložit vyhledávání..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
 msgid "_Edit Saved Searches..."
 msgstr "Upravit u_ložená vyhledávání..."
 
-#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:114
+#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
 msgid "_Advanced Search..."
 msgstr "_Pokročilé hledání..."
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "All Accounts"
 msgstr "Všechny účty"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:108
 msgid "Current Account"
 msgstr "Aktuální účet"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:109
 msgid "Current Folder"
 msgstr "Aktuální složka"
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:110
 msgid "Current Message"
 msgstr "Aktuální zpráva"
 
-#: ../widgets/misc/e-image-chooser.c:167
+#: ../widgets/misc/e-image-chooser.c:169
 msgid "Choose Image"
 msgstr "Zvolte obrázek"
 
-#: ../widgets/misc/e-map.c:625
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Mapa světa"
 
-#: ../widgets/misc/e-map.c:627
-#, fuzzy
+#: ../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."
 msgstr ""
 "Widget interaktivní mapy ovládané myší pro výběr časového pásma. Uživatelé "
-"klávesnice by měli vybrat časové pásmo z kombinovaného pole níže."
+"klávesnice by měli vybrat časové pásmo z rozbalovacího pole níže."
 
-#: ../widgets/misc/e-online-button.c:112
-#, fuzzy
+#: ../widgets/misc/e-online-button.c:106
 msgid "Online"
-msgstr "Vložené"
+msgstr "Online"
 
-#: ../widgets/misc/e-online-button.c:113
+#: ../widgets/misc/e-online-button.c:107
 msgid "The button state is online"
-msgstr ""
+msgstr "Stav tlačítka je online"
 
-#: ../widgets/misc/e-pilot-settings.c:103
+#: ../widgets/misc/e-pilot-settings.c:102
 msgid "Sync with:"
 msgstr "Synchronizovat s:"
 
-#: ../widgets/misc/e-pilot-settings.c:111
+#: ../widgets/misc/e-pilot-settings.c:110
 msgid "Sync Private Records:"
 msgstr "Synchronizovat soukromé záznamy:"
 
-#: ../widgets/misc/e-pilot-settings.c:120
+#: ../widgets/misc/e-pilot-settings.c:119
 msgid "Sync Categories:"
 msgstr "Synchronizované kategorie:"
 
@@ -23167,78 +23087,78 @@ msgstr "Model přeformátování"
 msgid "Column width"
 msgstr "Šířka sloupce"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
-#: ../widgets/misc/e-search-bar.c:476
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Search"
 msgstr "Hledat"
 
-#: ../widgets/misc/e-search-bar.c:341 ../widgets/misc/e-search-bar.c:474
-#: ../widgets/misc/e-search-bar.c:476
+#: ../widgets/misc/e-search-bar.c:340 ../widgets/misc/e-search-bar.c:473
+#: ../widgets/misc/e-search-bar.c:475
 msgid "Click here to change the search type"
 msgstr "Kliknutím zde změníte typ vyhledávání"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:606
 msgid "_Search"
 msgstr "_Hledat"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:612
 msgid "_Find Now"
 msgstr "_Hledat"
 
-#: ../widgets/misc/e-search-bar.c:614
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Clear"
 msgstr "Vy_mazat"
 
-#: ../widgets/misc/e-search-bar.c:869
+#: ../widgets/misc/e-search-bar.c:868
 msgid "Item ID"
 msgstr "ID položky"
 
-#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3565
+#: ../widgets/misc/e-search-bar.c:875 ../widgets/text/e-text.c:3565
 #: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Text"
 
 #. 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:1007
+#: ../widgets/misc/e-search-bar.c:1006
 msgid "Sho_w: "
 msgstr "_Zobrazit: "
 
 #. 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:1024
+#: ../widgets/misc/e-search-bar.c:1023
 msgid "Sear_ch: "
 msgstr "_Hledat: "
 
 #. 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:1036
+#: ../widgets/misc/e-search-bar.c:1035
 msgid " i_n "
 msgstr " _v "
 
 #: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:807
+#: ../widgets/table/e-tree-selection-model.c:806
 msgid "Cursor Row"
 msgstr "Řádek kurzoru"
 
 #: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:814
+#: ../widgets/table/e-tree-selection-model.c:813
 msgid "Cursor Column"
 msgstr "Sloupec kurzoru"
 
-#: ../widgets/misc/e-selection-model.c:210
+#: ../widgets/misc/e-selection-model.c:209
 msgid "Sorter"
 msgstr "Řadič"
 
-#: ../widgets/misc/e-selection-model.c:217
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Selection Mode"
 msgstr "Režim výběru"
 
-#: ../widgets/misc/e-selection-model.c:225
+#: ../widgets/misc/e-selection-model.c:224
 msgid "Cursor Mode"
 msgstr "Režim kurzoru"
 
-#: ../widgets/misc/e-send-options.c:518
+#: ../widgets/misc/e-send-options.c:522
 msgid "When de_leted:"
 msgstr "Při _odstranění:"
 
@@ -23368,19 +23288,19 @@ msgid "_When opened:"
 msgstr "_Při otevření:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:278
+#: ../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:284
+#: ../widgets/misc/e-task-widget.c:261
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hotovo)"
 
-#: ../widgets/misc/e-url-entry.c:107
+#: ../widgets/misc/e-url-entry.c:106
 msgid "Click here to go to URL"
 msgstr "Kliknutím zde přejdete na URL"
 
@@ -23400,7 +23320,7 @@ msgstr "_Dostupné kategorie:"
 msgid "categories"
 msgstr "kategorie"
 
-#: ../widgets/table/e-cell-combo.c:169
+#: ../widgets/table/e-cell-combo.c:170
 msgid "popup list"
 msgstr "zobrazit seznam"
 
@@ -23463,7 +23383,7 @@ msgstr "Bez skupin"
 #: ../widgets/table/e-table-config.c:643
 #: ../widgets/table/e-table-config.glade.h:11
 msgid "Show Fields"
-msgstr "Zobrazit polš"
+msgstr "Zobrazit pole"
 
 #: ../widgets/table/e-table-config.c:664
 msgid "Available Fields"
@@ -23548,15 +23468,15 @@ msgid "_Sort..."
 msgstr "Ř_adit..."
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:634
-#: ../widgets/table/e-table-field-chooser.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 "Kód DnD"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:641
-#: ../widgets/table/e-table-field-chooser.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 "Úplný nadpis"
@@ -23577,7 +23497,7 @@ msgstr ""
 "Sloupec do tabulky přidejte jeho přetažením\n"
 "na místo, kde chcete, aby se objevil."
 
-#: ../widgets/table/e-table-group-container.c:345
+#: ../widgets/table/e-table-group-container.c:344
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
@@ -23585,7 +23505,7 @@ msgstr[0] "%s : %s (%d položka)"
 msgstr[1] "%s : %s (%d položky)"
 msgstr[2] "%s : %s (%d položek)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:350
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
@@ -23593,79 +23513,79 @@ msgstr[0] "%s (%d položka)"
 msgstr[1] "%s (%d položky)"
 msgstr[2] "%s (%d položek)"
 
+#: ../widgets/table/e-table-group-container.c:922
 #: ../widgets/table/e-table-group-container.c:923
-#: ../widgets/table/e-table-group-container.c:924
 #: ../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 "Střídající se barvy řádků"
 
+#: ../widgets/table/e-table-group-container.c:929
 #: ../widgets/table/e-table-group-container.c:930
-#: ../widgets/table/e-table-group-container.c:931
 #: ../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:3322 ../widgets/table/e-tree.c:3323
+#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
 msgid "Horizontal Draw Grid"
 msgstr "Kreslit vodorovný rastr"
 
+#: ../widgets/table/e-table-group-container.c:936
 #: ../widgets/table/e-table-group-container.c:937
-#: ../widgets/table/e-table-group-container.c:938
 #: ../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:3328 ../widgets/table/e-tree.c:3329
+#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
 msgid "Vertical Draw Grid"
 msgstr "Kreslit svislý rastr"
 
+#: ../widgets/table/e-table-group-container.c:943
 #: ../widgets/table/e-table-group-container.c:944
-#: ../widgets/table/e-table-group-container.c:945
 #: ../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:3334 ../widgets/table/e-tree.c:3335
+#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
 msgid "Draw focus"
 msgstr "Kreslit zaměření"
 
+#: ../widgets/table/e-table-group-container.c:950
 #: ../widgets/table/e-table-group-container.c:951
-#: ../widgets/table/e-table-group-container.c:952
 #: ../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 "Režim kurzoru"
 
+#: ../widgets/table/e-table-group-container.c:957
 #: ../widgets/table/e-table-group-container.c:958
-#: ../widgets/table/e-table-group-container.c:959
 #: ../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 "Model výběru"
 
+#: ../widgets/table/e-table-group-container.c:964
 #: ../widgets/table/e-table-group-container.c:965
-#: ../widgets/table/e-table-group-container.c:966
 #: ../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:3316
-#: ../widgets/table/e-tree.c:3317
+#: ../widgets/table/e-table.c:3325 ../widgets/table/e-tree.c:3337
+#: ../widgets/table/e-tree.c:3338
 msgid "Length Threshold"
 msgstr "Práh délky"
 
+#: ../widgets/table/e-table-group-container.c:971
 #: ../widgets/table/e-table-group-container.c:972
-#: ../widgets/table/e-table-group-container.c:973
 #: ../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:3348
-#: ../widgets/table/e-tree.c:3349
+#: ../widgets/table/e-table.c:3332 ../widgets/table/e-tree.c:3369
+#: ../widgets/table/e-tree.c:3370
 msgid "Uniform row height"
 msgstr "Stejná výška řádku"
 
+#: ../widgets/table/e-table-group-container.c:978
 #: ../widgets/table/e-table-group-container.c:979
-#: ../widgets/table/e-table-group-container.c:980
 #: ../widgets/table/e-table-group-leaf.c:651
 #: ../widgets/table/e-table-group-leaf.c:652
 msgid "Frozen"
@@ -23673,7 +23593,7 @@ msgstr "Zmrazen"
 
 #: ../widgets/table/e-table-header-item.c:1453
 msgid "Customize Current View"
-msgstr "Přizpůsobit aktuální pohled"
+msgstr "Přizpůsobit aktuální zobrazení"
 
 #: ../widgets/table/e-table-header-item.c:1473
 msgid "Sort _Ascending"
@@ -23733,7 +23653,7 @@ msgid "Font Description"
 msgstr "Popis písma"
 
 #: ../widgets/table/e-table-header-item.c:1915
-#: ../widgets/table/e-table-sorter.c:173
+#: ../widgets/table/e-table-sorter.c:172
 msgid "Sort Info"
 msgstr "Řadicí informace"
 
@@ -23755,8 +23675,8 @@ msgstr "Model tabulky"
 msgid "Cursor row"
 msgstr "Řádek kurzoru"
 
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3355
-#: ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3376
+#: ../widgets/table/e-tree.c:3377
 msgid "Always search"
 msgstr "Vždy hledat"
 
@@ -23764,15 +23684,15 @@ msgstr "Vždy hledat"
 msgid "Use click to add"
 msgstr "Přidejte kliknutím"
 
-#: ../widgets/table/e-tree.c:3341 ../widgets/table/e-tree.c:3342
+#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
 msgid "ETree table adapter"
 msgstr "Adaptér tabulky ETree"
 
-#: ../widgets/table/e-tree.c:3362
+#: ../widgets/table/e-tree.c:3383
 msgid "Retro Look"
 msgstr "Vzhled retro"
 
-#: ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree.c:3384
 msgid "Draw lines and +/- expanders."
 msgstr "Kreslit čáry a rozbalovače +/-."
 
@@ -23798,7 +23718,7 @@ msgstr "Ukotvení"
 
 #: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
 msgid "Justification"
-msgstr "Zarování"
+msgstr "Zarovnání"
 
 #: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 msgid "Clip Width"
@@ -23879,219 +23799,3 @@ msgstr "Kontext IM"
 #: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "Obsloužit kontextovou nabídku"
-
-#, fuzzy
-#~ msgid ""
-#~ "'{0}' is a read-only calendar source. Change Calendar to one that can "
-#~ "accept appointments."
-#~ msgstr ""
-#~ "'{0}' je zdroj kalendáře pouze pro čtení. Přepněte na náhled kalendáře a "
-#~ "zvýrazněte kalendář, který může přijmout události."
-
-#~ msgid "A string description of the current printer settings."
-#~ msgstr "Popis aktuálního nastavení tiskárny."
-
-#~ msgid "No folder name specified."
-#~ msgstr "Není zadán název složky."
-
-#~ msgid "Folder name cannot contain the Return character."
-#~ msgstr "Název složky nesmí obsahovat znak Enter."
-
-#~ msgid "Folder name cannot contain the character \"/\"."
-#~ msgstr "Název složky nesmí obsahovat znak \"/\"."
-
-#~ msgid "Folder name cannot contain the character \"#\"."
-#~ msgstr "Název složky nesmí obsahovat znak \"#\"."
-
-#~ msgid "'.' and '..' are reserved folder names."
-#~ msgstr "'.' a '..' jsou rezervované názvy složek."
-
-#~ msgid "All Day Event"
-#~ msgstr "Celodenní událost"
-
-#~ msgid "Send _Options"
-#~ msgstr "Možnosti _odesílání"
-
-#~ msgid "Status Details"
-#~ msgstr "Podrobnosti o stavu"
-
-#~ msgid "Time Zone"
-#~ msgstr "Časové pásmo"
-
-#~ msgid "%.1f KB"
-#~ msgstr "%.1f KB"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
-
-#~ msgid "%.1f GB"
-#~ msgstr "%.1f GB"
-
-#~ msgid "Permission Denied."
-#~ msgstr "Oprávnění zamítnuto."
-
-#~ msgid "<b>Display</b>"
-#~ msgstr "<b>Zobrazení</b>"
-
-#~ msgid "<b>Server Information</b>"
-#~ msgstr "<b>Informace o serveru</b>"
-
-#~ msgid "Unknown reason"
-#~ msgstr "Neznámý důvod"
-
-#~ msgid "Open File"
-#~ msgstr "Otevřít soubor"
-
-#~ msgid "Cannot open file &quot;{0}&quot;."
-#~ msgstr "Nemohu otevřít soubor &quot;{0}&quot;."
-
-#~ msgid "Attach original message"
-#~ msgstr "Přiložit původní zprávu"
-
-#~ msgid "Do not quote original message"
-#~ msgstr "Necitovat původní zprávu"
-
-#~ msgid "Quote original message"
-#~ msgstr "Citovat původní zprávu"
-
-#~ msgid "Enter a name for this signature."
-#~ msgstr "Zadejte název tohoto podpisu."
-
-#~ msgid "Name:"
-#~ msgstr "Název:"
-
-#~ msgid ""
-#~ "Are you sure you want to permanently remove all the deleted messages in "
-#~ "folder &quot;{0}&quot;?"
-#~ msgstr ""
-#~ "Opravdu chcete natrvalo odstranit všechny odstraněné zprávy ze složky "
-#~ "&quot;{0}&quot;?"
-
-#~ msgid "Delete &quot;{0}&quot;?"
-#~ msgstr "Odstranit &quot;{0}&quot;?"
-
-#~ msgid "Delete messages in Search Folder &quot;{0}&quot;?"
-#~ msgstr "Odstranit zprávy ve složce hledání &quot;{0}&quot;?"
-
-#~ msgid "Only on _Current Folder"
-#~ msgstr "Po_uze na aktuální složce"
-
-#~ msgid "Enable attachment reminder plugin"
-#~ msgstr "Povolit zásuvný modul připomínající přílohu"
-
-#~ msgid "Enable attachment reminder plugin."
-#~ msgstr "Povolit zásuvný modul připomínající přílohu."
-
-#~ msgid "Remind _missing attachments"
-#~ msgstr "Připomenout _chybějící přílohy"
-
-#~ msgid "_Continue Editing"
-#~ msgstr "_Pokračovat v editaci"
-
-#~ msgid "_Refresh:"
-#~ msgstr "_Obnovit:"
-
-#~ msgid "There is no configuration option for this plugin."
-#~ msgstr "Pro tento zásuvný modul neexistuje žádná možnost nastavení."
-
-#~ msgid "Gives an option to print from the composer."
-#~ msgstr "Dává možnost tisknout zprávy z editoru."
-
-#~ msgid "Print Message"
-#~ msgstr "Tisknout zprávu"
-
-#~ msgid "Prints the message"
-#~ msgstr "Vytiskne zprávu"
-
-#~ msgid "Copy selection to clipboard"
-#~ msgstr "Kopírovat výběr do schránky"
-
-#~ msgid "Cut selection to clipboard"
-#~ msgstr "Vyjmout vybrané do schránky"
-
-#~ msgid "Paste from clipboard"
-#~ msgstr "Vložit z schránky"
-
-#~ msgid "Delete all but signature"
-#~ msgstr "Odstranit vše kromě podpisu"
-
-#~ msgid "For_mat"
-#~ msgstr "For_mát"
-
-#~ msgid "HT_ML"
-#~ msgstr "_HTML"
-
-#~ msgid "Open a file"
-#~ msgstr "Otevřít soubor"
-
-#~ msgid "PGP Encrypt"
-#~ msgstr "Šifrování PGP"
-
-#~ msgid "PGP Sign"
-#~ msgstr "Podpis PGP"
-
-#~ msgid "S/MIME Encrypt"
-#~ msgstr "Šifrování S/MIME"
-
-#~ msgid "S/MIME Sign"
-#~ msgstr "Podpis S/MIME"
-
-#~ msgid "Save As"
-#~ msgstr "Uložit jako"
-
-#~ msgid "Save Draft"
-#~ msgstr "Uložit koncept"
-
-#~ msgid "Save in folder..."
-#~ msgstr "Uložit ve složce..."
-
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "Uložit zprávu do určené složky"
-
-#~ msgid "Send"
-#~ msgstr "Poslat"
-
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "Poslat zprávu ve formátu HTML"
-
-#~ msgid "_Delete all"
-#~ msgstr "_Odstranit vše"
-
-#~ msgid "_Open..."
-#~ msgstr "_Otevřít..."
-
-#~ msgid "C_lose"
-#~ msgstr "Z_avřít"
-
-#~ msgid "H_TML"
-#~ msgstr "_HTML"
-
-#~ msgid "Save and _Close"
-#~ msgstr "_Uložit a zavřít"
-
-#~ msgid "Save the current file and close the window"
-#~ msgstr "Uložit aktuální soubor a zavřít okno"
-
-#~ msgid "Add folder to your list of subscribed folders"
-#~ msgstr "Přidat složku do seznamu přihlášených složek"
-
-#~ msgid "Refresh List"
-#~ msgstr "Obnovit seznam"
-
-#~ msgid "Refresh List of Folders"
-#~ msgstr "Obnovit seznam složek"
-
-#~ msgid "Remove folder from your list of subscribed folders"
-#~ msgstr "Odstranit složku ze seznamu přihlášených složek"
-
-#~ msgid "Subscribe"
-#~ msgstr "Přihlásit se"
-
-#~ msgid "Unsubscribe"
-#~ msgstr "Odhlásit se"
-
-#~ msgid "_Invert Selection"
-#~ msgstr "_Invertovat výběr"
-
-#~ msgid "TimeZone Combobox"
-#~ msgstr "Kombinované pole časového pásma"
diff --git a/po/da.po b/po/da.po
index da16b60a48..89e9c298cb 100644
--- a/po/da.po
+++ b/po/da.po
author	Matthew Barnes <mbarnes@src.gnome.org>	2008-10-02 04:56:04 +0800
committer	Matthew Barnes <mbarnes@src.gnome.org>	2008-10-02 04:56:04 +0800
commit	b2cda1d0c6d44f53f71bad9e256f41188677dfba (patch)
tree	65bd7560e802baf1740482ae48b952dc5c5957fc
parent	e52986f4225cbe8496043da74ca250521d244705 (diff)
download	gsoc2013-evolution-b2cda1d0c6d44f53f71bad9e256f41188677dfba.tar.gz gsoc2013-evolution-b2cda1d0c6d44f53f71bad9e256f41188677dfba.tar.zst gsoc2013-evolution-b2cda1d0c6d44f53f71bad9e256f41188677dfba.zip