Kovid changes

LICENSE.rtf

@@ -0,0 +1,332 @@
+{\rtf1\ansi\deff1\adeflang1025
+{\fonttbl{\f0\froman\fprq2\fcharset128 Times New Roman;}{\f1\fnil\fprq0\fcharset128 Times{\*\falt Times New Roman};}{\f2\froman\fprq2\fcharset128 Nimbus Roman No9 L{\*\falt Times New Roman};}{\f3\fnil\fprq0\fcharset128 Times{\*\falt Times New Roman};}{\f4\fnil\fprq0\fcharset128 Helvetica{\*\falt Arial};}{\f5\fmodern\fprq1\fcharset128 Nimbus Mono L{\*\falt Courier New};}{\f6\fswiss\fprq2\fcharset128 DejaVuSans;}{\f7\fnil\fprq2\fcharset128 HG Mincho Light J{\*\falt msmincho};}{\f8\fswiss\fprq0\fcharset128 Tahoma;}}
+{\colortbl;\red0\green0\blue0;\red128\green128\blue128;}
+{\stylesheet{\s1\aspalpha\rtlch\afs24\lang255\ltrch\dbch\af6\langfe255\hich\fs24\lang9226\loch\fs24\lang9226\snext1 Normal;}
+{\s2\sb240\sa120\keepn\aspalpha\rtlch\af4\afs28\lang255\ltrch\dbch\af7\langfe255\hich\f4\fs28\lang9226\loch\f4\fs28\lang9226\sbasedon1\snext3 Heading;}
+{\s3\sa120\aspalpha\rtlch\afs24\lang255\ltrch\dbch\af6\langfe255\hich\fs24\lang9226\loch\fs24\lang9226\sbasedon1\snext3 Body Text;}
+{\s4\sa120\aspalpha\rtlch\af8\afs24\lang255\ltrch\dbch\af6\langfe255\hich\fs24\lang9226\loch\fs24\lang9226\sbasedon3\snext4 List;}
+{\s5\sb120\sa120\aspalpha\rtlch\afs24\lang255\ai\ltrch\dbch\af6\langfe255\hich\fs24\lang9226\i\loch\fs24\lang9226\i\sbasedon1\snext5 caption;}
+{\s6\aspalpha\rtlch\af8\afs24\lang255\ltrch\dbch\af6\langfe255\hich\fs24\lang9226\loch\fs24\lang9226\sbasedon1\snext6 Index;}
+{\s7\sb120\sa120\aspalpha\rtlch\af8\afs24\lang255\ai\ltrch\dbch\af6\langfe255\hich\fs24\lang9226\i\loch\fs24\lang9226\i\sbasedon1\snext7 caption;}
+{\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226\sbasedon1\snext8 Preformatted Text;}
+}
+{\info{\author carlos luna}{\creatim\yr0\mo0\dy0\hr0\min0}{\revtim\yr2007\mo11\dy5\hr17\min33}{\printim\yr0\mo0\dy0\hr0\min0}{\comment StarWriter}{\vern3100}}\deftab709
+{\*\pgdsctbl
+{\pgdsc0\pgdscuse195\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\pgdscnxt0 Standard;}}
+{\*\pgdscno0}\paperh16838\paperw11906\margl1134\margr1134\margt1134\margb1134\sectd\sbknone\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
+\pard\plain \ltrpar\s8\qc\aspalpha\rtlch\af5\afs36\lang255\ab\ltrch\dbch\af5\langfe255\hich\f5\fs36\lang9226\b\loch\f5\fs36\lang9226\b {\rtlch \ltrch\loch\f5\fs36\lang9226\i0\b GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007}
+\par \pard\plain \ltrpar\s8\qc\aspalpha\rtlch\af5\afs36\lang255\ab\ltrch\dbch\af5\langfe255\hich\f5\fs36\lang9226\b\loch\f5\fs36\lang9226\b 
+\par \pard\plain \ltrpar\s8\qc\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 Preamble}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 The GNU General Public License is a free, copyleft license for software and other kinds of works.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 The licenses for most software and other practical works are designed to take away your freedom to share and change the works.  By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program-
+-to make sure it remains free software for all its users.  We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors.  You can apply it to}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 your programs, too.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 When we speak of free software, we are referring to freedom, not price.  Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code o
+r can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights.  Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect 
+the freedom of others.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received.  You must make sure that they, too, receive or can get the source code.  And you must show them th
+ese terms so they know their rights.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 Developers that use the GNU GPL protect your rights with two steps:}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software.  For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be att
+ributed erroneously to authors of previous versions.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so.  This is fundamentally incompatible with the aim of protecting users' freedom to change the software.  The 
+systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable.  Therefore, we have designed this version of the GPL to prohibit the practice for those products.  If such problems ar
+ise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose      computers, but in those that do, we wish to avoid the special danger that patents appli
+ed to a free program could make it effectively proprietary.  To prevent this, the GPL assures that patents cannot be used to render the program non-free.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 The precise terms and conditions for copying, distribution and modification follow.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qc\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 TERMS AND CONDITIONS}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 0. Definitions.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 "This License" refers to version 3 of the GNU General Public License.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 "The Program" refers to any copyrightable work licensed under this License.  Each licensee is addressed as "you".  "Licensees" and "recipients" may be individuals or organizations.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy.  The  resulting work is called a "modified version" of the earlier work or a work "based on" the ear
+lier work.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 A "covered work" means either the unmodified Program or a work based on the Program.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy.  Propagation includes
+ copying, distribution (with or without modification), making available to the}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 public, and in some countries other activities as well.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 To "convey" a work means any kind of propagation that enables other parties to make or receive copies.  Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work 
+(except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License.  If the interface presents a list of user commands or options, such as a menu, a prominent item in the list 
+meets this criterion.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 1. Source Code.}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 The "source code" for a work means the preferred form of the work for making modifications to it.  "Object code" means any non-source form of a work.}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that 
+language.}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the
+ work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form.  A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of
+ the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities.  However, it does not
+ include the work's System Libraries, or general-purpose tools or generally available free}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 programs which are used unmodified in performing those activities but which are not part of the work.  For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries
+ and dynamically linked subprograms that the work is specifically designed to require,}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 such as by intimate data communication or control flow between those subprograms and other parts of the work.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 The Corresponding Source for a work in source code form is that same work.}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 2. Basic Permissions.}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met.  This License explicitly affirms your unlimited permission to run the unmodified Program.  The output 
+from running a covered work is covered by this License only if the output, given its content, constitutes a covered work.  This License acknowledges your}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 rights of fair use or other equivalent, as provided by copyright law.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force.  You may convey covered works to others for the sole purpose of having them make modifications exclusively for yo
+u, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright.  Those thus making or running the covered works}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 Conveying under any other circumstances is permitted solely under the conditions stated below.  Sublicensing is not allowed; section 10 makes it unnecessary.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 3. Protecting Users' Legal Rights From Anti-Circumvention Law.}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention
+ of such measures.}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intent
+ion to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 4. Conveying Verbatim Copies.}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and an
+y non-permissive terms added in accord with section 7 apply to the code;}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 5. Conveying Modified Source Versions.}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 a) The work must carry prominent notices stating that you modified}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 it, and giving a relevant date.}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 b) The work must carry prominent notices stating that it is released under this License and any conditions added under section }
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch    }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 7.  This requirement modifies the requirement in section 4 to "keep intact all notices".}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy.  This License will therefore apply, along with any applicable section 7  additional terms, to the whole of the work, and all its parts,  
+   regardless of how they are packaged.  This License gives no  permission to license the work in any other way, but it does not  invalidate such permission if you have separately received it.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive  interfaces that do not display  Appropriate Legal Notices, your work need not make them do so.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution m
+edium, is called an "aggregate" if the compilation and its resulting copyright are not}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 used to limit the access or legal rights of the compilation's users beyond what the individual works permit.  Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 6. Conveying Non-Source Forms.}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 a) Convey the object code in, or embodied in, a physical product  (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that prod
+uct model, to give anyone who possesses the object code either (1) a  copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price 
+no more than your reasonable cost of physically performing this  conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source.  This  alternative is allowed only occasionally and noncommercially, and  only if you received the object code with such an offer, in a
+ccord with subsection 6b.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge.  You need not require recipients to copy
+ the Corresponding Source along with the object code.  If the place to  copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided
+ you maintain clear directions next to the object code saying where to find the Corresponding Source.  Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requ
+irements.}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 e) Convey the object code using peer-to-peer transmission, provided  you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling.  In determining whethe
+r a product is a consumer product, doubtful cases shall be resolved in favor of coverage.  For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the p
+articular user or of the way in which the particular user actually uses, or expects or is expected to use, the product.  A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless s
+uch uses represent the only significant mode of use of the product.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 "Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding So
+urce.  The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient i
+n perpetuity or for a fixed term (regardless of how the transaction is characterized), the}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 Corresponding Source conveyed under this section must be accompanied by the Installation Information.  But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for examp
+le, the work has been installed in ROM).}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been 
+modified or installed.  Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special passwo
+rd or key for unpacking, reading or copying.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 7. Additional Terms.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 "Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this L
+icense, to the extent that they are valid under applicable law.  If additional permissions apply only to part of the Program, that part may be used separately}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it.  (Additional  permissions may be written to require their own removal in certain cases when you modify the work.)  
+You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 a) Disclaiming warranty or limiting liability differently from the  terms of sections 15 and 16 of this License; or}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 b) Requiring preservation of specified reasonable legal notices or  author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 d) Limiting the use for publicity purposes of names of licensors or authors of the material; or}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch     }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions dire
+ctly impose on those licensors and authors.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10.  If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that 
+is a further restriction, you may remove that term.  If a license document contains}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 8. Termination.}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 You may not propagate or modify a covered work except as expressly provided under this License.  Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses grant
+ed under the third paragraph of section 11).}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the c
+opyright holder fails to notify you of the violation by some reasonable means}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 prior to 60 days after the cessation.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work
+) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License.  If your rights have been terminated and not permanently reinstated, you do not qualify to receive ne
+w licenses for the same material under section 10.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 9. Acceptance Not Required for Having Copies.}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 You are not required to accept this License in order to receive or run a copy of the Program.  Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require accept
+ance.  However, nothing other than this License grants you permission to propagate or modify any covered work.  These actions infringe copyright if you do}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 not accept this License.  Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 10. Automatic Licensing of Downstream Recipients.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License.  You are not responsible for enforcing compliance by third parties with this
+ License.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging  organizations.  If propagation of a covered work results from an entity transaction, each pa
+rty to that transaction who receives a copy of the work also receives whatever}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reaso
+nable efforts.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License.  For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not 
+initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 11. Patents.}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based.  The work thus licensed is called the contributor's "contributor version".}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its co
+ntributor version, but do not include claims that would be infringed only as a}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 consequence of further modification of the contributor version.  For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor versio
+n.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement).  To "grant" su
+ch a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other re
+adily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients.  "Knowingly relying" means you have actual knowledge that, but for the patent lice
+nse, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 country that you have reason to believe are valid.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagat
+e, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 work and works based on it.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License.  You may not con
+vey a covered work if you are a party to an arrangement with a third party that is}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you,
+ a discriminatory patent license (a) in connection with copies of the covered work}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March
+ 2007.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 12. No Surrender of Others' Freedom.}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 If 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 convey a covered work so as to satisfy simultaneo
+usly your obligations under this License and any other pertinent  obligations, then as a consequence you may not convey it at all.  For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you conve
+y the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 13. Use with the GNU Affero General Public License.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work.  The
+ terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 combination as such.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 14. Revised Versions of this License.}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 The Free Software Foundation may publish revised and/or new versions of the GNU 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.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 Each version is given a distinguishing version number.  If the Program specifies that a certain numbered version of the GNU General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of t
+hat numbered version or of any later version published by the Free Software Foundation.  If the Program does not specify a version number of the GNU General Public  License, you may choose any version ever published by the Free Software Foundation.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 Later license versions may give you additional or different permissions.  However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 15. Disclaimer of Warranty.}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT  PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, I
+NCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE  PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NE
+CESSARY SERVICING, REPAIR OR CORRECTION.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 16. Limitation of Liability.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CO
+NSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRA
+MS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE    POSSIBILITY OF SUCH DAMAGES.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 17. Interpretation of Sections 15 and 16.}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\qj\aspalpha\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 {\rtlch \ltrch\loch   }{\rtlch \ltrch\loch\f2\fs24\lang9226\i0\b0 If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in conne
+ction with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.}
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af2\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f2\fs24\lang9226\loch\f2\fs24\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs24\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs24\lang9226\loch\f5\fs24\lang9226 {\rtlch \ltrch\loch                      }{\rtlch \ltrch\loch\f5\fs24\lang9226\i0\b0\ltrch\hich\f2\loch\f2 END OF TERMS AND CONDITIONS}
+\par \pard\plain \ltrpar\s8\aspalpha\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 
+\par \pard\plain \ltrpar\s8\aspalpha\ql\rtlch\af5\afs20\lang255\ltrch\dbch\af5\langfe255\hich\f5\fs20\lang9226\loch\f5\fs20\lang9226 {\rtlch \ltrch\loch        }
+\par }

resources/content_server/gui.js

@@ -247,7 +247,7 @@ function setup_sorting() {
     });
 
     $('table#book_list  thead tr td').mouseout(function() {
-        this.style.backgroundColor = "inherit";
+        this.style.backgroundColor = "transparent";
     });
 
     for (i = 0; i < cmap.length; i++) {

setup/__init__.py

@@ -210,7 +210,7 @@ class Command(object):
         sys.stdout.flush()
 
 def installer_name(ext, is64bit=False):
-    if ext == 'exe':
+    if ext in ('exe', 'msi'):
         return 'dist/%s-%s.%s'%(__appname__, __version__, ext)
     if ext == 'dmg':
         if is64bit:

setup/build_environment.py

@@ -11,7 +11,7 @@ from distutils.spawn import find_executable
 
 from PyQt4 import pyqtconfig
 
-from setup import isosx, iswindows
+from setup import isosx, iswindows, islinux
 
 OSX_SDK = '/Developer/SDKs/MacOSX10.5.sdk'
 if not os.path.exists(OSX_SDK):
@@ -111,8 +111,8 @@ if iswindows:
     popplerqt4_lib_dirs = poppler_lib_dirs
     poppler_libs = ['poppler']
     popplerqt4_libs = poppler_libs + ['QtCore4', 'QtGui4']
-    magick_inc_dirs = [r'C:\cygwin\home\kovid\ImageMagick-6.5.6-Q16\include']
+    magick_inc_dirs = [os.path.join(prefix, 'build', 'ImageMagick-6.5.6')]
-    magick_lib_dirs = [r'C:\cygwin\home\kovid\ImageMagick-6.5.6-Q16\lib']
+    magick_lib_dirs = [os.path.join(magick_inc_dirs[0], 'VisualMagick', 'lib')]
     magick_libs = ['CORE_RL_wand_', 'CORE_RL_magick_']
     podofo_inc = os.path.join(sw_inc_dir, 'podofo')
     podofo_lib = sw_lib_dir
@@ -213,12 +213,15 @@ def get_ip_address(ifname):
     )[20:24])
 
 try:
-    HOST=get_ip_address('eth0')
+    if islinux:
+        HOST=get_ip_address('eth0')
+    else:
+        HOST='192.168.1.2'
 except:
     try:
         HOST=get_ip_address('wlan0')
     except:
-        HOST='unknown'
+        HOST='192.168.1.2'
 
 PROJECT=os.path.basename(os.path.abspath('.'))
 

setup/commands.py

@@ -18,7 +18,7 @@ __all__ = [
         'pypi_register', 'pypi_upload', 'upload_to_server',
         'upload_user_manual', 'upload_installers', 'upload_demo',
         'linux32', 'linux64', 'linux', 'linux_freeze',
-        'osx32_freeze', 'osx32', 'osx',
+        'osx32_freeze', 'osx32', 'osx', 'rsync',
         'win32_freeze', 'win32', 'win',
         'stage1', 'stage2', 'stage3', 'publish'
         ]
@@ -65,6 +65,9 @@ upload_installers = UploadInstallers()
 upload_demo = UploadDemo()
 upload_to_server = UploadToServer()
 
+from setup.installer import Rsync
+rsync = Rsync()
+
 from setup.installer.linux import Linux, Linux32, Linux64
 linux = Linux()
 linux32 = Linux32()

setup/extensions.py

@@ -102,6 +102,7 @@ extensions = [
                     libraries=['podofo'],
                     lib_dirs=[podofo_lib],
                     inc_dirs=[podofo_inc],
+                    optional=True,
                     error=podofo_error),
 
     Extension('pictureflow',

setup/installer/__init__.py

@@ -11,6 +11,22 @@ import subprocess, tempfile, os, time
 from setup import Command, installer_name
 from setup.build_environment import HOST, PROJECT
 
+class Rsync(Command):
+
+    description = 'Sync source tree from development machine'
+
+    SYNC_CMD = ('rsync -avz --exclude src/calibre/plugins '
+               '--exclude src/calibre/manual --exclude src/calibre/trac '
+               '--exclude .bzr --exclude .build --exclude .svn --exclude build --exclude dist '
+               '--exclude "*.pyc" --exclude "*.pyo" --exclude "*.swp" --exclude "*.swo" '
+               'rsync://{host}/work/{project} ..')
+
+    def run(self, opts):
+        cmd = self.SYNC_CMD.format(host=HOST, project=PROJECT)
+        self.info(cmd)
+        subprocess.check_call(cmd, shell=True)
+
+
 class VMInstaller(Command):
 
     EXTRA_SLEEP = 5
@@ -25,15 +41,9 @@ class VMInstaller(Command):
 
     BUILD_CMD = 'ssh -t %s bash build-calibre'
     BUILD_PREFIX = ['#!/bin/bash', 'export CALIBRE_BUILDBOT=1']
-    BUILD_RSYNC  = [r'cd ~/build', (
+    BUILD_RSYNC  = [r'cd ~/build/{project}', Rsync.SYNC_CMD]
-        'rsync -avz --exclude src/calibre/plugins '
+    BUILD_CLEAN  = ['rm -rf dist/* build/* src/calibre/plugins/*']
-               '--exclude calibre/src/calibre.egg-info --exclude docs '
+    BUILD_BUILD  = ['python setup.py build',]
-               '--exclude .bzr --exclude .build --exclude build --exclude dist '
-               '--exclude "*.pyc" --exclude "*.pyo" --exclude "*.swp" --exclude "*.swo" '
-               'rsync://{host}/work/{project} . ')]
-    BUILD_CLEAN = ['cd {project} ',
-                   'rm -rf dist/* build/* src/calibre/plugins/*']
-    BUILD_BUILD = ['python setup.py build',]
 
     def add_options(self, parser):
         if not parser.has_option('--dont-shutdown'):
@@ -45,7 +55,7 @@ class VMInstaller(Command):
 
     def get_build_script(self):
         ans = '\n'.join(self.BUILD_PREFIX)+'\n\n'
-        ans += ' && \\\n'.join(self.BUILD_RSYNC)+ ' && \\\n'
+        ans += ' && \\\n'.join(self.BUILD_RSYNC) + ' && \\\n'
         ans += ' && \\\n'.join(self.BUILD_CLEAN) + ' && \\\n'
         ans += ' && \\\n'.join(self.BUILD_BUILD) + ' && \\\n'
         ans += self.FREEZE_TEMPLATE.format(freeze_command=self.FREEZE_COMMAND) + '\n'

setup/installer/windows/__init__.py

@@ -10,7 +10,6 @@ import os, shutil, subprocess
 
 from setup import Command, __appname__
 from setup.installer import VMInstaller
-from setup.installer.windows import build_installer
 
 class Win(Command):
 
@@ -30,24 +29,18 @@ class Win32(VMInstaller):
     VM_NAME = 'xp_build'
     VM = '/vmware/bin/%s'%VM_NAME
     FREEZE_COMMAND = 'win32_freeze'
-    SHUTDOWN_CMD = ['shutdown', '-s']
+    FREEZE_TEMPLATE = 'python -OO setup.py {freeze_command} --no-ice'
+    INSTALLER_EXT = 'msi'
+    SHUTDOWN_CMD = ['shutdown.exe', '-s', '-f', '-t', '0']
 
     def download_installer(self):
         installer = self.installer()
-        if os.path.exists('build/py2exe'):
+        if os.path.exists('build/winfrozen'):
-            shutil.rmtree('build/py2exe')
+            shutil.rmtree('build/winfrozen')
-        subprocess.check_call(('scp', '-rp', 'xp_build:build/%s/build/py2exe'%__appname__,
+        subprocess.check_call(('scp',
-                     'build'))
+            'xp_build:build/%s/%s'%(__appname__, installer), 'dist'))
-        if not os.path.exists('build/py2exe'):
-            self.warn('Failed to run py2exe')
-            raise SystemExit(1)
-        self.run_windows_install_jammer(installer)
-
-    def run_windows_install_jammer(self, installer):
-        build_installer.run_install_jammer(
-                                    installer_name=os.path.basename(installer))
         if not os.path.exists(installer):
-            self.warn('Failed to run installjammer')
+            self.warn('Failed to freeze')
             raise SystemExit(1)
 
 

setup/installer/windows/build_installer.py

@@ -1,51 +0,0 @@
-#!/usr/bin/env  python
-__license__   = 'GPL v3'
-__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
-__docformat__ = 'restructuredtext en'
-
-'''
-'''
-import sys, time, subprocess, os, re
-from setup import SRC, __appname__, __version__
-
-INSTALLJAMMER = '/usr/local/installjammer/installjammer'
-
-sv = re.sub(r'[a-z]\d+', '', __version__)
-
-cmdline = [
-    INSTALLJAMMER,
-    '--build-dir', '/tmp/calibre-installjammer',
-    '-DAppName', __appname__,
-    '-DShortAppName', __appname__,
-    '-DApplicationURL', 'http://%s.kovidgoyal.net'%__appname__,
-    '-DCopyright', time.strftime('%Y Kovid Goyal'),
-    '-DPackageDescription', '%s is an e-book library manager. It can view, convert and catalog e-books in most of the major e-book formats. It can also talk to e-book reader devices. It can go out to the internet and fetch metadata for your books. It can download newspapers and convert them into e-books for convenient reading.'%__appname__,
-    '-DPackageSummary', '%s: E-book library management'%__appname__,
-    '-DVersion', __version__,
-    '-DInstallVersion', sv + '.0',
-    '-DLicense', open(os.path.join(os.path.dirname(SRC), 'LICENSE'), 'rb').read().replace('\n', '\r\n'),
-    '--output-dir', os.path.join(os.path.dirname(SRC), 'dist'),
-    '--platform', 'Windows',
-    '--verbose'
-]
-
-def run_install_jammer(installer_name='<%AppName%>-<%Version%><%Ext%>', build_for_release=True):
-    global cmdline
-    mpi = os.path.abspath(os.path.join(os.path.dirname(__file__), 'calibre', 'calibre.mpi'))
-    cmdline.extend(['-DWindows,Executable', installer_name])
-    compression = 'zlib'
-    if build_for_release:
-        cmdline += ['--build-for-release']
-        compression = 'lzma (solid)'
-    cmdline += ['-DCompressionMethod', compression]
-    cmdline += ['--build', mpi]
-    #print 'Running installjammer with cmdline:'
-    #print cmdline
-    subprocess.check_call(cmdline)
-
-def main(args=sys.argv):
-    run_install_jammer(build_for_release=True)
-    return 0
-
-if __name__ == '__main__':
-    sys.exit(main())

setup/installer/windows/en-us.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+    <String Id="AdvancedWelcomeEulaDlgDescriptionPerUser">If you are upgrading from a {app} version older than 0.6.17, please uninstall {app} first. Click Advanced to change installation settings.</String>
+</WixLocalization>
+

setup/installer/windows/freeze.py

@@ -1,280 +1,359 @@
-#!/usr/bin/env  python
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+from __future__ import with_statement
+
 __license__   = 'GPL v3'
-__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
+__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-'''
+import sys, os, shutil, glob, py_compile, subprocess, re
-Freeze app into executable using py2exe.
+
-'''
+from setup import Command, modules, functions, basenames, __version__, \
-QT_DIR           = 'C:\\Qt\\4.5.2'
+    __appname__
+from setup.build_environment import msvc, MT, RC
+from setup.installer.windows.wix import WixMixIn
+
+QT_DIR = 'C:\\Qt\\4.5.2'
+QT_DLLS = ['Core', 'Gui', 'Network', 'Svg', 'WebKit', 'Xml', 'phonon']
 LIBUSB_DIR       = 'C:\\libusb'
 LIBUNRAR         = 'C:\\Program Files\\UnrarDLL\\unrar.dll'
-IMAGEMAGICK_DIR  = 'C:\\ImageMagick'
 SW               = r'C:\cygwin\home\kovid\sw'
+IMAGEMAGICK      = os.path.join(SW, 'build', 'ImageMagick-6.5.6',
+        'VisualMagick', 'bin')
 
-import sys
+VERSION = re.sub('[a-z]\d+', '', __version__)
-
-def fix_module_finder():
-    # ModuleFinder can't handle runtime changes to __path__, but win32com uses them
-    import py2exe.mf as modulefinder
-    import win32com
-    for p in win32com.__path__[1:]:
-        modulefinder.AddPackagePath("win32com", p)
-    for extra in ["win32com.shell"]: #,"win32com.mapi"
-        __import__(extra)
-        m = sys.modules[extra]
-        for p in m.__path__[1:]:
-            modulefinder.AddPackagePath(extra, p)
-
-
-import os, shutil, zipfile, glob, re
-from distutils.core import setup
-from setup import __version__ as VERSION, __appname__ as APPNAME, scripts, \
-    basenames, SRC, Command
-
-BASE_DIR = os.path.dirname(SRC)
-ICONS = [os.path.abspath(os.path.join(BASE_DIR, 'icons', i)) for i in ('library.ico', 'viewer.ico')]
-for icon in ICONS:
-    if not os.access(icon, os.R_OK):
-        raise Exception('No icon at '+icon)
-
-VERSION = re.sub('[a-z]\d+', '', VERSION)
 WINVER = VERSION+'.0'
 
-PY2EXE_DIR = os.path.join(BASE_DIR, 'build','py2exe')
+DESCRIPTIONS = {
+        'calibre' : 'The main calibre program',
+        'ebook-viewer' : 'Viewer for all e-book formats',
+        'lrfviewer'    : 'Viewer for LRF files',
+        'ebook-convert': 'Command line interface to the conversion/news download system',
+        'ebook-meta'   : 'Command line interface for manipulating e-book metadata',
+        'calibredb'    : 'Command line interface to the calibre database',
+        'calibre-launcher' : 'Utility functions common to all executables',
+        'calibre-debug' : 'Command line interface for calibre debugging/development',
+        'calibre-customize' : 'Command line interface to calibre plugin system',
+        'pdfmanipulate' : 'Command line tool to manipulate PDF files',
+        'calibre-server': 'Standalone calibre content server',
+        'calibre-parallel': 'calibre worker process',
+        'calibre-smtp' : 'Command line interface for sending books via email',
+}
 
-info = warn = None
+class Win32Freeze(Command, WixMixIn):
 
-class Win32Freeze(Command):
+    description = 'Free windows calibre installation'
 
-    description = 'Freeze windows calibre installation'
+    def add_options(self, parser):
+        parser.add_option('--no-ice', default=False, action='store_true',
+                help='Disable ICE checks when building MSI (needed when running'
+                ' from cygwin sshd)')
+        parser.add_option('--msi-compression', '--compress', default='high',
+                help='Compression when generating installer. Set to none to disable')
+        parser.add_option('--keep-site', default=False, action='store_true',
+            help='Keep human readable site.py')
+        parser.add_option('--verbose', default=0, action="count",
+                help="Be more verbose")
 
     def run(self, opts):
-        global info, warn
+        self.SW = SW
-        info, warn = self.info, self.warn
+        self.opts = opts
-        main()
+        self.src_root = self.d(self.SRC)
+        self.base = self.j(self.d(self.SRC), 'build', 'winfrozen')
+        self.rc_template = self.j(self.d(self.a(__file__)), 'template.rc')
+        self.py_ver = ''.join(map(str, sys.version_info[:2]))
+        self.lib_dir = self.j(self.base, 'Lib')
 
-BOOT_COMMON = '''\
+        self.initbase()
-import sys, os
+        self.build_launchers()
-if sys.frozen == "windows_exe":
+        self.freeze()
-    class Stderr(object):
+        self.embed_manifests()
-        softspace = 0
+        self.install_site_py()
-        _file = None
+        self.create_installer()
-        _error = None
-        def write(self, text, alert=sys._MessageBox, fname=os.path.expanduser('~\calibre.log')):
-            if self._file is None and self._error is None:
-                try:
-                    self._file = open(fname, 'wb')
-                except Exception, details:
-                    self._error = details
-                    import atexit
-                    atexit.register(alert, 0,
-                                    ("The logfile %s could not be opened: "
-                                    "\\n%s\\n\\nTry setting the HOME environment "
-                                    "variable to a directory for which you "
-                                    "have write permission.") % (fname, details),
-                                    "Errors occurred")
-                else:
-                    import atexit
-                    #atexit.register(alert, 0,
-                    #                "See the logfile '%s' for details" % fname,
-                    #                "Errors occurred")
-            if self._file is not None:
-                self._file.write(text)
-                self._file.flush()
-        def flush(self):
-            if self._file is not None:
-                self._file.flush()
 
-    #del sys._MessageBox
+    def initbase(self):
-    #del Stderr
+        if self.e(self.base):
+            shutil.rmtree(self.base)
+        os.makedirs(self.base)
 
-    class Blackhole(object):
+    def freeze(self):
-        softspace = 0
+        shutil.copy2(self.j(self.src_root, 'LICENSE'), self.base)
-        def write(self, text):
-            pass
-        def flush(self):
-            pass
-    sys.stdout = Stderr()
-    sys.stderr = Stderr()
-    del Blackhole
 
-# Disable linecache.getline() which is called by
+        self.info('Adding plugins...')
-# traceback.extract_stack() when an exception occurs to try and read
+        tgt = os.path.join(self.base, 'plugins')
-# the filenames embedded in the packaged python code.  This is really
-# annoying on windows when the d: or e: on our build box refers to
-# someone elses removable or network drive so the getline() call
-# causes it to ask them to insert a disk in that drive.
-import linecache
-def fake_getline(filename, lineno, module_globals=None):
-    return ''
-linecache.orig_getline = linecache.getline
-linecache.getline = fake_getline
-
-del linecache, fake_getline
-
-fenc = sys.getfilesystemencoding( )
-base = os.path.dirname(sys.executable.decode(fenc))
-sys.resources_location = os.path.join(base, 'resources')
-sys.extensions_location = os.path.join(base, 'plugins')
-
-dv = os.environ.get('CALIBRE_DEVELOP_FROM', None)
-if dv and os.path.exists(dv):
-    sys.path.insert(0, os.path.abspath(dv))
-
-del sys
-'''
-
-try:
-    import py2exe
-    bc = py2exe.build_exe.py2exe
-except ImportError:
-    py2exe = object
-    bc = object
-
-class BuildEXE(bc):
-
-    def run(self):
-        py2exe.build_exe.py2exe.run(self)
-        info('\nAdding plugins...')
-        tgt = os.path.join(self.dist_dir, 'plugins')
         if not os.path.exists(tgt):
             os.mkdir(tgt)
-        for f in glob.glob(os.path.join(BASE_DIR, 'src', 'calibre', 'plugins', '*.dll')):
+        base = self.j(self.SRC, 'calibre', 'plugins')
-            shutil.copyfile(f, os.path.join(self.dist_dir, os.path.basename(f)))
+        for pat in ('*.pyd', '*.manifest'):
-        for f in glob.glob(os.path.join(BASE_DIR, 'src', 'calibre', 'plugins', '*.pyd')):
+            for f in glob.glob(self.j(base, pat)):
-            shutil.copyfile(f, os.path.join(tgt, os.path.basename(f)))
+                shutil.copy2(f, tgt)
-        for f in glob.glob(os.path.join(BASE_DIR, 'src', 'calibre', 'plugins', '*.manifest')):
-            shutil.copyfile(f, os.path.join(tgt, os.path.basename(f)))
-        shutil.copyfile('LICENSE', os.path.join(self.dist_dir, 'LICENSE'))
 
-
+        self.info('Adding resources...')
-        info('\nAdding resources...')
+        tgt = self.j(self.base, 'resources')
-        tgt = os.path.join(self.dist_dir, 'resources')
         if os.path.exists(tgt):
             shutil.rmtree(tgt)
-        shutil.copytree(os.path.join(BASE_DIR, 'resources'), tgt)
+        shutil.copytree(self.j(self.src_root, 'resources'), tgt)
 
-        info('\nAdding QtXml4.dll')
+        self.info('Adding Qt and python...')
-        shutil.copyfile(os.path.join(QT_DIR, 'bin', 'QtXml4.dll'),
+        self.dll_dir = self.j(self.base, 'DLLs')
-                            os.path.join(self.dist_dir, 'QtXml4.dll'))
+        shutil.copytree(r'C:\Python%s\DLLs'%self.py_ver, self.dll_dir,
-        info('\nAdding Qt plugins...')
+                ignore=shutil.ignore_patterns('msvc*.dll', 'Microsoft.*'))
+        for x in QT_DLLS:
+            x += '4.dll'
+            if not x.startswith('phonon'): x = 'Qt'+x
+            shutil.copy2(os.path.join(QT_DIR, 'bin', x), self.dll_dir)
+        shutil.copy2(r'C:\windows\system32\python%s.dll'%self.py_ver,
+                    self.dll_dir)
+        for x in os.walk(r'C:\Python%s\Lib'%self.py_ver):
+            for f in x[-1]:
+                if f.lower().endswith('.dll'):
+                    f = self.j(x[0], f)
+                    if 'py2exe' not in f:
+                        shutil.copy2(f, self.dll_dir)
+        shutil.copy2(
+            r'C:\Python%(v)s\Lib\site-packages\pywin32_system32\pywintypes%(v)s.dll'
+            % dict(v=self.py_ver), self.dll_dir)
+
+        def ignore_lib(root, items):
+            ans = []
+            for x in items:
+                ext = os.path.splitext(x)[1]
+                if (not ext and (x in ('demos', 'tests') or 'py2exe' in x)) or \
+                    (ext in ('.dll', '.chm', '.htm', '.txt')):
+                    ans.append(x)
+            return ans
+
+        shutil.copytree(r'C:\Python%s\Lib'%self.py_ver, self.lib_dir,
+                ignore=ignore_lib)
+
+        # Fix win32com
+        sp_dir = self.j(self.lib_dir, 'site-packages')
+        comext = self.j(sp_dir, 'win32comext')
+        shutil.copytree(self.j(comext, 'shell'), self.j(sp_dir, 'win32com', 'shell'))
+        shutil.rmtree(comext)
+
+        for pat in (r'numpy', r'PyQt4\uic\port_v3'):
+            x = glob.glob(self.j(self.lib_dir, 'site-packages', pat))[0]
+            shutil.rmtree(x)
+
+        self.info('Adding calibre sources...')
+        for x in glob.glob(self.j(self.SRC, '*')):
+            shutil.copytree(x, self.j(sp_dir, self.b(x)))
+
+        for x in (r'calibre\manual', r'calibre\trac', 'pythonwin'):
+            shutil.rmtree(self.j(sp_dir, x))
+
+        for x in os.walk(self.j(sp_dir, 'calibre')):
+            for f in x[-1]:
+                if not f.endswith('.py'):
+                    os.remove(self.j(x[0], f))
+
+        self.info('Byte-compiling all python modules...')
+        for x in ('test', 'lib2to3', 'distutils'):
+            shutil.rmtree(self.j(self.lib_dir, x))
+        for x in os.walk(self.lib_dir):
+            root = x[0]
+            for f in x[-1]:
+                if f.endswith('.py'):
+                    y = self.j(root, f)
+                    rel = os.path.relpath(y, self.lib_dir)
+                    try:
+                        py_compile.compile(y, dfile=rel, doraise=True)
+                        os.remove(y)
+                    except:
+                        self.warn('Failed to byte-compile', y)
+                    pyc, pyo = y+'c', y+'o'
+                    epyc, epyo, epy = map(os.path.exists, (pyc,pyo,y))
+                    if (epyc or epyo) and epy:
+                        os.remove(y)
+                    if epyo and epyc:
+                        os.remove(pyc)
+
+        self.info('\nAdding Qt plugins...')
         qt_prefix = QT_DIR
-        plugdir = os.path.join(qt_prefix, 'plugins')
+        plugdir = self.j(qt_prefix, 'plugins')
+        tdir = self.j(self.base, 'qt_plugins')
         for d in ('imageformats', 'codecs', 'iconengines'):
-            info(d)
+            self.info('\t', d)
             imfd = os.path.join(plugdir, d)
-            tg = os.path.join(self.dist_dir, d)
+            tg = os.path.join(tdir, d)
             if os.path.exists(tg):
                 shutil.rmtree(tg)
             shutil.copytree(imfd, tg)
 
-        info('Adding main scripts')
-        f = zipfile.ZipFile(os.path.join(PY2EXE_DIR, 'library.zip'), 'a', zipfile.ZIP_DEFLATED)
-        for i in scripts['console'] + scripts['gui']:
-            f.write(i, i.partition('\\')[-1])
-        f.close()
-
-        info('Copying icons')
-        for icon in ICONS:
-            shutil.copyfile(icon, os.path.join(PY2EXE_DIR, os.path.basename(icon)))
-
         print
         print 'Adding third party dependencies'
-        tdir = os.path.join(PY2EXE_DIR, 'driver')
+        tdir = os.path.join(self.base, 'driver')
         os.makedirs(tdir)
         for pat in ('*.dll', '*.sys', '*.cat', '*.inf'):
             for f in glob.glob(os.path.join(LIBUSB_DIR, pat)):
                 shutil.copyfile(f, os.path.join(tdir, os.path.basename(f)))
         print '\tAdding unrar'
-        shutil.copyfile(LIBUNRAR, os.path.join(PY2EXE_DIR, os.path.basename(LIBUNRAR)))
+        shutil.copyfile(LIBUNRAR,
+                os.path.join(self.dll_dir, os.path.basename(LIBUNRAR)))
 
         print '\tAdding misc binary deps'
         bindir = os.path.join(SW, 'bin')
-        shutil.copy2(os.path.join(bindir, 'pdftohtml.exe'), PY2EXE_DIR)
+        shutil.copy2(os.path.join(bindir, 'pdftohtml.exe'), self.base)
-        for pat in ('*.dll', '*.xml'):
+        for pat in ('*.dll',):
             for f in glob.glob(os.path.join(bindir, pat)):
-                shutil.copy2(f, PY2EXE_DIR)
+                ok = True
-        for x in ('Microsoft.VC90.CRT', 'zlib1.dll', 'libxml2.dll'):
+                for ex in ('expatw',):
-            shutil.copy2(os.path.join(bindir, x+'.manifest'), PY2EXE_DIR)
+                    if ex in f.lower():
+                        ok = False
+                if not ok: continue
+                dest = self.dll_dir
+                shutil.copy2(f, dest)
+        for x in ('zlib1.dll', 'libxml2.dll'):
+            shutil.copy2(self.j(bindir, x+'.manifest'), self.dll_dir)
+
         shutil.copytree(os.path.join(SW, 'etc', 'fonts'),
-						os.path.join(PY2EXE_DIR, 'fontconfig'))
+						os.path.join(self.base, 'fontconfig'))
-
+        # Copy ImageMagick
-        print
+        for pat in ('*.dll', '*.xml'):
-        print 'Doing DLL redirection' # See http://msdn.microsoft.com/en-us/library/ms682600(VS.85).aspx
+            for f in glob.glob(self.j(IMAGEMAGICK, pat)):
-        for f in glob.glob(os.path.join(PY2EXE_DIR, '*.exe')):
+                ok = True
-            open(f + '.local', 'w').write('\n')
+                for ex in ('magick++', 'x11.dll', 'xext.dll'):
-
+                    if ex in f.lower(): ok = False
-
+                if not ok: continue
-
+                shutil.copy2(f, self.dll_dir)
-def exe_factory(dest_base, script, icon_resources=None):
-    exe = {
-           'dest_base'       : dest_base,
-           'script'          : script,
-           'name'            : dest_base,
-           'version'         : WINVER,
-           'description'     : 'calibre - E-book library management',
-           'author'          : 'Kovid Goyal',
-           'copyright'       : '(c) Kovid Goyal, 2008',
-           'company'         : 'kovidgoyal.net',
-           }
-    if icon_resources is not None:
-        exe['icon_resources'] = icon_resources
-    return exe
-
-def main(args=sys.argv):
-    sys.argv[1:2] = ['py2exe']
-    if os.path.exists(PY2EXE_DIR):
-        shutil.rmtree(PY2EXE_DIR)
-
-    fix_module_finder()
-
-    boot_common = os.path.join(sys.prefix, 'Lib', 'site-packages', 'py2exe',
-    'boot_common.py')
-    open(boot_common, 'wb').write(BOOT_COMMON)
-
-    console = [exe_factory(basenames['console'][i], scripts['console'][i])
-               for i in range(len(scripts['console']))]
-    setup(
-          cmdclass = {'py2exe': BuildEXE},
-          windows = [
-                     exe_factory(APPNAME, scripts['gui'][0], [(1, ICONS[0])]),
-                     exe_factory('lrfviewer', scripts['gui'][1], [(1, ICONS[1])]),
-                     exe_factory('ebook-viewer', scripts['gui'][2], [(1, ICONS[1])]),
-                    ],
-          console = console,
-          options = { 'py2exe' : {'compressed': 1,
-                                  'optimize'  : 2,
-                                  'dist_dir'  : PY2EXE_DIR,
-                                  'includes'  : [
-                                             'sip', 'pkg_resources', 'PyQt4.QtSvg',
-                                             'mechanize', 'ClientForm', 'wmi',
-                                             'win32file', 'pythoncom',
-                                             'email.iterators',
-                                             'email.generator',
-                                             'win32process', 'win32api', 'msvcrt',
-                                             'win32event',
-                                             'sqlite3.dump',
-                                             'BeautifulSoup', 'pyreadline',
-                                             'pydoc', 'IPython.Extensions.*',
-                                             'calibre.web.feeds.recipes.*',
-                                             'calibre.gui2.convert.*',
-                                             'PyQt4.QtWebKit', 'PyQt4.QtNetwork',
-                                             ],
-                                  'packages'  : ['PIL', 'lxml', 'cherrypy',
-                                                 'dateutil', 'dns'],
-                                  'excludes'  : ["Tkconstants", "Tkinter", "tcl",
-                                                 "_imagingtk", "ImageTk",
-                                                 "FixTk",
-                                                 'PyQt4.uic.port_v3.proxy_base'
-                                                ],
-                                  'dll_excludes' : ['mswsock.dll', 'tcl85.dll',
-                                      'tk85.dll'],
-                                 },
-                    },
-
-          )
-    return 0
 
+    def embed_manifests(self):
+        self.info('Embedding remaining manifests...')
+        for x in os.walk(self.base):
+            for f in x[-1]:
+                base, ext = os.path.splitext(f)
+                if ext != '.manifest': continue
+                dll = self.j(x[0], base)
+                manifest = self.j(x[0], f)
+                res = 2
+                if os.path.splitext(dll)[1] == '.exe':
+                    res = 1
+                if os.path.exists(dll):
+                    self.run_builder([MT, '-manifest', manifest,
+                        '-outputresource:%s;%d'%(dll,res)])
+                    os.remove(manifest)
+
+    def compress(self):
+        self.info('Compressing app dir using 7-zip')
+        subprocess.check_call([r'C:\Program Files\7-Zip\7z.exe', 'a', '-r',
+            '-scsUTF-8', '-sfx', 'winfrozen', 'winfrozen'], cwd=self.base)
+
+    def embed_resources(self, module, desc=None):
+        icon_base = self.j(self.src_root, 'icons')
+        icon_map = {'calibre':'library', 'ebook-viewer':'viewer',
+                'lrfviewer':'viewer'}
+        file_type = 'DLL' if module.endswith('.dll') else 'APP'
+        template = open(self.rc_template, 'rb').read()
+        bname = self.b(module)
+        internal_name = os.path.splitext(bname)[0]
+        icon = icon_map.get(internal_name, 'command-prompt')
+        icon = self.j(icon_base, icon+'.ico')
+        if desc is None:
+            defdesc = 'A dynamic link library' if file_type == 'DLL' else \
+                    'An executable program'
+            desc = DESCRIPTIONS.get(internal_name, defdesc)
+        license = 'GNU GPL v3.0'
+        def e(val): return val.replace('"', r'\"')
+        rc = template.format(
+                icon=icon,
+                file_type=e(file_type),
+                file_version=e(WINVER.replace('.', ',')),
+                file_version_str=e(WINVER),
+                file_description=e(desc),
+                internal_name=e(internal_name),
+                original_filename=e(bname),
+                product_version=e(WINVER.replace('.', ',')),
+                product_version_str=e(__version__),
+                product_name=e(__appname__),
+                product_description=e(__appname__+' - E-book management'),
+                legal_copyright=e(license),
+                legal_trademarks=e(__appname__ + \
+                        ' is a registered U.S. trademark number 3,666,525')
+        )
+        tdir = self.obj_dir
+        rcf = self.j(tdir, bname+'.rc')
+        with open(rcf, 'wb') as f:
+            f.write(rc)
+        res = self.j(tdir, bname + '.res')
+        cmd = [RC, '/n', '/fo'+res, rcf]
+        self.run_builder(cmd)
+        return res
+
+    def install_site_py(self):
+        if not os.path.exists(self.lib_dir):
+            os.makedirs(self.lib_dir)
+        shutil.copy2(self.j(self.d(__file__), 'site.py'), self.lib_dir)
+        y = os.path.join(self.lib_dir, 'site.py')
+        py_compile.compile(y, dfile='site.py', doraise=True)
+        if not self.opts.keep_site:
+            os.remove(y)
+
+    def run_builder(self, cmd):
+        p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE)
+        if p.wait() != 0:
+            self.info('Failed to run builder:')
+            self.info(*cmd)
+            self.info(p.stdout.read())
+            self.info(p.stderr.read())
+            sys.exit(1)
+
+    def build_launchers(self):
+        self.obj_dir = self.j(self.src_root, 'build', 'launcher')
+        if not os.path.exists(self.obj_dir):
+            os.makedirs(self.obj_dir)
+        base = self.j(self.src_root, 'setup', 'installer', 'windows')
+        sources = [self.j(base, x) for x in ['util.c']]
+        headers = [self.j(base, x) for x in ['util.h']]
+        objects = [self.j(self.obj_dir, self.b(x)+'.obj') for x in sources]
+        cflags  = '/c /EHsc /MD /W3 /Ox /nologo /D_UNICODE'.split()
+        cflags += ['/DPYDLL="python%s.dll"'%self.py_ver, '/IC:/Python%s/include'%self.py_ver]
+        for src, obj in zip(sources, objects):
+            if not self.newer(obj, headers+[src]): continue
+            cmd = [msvc.cc] + cflags + ['/Fo'+obj, '/Tc'+src]
+            self.run_builder(cmd)
+
+        dll = self.j(self.obj_dir, 'calibre-launcher.dll')
+        ver = '.'.join(__version__.split('.')[:2])
+        if self.newer(dll, objects):
+            cmd = [msvc.linker, '/DLL', '/INCREMENTAL:NO', '/VERSION:'+ver,
+                    '/OUT:'+dll, '/nologo', '/MACHINE:X86'] + objects + \
+                [self.embed_resources(dll),
+                '/LIBPATH:C:/Python%s/libs'%self.py_ver,
+                'python%s.lib'%self.py_ver,
+                '/delayload:python%s.dll'%self.py_ver]
+            self.info('Linking calibre-launcher.dll')
+            self.run_builder(cmd)
+
+        src = self.j(base, 'main.c')
+        shutil.copy2(dll, self.base)
+        for typ in ('console', 'gui', ):
+            self.info('Processing %s launchers'%typ)
+            subsys = 'WINDOWS' if typ == 'gui' else 'CONSOLE'
+            for mod, bname, func in zip(modules[typ], basenames[typ],
+                    functions[typ]):
+                xflags = list(cflags)
+                if typ == 'gui':
+                    xflags += ['/DGUI_APP=']
+
+                xflags += ['/DMODULE="%s"'%mod, '/DBASENAME="%s"'%bname,
+                    '/DFUNCTION="%s"'%func]
+                dest = self.j(self.obj_dir, bname+'.obj')
+                if self.newer(dest, [src]+headers):
+                    self.info('Compiling', bname)
+                    cmd = [msvc.cc] + xflags + ['/Tc'+src, '/Fo'+dest]
+                    self.run_builder(cmd)
+                exe = self.j(self.base, bname+'.exe')
+                manifest = exe+'.manifest'
+                lib = dll.replace('.dll', '.lib')
+                if self.newer(exe, [dest, lib, self.rc_template, __file__]):
+                    self.info('Linking', bname)
+                    cmd = [msvc.linker] + ['/INCREMENTAL:NO', '/MACHINE:X86',
+                            '/LIBPATH:'+self.obj_dir, '/SUBSYSTEM:'+subsys,
+                            '/LIBPATH:C:/Python%s/libs'%self.py_ver, '/RELEASE',
+                            '/OUT:'+exe, self.embed_resources(exe),
+                            dest, lib]
+                    self.run_builder(cmd)
 
 

setup/installer/windows/main.c

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2009 Kovid Goyal
+ */
+
+#include "util.h"
+
+#ifdef GUI_APP
+
+int WINAPI                                                                                                      
+wWinMain(HINSTANCE Inst, HINSTANCE PrevInst,
+    wchar_t *CmdLine, int CmdShow) {
+
+    wchar_t *stdout_redirect, *stderr_redirect, basename[50];
+	int ret = 0;
+
+    set_gui_app((char)1);
+
+    MultiByteToWideChar(CP_UTF8, 0, BASENAME, -1, basename, 50);
+
+    stdout_redirect = redirect_out_stream(basename, (char)1);
+    stderr_redirect = redirect_out_stream(basename, (char)0);
+
+	ret = execute_python_entrypoint(BASENAME, MODULE, FUNCTION,
+					stdout_redirect, stderr_redirect);
+
+    DeleteFile(stdout_redirect);
+    DeleteFile(stderr_redirect);
+
+    return ret;
+}
+
+#else
+
+
+int wmain(int argc, wchar_t *argv) {
+    int ret = 0;
+    set_gui_app((char)0);
+	ret = execute_python_entrypoint(BASENAME, MODULE, FUNCTION, NULL, NULL);
+
+    return ret;
+}
+
+#endif

setup/installer/windows/notes.rst

@@ -165,3 +165,19 @@ SET(PODOFO_BUILD_STATIC FALSE)
 cp build/podofo-0.7.0/build/src/Release/podofo.dll bin/
 cp build/podofo-0.7.0/build/src/Release/podofo.lib lib/
 cp build/podofo-0.7.0/build/src/Release/podofo.exp lib/
+
+ImageMagick
+--------------
+
+Edit VisualMagick/configure/configure.cpp to set
+
+int projectType = MULTITHREADEDDLL;
+
+Run configure.bat ina  visual studio command prompt
+
+Edit magick/magick-config.h
+
+Undefine ProvideDllMain and MAGICKCORE_X11_DELEGATE
+
+Now open VisualMagick/VisualDynamicMT.sln set to Release
+Remove the CORE_xlib project

setup/installer/windows/site.py

@@ -0,0 +1,105 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+from __future__ import with_statement
+
+__license__   = 'GPL v3'
+__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+import sys, os, linecache
+
+
+def abs__file__():
+    """Set all module __file__ attribute to an absolute path"""
+    for m in sys.modules.values():
+        if hasattr(m, '__loader__'):
+            continue   # don't mess with a PEP 302-supplied __file__
+        try:
+            m.__file__ = os.path.abspath(m.__file__)
+        except AttributeError:
+            continue
+
+def aliasmbcs():
+    import locale, codecs
+    enc = locale.getdefaultlocale()[1]
+    if enc.startswith('cp'):            # "cp***" ?
+        try:
+            codecs.lookup(enc)
+        except LookupError:
+            import encodings
+            encodings._cache[enc] = encodings._unknown
+            encodings.aliases.aliases[enc] = 'mbcs'
+
+def add_calibre_vars():
+    sys.resources_location = os.path.join(sys.app_dir, 'resources')
+    sys.extensions_location = os.path.join(sys.app_dir, 'plugins')
+
+    dv = os.environ.get('CALIBRE_DEVELOP_FROM', None)
+    if dv and os.path.exists(dv):
+        sys.path.insert(0, os.path.abspath(dv))
+
+def makepath(*paths):
+    dir = os.path.abspath(os.path.join(*paths))
+    return dir, os.path.normcase(dir)
+
+def addpackage(sitedir, name):
+    """Process a .pth file within the site-packages directory:
+       For each line in the file, either combine it with sitedir to a path,
+       or execute it if it starts with 'import '.
+    """
+    fullname = os.path.join(sitedir, name)
+    try:
+        f = open(fullname, "rU")
+    except IOError:
+        return
+    with f:
+        for line in f:
+            if line.startswith("#"):
+                continue
+            if line.startswith(("import ", "import\t")):
+                exec line
+                continue
+            line = line.rstrip()
+            dir, dircase = makepath(sitedir, line)
+            if os.path.exists(dir):
+                sys.path.append(dir)
+
+
+def addsitedir(sitedir):
+    """Add 'sitedir' argument to sys.path if missing and handle .pth files in
+    'sitedir'"""
+    sitedir, sitedircase = makepath(sitedir)
+    try:
+        names = os.listdir(sitedir)
+    except os.error:
+        return
+    dotpth = os.extsep + "pth"
+    names = [name for name in names if name.endswith(dotpth)]
+    for name in sorted(names):
+        addpackage(sitedir, name)
+
+def run_entry_point():
+    bname, mod, func = sys.calibre_basename, sys.calibre_module, sys.calibre_function
+    sys.argv[0] = bname+'.exe'
+    pmod = __import__(mod, fromlist=[1], level=0)
+    return getattr(pmod, func)()
+
+def main():
+    sys.frozen = 'windows_exe'
+    sys.setdefaultencoding('utf-8')
+    aliasmbcs()
+
+    def fake_getline(filename, lineno, module_globals=None):
+        return ''
+    linecache.orig_getline = linecache.getline
+    linecache.getline = fake_getline
+
+    abs__file__()
+
+    addsitedir(os.path.join(sys.app_dir, 'Lib', 'site-packages'))
+
+    add_calibre_vars()
+
+    return run_entry_point()
+
+

setup/installer/windows/template.rc

@@ -0,0 +1,42 @@
+#include <windows.h>
+
+#define VER_FILEVERSION             {file_version}
+#define VER_FILEVERSION_STR         "{file_version_str}"
+
+#define VER_PRODUCTVERSION          {product_version}
+#define VER_PRODUCTVERSION_STR      "{product_version_str}"
+
+#define VER_DEBUG                   0
+
+1 VERSIONINFO
+FILEVERSION    	VER_FILEVERSION
+PRODUCTVERSION 	VER_PRODUCTVERSION
+FILEFLAGSMASK  	VS_FFI_FILEFLAGSMASK
+FILEFLAGS      	VER_DEBUG
+FILEOS         	VOS_NT_WINDOWS32
+FILETYPE       	VFT_{file_type}
+FILESUBTYPE    	VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "CompanyName",      "calibre-ebook.com"
+            VALUE "FileDescription",  "{file_description}"
+            VALUE "FileVersion",      VER_FILEVERSION_STR
+            VALUE "InternalName",     "{internal_name}"
+            VALUE "LegalCopyright",   "{legal_copyright}"
+            VALUE "LegalTrademarks",  "{legal_trademarks}"
+            VALUE "OriginalFilename", "{original_filename}"
+            VALUE "ProductName",      "{product_name}"
+            VALUE "ProductVersion",   VER_PRODUCTVERSION_STR
+        END
+    END
+
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+1 ICON "{icon}"

setup/installer/windows/util.c

@@ -0,0 +1,414 @@
+/*
+ * Copyright 2009 Kovid Goyal
+ */
+
+#include "util.h"
+#include <delayimp.h>
+#include <io.h>
+#include <fcntl.h>
+
+static char GUI_APP = 0;
+static char python_dll[] = PYDLL;
+
+void set_gui_app(char yes) { GUI_APP = yes; }
+char is_gui_app() { return GUI_APP; }
+
+static int _show_error(const wchar_t *preamble, const wchar_t *msg, const int code) {
+    wchar_t *buf, *cbuf;
+    buf = (wchar_t*)LocalAlloc(LMEM_ZEROINIT, sizeof(wchar_t)*
+            (wcslen(msg) + wcslen(preamble) + 80));
+
+    _snwprintf_s(buf, 
+        LocalSize(buf) / sizeof(wchar_t), _TRUNCATE,
+        L"%s\r\n  %s (Error Code: %d)\r\n", 
+        preamble, msg, code);
+
+    if (GUI_APP) {
+        MessageBeep(MB_ICONERROR);
+        MessageBox(NULL, buf, NULL, MB_OK|MB_ICONERROR);
+    }
+    else {
+        cbuf = (char*) calloc(10+(wcslen(buf)*4), sizeof(char));
+        if (cbuf) {
+            if (WideCharToMultiByte(CP_UTF8, 0, buf, -1, cbuf, 10+(wcslen(buf)*4), NULL, NULL) != 0) printf_s(cbuf);
+            free(cbuf);
+        }
+    }
+
+    LocalFree(buf);
+    return code;
+}
+
+
+
+int show_last_error_crt(wchar_t *preamble) {
+    wchar_t buf[1000];
+    int err = 0;
+
+    _get_errno(&err);
+    _wcserror_s(buf, 1000, err);
+    return _show_error(preamble, buf, err);
+}
+
+int show_last_error(wchar_t *preamble) {
+    wchar_t *msg = NULL;
+    DWORD dw = GetLastError(); 
+
+    FormatMessage(
+        FORMAT_MESSAGE_ALLOCATE_BUFFER | 
+        FORMAT_MESSAGE_FROM_SYSTEM |
+        FORMAT_MESSAGE_IGNORE_INSERTS,
+        NULL,
+        dw,
+        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+        msg,
+        0, NULL );
+
+    return _show_error(preamble, msg, (int)dw);
+}
+
+char* get_app_dir() {
+    char *buf, *buf2, *buf3;
+    char drive[4] = "\0\0\0";
+    DWORD sz; errno_t err;
+
+    buf = (char*)calloc(MAX_PATH, sizeof(char));
+    buf2 = (char*)calloc(MAX_PATH, sizeof(char));
+    buf3 = (char*)calloc(MAX_PATH, sizeof(char));
+    if (!buf || !buf2 || !buf3) ExitProcess(_show_error(L"Out of memory", L"", 1));
+    sz = GetModuleFileNameA(NULL, buf, MAX_PATH);
+    if (sz >= MAX_PATH-1) ExitProcess(_show_error(L"Installation directory path too long", L"", 1));
+    err = _splitpath_s(buf, drive, 4, buf2, MAX_PATH, NULL, 0, NULL, 0);
+    if (err != 0) ExitProcess(show_last_error_crt(L"Failed to find application directory")); 
+    _snprintf_s(buf3, MAX_PATH, _TRUNCATE, "%s%s", drive, buf2);
+    free(buf); free(buf2);
+    return buf3;
+}
+
+wchar_t* get_app_dirw() {
+    wchar_t *buf, *buf2, *buf3;
+    wchar_t drive[4] = L"\0\0\0";
+    DWORD sz; errno_t err;
+
+    buf = (wchar_t*)calloc(MAX_PATH, sizeof(wchar_t));
+    buf2 = (wchar_t*)calloc(MAX_PATH, sizeof(wchar_t));
+    buf3 = (wchar_t*)calloc(MAX_PATH, sizeof(wchar_t));
+    if (!buf || !buf2 || !buf3) ExitProcess(_show_error(L"Out of memory", L"", 1));
+    sz = GetModuleFileNameW(NULL, buf, MAX_PATH);
+    if (sz >= MAX_PATH-1) ExitProcess(_show_error(L"Installation directory path too long", L"", 1));
+    err = _wsplitpath_s(buf, drive, 4, buf2, MAX_PATH, NULL, 0, NULL, 0);
+    if (err != 0) ExitProcess(show_last_error_crt(L"Failed to find application directory")); 
+    _snwprintf_s(buf3, MAX_PATH, _TRUNCATE, L"%s%s", drive, buf2);
+    free(buf); free(buf2);
+    return buf3;
+}
+
+
+void load_python_dll() {
+    char *app_dir;
+    char *dll_dir, *qt_plugin_dir;
+    size_t l;
+    app_dir = get_app_dir();
+    l = strlen(app_dir)+20;
+    dll_dir = (char*) calloc(l, sizeof(char));
+    qt_plugin_dir = (char*) calloc(l, sizeof(char));
+    if (!dll_dir || !qt_plugin_dir) ExitProcess(_show_error(L"Out of memory", L"", 1));
+    _snprintf_s(dll_dir, l, _TRUNCATE, "%sDLLs", app_dir);
+    _snprintf_s(qt_plugin_dir, l, _TRUNCATE, "%sqt_plugins", app_dir);
+    free(app_dir);
+
+    _putenv_s("MAGICK_HOME", dll_dir);
+    _putenv_s("MAGICK_CONFIGURE_PATH", dll_dir);
+    _putenv_s("MAGICK_CODER_MODULE_PATH", dll_dir);
+    _putenv_s("MAGICK_FILTER_MODULE_PATH", dll_dir);
+    _putenv_s("QT_PLUGIN_PATH", qt_plugin_dir);
+
+    if (!SetDllDirectoryA(dll_dir)) ExitProcess(show_last_error(L"Failed to set DLL directory."));
+    if (FAILED(__HrLoadAllImportsForDll(python_dll))) 
+        ExitProcess(_show_error(L"Failed to delay load the python dll", L"", 1));
+}
+
+static char program_name[MAX_PATH];
+static char python_home[MAX_PATH];
+
+static wchar_t out_of_memory[] = L"Out of memory";
+
+void setup_stream(const char *name, const char *errors, UINT cp) {
+    PyObject *stream;
+    char *buf = (char *)calloc(100, sizeof(char));
+    if (!buf) ExitProcess(_show_error(out_of_memory, L"", 1));
+
+    if (cp == CP_UTF8) _snprintf_s(buf, 100, _TRUNCATE, "%s", "utf-8");
+    else if (cp == CP_UTF7) _snprintf_s(buf, 100, _TRUNCATE, "%s", "utf-7");
+    else _snprintf_s(buf, 100, _TRUNCATE, "cp%d", cp);
+
+    stream = PySys_GetObject(name);
+
+    if (!PyFile_SetEncodingAndErrors(stream, buf, errors)) 
+        ExitProcess(calibre_show_python_error("Failed to set stream encoding", 1));
+
+    free(buf);
+    
+}
+
+void setup_streams() {
+    SetConsoleOutputCP(CP_UTF8);
+    _putenv_s("PYTHONIOENCODING", "UTF-8");
+    _setmode(_fileno(stdin),  _O_BINARY);
+    _setmode(_fileno(stdout), _O_BINARY);
+    _setmode(_fileno(stderr), _O_BINARY);
+    if (!GUI_APP) { // Remove buffering
+        setvbuf(stdin,  NULL, _IONBF, 2);
+        setvbuf(stdout, NULL, _IONBF, 2);                                                   
+        setvbuf(stderr, NULL, _IONBF, 2);
+    }
+
+    //printf("input cp: %d output cp: %d\r\n", GetConsoleCP(), GetConsoleOutputCP());
+    
+    setup_stream("stdin", "strict", GetConsoleCP());
+    setup_stream("stdout", "strict", CP_UTF8);
+    setup_stream("stderr", "strict", CP_UTF8);
+}
+
+void initialize_interpreter(wchar_t *outr, wchar_t *errr,
+        const char *basename, const char *module, const char *function) {
+    DWORD sz; char *buf, *path; HMODULE dll;
+    int *flag, i, argc;
+    wchar_t *app_dir, **wargv;
+    PyObject *argv, *v;
+    char *dummy_argv[1] = {""};
+
+    buf  = (char*)calloc(MAX_PATH, sizeof(char));
+    path = (char*)calloc(3*MAX_PATH, sizeof(char));
+    if (!buf || !path) ExitProcess(_show_error(L"Out of memory", L"", 1));
+
+    sz = GetModuleFileNameA(NULL, buf, MAX_PATH);
+    if (sz >= MAX_PATH-1) ExitProcess(_show_error(L"Installation directory path too long", L"", 1));
+
+    _snprintf_s(program_name, MAX_PATH, _TRUNCATE, "%s", buf);
+    free(buf);
+
+    buf = get_app_dir();
+    buf[strlen(buf)-1] = '\0';
+
+    _snprintf_s(python_home, MAX_PATH, _TRUNCATE, "%s", buf);
+    _snprintf_s(path, 3*MAX_PATH, _TRUNCATE, "%s\\DLLs;%s\\Lib;%s\\Lib\\site-packages",
+            buf, buf, buf);
+    free(buf);
+
+
+    dll = GetModuleHandleA(python_dll);
+    if (!dll) ExitProcess(show_last_error(L"Failed to get python dll handle"));
+    flag = (int*)GetProcAddress(dll, "Py_OptimizeFlag");
+    if (!flag) ExitProcess(_show_error(L"Failed to get optimize flag", L"", 1));
+    *flag = 2;
+    flag = (int*)GetProcAddress(dll, "Py_NoSiteFlag");
+    if (!flag) ExitProcess(_show_error(L"Failed to get no_site flag", L"", 1));
+    *flag = 1;
+    flag = (int*)GetProcAddress(dll, "Py_DontWriteBytecodeFlag");
+    if (!flag) ExitProcess(_show_error(L"Failed to get no_bytecode flag", L"", 1));
+    *flag = 1;
+    flag = (int*)GetProcAddress(dll, "Py_IgnoreEnvironmentFlag");
+    if (!flag) ExitProcess(_show_error(L"Failed to get ignore_environment flag", L"", 1));
+    *flag = 1;
+    flag = (int*)GetProcAddress(dll, "Py_NoUserSiteDirectory");
+    if (!flag) ExitProcess(_show_error(L"Failed to get user_site flag", L"", 1));
+    *flag = 1;
+    flag = (int*)GetProcAddress(dll, "Py_VerboseFlag");
+    if (!flag) ExitProcess(_show_error(L"Failed to get verbose flag", L"", 1));
+    //*flag = 1;
+    flag = (int*)GetProcAddress(dll, "Py_DebugFlag");
+    if (!flag) ExitProcess(_show_error(L"Failed to get debug flag", L"", 1));
+    //*flag = 1;
+
+
+
+    Py_SetProgramName(program_name);
+    Py_SetPythonHome(python_home);
+
+    //printf("Path before Py_Initialize(): %s\r\n\n", Py_GetPath()); 
+    Py_Initialize();
+    setup_streams();
+
+    PySys_SetArgv(1, dummy_argv);
+    //printf("Path after Py_Initialize(): %s\r\n\n", Py_GetPath());
+    PySys_SetPath(path);
+    //printf("Path set by me: %s\r\n\n", path);
+    PySys_SetObject("gui_app", PyBool_FromLong((long)GUI_APP));
+    app_dir = get_app_dirw();
+    PySys_SetObject("app_dir", PyUnicode_FromWideChar(app_dir, wcslen(app_dir)));
+
+    PySys_SetObject("calibre_basename", PyBytes_FromString(basename));
+    PySys_SetObject("calibre_module", PyBytes_FromString(module));
+    PySys_SetObject("calibre_function", PyBytes_FromString(function));
+
+    if (GUI_APP && outr && errr) {
+        PySys_SetObject("stdout_redirect", PyUnicode_FromWideChar(outr, wcslen(outr)));
+        PySys_SetObject("stderr_redirect", PyUnicode_FromWideChar(errr, wcslen(outr)));
+    }
+
+    wargv = CommandLineToArgvW(GetCommandLineW(), &argc);
+    if (wargv == NULL) ExitProcess(show_last_error(L"Failed to get command line"));
+    argv = PyList_New(argc);
+    if (argv == NULL) ExitProcess(_show_error(out_of_memory, L"", 1));
+    for (i = 0; i < argc; i++) {
+        v = PyUnicode_FromWideChar(wargv[i], wcslen(wargv[i]));
+        if (v == NULL) ExitProcess(_show_error(out_of_memory, L"", 1));
+        PyList_SetItem(argv, i, v);
+    }
+    PySys_SetObject("argv", argv);
+}
+
+
+wchar_t* pyobject_to_wchar(PyObject *o) {
+    PyUnicodeObject *t;
+    size_t s;
+    wchar_t *ans;
+
+    if (!PyUnicode_Check(o)) {
+        t = (PyUnicodeObject*)PyUnicode_FromEncodedObject(o, NULL, "replace");
+        if (t == NULL) return NULL;
+    } else t = (PyUnicodeObject*)o;
+
+
+    s = 2*PyUnicode_GET_SIZE(t) +1; 
+    ans = (wchar_t*)calloc(s, sizeof(wchar_t));
+    if (ans == NULL) return NULL;
+    s = PyUnicode_AsWideChar(t, ans, s-1);
+    ans[s] = L'\0';
+    
+    return ans;
+}
+
+int pyobject_to_int(PyObject *res) {
+    int ret; PyObject *tmp;
+    tmp = PyNumber_Int(res);
+    if (tmp == NULL) ret = (PyObject_IsTrue(res)) ? 1 : 0;
+    else ret = (int)PyInt_AS_LONG(tmp);
+
+    return ret;
+}
+
+int handle_sysexit(PyObject *e) {
+    PyObject *code;
+
+    code = PyObject_GetAttrString(e, "code");
+    if (!code) return 0;
+    return pyobject_to_int(code);
+}
+
+int calibre_show_python_error(const wchar_t *preamble, int code) {
+    PyObject *exc, *val, *tb, *str, **system_exit;
+    HMODULE dll;
+    int ret, issysexit = 0; wchar_t *i; 
+
+    if (!PyErr_Occurred()) return code;
+    dll = GetModuleHandleA(python_dll);
+    if (!dll) ExitProcess(show_last_error(L"Failed to get python dll handle"));
+    system_exit = (PyObject**)GetProcAddress(dll, "PyExc_SystemExit");
+    issysexit = PyErr_ExceptionMatches(*system_exit);
+
+
+    PyErr_Fetch(&exc, &val, &tb);
+
+    if (exc != NULL) {
+        PyErr_NormalizeException(&exc, &val, &tb);
+
+        if (issysexit) {
+            return (val) ? handle_sysexit(val) : 0;
+        }
+        if (val != NULL) {
+            str = PyObject_Unicode(val);
+            if (str == NULL) {
+                PyErr_Clear();
+                str = PyObject_Str(val);
+            }
+            i = pyobject_to_wchar(str);
+            ret = _show_error(preamble, (i==NULL)?out_of_memory:i, code);
+            if (i) free(i);
+            if (tb != NULL) {
+                PyErr_Restore(exc, val, tb);
+                PyErr_Print();
+            }
+            return ret;
+        }
+    }
+    return _show_error(preamble, L"", code);
+}
+
+int execute_python_entrypoint(const char *basename, const char *module, const char *function,
+        wchar_t *outr, wchar_t *errr) {
+    PyObject *site, *main, *res;
+    int ret = 0;
+
+    load_python_dll();
+    initialize_interpreter(outr, errr, basename, module, function);
+
+    site = PyImport_ImportModule("site");
+
+    if (site == NULL)
+        ret = calibre_show_python_error(L"Failed to import site module",  1);
+    else {
+        Py_XINCREF(site);
+
+        main = PyObject_GetAttrString(site, "main");
+        if (main == NULL || !PyCallable_Check(main)) 
+            ret = calibre_show_python_error(L"site module has no main function", 1);
+        else {
+            Py_XINCREF(main);
+            res = PyObject_CallObject(main, NULL);
+
+            if (res == NULL) 
+                ret = calibre_show_python_error(L"Python function terminated unexpectedly", 1);
+            else {
+            }
+        }
+    }
+    PyErr_Clear();
+    Py_Finalize();
+
+    //printf("11111 Returning: %d\r\n", ret);
+    return ret;
+}
+
+
+wchar_t* get_temp_filename(const wchar_t *prefix) {
+    DWORD dwRetVal;
+    UINT uRetVal;
+
+    wchar_t *szTempName;
+    wchar_t lpPathBuffer[MAX_PATH];
+    szTempName = (wchar_t *)LocalAlloc(LMEM_ZEROINIT, sizeof(wchar_t)*MAX_PATH);
+
+    dwRetVal = GetTempPath(MAX_PATH, lpPathBuffer);
+
+    if (dwRetVal > MAX_PATH || (dwRetVal == 0)) {
+        ExitProcess(show_last_error(L"Failed to get temp path."));
+    }
+
+    uRetVal = GetTempFileName(lpPathBuffer, // directory for tmp files
+                              prefix,       // temp file name prefix 
+                              0,            // create unique name 
+                              szTempName);  // buffer for name 
+
+     if (uRetVal == 0) {
+         ExitProcess(show_last_error(L"Failed to get temp file name"));
+     }
+     return szTempName;
+}
+
+wchar_t* redirect_out_stream(const wchar_t *prefix, char outstream) {
+    FILE *f = NULL;
+    wchar_t *temp_file;
+    errno_t err;
+
+    temp_file = get_temp_filename(prefix);
+
+    err = _wfreopen_s(&f, temp_file, L"a+t", (outstream) ? stdout : stderr);
+    if (err != 0) {
+        ExitProcess(show_last_error_crt(L"Failed to redirect stdout."));
+    }
+
+    return temp_file;
+
+}

setup/installer/windows/util.h

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2009 Kovid Goyal
+ */
+
+#pragma once
+
+#ifndef _UNICODE
+#define _UNICODE
+#endif
+
+#ifndef UNICODE
+#define UNICODE
+#endif
+
+#define _WIN32_WINNT 0x0502 
+
+#include <windows.h>
+#ifdef _DLL
+#   include <Python.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <Shellapi.h>
+
+#define DllExport __declspec( dllexport )
+#define DllImport __declspec( dllimport )
+
+#ifdef _DLL
+#   define ExIm DllExport
+#   pragma comment(lib, "delayimp")
+#   pragma comment(lib, "user32")
+#   pragma comment(lib, "shell32")
+#else
+#   define ExIm DllImport
+#endif
+
+ExIm void set_gui_app(char yes);
+ExIm char is_gui_app();
+
+// Redirect output streams to a temporary file
+// The temporary file name is returned it should be
+// free'ed with LocalFree
+// If outstream is true redirects stdout, otherwise redirects stderr
+ExIm wchar_t* redirect_out_stream(const wchar_t *prefix, char outstream);
+
+// Execute python entry point defined by: module and function
+ExIm int execute_python_entrypoint(const char *basename, const char *module, const char *function, wchar_t *stdout_redirect, wchar_t *stderr_redirect);
+

setup/installer/windows/wix-template.xml

@@ -0,0 +1,130 @@
+<?xml version='1.0' encoding='utf-8'?>
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
+>		
+
+		<Product Name='{app}' Id='{product_guid}' UpgradeCode='{upgrade_code}'
+				Language='1033' Codepage='1252' Version='{version}' Manufacturer='Kovid Goyal'>
+				
+				<Package Id='*' Keywords='Installer' Description="{app} Installer"
+						Comments='{app} is a registered trademark of Kovid Goyal' Manufacturer='Kovid Goyal'
+						InstallerVersion='300' Languages='1033' Compressed='yes'
+						SummaryCodepage='1252' />
+                <Media Id="1" Cabinet="{app}.cab" CompressionLevel="{compression}" EmbedCab="yes" />
+
+                <Directory Id='TARGETDIR' Name='SourceDir'>
+                    <Merge Id="VCRedist" SourceFile="{crt_msm}" DiskId="1" Language="0"/>
+						<Directory Id='ProgramFilesFolder' Name='PFiles'>
+								<Directory Id='APPLICATIONFOLDER' Name='{app}' />
+						</Directory>
+                        <Directory Id="ProgramMenuFolder">
+                            <Directory Id="ApplicationProgramsFolder" Name="{app} - E-book Management"/>
+                        </Directory>
+                        <Directory Id="DesktopFolder" Name="Desktop"/>
+				</Directory>
+
+				<DirectoryRef Id="APPLICATIONFOLDER">
+						{app_components}
+                </DirectoryRef>
+
+                <DirectoryRef Id="ApplicationProgramsFolder">
+                    <Component Id="StartMenuShortcuts" Guid="*">
+                        <Shortcut Id="s1" Name="{app} - E-book management"
+                            Description="Manage you e-book collection and download news"
+                            Target="[#{exe_map[calibre]}]"
+                             WorkingDirectory="APPLICATIONROOTDIRECTORY" />
+                        <Shortcut Id="s2" Name="E-book viewer"
+                            Description="Viewer for all the major e-book formats"
+                            Target="[#{exe_map[ebook-viewer]}]"
+                             WorkingDirectory="APPLICATIONROOTDIRECTORY" />
+                        <Shortcut Id="s3" Name="LRF viewer"
+                            Description="Viewer for LRF format e-books"
+                            Target="[#{exe_map[lrfviewer]}]"
+                             WorkingDirectory="APPLICATIONROOTDIRECTORY" />
+                        <util:InternetShortcut Id="OnlineDocumentationShortcut"
+                            Name="User Manual" Type="url"
+                               Target="http://calibre.kovidgoyal.net/user_manual"/>
+                        <util:InternetShortcut Id="GetInvolvedS"
+                            Name="Get Involved" Type="url"
+                               Target="http://calibre.kovidgoyal.net/wiki/Development"/>
+
+                        <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
+                        <RegistryValue Root="HKCU" Key="Software\Microsoft\{app}" Name="start_menu_shortcuts_installed" Type="integer" Value="1" KeyPath="yes"/>
+                    </Component>
+                </DirectoryRef>
+
+                <DirectoryRef Id="DesktopFolder">
+                    <Component Id="DesktopShortcut" Guid="*">
+                        <Shortcut Id="ds1" Name="{app} - E-book management"
+                            Description="Manage you e-book collection and download news"
+                            Target="[#{exe_map[calibre]}]"
+                            WorkingDirectory="APPLICATIONROOTDIRECTORY" />
+                        <RegistryValue Root="HKCU" Key="Software\Microsoft\{app}" Name="desktop_shortcut_installed" Type="integer" Value="1" KeyPath="yes"/>
+                    </Component> 
+                </DirectoryRef>
+         
+
+
+				<Feature Id="Complete" Title="{app}" Display="expand" Level="1"
+						ConfigurableDirectory="APPLICATIONFOLDER">
+
+						<Feature Id="MainApplication" Title="Program Files" Level="1"
+                            Description="All the files need to run {app}" Absent="disallow">
+                        </Feature>
+
+                        <Feature Id="VCRedist" Title="Visual C++ 8.0 Runtime" AllowAdvertise="no" Display="hidden" Level="1">
+                            <MergeRef Id="VCRedist"/>
+                        </Feature>
+
+                        <Feature Id="FSMS" Title="Start menu shortcuts" Level="1"
+                            Description="Program shortcuts installed in the Start Menu">
+                            <ComponentRef Id="StartMenuShortcuts"/>
+                        </Feature>
+
+                        <Feature Id="DS" Title="Shortcut on desktop" Level="1"
+                            Description="Shortcut to {app} on your desktop">
+                            <ComponentRef Id="DesktopShortcut"/>
+                        </Feature>
+				</Feature>
+
+				<!-- Add icon to entry in Add/Remove programs -->
+                <Icon Id="main_icon" SourceFile="{main_icon}"/>
+				<Property Id="ARPPRODUCTICON" Value="main_icon" />
+
+                <Condition
+                    Message="This application is only supported on Windows XP SP2, or higher.">
+                    <![CDATA[Installed OR (VersionNT >= 501)]]>
+				</Condition>
+
+                <UI>
+                    <UIRef Id="WixUI_Advanced" />
+                    <Publish Dialog="ExitDialog"
+                        Control="Finish" 
+                        Event="DoAction" 
+                        Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
+
+                </UI>
+
+                <!-- 
+                Set default folder name and allow only per machine installs.
+                For a per-machine installation, the default installation location
+                will be [ProgramFilesFolder][ApplicationFolderName] and the user
+                will be able to change it in the setup UI. This is because the installer
+                has to install the VC90 merge module into the system winsxs folder for python
+                to work, so per user installs are impossible anyway.
+                -->
+                <Property Id="ApplicationFolderName" Value="Calibre - E-book Management" />
+                <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
+                <WixVariable Id="WixUISupportPerUser" Value="0" />
+
+                <!-- Add option to launch calibre after install -->
+                <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch {app}" />
+                <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1"/>
+                <Property Id="WixShellExecTarget" Value="[#{exe_map[calibre]}]" />
+                <CustomAction Id="LaunchApplication" BinaryKey="WixCA"
+                    DllEntry="WixShellExec" Impersonate="yes"/>
+
+		</Product>
+</Wix>
+
+
+

setup/installer/windows/wix.py

@@ -0,0 +1,121 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+from __future__ import with_statement
+
+__license__   = 'GPL v3'
+__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+import os, uuid, shutil, subprocess
+
+from setup import __appname__, __version__, basenames
+
+guid = uuid.uuid4 # Random GUID
+
+WIXP = r'C:\Program Files\Windows Installer XML v3.5'
+CANDLE = WIXP+r'\bin\candle.exe'
+LIGHT = WIXP+r'\bin\light.exe'
+
+class WixMixIn:
+
+    def create_installer(self):
+        self.installer_dir = self.j(self.src_root, 'build', 'wix')
+        if os.path.exists(self.installer_dir):
+            shutil.rmtree(self.installer_dir)
+        os.makedirs(self.installer_dir)
+
+        template = open(self.j(self.d(__file__), 'wix-template.xml'),
+                'rb').read()
+
+        components = self.get_components_from_files()
+        wxs = template.format(
+                app               = __appname__,
+                version           = __version__,
+                product_guid      = guid(),
+                upgrade_code      = guid(),
+                compression       = self.opts.msi_compression,
+                app_components    = components,
+                exe_map           = self.smap,
+                main_icon         = self.j(self.src_root, 'icons', 'library.ico'),
+                web_icon          = self.j(self.src_root, 'icons', 'web.ico'),
+                crt_msm           = self.j(self.SW, 'Microsoft_VC90_CRT_x86.msm')
+                )
+        template = open(self.j(self.d(__file__), 'en-us.xml'),
+                'rb').read()
+        enus = template.format(app=__appname__)
+
+
+        enusf = self.j(self.installer_dir, 'en-us.wxl')
+        wxsf = self.j(self.installer_dir, __appname__+'.wxs')
+        with open(wxsf, 'wb') as f:
+            f.write(wxs)
+        with open(enusf, 'wb') as f:
+            f.write(enus)
+        wixobj = self.j(self.installer_dir, __appname__+'.wixobj')
+        cmd = [CANDLE, '-nologo', '-ext', 'WiXUtilExtension', '-o', wixobj, wxsf]
+        self.info(*cmd)
+        subprocess.check_call(cmd)
+        self.installer = self.j(self.src_root, 'dist')
+        if not os.path.exists(self.installer):
+            os.makedirs(self.installer)
+        self.installer = self.j(self.installer, '%s-%s.msi' % (__appname__,
+            __version__))
+        license = self.j(self.src_root, 'LICENSE.rtf')
+        banner  = self.j(self.src_root, 'icons', 'wix-banner.bmp')
+        dialog  = self.j(self.src_root, 'icons', 'wix-dialog.bmp')
+        cmd = [LIGHT, '-nologo', '-ext', 'WixUIExtension',
+                '-cultures:en-us', '-loc', enusf, wixobj,
+                '-ext', 'WixUtilExtension',
+                '-o', self.installer,
+                '-dWixUILicenseRtf='+license,
+                '-dWixUIBannerBmp='+banner,
+                '-dWixUIDialogBmp='+dialog]
+        cmd.append('-sice:ICE60') # No language in dlls warning
+        if self.opts.no_ice:
+            cmd.append('-sval')
+        if self.opts.verbose:
+            cmd.append('-v')
+        self.info(*cmd)
+        subprocess.check_call(cmd)
+
+    def get_components_from_files(self):
+
+        self._file_idc = 0
+        self.file_id_map = {}
+
+        def process_dir(path):
+            components = []
+            for x in os.listdir(path):
+                self._file_idc += 1
+                f = os.path.join(path, x)
+                self.file_id_map[f] = fid = self._file_idc
+
+                if os.path.isdir(f):
+                    components.append(
+                        '<Directory Id="file_%s" FileSource="%s" Name="%s">' %
+                        (self.file_id_map[f], f, x))
+                    c = process_dir(f)
+                    components.extend(c)
+                    components.append('</Directory>')
+                else:
+                    checksum = 'Checksum="yes"' if x.endswith('.exe') else ''
+                    c = [
+                    ('<Component Id="component_%s" Feature="MainApplication" '
+                     'Guid="*">') % (fid,),
+                    ('<File Id="file_%s" Source="%s" Name="%s" ReadOnly="yes" '
+                     'KeyPath="yes" %s/>') %
+                        (fid, f, x, checksum),
+                    '</Component>'
+                    ]
+                    components.append(''.join(c))
+            return components
+
+        components = process_dir(os.path.abspath(self.base))
+        self.smap = {}
+        for x in basenames['gui']:
+            self.smap[x] = 'file_%d'%self.file_id_map[self.a(self.j(self.base, x+'.exe'))]
+
+        return '\t\t\t\t'+'\n\t\t\t\t'.join(components)
+
+
+

setup/upload.py

@@ -90,7 +90,7 @@ class UploadInstallers(Command):
 
     def run(self, opts):
         self.info('Uploading installers...')
-        installers = list(map(installer_name, ('dmg', 'exe', 'tar.bz2')))
+        installers = list(map(installer_name, ('dmg', 'msi', 'tar.bz2')))
         installers.append(installer_name('tar.bz2', is64bit=True))
         map(self.upload_installer, installers)
 

src/calibre/constants.py

@@ -2,7 +2,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = 'calibre'
-__version__   = '0.6.16'
+__version__   = '0.6.17'
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"
 
 import re

src/calibre/debug.py

@@ -190,6 +190,9 @@ def main(args=sys.argv):
     elif opts.develop_from is not None:
         develop_from(opts.develop_from)
     else:
+        from calibre.utils.config import config_dir
+        ipydir = os.path.join(config_dir, ('_' if iswindows else '.')+'ipython')
+        os.environ['IPYTHONDIR'] = ipydir
         from IPython.Shell import IPShellEmbed
         ipshell = IPShellEmbed()
         ipshell()

src/calibre/devices/eslick/driver.py

@@ -25,8 +25,8 @@ class ESLICK(USBMS):
     BCD         = [0x0110]
 
     VENDOR_NAME = 'FOXIT'
-    WINDOWS_MAIN_MEM = 'ESLICK_USB_DEVICE'
+    WINDOWS_MAIN_MEM = 'ESLICK_USB_DEVIC'
-    WINDOWS_CARD_A_MEM = 'ESLICK_USB_DEVICE'
+    WINDOWS_CARD_A_MEM = 'ESLICK_USB_DEVIC'
 
     #OSX_MAIN_MEM = 'Kindle Internal Storage Media'
     #OSX_CARD_A_MEM = 'Kindle Card Storage Media'

src/calibre/devices/interface.py

@@ -80,6 +80,12 @@ class DevicePlugin(Plugin):
         '''
         raise NotImplementedError()
 
+    def post_yank_cleanup(self):
+        '''
+        Called if the user yanks the device without ejecting it first.
+        '''
+        raise NotImplementedError()
+
     def set_progress_reporter(self, report_progress):
         '''
         @param report_progress: Function that is called with a % progress

src/calibre/devices/jetbook/driver.py

@@ -36,8 +36,8 @@ class JETBOOK(USBMS):
     WINDOWS_MAIN_MEM = 'EBOOK'
     WINDOWS_CARD_A_MEM = 'EBOOK'
 
-    OSX_MAIN_MEM = None
+    OSX_MAIN_MEM = 'Linux ebook Media'
-    OSX_CARD_A_MEM = None
+    OSX_CARD_A_MEM = 'Linux ebook Media'
 
     MAIN_MEMORY_VOLUME_LABEL  = 'Jetbook Main Memory'
     STORAGE_CARD_VOLUME_LABEL = 'Jetbook Storage Card'

src/calibre/devices/linux_mount_helper.c

@@ -9,39 +9,46 @@
 #include <fcntl.h>
 
 #define MARKER ".created_by_calibre_mount_helper"
+#define False 0
+#define True 1
 
-int exists(char *path) {
+int exists(const char *path) {
     struct stat file_info;
-    if (stat(path, &file_info) == 0) return 1;
+    if (stat(path, &file_info) == 0) return True;
-    return 0;
+    return False;
 }
 
 int get_root() {
     int res;
     res = setreuid(0, 0);
-    if (res != 0) return 1;
+    if (res != 0) return False;
-    if (setregid(0, 0) != 0) return 1;
+    if (setregid(0, 0) != 0) return False;
-    return 0;
+    return True;
 }
 
-int do_mount(char *dev, char *mp) {
+void ensure_root() {
-    char options[1000];
+    if (!get_root()) {
-    char marker[2000];
+        fprintf(stderr, "Failed to get root.\n");
+        exit(EXIT_FAILURE);
+    }
+}
+
+int do_mount(const char *dev, const char *mp) {
+    char options[1000], marker[2000];
     int errsv;
-    if (exists(dev) == 0) {
+
+    if (!exists(dev)) {
         fprintf(stderr, "Specified device node does not exist\n");
         return EXIT_FAILURE;
     }
-    if (exists(mp) == 0) {
+    if (!exists(mp)) {
         if (mkdir(mp, S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH) != 0) {
-            int errsv = errno;
+            errsv = errno;
             fprintf(stderr, "Failed to create mount point with error: %s\n", strerror(errsv));
         }
     }
-    strncat(marker, mp, strlen(mp));
+    snprintf(marker, 2000, "%s/%s", mp, MARKER);
-    strncat(marker, "/", 1);
+    if (!exists(marker)) {
-    strncat(marker, MARKER, strlen(MARKER));
-    if (exists(marker) == 0) {
         int fd = creat(marker, S_IRUSR|S_IWUSR);
         if (fd == -1) {
             int errsv = errno;
@@ -51,68 +58,112 @@ int do_mount(char *dev, char *mp) {
         close(fd);
     }
     snprintf(options, 1000, "rw,noexec,nosuid,sync,nodev,quiet,shortname=mixed,uid=%d,gid=%d,umask=077,fmask=0177,dmask=0077,utf8,iocharset=iso8859-1", getuid(), getgid());
-    if (get_root() != 0) {
+    ensure_root();
-        fprintf(stderr, "Failed to elevate to root privileges\n");
-        return EXIT_FAILURE;
-    }
     execlp("mount", "mount", "-t", "vfat", "-o", options, dev, mp, NULL);
     errsv = errno;
     fprintf(stderr, "Failed to mount with error: %s\n", strerror(errsv));
     return EXIT_FAILURE;
 }
 
-int do_eject(char *dev, char*mp) {
+int call_eject(const char *dev, const char *mp) {
-    char marker[2000];
+    int ret, pid, errsv, i, status = EXIT_FAILURE;
-    int status = EXIT_FAILURE, ret, pid, errsv, i, rmd;
+
-    if (get_root() != 0) {
-        fprintf(stderr, "Failed to elevate to root privileges\n");
-        return EXIT_FAILURE;
-    }
     pid = fork();
     if (pid == -1) {
         fprintf(stderr, "Failed to fork\n");
-        return EXIT_FAILURE;
+        exit(EXIT_FAILURE);
     }
-    if (pid == 0) {
+
-        if (get_root() != 0) {
+    if (pid == 0) { /* Child process */
-            fprintf(stderr, "Failed to elevate to root privileges\n");
+        ensure_root();
-            return EXIT_FAILURE;
-        }
         execlp("eject", "eject", "-s", dev, NULL);
+        /* execlp failed */
         errsv = errno;
         fprintf(stderr, "Failed to eject with error: %s\n", strerror(errsv));
-        return EXIT_FAILURE;
+        exit(EXIT_FAILURE);
-    } else {
+    } else { /* Parent */
-        for (i =0; i < 7; i++) {
+        for (i = 0; i < 7; i++) {
             sleep(1);
             ret = waitpid(pid, &status, WNOHANG);
-            if (ret == -1) return EXIT_FAILURE;
+            if (ret == -1) return False;
             if (ret > 0) break;
         }
-        if (WIFEXITED(status) && WEXITSTATUS(status) == 0) {
+        return WIFEXITED(status) && WEXITSTATUS(status) == 0;
-            strncat(marker, mp, strlen(mp));
+    }
-            strncat(marker, "/", 1);
+    return False;
-            strncat(marker, MARKER, strlen(MARKER));
+}
-            if (exists(marker)) {
+
-                int urt = unlink(marker);
+int call_umount(const char *dev, const char *mp) {
-                if (urt == -1) {
+    int ret, pid, errsv, i, status = EXIT_FAILURE;
-                    fprintf(stderr, "Failed to unlink marker: %s\n", strerror(errno));
+
-                    return EXIT_FAILURE;
+    pid = fork();
-                }
+    if (pid == -1) {
-                rmd = rmdir(mp);
+        fprintf(stderr, "Failed to fork\n");
-                if (rmd == -1) {
+        exit(EXIT_FAILURE);
-                    fprintf(stderr, "Failed to remove mount point: %s\n", strerror(errno));
+    }
-                    return EXIT_FAILURE;
+
-                }
+    if (pid == 0) { /* Child process */
-            }
+        ensure_root();
+        execlp("umount", "umount", "-l", mp, NULL);
+        /* execlp failed */
+        errsv = errno;
+        fprintf(stderr, "Failed to umount with error: %s\n", strerror(errsv));
+        exit(EXIT_FAILURE);
+    } else { /* Parent */
+        for (i = 0; i < 7; i++) {
+            sleep(1);
+            ret = waitpid(pid, &status, WNOHANG);
+            if (ret == -1) return False;
+            if (ret > 0) break;
+        }
+        return WIFEXITED(status) && WEXITSTATUS(status) == 0;
+    }
+    return False;
+}
+
+int cleanup_mount_point(const char *mp) {
+    char marker[2000];
+    int urt, rmd, errsv;
+
+    snprintf(marker, 2000, "%s/%s", mp, MARKER);
+    if (exists(marker)) {
+        urt = unlink(marker);
+        if (urt == -1) {
+            errsv = errno;
+            fprintf(stderr, "Failed to unlink marker: %s\n", strerror(errsv));
+            return EXIT_FAILURE;
         }
     }
+    rmd = rmdir(mp);
+    if (rmd == -1) {
+        errsv = errno;
+        fprintf(stderr, "Failed to remove mount point: %s\n", strerror(errsv));
+        return EXIT_FAILURE;
+    }
     return EXIT_SUCCESS;
 }
 
+int do_eject(const char *dev, const char *mp) {
+    int unmounted = False;
+
+    ensure_root();
+
+    unmounted = call_eject(dev, mp);
+    if (!unmounted) call_umount(dev, mp);
+    if (unmounted) return cleanup_mount_point(mp);
+    return EXIT_FAILURE;
+}
+
+int cleanup(const char *dev, const char *mp) {
+    ensure_root();
+    call_umount(dev, mp);
+    return cleanup_mount_point(mp);
+}
+
 int main(int argc, char** argv)
 {
     char *action, *dev, *mp;
+    int status = EXIT_FAILURE;
 
     /*printf("Real UID\t= %d\n", getuid());
     printf("Effective UID\t= %d\n", geteuid());
@@ -121,21 +172,20 @@ int main(int argc, char** argv)
 
     if (argc != 4) {
         fprintf(stderr, "Needs 3 arguments: action, device node and mount point\n");
-        return EXIT_FAILURE;
+        exit(EXIT_FAILURE);
     }
     action = argv[1]; dev = argv[2]; mp = argv[3];
 
     if (strncmp(action, "mount", 5) == 0) {
-        return do_mount(dev, mp);
+        status = do_mount(dev, mp);
-    } 
+    } else if (strncmp(action, "eject", 5) == 0) {
-    else if (strncmp(action, "eject", 7) == 0) {
+        status = do_eject(dev, mp);
-        return do_eject(dev, mp);
+    } else if (strncmp(action, "cleanup", 7) == 0) {
+        status = cleanup(dev, mp);
     } else {
-        fprintf(stderr, "Unrecognized action: must be mount or eject\n");
+        fprintf(stderr, "Unrecognized action: must be mount, eject or cleanup\n");
-        return EXIT_FAILURE;
     }
-
  
-    return EXIT_SUCCESS;
+    return status;
 }
 

src/calibre/devices/usbms/device.py

@@ -638,6 +638,33 @@ class Device(DeviceConfig, DevicePlugin):
                 pass
         self._main_prefix = self._card_a_prefix = self._card_b_prefix = None
 
+    def linux_post_yank(self):
+        for drive, mp in getattr(self, '_linux_mount_map', {}).items():
+            if drive and mp:
+                mp = mp[:-1]
+                cmd = 'calibre-mount-helper'
+                if getattr(sys, 'frozen_path', False):
+                    cmd = os.path.join(sys.frozen_path, cmd)
+                cmd = [cmd, 'cleanup']
+                if mp and os.path.exists(mp):
+                    try:
+                        subprocess.Popen(cmd + [drive, mp]).wait()
+                    except:
+                        import traceback
+                        traceback.print_exc()
+        self._linux_mount_map = {}
+
+    def post_yank_cleanup(self):
+        if islinux:
+            try:
+                self.linux_post_yank()
+            except:
+                import traceback
+                traceback.print_exc()
+        self._main_prefix = self._card_a_prefix = self._card_b_prefix = None
+
+
+
     def _sanity_check(self, on_card, files):
         if on_card == 'carda' and not self._card_a_prefix:
             raise ValueError(_('The reader has no storage card in this slot.'))

src/calibre/devices/usbms/driver.py

@@ -162,6 +162,7 @@ class USBMS(CLI, Device):
     @classmethod
     def book_from_path(cls, path):
         from calibre.ebooks.metadata.meta import path_to_ext
+        from calibre.ebooks.metadata import MetaInformation
         mime = mime_type_ext(path_to_ext(path))
 
         if cls.settings().read_metadata or cls.MUST_READ_METADATA:
@@ -171,6 +172,10 @@ class USBMS(CLI, Device):
             mi = metadata_from_filename(os.path.basename(path),
                 re.compile(r'^(?P<title>[ \S]+?)[ _]-[ _](?P<author>[ \S]+?)_+\d+'))
 
+        if mi is None:
+            mi = MetaInformation(os.path.splitext(os.path.basename(path))[0],
+                    [_('Unknown')])
+
         authors = authors_to_string(mi.authors)
 
         book = Book(path, mi.title, authors, mime)

src/calibre/ebooks/__init__.py

@@ -103,8 +103,12 @@ def render_html(path_to_html, width=590, height=750):
         loop = QEventLoop()
         renderer = HTMLRenderer(page, loop)
 
-        page.connect(page, SIGNAL('loadFinished(bool)'), renderer)
+        page.connect(page, SIGNAL('loadFinished(bool)'), renderer,
+                Qt.QueuedConnection)
         page.mainFrame().load(QUrl.fromLocalFile(path_to_html))
         loop.exec_()
+    renderer.loop = renderer.page = None
+    del page
+    del loop
     return renderer
 

src/calibre/ebooks/fb2/fb2ml.py

@@ -30,6 +30,7 @@ TAG_MAP = {
     'i' : 'emphasis',
     'p' : 'p',
     'li' : 'p',
+    'br' : 'empty-line',
 }
 
 TAG_SPACE = [
@@ -74,6 +75,7 @@ class FB2MLizer(object):
         output.append(self.fb2mlize_images())
         output.append(self.fb2_footer())
         output = ''.join(output).replace(u'ghji87yhjko0Caliblre-toc-placeholder-for-insertion-later8ujko0987yjk', self.get_toc())
+        return output
         return u'<?xml version="1.0" encoding="UTF-8"?>\n%s' % etree.tostring(etree.fromstring(output), encoding=unicode, pretty_print=True)
 
     def fb2_header(self):
@@ -112,7 +114,7 @@ class FB2MLizer(object):
             item = self.oeb_book.manifest.hrefs[href]
             if item.spine_position is None:
                 stylizer = Stylizer(item.data, item.href, self.oeb_book, self.opts.output_profile)
-                output += self.dump_text(item.data.find(XHTML('body')), stylizer, item)
+                output += ''.join(self.dump_text(item.data.find(XHTML('body')), stylizer, item))
         return output
 
     def get_toc(self):
@@ -151,7 +153,7 @@ class FB2MLizer(object):
         if aid not in self.link_hrefs.keys():
             self.link_hrefs[aid] = 'calibre_link-%s' % len(self.link_hrefs.keys())
         aid = self.link_hrefs[aid]
-        return '<v id="%s"></v>' % aid
+        return '<a id="%s" />' % aid
 
     def fb2mlize_images(self):
         images = [u'']
@@ -204,6 +206,7 @@ class FB2MLizer(object):
             href = elem.get('href')
             if href:
                 href = prepare_string_for_xml(page.abshref(href))
+                href = href.replace('"', '&quot;')
                 if '://' in href:
                     fb2_text.append('<a xlink:href="%s">' % href)
                 else:
@@ -240,7 +243,10 @@ class FB2MLizer(object):
                 fb2_text.append(' ')
 
         if hasattr(elem, 'text') and elem.text != None:
-            fb2_text.append(prepare_string_for_xml(elem.text))
+            if 'p' not in tag_stack:
+                fb2_text.append('<p>%s</p>' % prepare_string_for_xml(elem.text))
+            else:
+                fb2_text.append(prepare_string_for_xml(elem.text))
 
         for item in elem:
             fb2_text += self.dump_text(item, stylizer, page, tag_stack)

src/calibre/ebooks/pdf/fonts.h

@@ -4,9 +4,7 @@
  */
 
 
-
+#pragma once
-#ifndef CALIBRE_REFLOW_FONTS
-#define CALIBRE_REFLOW_FONTS
 
 #include <vector>
 #include <sstream>
@@ -102,4 +100,3 @@ class Fonts : public vector<XMLFont*> {
 
 
 }
-#endif

src/calibre/ebooks/pdf/images.h

@@ -1,5 +1,4 @@
-#ifndef _CALIBRE_REFLOW_IMAGES
+#pragma once
-#define _CALIBRE_REFLOW_IMAGES
 
 #include <vector>
 #include <GfxState.h>
@@ -127,4 +126,3 @@ namespace calibre_reflow {
     };
 */
 }
-#endif

src/calibre/ebooks/pdf/links.h

@@ -5,9 +5,7 @@
 
 
 
-#ifndef _CALIBRE_XML_LINKS
+#pragma once
-#define _CALIBRE_XML_LINKS
-
 #include <vector>
 #include <sstream>
 
@@ -65,5 +63,4 @@ class XMLLinks : public vector<XMLLink*> {
 
 
 }
-#endif
    

src/calibre/ebooks/pdf/reflow.h

@@ -4,8 +4,7 @@
  * Based on pdftohtml from the poppler project.
  */
 
-#ifndef CALIBRE_REFLOW
+#pragma once
-#define CALIBRE_REFLOW
 #define UNICODE
 
 #ifdef _WIN32 
@@ -248,4 +247,3 @@ class XMLOutputDev : public OutputDev {
     void process_link(Link* link);
 };
 }
-#endif

src/calibre/ebooks/pdf/utils.h

@@ -4,9 +4,7 @@
  */
 
 
-#ifndef _CALIBRE_REFLOW_UTILS
+#pragma once
-#define _CALIBRE_REFLOW_UTILS
-
 #include <string>
 #include <sstream>
 
@@ -45,4 +43,3 @@ inline string encode_for_xml(const string &sSrc )
 
 
 }
-#endif

src/calibre/ebooks/pdf/writer.py

@@ -62,7 +62,7 @@ class PDFWriter(QObject):
                     self.custom_size = None
 
         self.opts = opts
-        
+
         self.size = self._size()
 
     def dump(self, items, out_stream, pdf_metadata):
@@ -111,7 +111,7 @@ class PDFWriter(QObject):
 
         self.logger.debug('Processing %s...' % item)
 
-        self.view.load(QUrl(item))
+        self.view.load(QUrl.fromLocalFile(item))
 
     def _render_html(self, ok):
         if ok:
@@ -149,15 +149,15 @@ class PDFWriter(QObject):
 
 
 class ImagePDFWriter(PDFWriter):
-    
+
     def _render_next(self):
         item = str(self.render_queue.pop(0))
         self.combine_queue.append(os.path.join(self.tmp_path, '%i.pdf' % (len(self.combine_queue) + 1)))
 
         self.logger.debug('Processing %s...' % item)
-        
+
         height = 'height: %fcm;' % (self.size[1] * 1.3)
-        
+
         html = '<html><body style="margin: 0;"><img src="%s" style="%s display: block; margin-left: auto; margin-right: auto; padding: 0px;" /></body></html>' % (item, height)
 
         self.view.setHtml(html)

src/calibre/gui2/__init__.py

@@ -124,17 +124,22 @@ class CopyButton(QPushButton):
 
 
     def keyPressEvent(self, ev):
-        if ev.key() in self.ACTION_KEYS:
+        try:
-            self.copied()
+            if ev.key() in self.ACTION_KEYS:
-        else:
+                self.copied()
-            QPushButton.event(self, ev)
+                return
+        except:
+            pass
+        return QPushButton.event(self, ev)
 
 
     def keyReleaseEvent(self, ev):
-        if ev.key() in self.ACTION_KEYS:
+        try:
+            if ev.key() in self.ACTION_KEYS:
+                return
+        except:
             pass
-        else:
+        return QPushButton.event(self, ev)
-            QPushButton.event(self, ev)
 
     def mouseReleaseEvent(self, ev):
         ev.accept()

src/calibre/gui2/device.py

@@ -128,6 +128,10 @@ class DeviceManager(Thread):
                         job.abort(Exception(_('Device no longer connected.')))
                     except Queue.Empty:
                         break
+                try:
+                    self.device.post_yank_cleanup()
+                except:
+                    pass
                 device[2] = False
                 self.device = None
                 self.connected_slot(False)

src/calibre/gui2/dialogs/metadata_single.py

@@ -12,8 +12,8 @@ import time
 import traceback
 from datetime import datetime, timedelta
 
-from PyQt4.QtCore import SIGNAL, QObject, QCoreApplication, Qt, QTimer, QThread, QDate
+from PyQt4.Qt import SIGNAL, QObject, QCoreApplication, Qt, QTimer, QThread, QDate, \
-from PyQt4.QtGui import QPixmap, QListWidgetItem, QErrorMessage, QDialog
+    QPixmap, QListWidgetItem, QDialog
 
 from calibre.gui2 import qstring_to_unicode, error_dialog, file_icon_provider, \
                            choose_files, choose_images, ResizableDialog
@@ -80,6 +80,7 @@ class Format(QListWidgetItem):
         QListWidgetItem.__init__(self, file_icon_provider().icon_from_ext(ext),
                                  text, parent, QListWidgetItem.UserType)
 
+
 class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
 
     COVER_FETCH_TIMEOUT = 240 # seconds
@@ -129,16 +130,21 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
 
     def add_format(self, x):
         files = choose_files(self, 'add formats dialog',
-                             "Choose formats for " + qstring_to_unicode((self.title.text())),
+                             _("Choose formats for ") + unicode((self.title.text())),
-                             [('Books', BOOK_EXTENSIONS)])
+                             [(_('Books'), BOOK_EXTENSIONS)])
-        if not files:
+        self._add_formats(files)
-            return
+
-        for _file in files:
+    def _add_formats(self, paths):
+        added = False
+        if not paths:
+            return added
+        bad_perms = []
+        for _file in paths:
             _file = os.path.abspath(_file)
             if not os.access(_file, os.R_OK):
-                QErrorMessage(self.window).showMessage("You do not have "+\
+                bad_perms.append(_file)
-                                    "permission to read the file: " + _file)
                 continue
+
             _file = run_plugins_on_import(_file)
             size = os.stat(_file).st_size
             ext = os.path.splitext(_file)[1].lower().replace('.', '')
@@ -149,6 +155,17 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
                     break
             Format(self.formats, ext, size, path=_file)
             self.formats_changed = True
+            added = True
+        if bad_perms:
+            error_dialog(self.window, _('You do not have '
+                'permission to read the following files:'),
+                det_msg='\n'.join(bad_perms), show=True)
+
+        return added
+
+    def formats_dropped(self, event, paths):
+        if self._add_formats(paths):
+            event.accept()
 
     def remove_format(self, x):
         rows = self.formats.selectionModel().selectedRows(0)
@@ -276,6 +293,7 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
         self.row = row
         self.cover_data = None
         self.formats_changed = False
+        self.formats.setAcceptDrops(True)
         self.cover_changed = False
         self.cpixmap = None
         self.cover.setAcceptDrops(True)
@@ -287,6 +305,9 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
                                                     self.select_cover)
         QObject.connect(self.add_format_button, SIGNAL("clicked(bool)"), \
                                                     self.add_format)
+        self.connect(self.formats,
+                SIGNAL('formats_dropped(PyQt_PyObject,PyQt_PyObject)'),
+                self.formats_dropped)
         QObject.connect(self.remove_format_button, SIGNAL("clicked(bool)"), \
                                                 self.remove_format)
         QObject.connect(self.fetch_metadata_button, SIGNAL('clicked()'),

src/calibre/gui2/dialogs/metadata_single.ui

@@ -439,7 +439,7 @@
                  <item>
                   <layout class="QGridLayout" name="gridLayout">
                    <item row="0" column="1" rowspan="3">
-                    <widget class="QListWidget" name="formats">
+                    <widget class="FormatList" name="formats">
                      <property name="sizePolicy">
                       <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
                        <horstretch>0</horstretch>
@@ -452,6 +452,9 @@
                        <height>130</height>
                       </size>
                      </property>
+                     <property name="dragDropMode">
+                      <enum>QAbstractItemView::DropOnly</enum>
+                     </property>
                      <property name="iconSize">
                       <size>
                        <width>64</width>
@@ -703,6 +706,11 @@
    <extends>QLineEdit</extends>
    <header>widgets.h</header>
   </customwidget>
+  <customwidget>
+   <class>FormatList</class>
+   <extends>QListWidget</extends>
+   <header location="global">calibre/gui2/widgets.h</header>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>title</tabstop>

src/calibre/gui2/main.py

@@ -30,7 +30,7 @@ from calibre.gui2 import APP_UID, warning_dialog, choose_files, error_dialog, \
                            max_available_height, config, info_dialog, \
                            available_width, GetMetadata
 from calibre.gui2.cover_flow import CoverFlow, DatabaseImages, pictureflowerror
-from calibre.gui2.widgets import ProgressIndicator
+from calibre.gui2.widgets import ProgressIndicator, IMAGE_EXTENSIONS
 from calibre.gui2.wizard import move_library
 from calibre.gui2.dialogs.scheduler import Scheduler
 from calibre.gui2.update import CheckForUpdates
@@ -220,6 +220,8 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
                 self.status_bar.job_done, Qt.QueuedConnection)
         QObject.connect(self.status_bar, SIGNAL('show_book_info()'),
                 self.show_book_info)
+        QObject.connect(self.status_bar, SIGNAL('files_dropped(PyQt_PyObject,PyQt_PyObject)'),
+                self.files_dropped_on_book)
         ####################### Setup Toolbar #####################
         md = QMenu()
         md.addAction(_('Edit metadata individually'))
@@ -826,6 +828,31 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
         to_device = self.stack.currentIndex() != 0
         self._add_books(paths, to_device)
 
+    def files_dropped_on_book(self, event, paths):
+        accept = False
+        if self.current_view() is not self.library_view:
+            return
+        db = self.library_view.model().db
+        current_idx = self.library_view.currentIndex()
+        if not current_idx.isValid(): return
+        cid = db.id(current_idx.row())
+        for path in paths:
+            ext = os.path.splitext(path)[1].lower()
+            if ext:
+                ext = ext[1:]
+            if ext in IMAGE_EXTENSIONS:
+                pmap = QPixmap()
+                pmap.load(path)
+                if not pmap.isNull():
+                    accept = True
+                    db.set_cover(cid, pmap)
+            elif ext in BOOK_EXTENSIONS:
+                db.add_format_with_hooks(cid, ext, path, index_is_id=True)
+                accept = True
+        if accept:
+            event.accept()
+            self.cover_cache.refresh([cid])
+            self.library_view.model().current_changed(current_idx, current_idx)
 
     def add_filesystem_book(self, path):
         if os.access(path, os.R_OK):
@@ -1200,6 +1227,8 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
                 self.library_view.model().db, book_ids,
                 out_format=prefs['output_format'], args=(rows, previous,
                     self.book_converted))
+            if self.__bulk_queue is None:
+                return
             num = len(self.__bulk_queue.book_ids)
         else:
             jobs, changed, bad = convert_single_ebook(self,

src/calibre/gui2/pictureflow/pictureflow.h

@@ -55,8 +55,7 @@
   THE SOFTWARE.
 */
 
-#ifndef PICTUREFLOW_H
+#pragma once
-#define PICTUREFLOW_H
 
 #include <QWidget>
 
@@ -202,4 +201,3 @@ private:
   PictureFlowPrivate* d;
 };
 
-#endif // PICTUREFLOW_H

src/calibre/gui2/search_box.py

@@ -20,6 +20,11 @@ class SearchLineEdit(QLineEdit):
         self.emit(SIGNAL('mouse_released(PyQt_PyObject)'), event)
         QLineEdit.mouseReleaseEvent(self, event)
 
+    def dropEvent(self, ev):
+        if self.parent().help_state:
+            self.parent().normalize_state()
+        return QLineEdit.dropEvent(self, ev)
+
 class SearchBox2(QComboBox):
 
     '''
@@ -27,7 +32,7 @@ class SearchBox2(QComboBox):
 
         * Call initialize()
         * Connect to the search() and cleared() signals from this widget
-        * Call search_done() after evry search is complete
+        * Call search_done() after every search is complete
         * Use clear() to clear back to the help message
     '''
 

src/calibre/gui2/status.py

@@ -1,14 +1,48 @@
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
-import re, collections
+import os, re, collections
 
 from PyQt4.QtGui import QStatusBar, QMovie, QLabel, QWidget, QHBoxLayout, QPixmap, \
                         QVBoxLayout, QSizePolicy, QToolButton, QIcon, QScrollArea, QFrame
 from PyQt4.QtCore import Qt, QSize, SIGNAL, QCoreApplication
 from calibre import fit_image, preferred_encoding, isosx
 from calibre.gui2 import qstring_to_unicode, config
+from calibre.gui2.widgets import IMAGE_EXTENSIONS
+from calibre.ebooks import BOOK_EXTENSIONS
 
 class BookInfoDisplay(QWidget):
+
+    DROPABBLE_EXTENSIONS = IMAGE_EXTENSIONS+BOOK_EXTENSIONS
+
+    @classmethod
+    def paths_from_event(cls, event):
+        '''
+        Accept a drop event and return a list of paths that can be read from
+        and represent files with extensions.
+        '''
+        if event.mimeData().hasFormat('text/uri-list'):
+            urls = [unicode(u.toLocalFile()) for u in event.mimeData().urls()]
+            urls = [u for u in urls if os.path.splitext(u)[1] and os.access(u, os.R_OK)]
+            return [u for u in urls if os.path.splitext(u)[1][1:].lower() in cls.DROPABBLE_EXTENSIONS]
+
+    def dragEnterEvent(self, event):
+        if int(event.possibleActions() & Qt.CopyAction) + \
+           int(event.possibleActions() & Qt.MoveAction) == 0:
+            return
+        paths = self.paths_from_event(event)
+        if paths:
+            event.acceptProposedAction()
+
+    def dropEvent(self, event):
+        paths = self.paths_from_event(event)
+        event.setDropAction(Qt.CopyAction)
+        self.emit(SIGNAL('files_dropped(PyQt_PyObject, PyQt_PyObject)'), event,
+            paths)
+
+    def dragMoveEvent(self, event):
+        event.acceptProposedAction()
+
+
     class BookCoverDisplay(QLabel):
 
         WIDTH = 81
@@ -184,15 +218,22 @@ class StatusBar(QStatusBar):
         self.addPermanentWidget(self.tag_view_button)
         self.addPermanentWidget(self.movie_button)
         self.book_info = BookInfoDisplay(self.clearMessage)
+        self.book_info.setAcceptDrops(True)
         self.scroll_area = QScrollArea()
         self.scroll_area.setWidget(self.book_info)
         self.scroll_area.setMaximumHeight(120)
         self.scroll_area.setWidgetResizable(True)
         self.connect(self.book_info, SIGNAL('show_book_info()'), self.show_book_info)
+        self.connect(self.book_info,
+                SIGNAL('files_dropped(PyQt_PyObject,PyQt_PyObject)'),
+                    self.files_dropped, Qt.QueuedConnection)
         self.addWidget(self.scroll_area, 100)
         self.setMinimumHeight(120)
         self.setMaximumHeight(120)
 
+    def files_dropped(self, event, paths):
+        self.emit(SIGNAL('files_dropped(PyQt_PyObject, PyQt_PyObject)'), event,
+            paths)
 
     def reset_info(self):
         self.book_info.show_data({})
@@ -243,7 +284,6 @@ if __name__ == '__main__':
     # Used to create the animated status icon
     from PyQt4.Qt import QApplication, QPainter, QSvgRenderer, QColor
     from subprocess import check_call
-    import os
     app = QApplication([])
 
     def create_pixmaps(path, size=16, delta=20):

src/calibre/gui2/tools.py

@@ -105,7 +105,7 @@ def convert_bulk_ebook(parent, queue, db, book_ids, out_format=None, args=[]):
 
     d = BulkConfig(parent, db, out_format)
     if d.exec_() != QDialog.Accepted:
-        return jobs, changed, bad
+        return None
 
     output_format = d.output_format
     user_recs = cPickle.loads(d.recommendations)

src/calibre/gui2/widgets.py

@@ -19,6 +19,7 @@ from calibre.gui2.dialogs.job_view_ui import Ui_Dialog
 from calibre.gui2.filename_pattern_ui import Ui_Form
 from calibre import fit_image
 from calibre.utils.fonts import fontconfig
+from calibre.ebooks import BOOK_EXTENSIONS
 from calibre.ebooks.metadata.meta import metadata_from_filename
 from calibre.utils.config import prefs
 
@@ -105,13 +106,44 @@ class FilenamePattern(QWidget, Ui_Form):
         return pat
 
 
+IMAGE_EXTENSIONS = ['jpg', 'jpeg', 'gif', 'png', 'bmp']
 
+class FormatList(QListWidget):
+    DROPABBLE_EXTENSIONS = BOOK_EXTENSIONS
+
+    @classmethod
+    def paths_from_event(cls, event):
+        '''
+        Accept a drop event and return a list of paths that can be read from
+        and represent files with extensions.
+        '''
+        if event.mimeData().hasFormat('text/uri-list'):
+            urls = [unicode(u.toLocalFile()) for u in event.mimeData().urls()]
+            urls = [u for u in urls if os.path.splitext(u)[1] and os.access(u, os.R_OK)]
+            return [u for u in urls if os.path.splitext(u)[1][1:].lower() in cls.DROPABBLE_EXTENSIONS]
+
+    def dragEnterEvent(self, event):
+        if int(event.possibleActions() & Qt.CopyAction) + \
+           int(event.possibleActions() & Qt.MoveAction) == 0:
+            return
+        paths = self.paths_from_event(event)
+        if paths:
+            event.acceptProposedAction()
+
+    def dropEvent(self, event):
+        paths = self.paths_from_event(event)
+        event.setDropAction(Qt.CopyAction)
+        self.emit(SIGNAL('formats_dropped(PyQt_PyObject,PyQt_PyObject)'),
+                event, paths)
+
+    def dragMoveEvent(self, event):
+        event.acceptProposedAction()
 
 class ImageView(QLabel):
 
     MAX_WIDTH  = 400
     MAX_HEIGHT = 300
-    DROPABBLE_EXTENSIONS = ('jpg', 'jpeg', 'gif', 'png', 'bmp')
+    DROPABBLE_EXTENSIONS = IMAGE_EXTENSIONS
 
     @classmethod
     def paths_from_event(cls, event):

src/calibre/libunrar.py

@@ -25,9 +25,10 @@ if iswindows:
 else:
     Structure = _Structure
 if hasattr(sys, 'frozen') and iswindows:
-    _libunrar = cdll.LoadLibrary(os.path.join(os.path.dirname(sys.executable),
+    lp = os.path.join(os.path.dirname(sys.executable), 'DLLs', 'unrar.dll')
-        'unrar.dll'))
+    _libunrar = cdll.LoadLibrary(lp)
-_libunrar = load_library(_librar_name, cdll)
+else:
+    _libunrar = load_library(_librar_name, cdll)
 
 RAR_OM_LIST    = 0
 RAR_OM_EXTRACT = 1

src/calibre/manual/faq.rst

@@ -78,7 +78,7 @@ Device Integration
 
 What devices does |app| support?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-At the moment |app| has full support for the SONY PRS 300/500/505/600/700, Cybook Gen 3/Opus, Amazon Kindle 1/2/DX, Netronix EB600, Ectaco Jetbook, BeBook/BeBook Mini, Irex Illiad/DR1000, Adroid phones and the iPhone. In addition, using the :guilabel:`Save to disk` function you can use it with any ebook reader that exports itself as a USB disk.
+At the moment |app| has full support for the SONY PRS 300/500/505/600/700, Cybook Gen 3/Opus, Amazon Kindle 1/2/DX, Netronix EB600, Ectaco Jetbook, BeBook/BeBook Mini, Irex Illiad/DR1000, Foxit eSlick, Android phones and the iPhone. In addition, using the :guilabel:`Save to disk` function you can use it with any ebook reader that exports itself as a USB disk.
 
 I used |app| to transfer some books to my reader, and now the SONY software hangs every time I connect the reader?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

src/calibre/startup.py

@@ -29,7 +29,7 @@ if not _run_once:
         winutil, winutilerror = plugins['winutil']
         if not winutil:
             raise RuntimeError('Failed to load the winutil plugin: %s'%winutilerror)
-        if len(sys.argv) > 1:
+        if len(sys.argv) > 1 and not isinstance(sys.argv[1], unicode):
             sys.argv[1:] = winutil.argv()[1-len(sys.argv):]
 
     ################################################################################

src/calibre/trac/plugins/download.py

@@ -141,11 +141,13 @@ else:
 
         def windows(self, req):
             version = self.version_from_filename()
-            file = '%s-%s.exe'%(__appname__, version,)
+            file = '%s-%s.msi'%(__appname__, version,)
             data = dict(version = version, name='windows',
                 installer_name='Windows installer',
                 title='Download %s for windows'%(__appname__),
-                compatibility='%s works on Windows XP and Windows Vista.'%(__appname__,),
+                compatibility=('%(a)s works on Windows XP, Vista and 7.'
+                    'If you are upgrading from a version older than 0.6.17, '
+                    'please uninstall %(a)s first.')%dict(a=__appname__,),
                 path=MOBILEREAD+file, app=__appname__,
                 note=Markup(\
     '''

src/calibre/trac/plugins/templates/binary.html

@@ -21,7 +21,8 @@
       </a> (Version: $version <a href="/wiki/Changelog">Changelog</a>)
       </p>
       While you wait for the download to complete, please consider donating to support the development
-      of ${app}.
+      of ${app}. If the above link does not work, the files are also available from
+      <a href="https://sourceforge.net/projects/calibre/">sourceforge</a>.
       <div>
           <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
             <input type="hidden" name="cmd" value="_s-xclick" />

src/calibre/trac/plugins/templates/linux.html

@@ -112,10 +112,13 @@ sudo python setup.py install
                                 </pre>
                                 Note that if your distribution does not have a
                                 correctly compiled libunrar.so, ${app} will not 
-                                support rar files. The calibre_postinstall step 
+                                support rar files. In order to compile ${app} successfully
-                                is required for device detection and integration
+                                poppler headers must include XPdf headers. That is, poppler 
-                                with your desktop environment.
+                                must have been configured with --enable-xpdf-headers. Also,
-                            </p>
+                                some distributions have buggy libpng headers. See 
+                                <a href="https://bugs.launchpad.net/ubuntu/+source/libpng/+bug/218409">here</a>
+                                for example. 
+                                </p>
                         </div>
                     </td>
                 </tr>

src/calibre/translations/ar.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-09-29 01:20+0000\n"
+"POT-Creation-Date: 2009-10-02 05:30+0000\n"
-"PO-Revision-Date: 2009-09-28 06:55+0000\n"
+"PO-Revision-Date: 2009-10-02 05:09+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-09-30 06:41+0000\n"
+"X-Launchpad-Export-Date: 2009-10-03 06:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
@@ -97,8 +97,8 @@ msgstr "لا يفعل شيءً"
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:219
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:261
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:124
@@ -547,7 +547,7 @@ msgstr "لا توجد مساحة كافية في بطاقة التخزين"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:686
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1007
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1011
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1334
@@ -1117,7 +1117,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/fb2ml.py:122
 #: /home/kovid/work/calibre/src/calibre/ebooks/pml/pmlml.py:111
 #: /home/kovid/work/calibre/src/calibre/ebooks/rb/rbml.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:77
 msgid "Table of Contents:"
 msgstr ""
 
@@ -1481,7 +1481,7 @@ msgstr "التعليقات"
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:1012
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:1072
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Tags"
 msgstr "الوسوم"
 
@@ -1489,7 +1489,7 @@ msgstr "الوسوم"
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:166
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:354
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Series"
 msgstr "السلسلة"
 
@@ -2214,51 +2214,68 @@ msgstr ""
 msgid "Choose Files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:53
 msgid "Searching in"
 msgstr "يتم البحث في"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:164
 msgid "Adding..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 msgid "Searching in all sub-directories..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:190
+msgid "Path error"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:191
+msgid "The specified directory could not be processed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+msgid "No books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:196
+msgid "No books found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:262
 msgid "Added"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:275
 msgid "Adding failed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:276
 msgid ""
 "The add books process seems to have hung. Try restarting calibre and adding "
 "the books in smaller increments, until you find the problem book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:288
 msgid "Duplicates found!"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:289
 msgid ""
 "Books with the same title as the following already exist in the database. "
 "Add them anyway?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:292
 msgid "Adding duplicates..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Saving..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:406
 msgid "Saved"
 msgstr "تم الحفظ"
 
@@ -2315,7 +2332,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:28
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:51
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:41
@@ -2861,7 +2878,7 @@ msgid "RB Output"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1329
 msgid "Choose the format to view"
 msgstr ""
 
@@ -3005,23 +3022,23 @@ msgstr ""
 msgid "Level &3 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
 msgid "Do not add &detected chapters to the Table of Contents"
 msgstr "لا تضف فصول مك&شوفة إلى قائمة المحتويات"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
 msgid "Number of &links to add to Table of Contents"
 msgstr "عدد الوصلات& لإضافتها لقائمة المحتويات"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
 msgid "Chapter &threshold"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
 msgid "&Force use of auto-generated Table of Contents"
 msgstr "ألزم& استخدام قائمة المحتويات المنشئة آلياً"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67
 msgid "TOC &Filter:"
 msgstr ""
 
@@ -3229,10 +3246,6 @@ msgstr ""
 msgid "Send specific format to storage card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
-msgid "No books"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "selected to send"
 msgstr ""
@@ -3373,7 +3386,7 @@ msgstr "المسار"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:216
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:344
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Formats"
 msgstr "التهيئات"
 
@@ -5071,7 +5084,7 @@ msgid "Save to disk in a single directory"
 msgstr "حفظ إلى القرص في دليل واحد"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1424
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1431
 msgid "Save only %s format to disk"
 msgstr ""
 
@@ -5106,12 +5119,12 @@ msgid "Bad database location"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:428
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:478
 msgid "Calibre Library"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:438
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1567
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1574
 msgid "Choose a location for your ebook library."
 msgstr ""
 
@@ -5292,25 +5305,29 @@ msgstr ""
 msgid "Cannot convert"
 msgstr "لا يمكن تحويله"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1335
+msgid "Starting conversion of %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1366
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1373
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1334
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1341
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1351
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1358
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1352
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1359
 msgid ""
 "You are attempting to open %d books. Opening too many books at once can be "
 "slow and have a negative effect on the responsiveness of your computer. Once "
@@ -5318,149 +5335,149 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1374
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1408
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1415
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1409
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1416
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1452
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1459
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1453
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1460
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1505
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid "Error talking to device"
 msgstr "خطأ في الاتصال بالجهاز"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1506
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1513
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1547
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1554
 msgid "Conversion Error"
 msgstr "خطأ في التحويل"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1537
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1548
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1555
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1576
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1583
 msgid "Invalid library location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1577
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1584
 msgid "Could not access %s. Using %s as the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1624
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1631
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1648
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1655
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1651
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1658
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
 "                      Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1655
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1662
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1706
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1713
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1725
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1732
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1733
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1740
 msgid "Update available"
 msgstr "تحديث متوفر"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1734
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1741
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1752
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1759
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1754
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1761
 msgid "Start minimized to system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1756
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1763
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1758
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1765
 msgid "Do not check for updates"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1806
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1813
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1808
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1815
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1816
 msgid "%s is already running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1812
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1819
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1821
 msgid "upper right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1816
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1823
 msgid "lower right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1819
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1826
 msgid "try rebooting your computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1840
 msgid "try deleting the file"
 msgstr ""
 
@@ -5644,57 +5661,52 @@ msgstr ""
 msgid "Click to browse books by tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Authors"
 msgstr "المؤلفون"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Publishers"
 msgstr "الناشرون"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
-msgid "Starting conversion of %d books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:184
 msgid "Convert book %d of %d (%s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:202
 msgid "Could not convert some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:203
 msgid ""
 "Could not convert %d of %d books, because no suitable source format was "
 "found."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:121
 msgid "Queueing books for bulk conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:183
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:181
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:235
 msgid "You must set a username and password for %s"
 msgstr "يجب أن تضبط اسم المستخدم وكلمة السرّ لـ %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:240
 msgid "Fetch news from "
 msgstr "احصل على الأخبار من "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:251
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:252
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -6146,7 +6158,7 @@ msgstr ""
 msgid "Could not move library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:541
 msgid "welcome wizard"
 msgstr ""
 
@@ -6776,57 +6788,57 @@ msgid ""
 "Start the calibre content server."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:45
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:47
 msgid "%sUsage%s: %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:89
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:91
 msgid "Created by "
 msgstr "أنشأه "
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:90
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:92
 msgid ""
 "Whenever you pass arguments to %prog that have spaces in them, enclose the "
 "arguments in quotation marks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:553
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:555
 msgid "Path to the database in which books are stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:555
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:557
 msgid "Pattern to guess metadata from filenames"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:557
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:559
 msgid "Access key for isbndb.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:559
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:561
 msgid "Default timeout for network operations (seconds)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:561
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:563
 msgid "Path to directory in which your library of books is stored"
 msgstr "المسار إلى الدليل الذي تحفظ فيها مكتبة كتبك"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:563
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:565
 msgid "The language in which to display the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:565
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:567
 msgid "The default output format for ebook conversions."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:569
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:571
 msgid "Ordered list of formats to prefer for input."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:571
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:573
 msgid "Read metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:573
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:575
 msgid "The priority of worker processes"
 msgstr ""
 

src/calibre/translations/da.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-09-29 01:20+0000\n"
+"POT-Creation-Date: 2009-10-02 05:30+0000\n"
-"PO-Revision-Date: 2009-09-24 15:25+0000\n"
+"PO-Revision-Date: 2009-10-02 05:10+0000\n"
-"Last-Translator: Thomas Hildebrandt <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-09-30 06:41+0000\n"
+"X-Launchpad-Export-Date: 2009-10-03 06:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
@@ -97,8 +97,8 @@ msgstr "Gør absolut ingenting"
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:219
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:261
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:124
@@ -570,7 +570,7 @@ msgstr "Der er ikke tilstrækkelig plads på hukommelseskortet"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:686
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1007
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1011
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1334
@@ -1187,7 +1187,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/fb2ml.py:122
 #: /home/kovid/work/calibre/src/calibre/ebooks/pml/pmlml.py:111
 #: /home/kovid/work/calibre/src/calibre/ebooks/rb/rbml.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:77
 msgid "Table of Contents:"
 msgstr ""
 
@@ -1558,7 +1558,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:1012
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:1072
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Tags"
 msgstr ""
 
@@ -1566,7 +1566,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:166
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:354
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Series"
 msgstr ""
 
@@ -2294,51 +2294,68 @@ msgstr ""
 msgid "Choose Files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:53
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:164
 msgid "Adding..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 msgid "Searching in all sub-directories..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:190
+msgid "Path error"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:191
+msgid "The specified directory could not be processed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+msgid "No books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:196
+msgid "No books found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:262
 msgid "Added"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:275
 msgid "Adding failed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:276
 msgid ""
 "The add books process seems to have hung. Try restarting calibre and adding "
 "the books in smaller increments, until you find the problem book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:288
 msgid "Duplicates found!"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:289
 msgid ""
 "Books with the same title as the following already exist in the database. "
 "Add them anyway?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:292
 msgid "Adding duplicates..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Saving..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:406
 msgid "Saved"
 msgstr ""
 
@@ -2395,7 +2412,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:28
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:51
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:41
@@ -2943,7 +2960,7 @@ msgid "RB Output"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1329
 msgid "Choose the format to view"
 msgstr ""
 
@@ -3087,23 +3104,23 @@ msgstr ""
 msgid "Level &3 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
 msgid "Do not add &detected chapters to the Table of Contents"
 msgstr "Føj ikke &opdagede kapitler til indholdsfortegnelsen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
 msgid "Number of &links to add to Table of Contents"
 msgstr "Antal &links at tilføje til indhldsfortegnelsen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
 msgid "Chapter &threshold"
 msgstr "Kapitel&grænse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
 msgid "&Force use of auto-generated Table of Contents"
 msgstr "&Tving autogenereret indholdsfortegnelse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67
 msgid "TOC &Filter:"
 msgstr ""
 
@@ -3311,10 +3328,6 @@ msgstr ""
 msgid "Send specific format to storage card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
-msgid "No books"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "selected to send"
 msgstr ""
@@ -3455,7 +3468,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:216
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:344
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Formats"
 msgstr ""
 
@@ -5158,7 +5171,7 @@ msgid "Save to disk in a single directory"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1424
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1431
 msgid "Save only %s format to disk"
 msgstr ""
 
@@ -5193,12 +5206,12 @@ msgid "Bad database location"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:428
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:478
 msgid "Calibre Library"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:438
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1567
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1574
 msgid "Choose a location for your ebook library."
 msgstr ""
 
@@ -5394,25 +5407,29 @@ msgstr " hentet."
 msgid "Cannot convert"
 msgstr "Kan ikke konvertere"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1335
+msgid "Starting conversion of %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "No book selected"
 msgstr "Ingen bog valgt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1366
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1373
 msgid "Cannot view"
 msgstr "Kan ikke vise"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1334
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1341
 msgid "Cannot open folder"
 msgstr "Kan ikke åbne mappe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1351
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1358
 msgid "Multiple Books Selected"
 msgstr "Flere bøger valgt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1352
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1359
 msgid ""
 "You are attempting to open %d books. Opening too many books at once can be "
 "slow and have a negative effect on the responsiveness of your computer. Once "
@@ -5423,31 +5440,31 @@ msgstr ""
 "tid og have en negativ effekt på din computers hastighed. Når processen er "
 "startet kan den ikke stoppes. Ønsker du at fortsætte?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1374
 msgid "%s has no available formats."
 msgstr "%s har ingen tilgængelige formater."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1408
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1415
 msgid "Cannot configure"
 msgstr "Kan ikke konfigurere"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1409
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1416
 msgid "Cannot configure while there are running jobs."
 msgstr "Kan ikke konfigurere mens processer kører."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1452
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1459
 msgid "No detailed info available"
 msgstr "Ingen detaljeret information tilgængelig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1453
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1460
 msgid "No detailed information is available for books on the device."
 msgstr "Ingen detaljeret information tilgængelig for bøger på enheden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1505
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid "Error talking to device"
 msgstr "Fejl ved kommunikation med enhed"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1506
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1513
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -5455,119 +5472,119 @@ msgstr ""
 "Der var en midlertidig fejl ved kommunikation med enheden. Afbryd og "
 "genforbind enheden eller genstart."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1547
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1554
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1537
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1548
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1555
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1576
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1583
 msgid "Invalid library location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1577
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1584
 msgid "Could not access %s. Using %s as the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1624
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1631
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1648
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1655
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Der er aktive opgaver. Er du sikker på du vil afslutte?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1651
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1658
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
 "                      Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1655
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1662
 msgid "WARNING: Active jobs"
 msgstr "ADVARSEL: Aktive opgaver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1706
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1713
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1725
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1732
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1733
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1740
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1734
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1741
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1752
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1759
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1754
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1761
 msgid "Start minimized to system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1756
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1763
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1758
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1765
 msgid "Do not check for updates"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1806
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1813
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1808
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1815
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1816
 msgid "%s is already running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1812
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1819
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1821
 msgid "upper right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1816
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1823
 msgid "lower right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1819
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1826
 msgid "try rebooting your computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1840
 msgid "try deleting the file"
 msgstr ""
 
@@ -5751,57 +5768,52 @@ msgstr ""
 msgid "Click to browse books by tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Authors"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Publishers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
-msgid "Starting conversion of %d books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:184
 msgid "Convert book %d of %d (%s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:202
 msgid "Could not convert some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:203
 msgid ""
 "Could not convert %d of %d books, because no suitable source format was "
 "found."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:121
 msgid "Queueing books for bulk conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:183
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:181
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:235
 msgid "You must set a username and password for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:240
 msgid "Fetch news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:251
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:252
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -6255,7 +6267,7 @@ msgstr ""
 msgid "Could not move library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:541
 msgid "welcome wizard"
 msgstr ""
 
@@ -6900,57 +6912,57 @@ msgstr ""
 "\n"
 "Start calibre indholdsserveren."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:45
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:47
 msgid "%sUsage%s: %s\n"
 msgstr "%sBrug%s: %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:89
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:91
 msgid "Created by "
 msgstr "Lavet af "
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:90
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:92
 msgid ""
 "Whenever you pass arguments to %prog that have spaces in them, enclose the "
 "arguments in quotation marks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:553
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:555
 msgid "Path to the database in which books are stored"
 msgstr "Sti til databasen, bøgerne er gemt i."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:555
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:557
 msgid "Pattern to guess metadata from filenames"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:557
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:559
 msgid "Access key for isbndb.com"
 msgstr "Adgangsnøgle for isbndb.com"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:559
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:561
 msgid "Default timeout for network operations (seconds)"
 msgstr "Standard timeout for netværksoperationer (sekunder)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:561
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:563
 msgid "Path to directory in which your library of books is stored"
 msgstr "Sti til mappen dit bibliotek ligger i"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:563
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:565
 msgid "The language in which to display the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:565
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:567
 msgid "The default output format for ebook conversions."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:569
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:571
 msgid "Ordered list of formats to prefer for input."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:571
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:573
 msgid "Read metadata from files"
 msgstr "Indlæs metadata fra filer"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:573
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:575
 msgid "The priority of worker processes"
 msgstr "Arbejdsprocessernes prioritet"
 

src/calibre/translations/de.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-29 01:20+0000\n"
+"POT-Creation-Date: 2009-10-02 05:30+0000\n"
-"PO-Revision-Date: 2009-09-30 21:25+0000\n"
+"PO-Revision-Date: 2009-10-05 21:31+0000\n"
 "Last-Translator: S. Dorscht <Unknown>\n"
 "Language-Team: American English <kde-i18n-doc@lists.kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-10-01 06:38+0000\n"
+"X-Launchpad-Export-Date: 2009-10-06 06:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
@@ -98,8 +98,8 @@ msgstr "Mach absolut garnichts"
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:219
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:261
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:124
@@ -577,7 +577,7 @@ msgstr "Nicht genügend freier Speicherplatz auf der Speicherkarte"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:686
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1007
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1011
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1334
@@ -1315,7 +1315,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/fb2ml.py:122
 #: /home/kovid/work/calibre/src/calibre/ebooks/pml/pmlml.py:111
 #: /home/kovid/work/calibre/src/calibre/ebooks/rb/rbml.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:77
 msgid "Table of Contents:"
 msgstr "Inhaltsverzeichnis:"
 
@@ -1714,7 +1714,7 @@ msgstr "Bemerkung"
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:1012
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:1072
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Tags"
 msgstr "Etiketten"
 
@@ -1722,7 +1722,7 @@ msgstr "Etiketten"
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:166
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:354
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Series"
 msgstr "Reihe"
 
@@ -2602,27 +2602,44 @@ msgstr "In die Zwischenablage kopieren"
 msgid "Choose Files"
 msgstr "Dateien wählen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:53
 msgid "Searching in"
 msgstr "Suche in"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:164
 msgid "Adding..."
 msgstr "Füge hinzu..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 msgid "Searching in all sub-directories..."
 msgstr "Suche in allen Unterverzeichnissen..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:190
+msgid "Path error"
+msgstr "Verzeichnis Fehler"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:191
+msgid "The specified directory could not be processed."
+msgstr "Das angegebene Verzeichnis konnte nicht bearbeitet werden."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+msgid "No books"
+msgstr "Keine Bücher"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:196
+msgid "No books found"
+msgstr "Keine Bücher gefunden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:262
 msgid "Added"
 msgstr "Hinzugefügt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:275
 msgid "Adding failed"
 msgstr "Hinzufügen schlug fehl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:276
 msgid ""
 "The add books process seems to have hung. Try restarting calibre and adding "
 "the books in smaller increments, until you find the problem book."
@@ -2631,11 +2648,11 @@ msgstr ""
 "Versuchen Sie Calibre neu zu starten und fügen Sie die Bücher in kleineren "
 "Mengen hinzu, bis Sie das verantwortliche Buch finden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:288
 msgid "Duplicates found!"
 msgstr "Duplikate gefunden!"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:289
 msgid ""
 "Books with the same title as the following already exist in the database. "
 "Add them anyway?"
@@ -2643,15 +2660,15 @@ msgstr ""
 "Es gibt schon Bücher mit dem selben Titel wie die folgenden in der "
 "Datenbank. Trotzdem hinzufügen?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:292
 msgid "Adding duplicates..."
 msgstr "Füge Duplikate hinzu..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Saving..."
 msgstr "Speichere..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:406
 msgid "Saved"
 msgstr "Gespeichert"
 
@@ -2708,7 +2725,7 @@ msgstr "Eingabe"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:28
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:51
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:41
@@ -3268,7 +3285,7 @@ msgid "RB Output"
 msgstr "RB Ausgabe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1329
 msgid "Choose the format to view"
 msgstr "Format zur Vorschau wählen"
 
@@ -3422,25 +3439,25 @@ msgstr "Ebene &2 Inhaltsverzeichnis (XPath Ausdruck):"
 msgid "Level &3 TOC (XPath expression):"
 msgstr "Ebene &3 Inhaltsverzeichnis (XPath Ausdruck):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
 msgid "Do not add &detected chapters to the Table of Contents"
 msgstr "Erkannte Kapitel &nicht zum Inhaltsverzeichnis hinzufügen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
 msgid "Number of &links to add to Table of Contents"
 msgstr ""
 "Anzahl der Vernküpfungen, die zum Inhaltsverzeichnis hinzugefügt werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
 msgid "Chapter &threshold"
 msgstr "Kapitel Grenzwer&t"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
 msgid "&Force use of auto-generated Table of Contents"
 msgstr ""
 "&Verwendung des automatisch erstellten Inhaltsverzeichnisses erzwingen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67
 msgid "TOC &Filter:"
 msgstr "Inhaltsverzeichnis &Filter:"
 
@@ -3658,10 +3675,6 @@ msgstr "Bestimmtes Format an Speicherkarte A senden"
 msgid "Send specific format to storage card B"
 msgstr "Bestimmtes Format an Speicherkarte B senden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
-msgid "No books"
-msgstr "Keine Bücher"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "selected to send"
 msgstr "zum Übertragen ausgewählt"
@@ -3810,7 +3823,7 @@ msgstr "Pfad"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:216
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:344
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Formats"
 msgstr "Formate"
 
@@ -5642,7 +5655,7 @@ msgid "Save to disk in a single directory"
 msgstr "Auf Festplatte in ein einziges Verzeichnis speichern"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1424
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1431
 msgid "Save only %s format to disk"
 msgstr "Nur das %s Format auf Festplatte speichern"
 
@@ -5677,12 +5690,12 @@ msgid "Bad database location"
 msgstr "Schlechter Datenbank Standort"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:428
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:478
 msgid "Calibre Library"
 msgstr "Calibre Bibliothek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:438
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1567
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1574
 msgid "Choose a location for your ebook library."
 msgstr "Wählen Sie einen Speicherort für Ihre eBook Bibliothek."
 
@@ -5881,25 +5894,29 @@ msgstr " abgerufen."
 msgid "Cannot convert"
 msgstr "Konvertierung nicht möglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1335
+msgid "Starting conversion of %d book(s)"
+msgstr "Starte Konvertierung von %d Büchern"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "No book selected"
 msgstr "Kein Buch ausgewählt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1366
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1373
 msgid "Cannot view"
 msgstr "Ansehen nicht möglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1334
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1341
 msgid "Cannot open folder"
 msgstr "Konnte Verzeichnis nicht öffnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1351
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1358
 msgid "Multiple Books Selected"
 msgstr "Mehrere Bücher ausgewählt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1352
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1359
 msgid ""
 "You are attempting to open %d books. Opening too many books at once can be "
 "slow and have a negative effect on the responsiveness of your computer. Once "
@@ -5911,32 +5928,32 @@ msgstr ""
 "Rechners haben. Einmal gestartet kann der Prozess nicht beendet werden, "
 "bevor er abgeschlossen ist. Möchten Sie fortfahren?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1374
 msgid "%s has no available formats."
 msgstr "%s hat keine verfügbaren Formate."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1408
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1415
 msgid "Cannot configure"
 msgstr "Konfiguration nicht möglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1409
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1416
 msgid "Cannot configure while there are running jobs."
 msgstr "Konfiguration nicht möglich während Aufträge abgearbeitet werden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1452
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1459
 msgid "No detailed info available"
 msgstr "Es sind keine genaueren Informationen verfügbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1453
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1460
 msgid "No detailed information is available for books on the device."
 msgstr ""
 "Es sind keine weitere Informationen über Bücher auf dem Gerät verfügbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1505
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid "Error talking to device"
 msgstr "Fehler in der Kommunikation zum Gerät"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1506
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1513
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -5944,12 +5961,12 @@ msgstr ""
 "Es trat ein Fehler in der Kommunikation mit dem Gerät auf. Bitte entfernen "
 "und schließen Sie das Gerät wieder an und - oder starten Sie neu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1547
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1554
 msgid "Conversion Error"
 msgstr "Konvertierungsfehler"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1537
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
@@ -5958,19 +5975,19 @@ msgstr ""
 "href=\"%s\">DRM</a> geschütztes Buch. Sie müssen zuerst das DRM mit Hilfe "
 "anderer Programme entfernen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1548
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1555
 msgid "<b>Failed</b>"
 msgstr "<b>Misslungen</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1576
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1583
 msgid "Invalid library location"
 msgstr "Ungültiger Ort der Bibliothek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1577
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1584
 msgid "Could not access %s. Using %s as the library."
 msgstr "Konnte nicht auf %s zugreifen. Verwende %s als Bibliothek."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1624
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1631
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
@@ -5979,12 +5996,12 @@ msgstr ""
 "Falls Sie es nützlich finden, sollten Sie eine Spende zur Unterstützung "
 "seiner Entwicklung in Betracht ziehen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1648
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1655
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 "Es bestehen aktive Aufträge. Sind Sie sicher, dass sie es beenden wollen?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1651
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1658
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -5995,11 +6012,11 @@ msgstr ""
 "verursachen.<br>\n"
 "                      Sind Sie sicher, dass sie beenden möchten?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1655
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1662
 msgid "WARNING: Active jobs"
 msgstr "WARNUNG: Aktive Aufträge"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1706
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1713
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -6007,7 +6024,7 @@ msgstr ""
 "wird im System Tray weiter laufen. Zum Schließen wählen Sie <b>Beenden</b> "
 "im Kontextmenü des System Tray."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1725
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1732
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -6015,11 +6032,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Letzte Version: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1733
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1740
 msgid "Update available"
 msgstr "Neue Version verfügbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1734
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1741
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -6029,52 +6046,52 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">neuen Features</a> an. "
 "Möchten Sie die Download Seite besuchen?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1752
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1759
 msgid "Use the library located at the specified path."
 msgstr "Die im angegebenen Pfad sich befindende Bibliothek verwenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1754
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1761
 msgid "Start minimized to system tray."
 msgstr "Minimiert im Systembereich der Kontrollleiste starten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1756
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1763
 msgid "Log debugging information to console"
 msgstr "Informationen zur Fehlersuche in Konsole aufzeichnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1758
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1765
 msgid "Do not check for updates"
 msgstr "Nicht nach Updates suchen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1806
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1813
 msgid "If you are sure it is not running"
 msgstr "Wenn Sie sicher sind, dass es nicht gestartet ist"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1808
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1815
 msgid "Cannot Start "
 msgstr "Start nicht möglich "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1816
 msgid "%s is already running."
 msgstr "%s ist schon gestartet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1812
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1819
 msgid "may be running in the system tray, in the"
 msgstr "kann im Systemtray gestartet sein, im"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1821
 msgid "upper right region of the screen."
 msgstr "oberen rechten Bereich des Bildschirms."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1816
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1823
 msgid "lower right region of the screen."
 msgstr "unteren rechten Bereich des Bildschirms."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1819
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1826
 msgid "try rebooting your computer."
 msgstr "Versuchen Sie Ihren Rechner neu zu starten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1840
 msgid "try deleting the file"
 msgstr "Versuche Sie die Datei zu löschen"
 
@@ -6266,31 +6283,26 @@ msgstr ""
 msgid "Click to browse books by tags"
 msgstr "Bücher anhand von Etiketten durchsuchen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Authors"
 msgstr "Autoren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Publishers"
 msgstr "Herausgeber"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
-msgid "Starting conversion of %d books"
-msgstr "Starte Konvertierung von %d Büchern"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:184
 msgid "Convert book %d of %d (%s)"
 msgstr "Konvertiere Buch %d von %d (%s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:202
 msgid "Could not convert some books"
 msgstr "Konnte einige Bücher nicht konvertieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:203
 msgid ""
 "Could not convert %d of %d books, because no suitable source format was "
 "found."
@@ -6298,27 +6310,27 @@ msgstr ""
 "Konnte %d von %d Büchern nicht konvertieren, da keine brauchbaren "
 "Ursprungsformate zur Verfügung standen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:121
 msgid "Queueing books for bulk conversion"
 msgstr "Bücher sammeln und zusammen konvertieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:183
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:181
 msgid "Queueing "
 msgstr "Sammle "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:235
 msgid "You must set a username and password for %s"
 msgstr "Sie müssen einen Benutzernamen und ein Kennwort angeben für %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:240
 msgid "Fetch news from "
 msgstr "Nachrichten abrufen von "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:251
 msgid "Convert existing"
 msgstr "Konvertiere bestehende"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:252
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -6808,7 +6820,7 @@ msgstr ""
 msgid "Could not move library"
 msgstr "Konnte Bibliothek nicht verschieben"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:541
 msgid "welcome wizard"
 msgstr "Willkommens-Assistent"
 
@@ -7590,15 +7602,15 @@ msgstr ""
 "\n"
 "Startet den Calibre Content Server."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:45
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:47
 msgid "%sUsage%s: %s\n"
 msgstr "%sBenutzung%s: %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:89
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:91
 msgid "Created by "
 msgstr "Erstellt von "
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:90
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:92
 msgid ""
 "Whenever you pass arguments to %prog that have spaces in them, enclose the "
 "arguments in quotation marks."
@@ -7606,44 +7618,44 @@ msgstr ""
 "Wann immer Sie Argumente an %prog weitergeben, die Leerzeichen beinhalten, "
 "setzen Sie diese Argumente in Anführungsstriche."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:553
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:555
 msgid "Path to the database in which books are stored"
 msgstr "Pfad zur Datenbank in der die Bücher gespeichtert sind"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:555
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:557
 msgid "Pattern to guess metadata from filenames"
 msgstr "Verhaltensmuster zum Erraten der Metadaten aus den Dateinamen"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:557
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:559
 msgid "Access key for isbndb.com"
 msgstr "Zugangsschlüssel für isbndb.com"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:559
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:561
 msgid "Default timeout for network operations (seconds)"
 msgstr ""
 "Voreinstellung der Zeitüberschreitung bei Netzwerkverbindungen (in Sekunden)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:561
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:563
 msgid "Path to directory in which your library of books is stored"
 msgstr "Pfad zum Verzeichnis, in dem die Bibliothek gespeichert ist"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:563
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:565
 msgid "The language in which to display the user interface"
 msgstr "Sprache, in der die Benutzer-Oberfläche dargestellt wird"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:565
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:567
 msgid "The default output format for ebook conversions."
 msgstr "Das voreingestellte Ausgabeformat für eBook Konvertierungen."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:569
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:571
 msgid "Ordered list of formats to prefer for input."
 msgstr "Geordnete Liste der Formate, die bei der Eingabe bevorzugt werden."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:571
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:573
 msgid "Read metadata from files"
 msgstr "Metadaten aus Dateien lesen"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:573
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:575
 msgid "The priority of worker processes"
 msgstr "Priorität der Arbeitsaufträge"
 
@@ -9899,6 +9911,9 @@ msgstr "Zeige detailierte Ausgabeinformation. Hilfreich zur Fehlersuche."
 #~ msgid "Communicate with the Sony PRS-700 eBook reader."
 #~ msgstr "Kommunikation mit dem Sony PRS-700 eBook Reader."
 
+#~ msgid "Starting conversion of %d books"
+#~ msgstr "Starte Konvertierung von %d Büchern"
+
 #~ msgid "Catalan"
 #~ msgstr "Katalanisch"
 

src/calibre/translations/es.po

@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-29 01:20+0000\n"
+"POT-Creation-Date: 2009-10-02 05:30+0000\n"
-"PO-Revision-Date: 2009-09-29 09:37+0000\n"
+"PO-Revision-Date: 2009-10-02 08:05+0000\n"
 "Last-Translator: Jellby <Unknown>\n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-09-30 06:42+0000\n"
+"X-Launchpad-Export-Date: 2009-10-03 06:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
@@ -100,8 +100,8 @@ msgstr "No hacer nada en absoluto"
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:219
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:261
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:124
@@ -581,7 +581,7 @@ msgstr "No hay suficiente espacio libre en la tarjeta de almacenamiento"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:686
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1007
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1011
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1334
@@ -1304,7 +1304,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/fb2ml.py:122
 #: /home/kovid/work/calibre/src/calibre/ebooks/pml/pmlml.py:111
 #: /home/kovid/work/calibre/src/calibre/ebooks/rb/rbml.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:77
 msgid "Table of Contents:"
 msgstr "Índice"
 
@@ -1694,7 +1694,7 @@ msgstr "Comentarios"
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:1012
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:1072
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Tags"
 msgstr "Etiquetas"
 
@@ -1702,7 +1702,7 @@ msgstr "Etiquetas"
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:166
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:354
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Series"
 msgstr "Serie"
 
@@ -2573,27 +2573,44 @@ msgstr "Copiar al portapapeles"
 msgid "Choose Files"
 msgstr "Escoger ficheros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:53
 msgid "Searching in"
 msgstr "Buscando en"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:164
 msgid "Adding..."
 msgstr "Añadiendo..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 msgid "Searching in all sub-directories..."
 msgstr "Buscando en todos los subdirectorios..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:190
+msgid "Path error"
+msgstr "Error en la ruta"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:191
+msgid "The specified directory could not be processed."
+msgstr "El directorio especificado no se puede procesar."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+msgid "No books"
+msgstr "Sin libros"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:196
+msgid "No books found"
+msgstr "No se encontró ningún libro"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:262
 msgid "Added"
 msgstr "Añadido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:275
 msgid "Adding failed"
 msgstr "Fallo al añadir"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:276
 msgid ""
 "The add books process seems to have hung. Try restarting calibre and adding "
 "the books in smaller increments, until you find the problem book."
@@ -2602,11 +2619,11 @@ msgstr ""
 "calibre y añadir los libros en grupos más pequeños, hasta que encuentre el "
 "libro que causa el problema."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:288
 msgid "Duplicates found!"
 msgstr "¡Se han encontrado duplicados!"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:289
 msgid ""
 "Books with the same title as the following already exist in the database. "
 "Add them anyway?"
@@ -2614,15 +2631,15 @@ msgstr ""
 "Ya existen libros con el mismo titulo que los siguientes en la base de "
 "datos. ¿Añadirlos de todas formas?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:292
 msgid "Adding duplicates..."
 msgstr "Añadiendo duplicados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:406
 msgid "Saved"
 msgstr "Guardado"
 
@@ -2679,7 +2696,7 @@ msgstr "entrada"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:28
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:51
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:41
@@ -3237,7 +3254,7 @@ msgid "RB Output"
 msgstr "Salida RB"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1329
 msgid "Choose the format to view"
 msgstr "Elija el formato para visualizar"
 
@@ -3389,23 +3406,23 @@ msgstr "&Segundo nivel del Índice (expresión XPath):"
 msgid "Level &3 TOC (XPath expression):"
 msgstr "&Tercer nivel del Índice (expresión XPath):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
 msgid "Do not add &detected chapters to the Table of Contents"
 msgstr "No añadir capítulos &detectados al Índice"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
 msgid "Number of &links to add to Table of Contents"
 msgstr "Número de &enlaces para añadir al Índice"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
 msgid "Chapter &threshold"
 msgstr "&Umbral de capítulos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
 msgid "&Force use of auto-generated Table of Contents"
 msgstr "&Forzar el uso del Índice generado automáticamente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67
 msgid "TOC &Filter:"
 msgstr "Fi&ltro para el Índice:"
 
@@ -3624,10 +3641,6 @@ msgstr "Enviar un formato específico a la tarjeta de memoria A"
 msgid "Send specific format to storage card B"
 msgstr "Enviar un formato específico a la tarjeta de memoria B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
-msgid "No books"
-msgstr "Sin libros"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "selected to send"
 msgstr "elegido para enviar"
@@ -3781,7 +3794,7 @@ msgstr "Ruta"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:216
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:344
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Formats"
 msgstr "Formatos"
 
@@ -5612,7 +5625,7 @@ msgid "Save to disk in a single directory"
 msgstr "Guardar en el disco, en un único directorio"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1424
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1431
 msgid "Save only %s format to disk"
 msgstr "Guardar solamente el formato %s en disco"
 
@@ -5647,12 +5660,12 @@ msgid "Bad database location"
 msgstr "Ubicación de la base de datos incorrecta"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:428
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:478
 msgid "Calibre Library"
 msgstr "Biblioteca de calibre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:438
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1567
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1574
 msgid "Choose a location for your ebook library."
 msgstr "Elija otra ubicación para la biblioteca de libros electrónicos."
 
@@ -5849,25 +5862,29 @@ msgstr " obtenidas."
 msgid "Cannot convert"
 msgstr "No se puede convertir"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1335
+msgid "Starting conversion of %d book(s)"
+msgstr "Iniciando la conversión de %d libro(s)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "No book selected"
 msgstr "No hay libros seleccionados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1366
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1373
 msgid "Cannot view"
 msgstr "No se puede visualizar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1334
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1341
 msgid "Cannot open folder"
 msgstr "No se puede abrir la carpeta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1351
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1358
 msgid "Multiple Books Selected"
 msgstr "Varios libros seleccionados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1352
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1359
 msgid ""
 "You are attempting to open %d books. Opening too many books at once can be "
 "slow and have a negative effect on the responsiveness of your computer. Once "
@@ -5879,32 +5896,32 @@ msgstr ""
 "equipo. Una vez comenzado el proceso no puede deterse hasta que se complete. "
 "¿Desea continuar?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1374
 msgid "%s has no available formats."
 msgstr "%s no tiene formatos disponibles."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1408
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1415
 msgid "Cannot configure"
 msgstr "No se puede configurar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1409
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1416
 msgid "Cannot configure while there are running jobs."
 msgstr "No se puede configurar mientras haya tareas en ejecución."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1452
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1459
 msgid "No detailed info available"
 msgstr "No hay información detallada disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1453
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1460
 msgid "No detailed information is available for books on the device."
 msgstr ""
 "No hay información detallada disponible para los libros en el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1505
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid "Error talking to device"
 msgstr "Error de comunicación con el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1506
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1513
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -5912,12 +5929,12 @@ msgstr ""
 "Hubo un error de comunicación con el dispositivo. Desconecte y vuelva a "
 "conectar el dispositivo o reinicie la aplicación."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1547
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1554
 msgid "Conversion Error"
 msgstr "Error de conversión"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1537
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
@@ -5926,19 +5943,19 @@ msgstr ""
 "href=\"%s\">DRM</a>. Debe eliminar primero el DRM con herramientas de "
 "terceros."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1548
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1555
 msgid "<b>Failed</b>"
 msgstr "<b>Fallo</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1576
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1583
 msgid "Invalid library location"
 msgstr "Ubicación de la biblioteca no válida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1577
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1584
 msgid "Could not access %s. Using %s as the library."
 msgstr "No se puede acceder a %s. Usando %s como biblioteca."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1624
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1631
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
@@ -5947,11 +5964,11 @@ msgstr ""
 "lo encuentra útil, por favor, considere donar dinero para apoyar su "
 "desarrollo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1648
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1655
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Hay tareas activas. ¿Está seguro de que quiere salir?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1651
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1658
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -5962,11 +5979,11 @@ msgstr ""
 "de datos en el dispositivo.<br>\n"
 "                      ¿Está seguro de que desea salir?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1655
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1662
 msgid "WARNING: Active jobs"
 msgstr "AVISO: Tareas activas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1706
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1713
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -5974,7 +5991,7 @@ msgstr ""
 "continuará ejecutándose en la bandeja del sistema. Para cerrarlo, elija "
 "<b>Salir</b> en el menú de contexto de la bandeja del sistema."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1725
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1732
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -5982,11 +5999,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Última versión: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1733
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1740
 msgid "Update available"
 msgstr "Actualización disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1734
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1741
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -5996,52 +6013,52 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">nuevas "
 "características</a>. ¿Visitar la página de descarga?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1752
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1759
 msgid "Use the library located at the specified path."
 msgstr "Usar la biblioteca de la ruta especificada."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1754
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1761
 msgid "Start minimized to system tray."
 msgstr "Iniciar el programa minimizado en la bandeja del sistema"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1756
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1763
 msgid "Log debugging information to console"
 msgstr "Dirigir registro de depuración a la consola"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1758
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1765
 msgid "Do not check for updates"
 msgstr "No comprobar actualizaciones"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1806
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1813
 msgid "If you are sure it is not running"
 msgstr "Si está seguro de que no está en ejecución"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1808
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1815
 msgid "Cannot Start "
 msgstr "No se puede iniciar "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1816
 msgid "%s is already running."
 msgstr "%s ya está ejecutándose."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1812
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1819
 msgid "may be running in the system tray, in the"
 msgstr "puede estar en ejecución en la bandeja del sistema, en la"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1821
 msgid "upper right region of the screen."
 msgstr "zona superior derecha de la pantalla."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1816
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1823
 msgid "lower right region of the screen."
 msgstr "zona inferior derecha de la pantalla."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1819
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1826
 msgid "try rebooting your computer."
 msgstr "inténtelo después de reiniciar el equipo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1840
 msgid "try deleting the file"
 msgstr "pruebe a borrar el fichero"
 
@@ -6233,31 +6250,26 @@ msgstr ""
 msgid "Click to browse books by tags"
 msgstr "Pulse para explorar los libros por etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Authors"
 msgstr "Autores"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Publishers"
 msgstr "Editoriales"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
-msgid "Starting conversion of %d books"
-msgstr "Iniciando la conversión de %d libros"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:184
 msgid "Convert book %d of %d (%s)"
 msgstr "Convertir el libro %d de %d (%s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:202
 msgid "Could not convert some books"
 msgstr "No se pudieron convertir algunos libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:203
 msgid ""
 "Could not convert %d of %d books, because no suitable source format was "
 "found."
@@ -6265,27 +6277,27 @@ msgstr ""
 "No se pudieron convertir %d de %d libros, porque no se encontró ningún "
 "formato de origen adecuado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:121
 msgid "Queueing books for bulk conversion"
 msgstr "Poniendo libros en cola para conversión en bloque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:183
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:181
 msgid "Queueing "
 msgstr "Poniendo en cola "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:235
 msgid "You must set a username and password for %s"
 msgstr "Debe establecer un usuario y contraseña para %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:240
 msgid "Fetch news from "
 msgstr "Obtener noticias de "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:251
 msgid "Convert existing"
 msgstr "La conversión ya existe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:252
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -6772,7 +6784,7 @@ msgstr ""
 msgid "Could not move library"
 msgstr "No se pudo mover la biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:541
 msgid "welcome wizard"
 msgstr "asistente de bienvenida"
 
@@ -7557,15 +7569,15 @@ msgstr ""
 "\n"
 "Iniciar el servidor de contenidos de calibre."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:45
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:47
 msgid "%sUsage%s: %s\n"
 msgstr "%sUso%s: %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:89
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:91
 msgid "Created by "
 msgstr "Creado por "
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:90
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:92
 msgid ""
 "Whenever you pass arguments to %prog that have spaces in them, enclose the "
 "arguments in quotation marks."
@@ -7573,44 +7585,44 @@ msgstr ""
 "Cuando alguno de los argumentos de %prog contenga espacios, póngalo entre "
 "comillas."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:553
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:555
 msgid "Path to the database in which books are stored"
 msgstr "Ruta de la base de datos en la que se almacenan los libros"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:555
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:557
 msgid "Pattern to guess metadata from filenames"
 msgstr "Patrón para extraer metadatos de los nombres de fichero"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:557
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:559
 msgid "Access key for isbndb.com"
 msgstr "Clave de acceso a isbndb.com"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:559
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:561
 msgid "Default timeout for network operations (seconds)"
 msgstr "Tiempo de vencimiento por defecto para operaciones de red (segundos)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:561
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:563
 msgid "Path to directory in which your library of books is stored"
 msgstr "Ruta al directorio en el que está almacenada la biblioteca de libros"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:563
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:565
 msgid "The language in which to display the user interface"
 msgstr "El idioma en que se muestra la interfaz de usuario"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:565
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:567
 msgid "The default output format for ebook conversions."
 msgstr ""
 "El formato de salida por defecto de las conversiones de libros electrónicos."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:569
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:571
 msgid "Ordered list of formats to prefer for input."
 msgstr "Lista por orden de preferencia de formatos de entrada."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:571
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:573
 msgid "Read metadata from files"
 msgstr "Leer metadatos de ficheros"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:573
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:575
 msgid "The priority of worker processes"
 msgstr "La prioridad de los procesos en ejecución"
 
@@ -9674,6 +9686,9 @@ msgstr "Mostrar información de salida detallada. Útil para la depuración"
 #~ "<p>No se pudo convertir: %s<p>Es un libro con <a href=\"%s\">DRM</a>. "
 #~ "Primero debe eliminar el DRM usando herramientas de terceros."
 
+#~ msgid "Starting conversion of %d books"
+#~ msgstr "Iniciando la conversión de %d libros"
+
 #~ msgid "Vietnamese"
 #~ msgstr "Vietnamita"
 

src/calibre/translations/fr.po

@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-29 01:20+0000\n"
+"POT-Creation-Date: 2009-10-02 05:30+0000\n"
-"PO-Revision-Date: 2009-09-26 11:02+0000\n"
+"PO-Revision-Date: 2009-10-02 05:11+0000\n"
-"Last-Translator: Vincent C. <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-09-30 06:41+0000\n"
+"X-Launchpad-Export-Date: 2009-10-03 06:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
@@ -97,8 +97,8 @@ msgstr "Ne fait strictement rien"
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:219
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:261
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:124
@@ -572,7 +572,7 @@ msgstr "Espace insuffisant sur la carte mémoire"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:686
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1007
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1011
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1334
@@ -1291,7 +1291,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/fb2ml.py:122
 #: /home/kovid/work/calibre/src/calibre/ebooks/pml/pmlml.py:111
 #: /home/kovid/work/calibre/src/calibre/ebooks/rb/rbml.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:77
 msgid "Table of Contents:"
 msgstr "Tables des Matières:"
 
@@ -1683,7 +1683,7 @@ msgstr "Commentaires"
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:1012
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:1072
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Tags"
 msgstr "Etiquettes"
 
@@ -1691,7 +1691,7 @@ msgstr "Etiquettes"
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:166
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:354
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Series"
 msgstr "Séries"
 
@@ -2542,37 +2542,54 @@ msgstr "Copier dans le Presse-papiers"
 msgid "Choose Files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:53
 msgid "Searching in"
 msgstr "Recherche dans"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:164
 msgid "Adding..."
 msgstr "Ajout..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 msgid "Searching in all sub-directories..."
 msgstr "Cherche dans tous les sous-répertoires..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:190
+msgid "Path error"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:191
+msgid "The specified directory could not be processed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+msgid "No books"
+msgstr "Aucun livre"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:196
+msgid "No books found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:262
 msgid "Added"
 msgstr "Ajouté"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:275
 msgid "Adding failed"
 msgstr "L'ajout a échoué"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:276
 msgid ""
 "The add books process seems to have hung. Try restarting calibre and adding "
 "the books in smaller increments, until you find the problem book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:288
 msgid "Duplicates found!"
 msgstr "Des doublons ont été détectés !"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:289
 msgid ""
 "Books with the same title as the following already exist in the database. "
 "Add them anyway?"
@@ -2580,15 +2597,15 @@ msgstr ""
 "Des livres avec des titres identiques à ceux qui suivent existent déjà la "
 "base. Voulez-vous quand-même les ajouter ?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:292
 msgid "Adding duplicates..."
 msgstr "Ajoute les dupliqués..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Saving..."
 msgstr "Sauvegarde..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:406
 msgid "Saved"
 msgstr "Sauvegardé"
 
@@ -2645,7 +2662,7 @@ msgstr "entrée"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:28
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:51
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:41
@@ -3200,7 +3217,7 @@ msgid "RB Output"
 msgstr "Sortie RB"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1329
 msgid "Choose the format to view"
 msgstr "Choisir le format à afficher"
 
@@ -3352,23 +3369,23 @@ msgstr "Niveau &2 TDM (Expression XPath):"
 msgid "Level &3 TOC (XPath expression):"
 msgstr "Niveau &3 TDM (Expression XPath):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
 msgid "Do not add &detected chapters to the Table of Contents"
 msgstr "Ne pas ajouter les chapitres &détectés à la Table des Matières"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
 msgid "Number of &links to add to Table of Contents"
 msgstr "Nombre de &liens ajoutés à la Table des Matières"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
 msgid "Chapter &threshold"
 msgstr "Seuil de chapi&tre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
 msgid "&Force use of auto-generated Table of Contents"
 msgstr "&Forcer l'utilisation d'une Table des matières auto-générée"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67
 msgid "TOC &Filter:"
 msgstr "&Filtre TDM:"
 
@@ -3588,10 +3605,6 @@ msgstr "Envoyer le format spécifique vers la carte mémoire A"
 msgid "Send specific format to storage card B"
 msgstr "Envoyer le format spécifique vers la carte mémoire B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
-msgid "No books"
-msgstr "Aucun livre"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "selected to send"
 msgstr "sélectionné pour l'envoi"
@@ -3744,7 +3757,7 @@ msgstr "Chemin"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:216
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:344
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Formats"
 msgstr "Formats"
 
@@ -5579,7 +5592,7 @@ msgid "Save to disk in a single directory"
 msgstr "Sauvegarder sur le disque dans un seul répertoire"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1424
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1431
 msgid "Save only %s format to disk"
 msgstr "Sauvegarder seulement le format %s vers le disque"
 
@@ -5614,12 +5627,12 @@ msgid "Bad database location"
 msgstr "Mauvais emplacement pour la base"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:428
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:478
 msgid "Calibre Library"
 msgstr "Librairie calibre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:438
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1567
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1574
 msgid "Choose a location for your ebook library."
 msgstr "Choisir un emplacement pour votre librairie d'ebook"
 
@@ -5815,25 +5828,29 @@ msgstr " récupéré."
 msgid "Cannot convert"
 msgstr "Conversion impossible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1335
+msgid "Starting conversion of %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "No book selected"
 msgstr "Aucun livre sélectionné"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1366
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1373
 msgid "Cannot view"
 msgstr "Impossible de visualiser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1334
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1341
 msgid "Cannot open folder"
 msgstr "Impossible d'ouvrir le répertoire"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1351
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1358
 msgid "Multiple Books Selected"
 msgstr "Plusieurs livres sélectionnés"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1352
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1359
 msgid ""
 "You are attempting to open %d books. Opening too many books at once can be "
 "slow and have a negative effect on the responsiveness of your computer. Once "
@@ -5845,32 +5862,32 @@ msgstr ""
 "réponses de l'ordinateur. Une fois démarré le processus ne peut pas être "
 "arrêté avant la fin. Voulez-vous continuer ?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1374
 msgid "%s has no available formats."
 msgstr "%s n'a pas de format disponible."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1408
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1415
 msgid "Cannot configure"
 msgstr "Configuration impossible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1409
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1416
 msgid "Cannot configure while there are running jobs."
 msgstr "Impossible de configurer pendant que des travaux sont en cours."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1452
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1459
 msgid "No detailed info available"
 msgstr "Pas d'information détaillée disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1453
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1460
 msgid "No detailed information is available for books on the device."
 msgstr ""
 "Pas d'information détaillée disponible pour les livres dans l'appareil."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1505
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid "Error talking to device"
 msgstr "Erreur pendant la communication avec le lecteur électronique"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1506
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1513
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -5879,30 +5896,30 @@ msgstr ""
 "lecteur électronique. Veuillez déconnecter et reconnecter le lecteur "
 "électronique et redémarrer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1547
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1554
 msgid "Conversion Error"
 msgstr "Erreur lors de la conversion"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1537
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1548
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1555
 msgid "<b>Failed</b>"
 msgstr "<b>Échoué</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1576
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1583
 msgid "Invalid library location"
 msgstr "Emplacement de la librairie invalide"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1577
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1584
 msgid "Could not access %s. Using %s as the library."
 msgstr "Impossible d'accéder à %s. Utilise %s comme librairie."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1624
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1631
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
@@ -5911,11 +5928,11 @@ msgstr ""
 "Si vous le trouvez utile, pensez à donner afin de supporter son "
 "développement."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1648
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1655
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Il y a des travaux actifs. Voulez-vous vraiment finir ?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1651
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1658
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -5926,11 +5943,11 @@ msgstr ""
 "l'appareil.<br>\n"
 "                      Êtes-vous sûr de vouloir quitter ?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1655
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1662
 msgid "WARNING: Active jobs"
 msgstr "ATTENTION: Travaux actifs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1706
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1713
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -5938,7 +5955,7 @@ msgstr ""
 "continuera à tourner dans la zone de notification. Pour le fermer, choisir "
 "<b>Quitter</b> dans le menu contextuel de la zone de notification."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1725
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1732
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -5946,11 +5963,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Dernière version: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1733
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1740
 msgid "Update available"
 msgstr "Mise à jour disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1734
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1741
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -5960,52 +5977,52 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">Nouveautés</a>. "
 "Visiter la page de téléchargement ?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1752
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1759
 msgid "Use the library located at the specified path."
 msgstr "Utiliser la librairie présente dans le répertoire spécifié."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1754
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1761
 msgid "Start minimized to system tray."
 msgstr "Démarrer en mode minimisé dans la zone de notification."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1756
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1763
 msgid "Log debugging information to console"
 msgstr "Loggue les informations de débogage dans la console"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1758
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1765
 msgid "Do not check for updates"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1806
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1813
 msgid "If you are sure it is not running"
 msgstr "Si vous êtes sûr qu'il n'est pas démarré"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1808
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1815
 msgid "Cannot Start "
 msgstr "Impossible de lancer "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1816
 msgid "%s is already running."
 msgstr "%s est déjà démarré."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1812
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1819
 msgid "may be running in the system tray, in the"
 msgstr "peut être démarré dans la zone de notification, dans la"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1821
 msgid "upper right region of the screen."
 msgstr "région en haut et à droite de l'écran."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1816
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1823
 msgid "lower right region of the screen."
 msgstr "région en bas et à droite de l'écran."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1819
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1826
 msgid "try rebooting your computer."
 msgstr "Essayer de redémarrer l'ordinateur."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1840
 msgid "try deleting the file"
 msgstr "Essayer de supprimer le fichier"
 
@@ -6197,31 +6214,26 @@ msgstr ""
 msgid "Click to browse books by tags"
 msgstr "Cliquer pour naviguer dans les livres à l'aide des étiquettes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Authors"
 msgstr "Auteurs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Publishers"
 msgstr "Editeurs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
-msgid "Starting conversion of %d books"
-msgstr "Commence la conversion de %d livres"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:184
 msgid "Convert book %d of %d (%s)"
 msgstr "Convertir le livre %d / %d (%s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:202
 msgid "Could not convert some books"
 msgstr "Impossible de convertir certains livres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:203
 msgid ""
 "Could not convert %d of %d books, because no suitable source format was "
 "found."
@@ -6229,27 +6241,27 @@ msgstr ""
 "Impossible de convertir %d sur %d livres, car aucun format convenable pour "
 "la source n'a été trouvé."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:121
 msgid "Queueing books for bulk conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:183
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:181
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:235
 msgid "You must set a username and password for %s"
 msgstr "Vous devez indiquer un utilisateur et un mot de passe pour %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:240
 msgid "Fetch news from "
 msgstr "Récupérer des News de "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:251
 msgid "Convert existing"
 msgstr "Conversion existante"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:252
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -6741,7 +6753,7 @@ msgstr ""
 msgid "Could not move library"
 msgstr "Impossible de déplacer la librairie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:541
 msgid "welcome wizard"
 msgstr "assistant de bienvenue"
 
@@ -7520,15 +7532,15 @@ msgstr ""
 "\n"
 "Démarre le serveur de contenu calibre"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:45
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:47
 msgid "%sUsage%s: %s\n"
 msgstr "%sUsage%s: %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:89
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:91
 msgid "Created by "
 msgstr "Créé par "
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:90
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:92
 msgid ""
 "Whenever you pass arguments to %prog that have spaces in them, enclose the "
 "arguments in quotation marks."
@@ -7536,44 +7548,44 @@ msgstr ""
 "Chaque fois que vous passez des arguments comportant des espaces à %prog ,  "
 "entourer l'argument à l'aide de guillemets."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:553
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:555
 msgid "Path to the database in which books are stored"
 msgstr "Répertoire de la base dans laquelle les livres sont stockés"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:555
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:557
 msgid "Pattern to guess metadata from filenames"
 msgstr "Modèle de détection de métadonnées à partir de noms de fichiers."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:557
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:559
 msgid "Access key for isbndb.com"
 msgstr "Clef d'accès pour isbndb.com"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:559
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:561
 msgid "Default timeout for network operations (seconds)"
 msgstr "Timeout par défaut pour les opérations réseaux (en secondes)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:561
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:563
 msgid "Path to directory in which your library of books is stored"
 msgstr ""
 "Chemin vers le répertoire où est enregistrée votre librairie de livres"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:563
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:565
 msgid "The language in which to display the user interface"
 msgstr "Langue utilisée pour l'affichage de l'interface utilisateur"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:565
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:567
 msgid "The default output format for ebook conversions."
 msgstr "Le format de sortie par défaut pour les conversions d'ebook."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:569
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:571
 msgid "Ordered list of formats to prefer for input."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:571
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:573
 msgid "Read metadata from files"
 msgstr "Lire les métadonnées à partir des fichiers"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:573
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:575
 msgid "The priority of worker processes"
 msgstr "Priorité du processus de travail"
 
@@ -9777,6 +9789,9 @@ msgstr "Affiche des informations détaillées. Utile pour le débogage"
 #~ msgid "Portuguese"
 #~ msgstr "Portugais"
 
+#~ msgid "Starting conversion of %d books"
+#~ msgstr "Commence la conversion de %d livres"
+
 #~ msgid "Catalan"
 #~ msgstr "Catalan"
 

src/calibre/translations/hr.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-09-29 01:20+0000\n"
+"POT-Creation-Date: 2009-10-02 05:30+0000\n"
-"PO-Revision-Date: 2009-09-29 23:18+0000\n"
+"PO-Revision-Date: 2009-10-05 00:35+0000\n"
 "Last-Translator: Miro Glavić <glavicmiro@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-09-30 06:42+0000\n"
+"X-Launchpad-Export-Date: 2009-10-05 06:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
@@ -97,8 +97,8 @@ msgstr "Uopće ne funkcionira"
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:219
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:261
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:124
@@ -575,7 +575,7 @@ msgstr "Memorijska kartica nema dovoljno slobodnog prostora"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:686
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1007
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1011
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1334
@@ -1284,7 +1284,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/fb2ml.py:122
 #: /home/kovid/work/calibre/src/calibre/ebooks/pml/pmlml.py:111
 #: /home/kovid/work/calibre/src/calibre/ebooks/rb/rbml.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:77
 msgid "Table of Contents:"
 msgstr "Sadržaj"
 
@@ -1671,7 +1671,7 @@ msgstr "Komentari"
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:1012
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:1072
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Tags"
 msgstr "Tagovi"
 
@@ -1679,7 +1679,7 @@ msgstr "Tagovi"
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:166
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:354
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Series"
 msgstr "Serije"
 
@@ -2535,27 +2535,44 @@ msgstr "Kopiraj u međuspremnik"
 msgid "Choose Files"
 msgstr "Odaberi Daoteke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:53
 msgid "Searching in"
 msgstr "Pretraživanje u"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:164
 msgid "Adding..."
 msgstr "Dodavanje..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 msgid "Searching in all sub-directories..."
 msgstr "Pretraživanje u svim pod-direktorijima..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:190
+msgid "Path error"
+msgstr "Greška u putu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:191
+msgid "The specified directory could not be processed."
+msgstr "Specificirani direktorij nije mogao biti procesiran."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+msgid "No books"
+msgstr "Nema knjiga"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:196
+msgid "No books found"
+msgstr "Nema pronađenih knjiga"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:262
 msgid "Added"
 msgstr "Dodano"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:275
 msgid "Adding failed"
 msgstr "Neuspjelo dodavanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:276
 msgid ""
 "The add books process seems to have hung. Try restarting calibre and adding "
 "the books in smaller increments, until you find the problem book."
@@ -2563,11 +2580,11 @@ msgstr ""
 "Proces dodavanja knjiga je zaustavljen. Probajte ponovo pokrenuti calibre i "
 "dodavati knjige u manjim količinama dok ne pronađete problematičnu knjigu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:288
 msgid "Duplicates found!"
 msgstr "Pronađeni duplikati!"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:289
 msgid ""
 "Books with the same title as the following already exist in the database. "
 "Add them anyway?"
@@ -2575,15 +2592,15 @@ msgstr ""
 "Knjige sa naslovom identičnim slijedećim već postoje u bazi podataka. Dodaj "
 "ih, bez obzira?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:292
 msgid "Adding duplicates..."
 msgstr "Dodavanje duplikata..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Saving..."
 msgstr "Spremanje..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:406
 msgid "Saved"
 msgstr "Spremljeno"
 
@@ -2640,7 +2657,7 @@ msgstr "unos"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:28
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:51
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:41
@@ -3197,7 +3214,7 @@ msgid "RB Output"
 msgstr "RB Izlaz"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1329
 msgid "Choose the format to view"
 msgstr "Odaberi format za pregled"
 
@@ -3345,23 +3362,23 @@ msgstr "Nivo &2 TOC (XPath izraz):"
 msgid "Level &3 TOC (XPath expression):"
 msgstr "Nivo &3 TOC (XPath izraz):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
 msgid "Do not add &detected chapters to the Table of Contents"
 msgstr "Ne dodavaj &otkrivena poglavlja u Sadržaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
 msgid "Number of &links to add to Table of Contents"
 msgstr "Broj &veza za dodati u Sadržaj"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
 msgid "Chapter &threshold"
 msgstr "&Početak poglavlja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
 msgid "&Force use of auto-generated Table of Contents"
 msgstr "&Prisili korištenje auto-generiranog Sadržaja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67
 msgid "TOC &Filter:"
 msgstr "TOC &Filter:"
 
@@ -3580,10 +3597,6 @@ msgstr "Pošalji specifični format na memorijsku karticu A"
 msgid "Send specific format to storage card B"
 msgstr "Pošalji specifični format na memorijsku karticu B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
-msgid "No books"
-msgstr "Nema knjiga"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "selected to send"
 msgstr "odabrano za slanje"
@@ -3729,7 +3742,7 @@ msgstr "Put"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:216
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:344
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Formats"
 msgstr "Formati"
 
@@ -5534,7 +5547,7 @@ msgid "Save to disk in a single directory"
 msgstr "Spremi na disk u zajednički direktorij."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1424
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1431
 msgid "Save only %s format to disk"
 msgstr "Pohrani samo %s format na disk"
 
@@ -5569,12 +5582,12 @@ msgid "Bad database location"
 msgstr "Loša lokacija baze podataka"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:428
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:478
 msgid "Calibre Library"
 msgstr "Calibre Biblioteka"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:438
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1567
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1574
 msgid "Choose a location for your ebook library."
 msgstr "Odaberi lokaciju za vašu e-book biblioteku"
 
@@ -5769,25 +5782,29 @@ msgstr " pribavlljeno."
 msgid "Cannot convert"
 msgstr "Nemoguće pretvoriti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1335
+msgid "Starting conversion of %d book(s)"
+msgstr "Pokretanje konverzije %d knjige(a)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "No book selected"
 msgstr "Niste odabrali knjigu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1366
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1373
 msgid "Cannot view"
 msgstr "Nemoguć pregled"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1334
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1341
 msgid "Cannot open folder"
 msgstr "Nemoguće otvoriti mapu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1351
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1358
 msgid "Multiple Books Selected"
 msgstr "Odabrano Više Knjiga"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1352
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1359
 msgid ""
 "You are attempting to open %d books. Opening too many books at once can be "
 "slow and have a negative effect on the responsiveness of your computer. Once "
@@ -5799,31 +5816,31 @@ msgstr ""
 "započet, ovaj proces se ne može zustaviti dok se ne završi. Da li želite "
 "nastaviti?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1374
 msgid "%s has no available formats."
 msgstr "%s nema raspoložive formate."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1408
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1415
 msgid "Cannot configure"
 msgstr "Nemoguće konfigurirati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1409
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1416
 msgid "Cannot configure while there are running jobs."
 msgstr "Nemoguće konfigurirati dok postoje aktivni poslovi."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1452
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1459
 msgid "No detailed info available"
 msgstr "Detaljni podaci nisu raspoloživi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1453
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1460
 msgid "No detailed information is available for books on the device."
 msgstr "Detaljni podaci nisu raspoloživi za knjige na uređaju."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1505
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid "Error talking to device"
 msgstr "Greška u razgovoru sa uređajem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1506
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1513
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -5831,12 +5848,12 @@ msgstr ""
 "Došlo je do privremene greške u komunikaciji sa uređajem. Molimo islkjučite "
 "i ponovo priključite uređaj ili kompletno ponovo pokrenite sustav."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1547
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1554
 msgid "Conversion Error"
 msgstr "Greška u Pretvorbi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1537
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
@@ -5844,19 +5861,19 @@ msgstr ""
 "<p>Nemoguće pretvoriti: %s<p>Ovo je <a href=\"%s\">DRM</a>knjiga. Prvo "
 "morate ukloniti DRM koristeći alate drugih dobavljača."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1548
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1555
 msgid "<b>Failed</b>"
 msgstr "<b>Neuspjelo</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1576
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1583
 msgid "Invalid library location"
 msgstr "Nevažeća lokacija biblioteke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1577
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1584
 msgid "Could not access %s. Using %s as the library."
 msgstr "Nemoguć pristup do %s. Korištenje %s kao biblioteke."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1624
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1631
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
@@ -5864,11 +5881,11 @@ msgstr ""
 "je rezultat napora brojnih volontera iz cijelog svijeta. Ako smatrate da je "
 "koristan, molimo razmislite o donaciji za podršku razvoju ovog projekta."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1648
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1655
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Imate aktivne poslove. Jeste li sigurni da hoćete prekinuti?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1651
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1658
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -5878,11 +5895,11 @@ msgstr ""
 "                      Prekid može prouzrokovati korupciju uređaja.<br>\n"
 "                      Jeste li sigurni da hoćete da prekinete?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1655
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1662
 msgid "WARNING: Active jobs"
 msgstr "UPOZORENJE: Aktivni poslovi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1706
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1713
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -5890,7 +5907,7 @@ msgstr ""
 "će nastaviti biti aktivan u sustavnom poslužavniku. Da zatvorite, odaberite "
 "<b>Prekini</b> u sadržajnom izborniku sustavnog poslužavnika."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1725
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1732
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -5898,11 +5915,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Posljednja inačica: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1733
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1740
 msgid "Update available"
 msgstr "Obnova raspoloživa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1734
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1741
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -5912,52 +5929,52 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">nove značajke</a>. "
 "Posjetite stranicu za skidanje."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1752
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1759
 msgid "Use the library located at the specified path."
 msgstr "Koristi biblioteku lociranu na specificiranom putu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1754
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1761
 msgid "Start minimized to system tray."
 msgstr "Pokretanje minimizirano na sustavni poslužavnik."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1756
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1763
 msgid "Log debugging information to console"
 msgstr "Ubilježi informacije o uklanjanju grašaka u konzolu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1758
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1765
 msgid "Do not check for updates"
 msgstr "Ne provjeravaj osvježenja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1806
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1813
 msgid "If you are sure it is not running"
 msgstr "Ako si siguran da nije aktivan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1808
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1815
 msgid "Cannot Start "
 msgstr "Ne može Krenuti "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1816
 msgid "%s is already running."
 msgstr "%s je već aktivan."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1812
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1819
 msgid "may be running in the system tray, in the"
 msgstr "možda funkcionira u sustavnom poslužavniku, u"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1821
 msgid "upper right region of the screen."
 msgstr "gornji desni dio zaslona."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1816
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1823
 msgid "lower right region of the screen."
 msgstr "donji desni dio zaslona."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1819
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1826
 msgid "try rebooting your computer."
 msgstr "probaj ponovo startati svoje računalo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1840
 msgid "try deleting the file"
 msgstr "probaj obrisati datoteku."
 
@@ -6147,31 +6164,26 @@ msgstr ""
 msgid "Click to browse books by tags"
 msgstr "Klikni da pretražiš knjige po tagovima"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Authors"
 msgstr "Autori"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Publishers"
 msgstr "Izdavači"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
-msgid "Starting conversion of %d books"
-msgstr "Početak konverzije %d knjiga"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:184
 msgid "Convert book %d of %d (%s)"
 msgstr "Pretvori knjigu %d od %d (%s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:202
 msgid "Could not convert some books"
 msgstr "Nemoguće pretvoriti neke knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:203
 msgid ""
 "Could not convert %d of %d books, because no suitable source format was "
 "found."
@@ -6179,27 +6191,27 @@ msgstr ""
 "Nije moguće konvertirati %d od %d knjige, jer odgovarajući izvorni format "
 "nije pronađen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:121
 msgid "Queueing books for bulk conversion"
 msgstr "Redoslijed knjiga za masovnu konverziju"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:183
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:181
 msgid "Queueing "
 msgstr "Redoslijed "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:235
 msgid "You must set a username and password for %s"
 msgstr "Morate postaviti korisničko ime i lozinku za %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:240
 msgid "Fetch news from "
 msgstr "Dograbi vijesti od "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:251
 msgid "Convert existing"
 msgstr "Pretvori postojeće"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:252
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -6686,7 +6698,7 @@ msgstr ""
 msgid "Could not move library"
 msgstr "Nije moguće premjestiti biblioteku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:541
 msgid "welcome wizard"
 msgstr "asistent dobrodošlice"
 
@@ -7451,15 +7463,15 @@ msgstr ""
 "\n"
 "Pokreni calibre sadržajni poslužitelj."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:45
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:47
 msgid "%sUsage%s: %s\n"
 msgstr "%sUsage%s: %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:89
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:91
 msgid "Created by "
 msgstr "Kreirao "
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:90
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:92
 msgid ""
 "Whenever you pass arguments to %prog that have spaces in them, enclose the "
 "arguments in quotation marks."
@@ -7467,43 +7479,43 @@ msgstr ""
 "Kod slanja argumenata na %prog koji u sebi imaju razmake, zatvorite "
 "argumente u znake navoda."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:553
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:555
 msgid "Path to the database in which books are stored"
 msgstr "Put do baze podataka u kojoj su knjige pohranjene"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:555
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:557
 msgid "Pattern to guess metadata from filenames"
 msgstr "Predložak za pogoditi metapodatak iza imena datoteka"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:557
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:559
 msgid "Access key for isbndb.com"
 msgstr "Pristupni ključ za isbndb.com"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:559
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:561
 msgid "Default timeout for network operations (seconds)"
 msgstr "Zadana pauza za mrežne zahvate  (sekunde)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:561
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:563
 msgid "Path to directory in which your library of books is stored"
 msgstr "Put do direktorija u kojem je pohranjena vaša biblioteke knjiga ."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:563
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:565
 msgid "The language in which to display the user interface"
 msgstr "Jezik u kojem izložiti korisničko sučelje"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:565
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:567
 msgid "The default output format for ebook conversions."
 msgstr "Zadani izlazni format za pretvorbu elektroničkih knjiga."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:569
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:571
 msgid "Ordered list of formats to prefer for input."
 msgstr "Poredana lista formata za preferirani ulaz."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:571
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:573
 msgid "Read metadata from files"
 msgstr "Čitaj metapodatke iz datoteka"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:573
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:575
 msgid "The priority of worker processes"
 msgstr "Prioriteti radnih procesa"
 
@@ -9701,6 +9713,9 @@ msgstr "Prikaži detaljne izlazne podatke. Korisno kod otkrivanja grešaka."
 #~ msgid "Portuguese"
 #~ msgstr "Portugalski"
 
+#~ msgid "Starting conversion of %d books"
+#~ msgstr "Početak konverzije %d knjiga"
+
 #~ msgid "Catalan"
 #~ msgstr "Katalanski"
 

src/calibre/translations/hu.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-09-29 01:20+0000\n"
+"POT-Creation-Date: 2009-10-02 05:30+0000\n"
-"PO-Revision-Date: 2009-09-25 09:10+0000\n"
+"PO-Revision-Date: 2009-10-06 05:46+0000\n"
-"Last-Translator: Muszela Balázs <bazsi86@gmail.com>\n"
+"Last-Translator: Devilinside <Unknown>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-09-30 06:41+0000\n"
+"X-Launchpad-Export-Date: 2009-10-07 06:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
@@ -97,8 +97,8 @@ msgstr "Semmit nem csinál"
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:219
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:261
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:124
@@ -573,7 +573,7 @@ msgstr "Nincs elég hely a memóriakártyán."
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:686
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1007
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1011
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1334
@@ -1276,7 +1276,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/fb2ml.py:122
 #: /home/kovid/work/calibre/src/calibre/ebooks/pml/pmlml.py:111
 #: /home/kovid/work/calibre/src/calibre/ebooks/rb/rbml.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:77
 msgid "Table of Contents:"
 msgstr "Tartalomjegyzék:"
 
@@ -1662,7 +1662,7 @@ msgstr "Megjegyzés"
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:1012
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:1072
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Tags"
 msgstr "Címkék"
 
@@ -1670,7 +1670,7 @@ msgstr "Címkék"
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:166
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:354
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Series"
 msgstr "Sorozatok"
 
@@ -2519,27 +2519,44 @@ msgstr "Másolás a vágólapra"
 msgid "Choose Files"
 msgstr "Válasszon a fájlok közül"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:53
 msgid "Searching in"
 msgstr "Keresés a következőben:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:164
 msgid "Adding..."
 msgstr "Hozzáadás..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 msgid "Searching in all sub-directories..."
 msgstr "Keresés minden almappában..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:190
+msgid "Path error"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:191
+msgid "The specified directory could not be processed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+msgid "No books"
+msgstr "Nincsenek könyvek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:196
+msgid "No books found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:262
 msgid "Added"
 msgstr "Hozzáadva"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:275
 msgid "Adding failed"
 msgstr "A hozzáadás nem sikerült"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:276
 msgid ""
 "The add books process seems to have hung. Try restarting calibre and adding "
 "the books in smaller increments, until you find the problem book."
@@ -2547,26 +2564,26 @@ msgstr ""
 "Probléma történt a könyvek hozzáadása közben. Indítsa újra a calibre-t és "
 "válasszon ki kevesebbet, amíg meg nem találja a problémát okozó könyvet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:288
 msgid "Duplicates found!"
 msgstr "Már létezik egy ilyen példány!"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:289
 msgid ""
 "Books with the same title as the following already exist in the database. "
 "Add them anyway?"
 msgstr ""
 "Ugyanezzel a címmel már létezik egy könyv az adatbázisban. Mégis hozzáadja?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:292
 msgid "Adding duplicates..."
 msgstr "Duplikációk hozzáadása..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Saving..."
 msgstr "Mentés..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:406
 msgid "Saved"
 msgstr "Elmentve"
 
@@ -2623,7 +2640,7 @@ msgstr "bemenet"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:28
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:51
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:41
@@ -3177,7 +3194,7 @@ msgid "RB Output"
 msgstr "RB kimenet"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1329
 msgid "Choose the format to view"
 msgstr "Válassza ki a kívánt formátumot olvasásra"
 
@@ -3324,23 +3341,23 @@ msgstr "Tartalomjegyzék 2. szintje (XPath kifejezés):"
 msgid "Level &3 TOC (XPath expression):"
 msgstr "Tartalomjegyzék 3. szintje (XPath kifejezés):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
 msgid "Do not add &detected chapters to the Table of Contents"
 msgstr "A felismert fejezeteket ne adja a Tartalomjegyzékhez"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
 msgid "Number of &links to add to Table of Contents"
 msgstr "A Tartalomjegyzékhez adandó linkek száma"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
 msgid "Chapter &threshold"
 msgstr "Fejezet határérték"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
 msgid "&Force use of auto-generated Table of Contents"
 msgstr "Mindenképpen az automatikusan generált Tartalomjegyzék használata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67
 msgid "TOC &Filter:"
 msgstr "Tartalomjegyzék szűrő:"
 
@@ -3558,10 +3575,6 @@ msgstr "A meghatározott formátum küldése az 'A' memóriakártyára"
 msgid "Send specific format to storage card B"
 msgstr "A meghatározott formátum küldése a 'B' memóriakártyára"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
-msgid "No books"
-msgstr "Nincsenek könyvek"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "selected to send"
 msgstr "kiválasztva küldéshez"
@@ -3713,7 +3726,7 @@ msgstr "Elérési út"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:216
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:344
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Formats"
 msgstr "Formátumok"
 
@@ -4643,7 +4656,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:380
 msgid "&Date:"
-msgstr ""
+msgstr "&Dátum:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:381
 msgid "&Comments"
@@ -5522,7 +5535,7 @@ msgid "Save to disk in a single directory"
 msgstr "Mentés lemezre egy mappába"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1424
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1431
 msgid "Save only %s format to disk"
 msgstr "Csak a(z) %s formátum mentése a lemezre"
 
@@ -5557,12 +5570,12 @@ msgid "Bad database location"
 msgstr "Hibás adatbázis elérési útvonal"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:428
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:478
 msgid "Calibre Library"
 msgstr "Calibre Library"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:438
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1567
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1574
 msgid "Choose a location for your ebook library."
 msgstr "Válasszon elérési utat az adatbázisod számára"
 
@@ -5758,25 +5771,29 @@ msgstr " letöltve"
 msgid "Cannot convert"
 msgstr "Nem lehet konvertálni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1335
+msgid "Starting conversion of %d book(s)"
+msgstr "%d könyv konvertálása"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "No book selected"
 msgstr "Nincs könyv kiválasztva"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1366
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1373
 msgid "Cannot view"
 msgstr "Nem lehet a könyvet olvasni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1334
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1341
 msgid "Cannot open folder"
 msgstr "A mappát nem lehet megnyitni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1351
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1358
 msgid "Multiple Books Selected"
 msgstr "Több könyv is ki van választva"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1352
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1359
 msgid ""
 "You are attempting to open %d books. Opening too many books at once can be "
 "slow and have a negative effect on the responsiveness of your computer. Once "
@@ -5787,31 +5804,31 @@ msgstr ""
 "lelassíthatja a gépedet. Ha a művelet elindult, már nem lehet leállítani. "
 "Biztosan folytatja?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1374
 msgid "%s has no available formats."
 msgstr "Nincs elérhető formátum a következőhöz: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1408
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1415
 msgid "Cannot configure"
 msgstr "Beállítás nem lehetséges"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1409
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1416
 msgid "Cannot configure while there are running jobs."
 msgstr "Művelet végrehajtása közben nem lehet a beállításokat változtatni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1452
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1459
 msgid "No detailed info available"
 msgstr "Nincs részletes információ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1453
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1460
 msgid "No detailed information is available for books on the device."
 msgstr "A könyvekhez nincsenek részletes információk az eszközön."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1505
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid "Error talking to device"
 msgstr "Hiba a kapcsolatban"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1506
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1513
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -5819,12 +5836,12 @@ msgstr ""
 "Hiba az eszközkapcsolatban. Válassza le majd csatlakoztassa újra az eszközt "
 "és/vagy indítssa újra az eszközt, esetleg a programot."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1547
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1554
 msgid "Conversion Error"
 msgstr "Konvertálási hiba"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1537
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
@@ -5834,19 +5851,19 @@ msgstr ""
 "egy külső program segítségével a DRM-et (Digital Rights Management) el kell "
 "távolítania."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1548
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1555
 msgid "<b>Failed</b>"
 msgstr "<b>Nem sikerült</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1576
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1583
 msgid "Invalid library location"
 msgstr "Érvénytelen adatbázis elérési útvonal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1577
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1584
 msgid "Could not access %s. Using %s as the library."
 msgstr "Nem elérhető: %s. Helyette %s lesz az adatbázis."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1624
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1631
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
@@ -5854,11 +5871,11 @@ msgstr ""
 "sok önkéntes erőfeszítéseinek eredménye a világ minden tájáról. Ha "
 "hasznosnak találja, kérem, támogassa a fejlesztést."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1648
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1655
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Folyamatban van néhány művelet végrehajtása. Megszakítja?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1651
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1658
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -5868,11 +5885,11 @@ msgstr ""
 "                      A kilépés adatvesztést okozhat az eszközön.<br>\n"
 "                      Biztos, hogy ki akarsz lépni??"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1655
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1662
 msgid "WARNING: Active jobs"
 msgstr "FIGYELEM: Aktív műveletek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1706
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1713
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -5880,7 +5897,7 @@ msgstr ""
 "tovább fut a tálcán. A bezáráshoz válassza a <b>Kilépést</b> a tálcaikon "
 "menüjéből."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1725
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1732
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -5888,11 +5905,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Legújabb verzió: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1733
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1740
 msgid "Update available"
 msgstr "Frissítés elérhető"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1734
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1741
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -5902,52 +5919,52 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Letöltő oldal meglátogatása?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1752
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1759
 msgid "Use the library located at the specified path."
 msgstr "A megadott elérési úton lévő adatbázis használata."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1754
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1761
 msgid "Start minimized to system tray."
 msgstr "A tálcára összecsukott állapotban induljon"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1756
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1763
 msgid "Log debugging information to console"
 msgstr "HIbakeresési információk megjelenítése a konzolon"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1758
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1765
 msgid "Do not check for updates"
 msgstr "Ne ellenőrizze a frissítéseket"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1806
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1813
 msgid "If you are sure it is not running"
 msgstr "Ha biztos benne, hogy nem fut"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1808
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1815
 msgid "Cannot Start "
 msgstr "Indítás nem lehetséges "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1816
 msgid "%s is already running."
 msgstr "%s már fut."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1812
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1819
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1821
 msgid "upper right region of the screen."
 msgstr "a képernyő jobb felső sarka."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1816
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1823
 msgid "lower right region of the screen."
 msgstr "a képernyő jobb alsó részén."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1819
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1826
 msgid "try rebooting your computer."
 msgstr "próblja meg újraindítani a számítógépet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1840
 msgid "try deleting the file"
 msgstr ""
 
@@ -6138,59 +6155,54 @@ msgstr ""
 msgid "Click to browse books by tags"
 msgstr "Könyvek böngészése a címkék szerint"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Authors"
 msgstr "Szerzők"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Publishers"
 msgstr "Kiadók"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
-msgid "Starting conversion of %d books"
-msgstr "%d könyv konvertálásának megkezdése"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:184
 msgid "Convert book %d of %d (%s)"
 msgstr "Könykonvertálás %d  / %d (%s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:202
 msgid "Could not convert some books"
 msgstr "Néhány könyvet nem sikerült konvertálni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:203
 msgid ""
 "Could not convert %d of %d books, because no suitable source format was "
 "found."
 msgstr ""
 "Nem lehet %d / %d könyvet konvertálni, mert nincs megfelelő formátumú."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:121
 msgid "Queueing books for bulk conversion"
-msgstr ""
+msgstr "Könyvek sorbaállítása csoportos konvertáláshoz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:183
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:181
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:235
 msgid "You must set a username and password for %s"
 msgstr ""
 "Meg kell adnia egy Felhasználónevet és egy Jelszót a következőhöz: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:240
 msgid "Fetch news from "
 msgstr "Hírek letöltése a következő helyről: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:251
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:252
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -6677,7 +6689,7 @@ msgstr ""
 msgid "Could not move library"
 msgstr "Nem lehet áthelyezni az adatbázist"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:541
 msgid "welcome wizard"
 msgstr "beállítás varázsló"
 
@@ -7392,15 +7404,15 @@ msgstr ""
 "\n"
 "A 'calibre' tartalom kiszolgáló indítása."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:45
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:47
 msgid "%sUsage%s: %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:89
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:91
 msgid "Created by "
 msgstr "Készítette: "
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:90
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:92
 msgid ""
 "Whenever you pass arguments to %prog that have spaces in them, enclose the "
 "arguments in quotation marks."
@@ -7408,43 +7420,43 @@ msgstr ""
 "Ha szóközöket tartalmazó paramétereket ad meg %prog-nak, akkor a paraméterek "
 "idézőjelek között legyenek."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:553
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:555
 msgid "Path to the database in which books are stored"
 msgstr "A könyveket tartalmazó adatbázis elérési útja"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:555
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:557
 msgid "Pattern to guess metadata from filenames"
 msgstr "Minta a metaadatok kinyerésére a fájlnévből"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:557
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:559
 msgid "Access key for isbndb.com"
 msgstr "Felhasználói kulcs az isbndb.com-hoz:"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:559
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:561
 msgid "Default timeout for network operations (seconds)"
 msgstr "Alap időtúllépés a hálózati műveletekhez (másodpercben)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:561
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:563
 msgid "Path to directory in which your library of books is stored"
 msgstr "A könyveket tartalmazó adatbázisfájl mappájának elérési útja"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:563
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:565
 msgid "The language in which to display the user interface"
 msgstr "A felhasználói felület nyelve:"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:565
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:567
 msgid "The default output format for ebook conversions."
 msgstr "Az ebook konvertálás alapértelmezett kimeneti formátuma."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:569
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:571
 msgid "Ordered list of formats to prefer for input."
 msgstr "A bementi formátum listája preferált sorrendben"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:571
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:573
 msgid "Read metadata from files"
 msgstr "Metaadatok olvasása a fájlokból"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:573
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:575
 msgid "The priority of worker processes"
 msgstr "Műveletek prioritási sorrendje"
 
@@ -8595,6 +8607,9 @@ msgstr ""
 #~ msgid "Communicate with the Sony PRS-700 eBook reader."
 #~ msgstr "Kapcsolódás Sony PRS-700 olvasóhoz"
 
+#~ msgid "Starting conversion of %d books"
+#~ msgstr "%d könyv konvertálásának megkezdése"
+
 #~ msgid "Frequently used directories"
 #~ msgstr "Leggyakrabban használt mappák"
 

src/calibre/translations/it.po

@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre_calibre-it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-29 01:20+0000\n"
+"POT-Creation-Date: 2009-10-02 05:30+0000\n"
-"PO-Revision-Date: 2009-09-28 07:20+0000\n"
+"PO-Revision-Date: 2009-10-02 21:23+0000\n"
-"Last-Translator: Kovid Goyal <Unknown>\n"
+"Last-Translator: Filippo <pippo75@alice.it>\n"
 "Language-Team: italiano\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-09-30 06:41+0000\n"
+"X-Launchpad-Export-Date: 2009-10-03 06:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
@@ -99,8 +99,8 @@ msgstr "Non fa assolutamente niente"
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:219
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:261
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:124
@@ -213,11 +213,11 @@ msgstr "Organizza i metadati in %s file"
 
 #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:298
 msgid "Set metadata from %s files"
-msgstr ""
+msgstr "imposta metadati da %s file"
 
 #: /home/kovid/work/calibre/src/calibre/customize/conversion.py:99
 msgid "Conversion Input"
-msgstr ""
+msgstr "Input per la conversione"
 
 #: /home/kovid/work/calibre/src/calibre/customize/conversion.py:122
 msgid ""
@@ -303,6 +303,9 @@ msgid ""
 "produce a document intended to be read at a computer or on a range of "
 "devices."
 msgstr ""
+"Questo profilo cerca di fornire adeguate impostazioni ed è utile se vuoi "
+"produrre un documento che dovrebbe essere letto tramite computer o su vari "
+"dispositivi"
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
 msgid "This profile is intended for the 5-inch JetBook."
@@ -558,7 +561,7 @@ msgstr "Non c'è spazio sufficiente nella scheda di memoria"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:686
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1007
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1011
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1334
@@ -1144,7 +1147,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/fb2ml.py:122
 #: /home/kovid/work/calibre/src/calibre/ebooks/pml/pmlml.py:111
 #: /home/kovid/work/calibre/src/calibre/ebooks/rb/rbml.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:77
 msgid "Table of Contents:"
 msgstr ""
 
@@ -1527,7 +1530,7 @@ msgstr "Commenti"
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:1012
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:1072
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Tags"
 msgstr "Tag"
 
@@ -1535,7 +1538,7 @@ msgstr "Tag"
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:166
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:354
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Series"
 msgstr "Serie"
 
@@ -2277,51 +2280,68 @@ msgstr ""
 msgid "Choose Files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:53
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:164
 msgid "Adding..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 msgid "Searching in all sub-directories..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:190
+msgid "Path error"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:191
+msgid "The specified directory could not be processed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+msgid "No books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:196
+msgid "No books found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:262
 msgid "Added"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:275
 msgid "Adding failed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:276
 msgid ""
 "The add books process seems to have hung. Try restarting calibre and adding "
 "the books in smaller increments, until you find the problem book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:288
 msgid "Duplicates found!"
 msgstr "Scoperti duplicati!"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:289
 msgid ""
 "Books with the same title as the following already exist in the database. "
 "Add them anyway?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:292
 msgid "Adding duplicates..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Saving..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:406
 msgid "Saved"
 msgstr ""
 
@@ -2378,7 +2398,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:28
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:51
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:41
@@ -2928,7 +2948,7 @@ msgid "RB Output"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1329
 msgid "Choose the format to view"
 msgstr "Scegliere il formato da leggere"
 
@@ -3072,23 +3092,23 @@ msgstr ""
 msgid "Level &3 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
 msgid "Do not add &detected chapters to the Table of Contents"
 msgstr "N&on aggiungere al sommario i capitoli autorilevati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
 msgid "Number of &links to add to Table of Contents"
 msgstr "N&umero di link da aggiungere al sommario"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
 msgid "Chapter &threshold"
 msgstr "I&nizio capitolo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
 msgid "&Force use of auto-generated Table of Contents"
 msgstr "&Forzare l'uso del sommario autogenerato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67
 msgid "TOC &Filter:"
 msgstr ""
 
@@ -3296,10 +3316,6 @@ msgstr ""
 msgid "Send specific format to storage card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
-msgid "No books"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "selected to send"
 msgstr ""
@@ -3442,7 +3458,7 @@ msgstr "Percorso"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:216
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:344
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Formats"
 msgstr "Formati"
 
@@ -5185,7 +5201,7 @@ msgid "Save to disk in a single directory"
 msgstr "Salva su disco in una singola cartella"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1424
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1431
 msgid "Save only %s format to disk"
 msgstr "Salva sul disco solo il formato %s"
 
@@ -5220,12 +5236,12 @@ msgid "Bad database location"
 msgstr "Percorso del database sbagliato"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:428
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:478
 msgid "Calibre Library"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:438
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1567
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1574
 msgid "Choose a location for your ebook library."
 msgstr "Scegliere un percorso per la propria biblioteca."
 
@@ -5419,25 +5435,29 @@ msgstr " preso."
 msgid "Cannot convert"
 msgstr "Impossibile convertire"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1335
+msgid "Starting conversion of %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "No book selected"
 msgstr "Nessun libro selezionato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1366
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1373
 msgid "Cannot view"
 msgstr "Impossibile leggere"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1334
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1341
 msgid "Cannot open folder"
 msgstr "Impossibile aprire la cartella"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1351
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1358
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1352
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1359
 msgid ""
 "You are attempting to open %d books. Opening too many books at once can be "
 "slow and have a negative effect on the responsiveness of your computer. Once "
@@ -5445,33 +5465,33 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1374
 msgid "%s has no available formats."
 msgstr "%s non ha formati disponibili"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1408
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1415
 msgid "Cannot configure"
 msgstr "Impossibile configurare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1409
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1416
 msgid "Cannot configure while there are running jobs."
 msgstr "Impossibile configurare mentre ci sono lavori in esecuzione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1452
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1459
 msgid "No detailed info available"
 msgstr "Nessuna informazione dettagliata disponibile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1453
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1460
 msgid "No detailed information is available for books on the device."
 msgstr ""
 "Non è disponibile alcuna informazione dettagliata per i libri nel "
 "dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1505
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid "Error talking to device"
 msgstr "Errore di comunicazione col dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1506
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1513
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -5479,30 +5499,30 @@ msgstr ""
 "Si è verificato un errore di comunicazione temporaneo col dispositivo. "
 "Disconnettere e riconnettere il dispositivo e/o riavviare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1547
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1554
 msgid "Conversion Error"
 msgstr "Errore di conversione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1537
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1548
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1555
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1576
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1583
 msgid "Invalid library location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1577
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1584
 msgid "Could not access %s. Using %s as the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1624
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1631
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
@@ -5510,22 +5530,22 @@ msgstr ""
 "è il risultato degli sforzi di tanti volontari da tutto il mondo. Se lo "
 "trovi utile, puoi fare una donazione per supportare il suo sviluppo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1648
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1655
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Ci sono lavori attivi. Uscire comunque?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1651
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1658
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
 "                      Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1655
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1662
 msgid "WARNING: Active jobs"
 msgstr "ATTENZIONE: Lavori attivi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1706
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1713
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -5533,7 +5553,7 @@ msgstr ""
 "continuerà a lavorare nel vassoio di sistema. Per chiuderlo, selezionare "
 "<b>Esci</b> nel menu contestuale del vassoio di sistema."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1725
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1732
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -5541,11 +5561,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Ultima versione: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1733
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1740
 msgid "Update available"
 msgstr "Aggiornamento disponibile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1734
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1741
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -5555,52 +5575,52 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">nuove "
 "funzionalità</a>. Una visita alla pagina del download?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1752
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1759
 msgid "Use the library located at the specified path."
 msgstr "Usa la biblioteca collocata nel percorso specificato."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1754
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1761
 msgid "Start minimized to system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1756
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1763
 msgid "Log debugging information to console"
 msgstr "Invia le informazioni di debug alla console"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1758
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1765
 msgid "Do not check for updates"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1806
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1813
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1808
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1815
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1816
 msgid "%s is already running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1812
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1819
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1821
 msgid "upper right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1816
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1823
 msgid "lower right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1819
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1826
 msgid "try rebooting your computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1840
 msgid "try deleting the file"
 msgstr ""
 
@@ -5788,57 +5808,52 @@ msgstr ""
 msgid "Click to browse books by tags"
 msgstr "Fare clic per sfogliare i libri per tag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Authors"
 msgstr "Autori"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Publishers"
 msgstr "Editori"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
-msgid "Starting conversion of %d books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:184
 msgid "Convert book %d of %d (%s)"
 msgstr "Conversione libro %d di %d (%s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:202
 msgid "Could not convert some books"
 msgstr "Impossibile convertire alcuni libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:203
 msgid ""
 "Could not convert %d of %d books, because no suitable source format was "
 "found."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:121
 msgid "Queueing books for bulk conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:183
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:181
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:235
 msgid "You must set a username and password for %s"
 msgstr "È necessario inserire nome utente e password per %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:240
 msgid "Fetch news from "
 msgstr "Scarica notizie da "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:251
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:252
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -6300,7 +6315,7 @@ msgstr ""
 msgid "Could not move library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:541
 msgid "welcome wizard"
 msgstr ""
 
@@ -7014,57 +7029,57 @@ msgstr ""
 "\n"
 "Avvia il server dei contenuti di calibre."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:45
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:47
 msgid "%sUsage%s: %s\n"
 msgstr "%sUso%s: %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:89
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:91
 msgid "Created by "
 msgstr "Creato da "
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:90
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:92
 msgid ""
 "Whenever you pass arguments to %prog that have spaces in them, enclose the "
 "arguments in quotation marks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:553
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:555
 msgid "Path to the database in which books are stored"
 msgstr "Percorso del database in cui sono salvati i libri"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:555
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:557
 msgid "Pattern to guess metadata from filenames"
 msgstr "Modelli per indovinare i metadati dai nomi dei file"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:557
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:559
 msgid "Access key for isbndb.com"
 msgstr "Chiave di accesso per isbndb.com"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:559
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:561
 msgid "Default timeout for network operations (seconds)"
 msgstr "Timeout predefinito per le operazioni di rete (secondi)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:561
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:563
 msgid "Path to directory in which your library of books is stored"
 msgstr "Percorso alla cartella in cui è salvata la biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:563
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:565
 msgid "The language in which to display the user interface"
 msgstr "La lingua in cui visualizzare l'interfaccia utente"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:565
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:567
 msgid "The default output format for ebook conversions."
 msgstr "Il formato predefinito per la conversione dei libri."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:569
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:571
 msgid "Ordered list of formats to prefer for input."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:571
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:573
 msgid "Read metadata from files"
 msgstr "Leggi metadati dai file"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:573
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:575
 msgid "The priority of worker processes"
 msgstr "La priorità dei processi di lavoro"
 

src/calibre/translations/nb.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-09-29 01:20+0000\n"
+"POT-Creation-Date: 2009-10-02 05:30+0000\n"
-"PO-Revision-Date: 2009-09-29 01:54+0000\n"
+"PO-Revision-Date: 2009-10-04 16:53+0000\n"
-"Last-Translator: Kovid Goyal <Unknown>\n"
+"Last-Translator: Øyvind Øritsland <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-09-30 06:41+0000\n"
+"X-Launchpad-Export-Date: 2009-10-05 06:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
@@ -97,8 +97,8 @@ msgstr "Gjør absolutt ingenting"
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:219
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:261
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:124
@@ -575,7 +575,7 @@ msgstr "Det er ikke nok ledig plass på lagringskortet"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:686
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1007
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1011
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1334
@@ -1288,7 +1288,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/fb2ml.py:122
 #: /home/kovid/work/calibre/src/calibre/ebooks/pml/pmlml.py:111
 #: /home/kovid/work/calibre/src/calibre/ebooks/rb/rbml.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:77
 msgid "Table of Contents:"
 msgstr "Innholdsfortegnelse"
 
@@ -1679,7 +1679,7 @@ msgstr "Sammendrag:"
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:1012
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:1072
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Tags"
 msgstr "Nøkkelord"
 
@@ -1687,7 +1687,7 @@ msgstr "Nøkkelord"
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:166
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:354
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Series"
 msgstr "Serie"
 
@@ -2537,27 +2537,44 @@ msgstr "Kopier til utklippstavlen"
 msgid "Choose Files"
 msgstr "Velg filer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:53
 msgid "Searching in"
 msgstr "Søker i"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:164
 msgid "Adding..."
 msgstr "Legger til..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 msgid "Searching in all sub-directories..."
 msgstr "Søker i alle undermapper..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:190
+msgid "Path error"
+msgstr "Feil i stien"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:191
+msgid "The specified directory could not be processed."
+msgstr "Det spesifiserte mappen kunne ikke prossesseres"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+msgid "No books"
+msgstr "Ingen bøker"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:196
+msgid "No books found"
+msgstr "Ingen bøker ble funnet"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:262
 msgid "Added"
 msgstr "Lagt til"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:275
 msgid "Adding failed"
 msgstr "Kunne ikke legge til"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:276
 msgid ""
 "The add books process seems to have hung. Try restarting calibre and adding "
 "the books in smaller increments, until you find the problem book."
@@ -2565,11 +2582,11 @@ msgstr ""
 "Legg til bøker prosessen ser ut til å være låst. Forsøk å re-starte calibre "
 "og legg til færre bøker av gangen, til du finner problemboka."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:288
 msgid "Duplicates found!"
 msgstr "Duplikater funnet!"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:289
 msgid ""
 "Books with the same title as the following already exist in the database. "
 "Add them anyway?"
@@ -2577,15 +2594,15 @@ msgstr ""
 "Bøker med den samme tittelen som den følgende finnes allerede i databasen. "
 "Legg dem til allikevel?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:292
 msgid "Adding duplicates..."
 msgstr "Legger inn duplikater..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Saving..."
 msgstr "Lagrer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:406
 msgid "Saved"
 msgstr "Lagret"
 
@@ -2642,7 +2659,7 @@ msgstr "Inndata"
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:28
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:51
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:41
@@ -2786,6 +2803,9 @@ msgid ""
 "of the conversion process. This HTML can sometimes serve as a good starting "
 "point for hand editing a conversion."
 msgstr ""
+"Feilsøkingsprosessen viser utdata for mellomliggende HTML kode generert i "
+"forskjellige stadier av konverteringsprosessen. Denne HTML koden kan noen "
+"ganger angi et godt startpunkt for å redigere konverteringen manuelt."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output.py:15
 msgid "EPUB Output"
@@ -3197,7 +3217,7 @@ msgid "RB Output"
 msgstr "RB Utdata"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1329
 msgid "Choose the format to view"
 msgstr "Velg format som skal vises"
 
@@ -3344,23 +3364,23 @@ msgstr "Nivå &2 TOC (XPath uttrykk):"
 msgid "Level &3 TOC (XPath expression):"
 msgstr "Nivå &3 TOC (XPath uttrykk):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
 msgid "Do not add &detected chapters to the Table of Contents"
 msgstr "Legg ikke til &oppdagede kapitler til innholdsfortegnelsen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
 msgid "Number of &links to add to Table of Contents"
 msgstr "Antall &lenker som skal legges til innholdsfortegnelsen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
 msgid "Chapter &threshold"
 msgstr "Kapittel &terskel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
 msgid "&Force use of auto-generated Table of Contents"
 msgstr "&Tvunget bruk av autogenerert innholdsfortegnelse"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67
 msgid "TOC &Filter:"
 msgstr "TOC &Filter:"
 
@@ -3579,10 +3599,6 @@ msgstr "Send spesifisert format til lagringskort A"
 msgid "Send specific format to storage card B"
 msgstr "Send spesifisert format til lagringskort B"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
-msgid "No books"
-msgstr "Ingen bøker"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "selected to send"
 msgstr "Velg for å sende"
@@ -3730,7 +3746,7 @@ msgstr "Bane"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:216
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:344
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Formats"
 msgstr "Formater"
 
@@ -4647,11 +4663,11 @@ msgstr "Publisert&t"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:379
 msgid "dd MMM yyyy"
-msgstr ""
+msgstr "ddMMMyyyy"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:380
 msgid "&Date:"
-msgstr ""
+msgstr "&Dato:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:381
 msgid "&Comments"
@@ -5531,7 +5547,7 @@ msgid "Save to disk in a single directory"
 msgstr "Lagre til disk i en enkelt mappe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1424
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1431
 msgid "Save only %s format to disk"
 msgstr "Lagre kun %s format til disken"
 
@@ -5566,12 +5582,12 @@ msgid "Bad database location"
 msgstr "Dårlig databaselokalisering"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:428
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:478
 msgid "Calibre Library"
 msgstr "Calibre-bibliotek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:438
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1567
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1574
 msgid "Choose a location for your ebook library."
 msgstr "Velg en lokalisering for ditt e-bokbibliotek"
 
@@ -5766,25 +5782,29 @@ msgstr " funnet."
 msgid "Cannot convert"
 msgstr "Kan ikke konvertere"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1335
+msgid "Starting conversion of %d book(s)"
+msgstr "Starter konverteringen av %d boken(bøkene)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "No book selected"
 msgstr "Ingen bøker ble valgt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1366
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1373
 msgid "Cannot view"
 msgstr "Kan ikke vise"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1334
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1341
 msgid "Cannot open folder"
 msgstr "Kan ikke åpne folder"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1351
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1358
 msgid "Multiple Books Selected"
 msgstr "Flere bøker ble valgt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1352
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1359
 msgid ""
 "You are attempting to open %d books. Opening too many books at once can be "
 "slow and have a negative effect on the responsiveness of your computer. Once "
@@ -5796,32 +5816,32 @@ msgstr ""
 "startet denne prosessen, kan den ikke stanses før den er fullført. Ønsker du "
 "å fortsette?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1374
 msgid "%s has no available formats."
 msgstr "%s har ikke tilgjengelig formater."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1408
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1415
 msgid "Cannot configure"
 msgstr "Kan ikke konfigurere"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1409
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1416
 msgid "Cannot configure while there are running jobs."
 msgstr "Kan ikke konfigurere samtidig som en oppgave kjører."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1452
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1459
 msgid "No detailed info available"
 msgstr "Ingen detaljert informasjon er tilgjengelig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1453
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1460
 msgid "No detailed information is available for books on the device."
 msgstr ""
 "Ingen detaljert informasjon er tilgjengelig for bøker på denne enheten."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1505
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid "Error talking to device"
 msgstr "Feil ved komminikasjonen med enheten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1506
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1513
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -5829,12 +5849,12 @@ msgstr ""
 "En midlertidig feil oppsto ved kommunikasjonen med enheten. Vennligst plugg "
 "ut og plugg inn igjen enheten, eller ta en omstart."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1547
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1554
 msgid "Conversion Error"
 msgstr "Feil ved konverteringen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1537
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
@@ -5843,19 +5863,19 @@ msgstr ""
 "Du må først fjerne DRM beskyttelsen ved å benytte et 3.parts program med "
 "slike egenskaper."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1548
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1555
 msgid "<b>Failed</b>"
 msgstr "<b>Feilet</b>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1576
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1583
 msgid "Invalid library location"
 msgstr "Ugylding biblioteklokalisering"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1577
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1584
 msgid "Could not access %s. Using %s as the library."
 msgstr "Kunne ikke koble til %s. Ved bruk av %s som bibliotek."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1624
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1631
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
@@ -5863,11 +5883,11 @@ msgstr ""
 "er resultatet av innsatsen til mange frivillige fra hele verden. Dersom du "
 "synes programmet er godt, vennligst bidra med støtte til videre utvikling."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1648
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1655
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Det finnes aktive oppgaver. Er du sikker på at du ønsker å avslutte?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1651
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1658
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
@@ -5877,11 +5897,11 @@ msgstr ""
 "                      Å avslutte kan føre til feil på enheten.<br>\n"
 "                      Er du sikker på at du ønsker å avslutte?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1655
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1662
 msgid "WARNING: Active jobs"
 msgstr "ADVARSEL: Aktive oppgaver"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1706
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1713
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -5889,7 +5909,7 @@ msgstr ""
 "vil fortsette å kjøre i systemstatusfeltet. For å stenge programmet, velg "
 "<b>Stopp</b>  innholdslisten i systemstatusfeltet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1725
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1732
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -5897,11 +5917,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Siste versjon: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1733
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1740
 msgid "Update available"
 msgstr "Oppdatering tilgjengelig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1734
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1741
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -5911,52 +5931,52 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Besøke nedlastingssiden?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1752
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1759
 msgid "Use the library located at the specified path."
 msgstr "Bruk biblioteket lokalisert ved en spesifikk sti."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1754
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1761
 msgid "Start minimized to system tray."
 msgstr "Start minimalisert til systemstatusfeltet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1756
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1763
 msgid "Log debugging information to console"
 msgstr "Logg debugging informasjon til konsollen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1758
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1765
 msgid "Do not check for updates"
 msgstr "Ikke søk etter oppdateringer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1806
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1813
 msgid "If you are sure it is not running"
 msgstr "Er du sikker på at den ikke kjører"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1808
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1815
 msgid "Cannot Start "
 msgstr "Kan ikke Starte "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1816
 msgid "%s is already running."
 msgstr "%s kjører allerede."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1812
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1819
 msgid "may be running in the system tray, in the"
 msgstr "kan kjøre i systemfeltet, i"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1821
 msgid "upper right region of the screen."
 msgstr "øvre høyre område av skjermen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1816
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1823
 msgid "lower right region of the screen."
 msgstr "nedre høyre område av skjermen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1819
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1826
 msgid "try rebooting your computer."
 msgstr "forsøk å re-starte datamaskinen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1840
 msgid "try deleting the file"
 msgstr "forsøk å slette filen"
 
@@ -6146,31 +6166,26 @@ msgstr ""
 msgid "Click to browse books by tags"
 msgstr "Klikk for å se gjennom bøker etter emneord"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Authors"
 msgstr "Forfattere"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Publishers"
 msgstr "Forlag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
-msgid "Starting conversion of %d books"
-msgstr "Start konverteringen av %d bøker"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:184
 msgid "Convert book %d of %d (%s)"
 msgstr "Konverter bok %d av %d (%s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:202
 msgid "Could not convert some books"
 msgstr "Kunne ikke konvertere enkelte av bøkene"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:203
 msgid ""
 "Could not convert %d of %d books, because no suitable source format was "
 "found."
@@ -6178,27 +6193,27 @@ msgstr ""
 "Kunne ikke konvertere %d av %d bøker, fordi ingen passende kildeformater ble "
 "funnet."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:121
 msgid "Queueing books for bulk conversion"
 msgstr "Kø bøker for samlet konvertering"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:183
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:181
 msgid "Queueing "
 msgstr "Kø "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:235
 msgid "You must set a username and password for %s"
 msgstr "Du må legge inn brukernavn og passord for %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:240
 msgid "Fetch news from "
 msgstr "Skaff nyheter fra "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:251
 msgid "Convert existing"
 msgstr "Konverter eksisterende"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:252
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -6684,7 +6699,7 @@ msgstr ""
 msgid "Could not move library"
 msgstr "Kunne ikke flytte bibliotek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:541
 msgid "welcome wizard"
 msgstr "Velkommen-veiviser"
 
@@ -7437,15 +7452,15 @@ msgstr ""
 "\n"
 "Start Calibres innholdserver."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:45
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:47
 msgid "%sUsage%s: %s\n"
 msgstr "%sBruksområde%s: %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:89
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:91
 msgid "Created by "
 msgstr "Utviklet av "
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:90
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:92
 msgid ""
 "Whenever you pass arguments to %prog that have spaces in them, enclose the "
 "arguments in quotation marks."
@@ -7453,43 +7468,43 @@ msgstr ""
 "Når du sender argumenter til %prog som har mellomrom i dem, ram inn "
 "argumentene i gåseøyne."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:553
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:555
 msgid "Path to the database in which books are stored"
 msgstr "Bane til databasen der bøker lagres"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:555
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:557
 msgid "Pattern to guess metadata from filenames"
 msgstr "Mønster for å vurdere metadata fra filnavnene"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:557
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:559
 msgid "Access key for isbndb.com"
 msgstr "Tilgangsnøkkel for isbndb.com"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:559
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:561
 msgid "Default timeout for network operations (seconds)"
 msgstr "Standard tidsavbrudd for nettverksoperasjoner (i sekunder)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:561
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:563
 msgid "Path to directory in which your library of books is stored"
 msgstr "Bane til direktoratet der ditt bibliotek av bøker er lagret."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:563
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:565
 msgid "The language in which to display the user interface"
 msgstr "Språket som skal benyttes for å vise brukers grensesnitt"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:565
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:567
 msgid "The default output format for ebook conversions."
 msgstr "Standard utdataformat for e-bok konverteringer."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:569
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:571
 msgid "Ordered list of formats to prefer for input."
 msgstr "Bestilt liste av formater som foretrekkes for inndata."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:571
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:573
 msgid "Read metadata from files"
 msgstr "Les metadata fra filer"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:573
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:575
 msgid "The priority of worker processes"
 msgstr "Arbeidsprosessenes prioritet"
 
@@ -8321,6 +8336,9 @@ msgstr "Vis detaljert utdatainformasjon. Benyttes for feilsøking"
 #~ "<p>Kunne ikke konvertere: %s<p>Det er en <a href=\"%s\">DRM</a>beskyttet "
 #~ "bok. Du må først fjerne DRM beskyttelsen ved bruk av et 3djeparts verktøy."
 
+#~ msgid "Starting conversion of %d books"
+#~ msgstr "Start konverteringen av %d bøker"
+
 #~ msgid "Catalan"
 #~ msgstr "katalansk"
 

src/calibre/translations/pl.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-09-29 01:20+0000\n"
+"POT-Creation-Date: 2009-10-02 05:30+0000\n"
-"PO-Revision-Date: 2009-09-28 07:23+0000\n"
+"PO-Revision-Date: 2009-10-02 05:13+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-09-30 06:41+0000\n"
+"X-Launchpad-Export-Date: 2009-10-03 06:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
@@ -97,8 +97,8 @@ msgstr "Ta opcja nic nie zmienia"
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:219
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:261
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:124
@@ -551,7 +551,7 @@ msgstr "Na karcie pamięci jest niewystarczająca ilość wolnego miejsca"
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:686
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1007
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1011
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1334
@@ -1125,7 +1125,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/fb2ml.py:122
 #: /home/kovid/work/calibre/src/calibre/ebooks/pml/pmlml.py:111
 #: /home/kovid/work/calibre/src/calibre/ebooks/rb/rbml.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:77
 msgid "Table of Contents:"
 msgstr ""
 
@@ -1498,7 +1498,7 @@ msgstr "Komentarze"
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:1012
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:1072
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Tags"
 msgstr "Etykiety"
 
@@ -1506,7 +1506,7 @@ msgstr "Etykiety"
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:166
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:354
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Series"
 msgstr "Seria"
 
@@ -2239,51 +2239,68 @@ msgstr ""
 msgid "Choose Files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:53
 msgid "Searching in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:164
 msgid "Adding..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 msgid "Searching in all sub-directories..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:190
+msgid "Path error"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:191
+msgid "The specified directory could not be processed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+msgid "No books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:196
+msgid "No books found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:262
 msgid "Added"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:275
 msgid "Adding failed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:276
 msgid ""
 "The add books process seems to have hung. Try restarting calibre and adding "
 "the books in smaller increments, until you find the problem book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:288
 msgid "Duplicates found!"
 msgstr "Znleziono duplikaty!"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:289
 msgid ""
 "Books with the same title as the following already exist in the database. "
 "Add them anyway?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:292
 msgid "Adding duplicates..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Saving..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:406
 msgid "Saved"
 msgstr ""
 
@@ -2340,7 +2357,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:28
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:51
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:41
@@ -2884,7 +2901,7 @@ msgid "RB Output"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1329
 msgid "Choose the format to view"
 msgstr "Wybierz format do wyświetlenia"
 
@@ -3028,23 +3045,23 @@ msgstr ""
 msgid "Level &3 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
 msgid "Do not add &detected chapters to the Table of Contents"
 msgstr "Nie &dodawaj automatycznie wykrytych rozdziałów do spisu treści"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
 msgid "Number of &links to add to Table of Contents"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
 msgid "Chapter &threshold"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
 msgid "&Force use of auto-generated Table of Contents"
 msgstr "&Wymuś użycie wygenerowanego automatycznie spisu treści"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67
 msgid "TOC &Filter:"
 msgstr ""
 
@@ -3252,10 +3269,6 @@ msgstr ""
 msgid "Send specific format to storage card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
-msgid "No books"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "selected to send"
 msgstr ""
@@ -3397,7 +3410,7 @@ msgstr "Ścieżka"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:216
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:344
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Formats"
 msgstr "Formaty"
 
@@ -5112,7 +5125,7 @@ msgid "Save to disk in a single directory"
 msgstr "Zapisz na dysku w pojedyńczym folderze"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1424
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1431
 msgid "Save only %s format to disk"
 msgstr "Zapisz na dysku jedynie pliki w formacie %s"
 
@@ -5147,12 +5160,12 @@ msgid "Bad database location"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:428
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:478
 msgid "Calibre Library"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:438
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1567
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1574
 msgid "Choose a location for your ebook library."
 msgstr "Wybierz lokalizację dla twojej biblioteki książek."
 
@@ -5333,25 +5346,29 @@ msgstr ""
 msgid "Cannot convert"
 msgstr "Nie można przekonwertować"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1335
+msgid "Starting conversion of %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "No book selected"
 msgstr "Nie wybrano ksiązki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1366
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1373
 msgid "Cannot view"
 msgstr "Nie można wyświetlić"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1334
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1341
 msgid "Cannot open folder"
 msgstr "Nie można otworzyć folderu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1351
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1358
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1352
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1359
 msgid ""
 "You are attempting to open %d books. Opening too many books at once can be "
 "slow and have a negative effect on the responsiveness of your computer. Once "
@@ -5359,31 +5376,31 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1374
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1408
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1415
 msgid "Cannot configure"
 msgstr "Nie można skonfigurować"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1409
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1416
 msgid "Cannot configure while there are running jobs."
 msgstr "Nie można skonfigurować, gdy są aktywne jakieś zadania."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1452
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1459
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1453
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1460
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1505
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid "Error talking to device"
 msgstr "Błąd komunikacji z urządzeniem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1506
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1513
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -5391,67 +5408,67 @@ msgstr ""
 "Wystąpił chwilowy błąd komunikacji z urządzeniem. Odłącz i podłącz je "
 "ponownie lub uruchom komputer ponownie."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1547
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1554
 msgid "Conversion Error"
 msgstr "Błąd podczas konwersji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1537
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1548
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1555
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1576
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1583
 msgid "Invalid library location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1577
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1584
 msgid "Could not access %s. Using %s as the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1624
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1631
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1648
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1655
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1651
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1658
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
 "                      Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1655
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1662
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1706
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1713
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1725
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1732
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1733
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1740
 msgid "Update available"
 msgstr "Aktualizacja dostępna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1734
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1741
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -5461,52 +5478,52 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">listę zmian i "
 "poprawek</a>. Otworzyć stronę pobierania?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1752
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1759
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1754
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1761
 msgid "Start minimized to system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1756
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1763
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1758
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1765
 msgid "Do not check for updates"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1806
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1813
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1808
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1815
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1816
 msgid "%s is already running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1812
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1819
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1821
 msgid "upper right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1816
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1823
 msgid "lower right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1819
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1826
 msgid "try rebooting your computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1840
 msgid "try deleting the file"
 msgstr ""
 
@@ -5692,57 +5709,52 @@ msgstr ""
 msgid "Click to browse books by tags"
 msgstr "Kliknij, aby przeglądać ksiązki po etykietach"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Authors"
 msgstr "Autorzy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Publishers"
 msgstr "Wydawcy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
-msgid "Starting conversion of %d books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:184
 msgid "Convert book %d of %d (%s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:202
 msgid "Could not convert some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:203
 msgid ""
 "Could not convert %d of %d books, because no suitable source format was "
 "found."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:121
 msgid "Queueing books for bulk conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:183
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:181
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:235
 msgid "You must set a username and password for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:240
 msgid "Fetch news from "
 msgstr "Pobierz aktualności z "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:251
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:252
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -6197,7 +6209,7 @@ msgstr ""
 msgid "Could not move library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:541
 msgid "welcome wizard"
 msgstr ""
 
@@ -6829,57 +6841,57 @@ msgstr ""
 "\n"
 "Włącz serwer zawartości calibre."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:45
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:47
 msgid "%sUsage%s: %s\n"
 msgstr "%sUżycie%s: %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:89
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:91
 msgid "Created by "
 msgstr "Stworzony przez "
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:90
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:92
 msgid ""
 "Whenever you pass arguments to %prog that have spaces in them, enclose the "
 "arguments in quotation marks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:553
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:555
 msgid "Path to the database in which books are stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:555
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:557
 msgid "Pattern to guess metadata from filenames"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:557
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:559
 msgid "Access key for isbndb.com"
 msgstr "Klucz dostępu do isbndb.com"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:559
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:561
 msgid "Default timeout for network operations (seconds)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:561
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:563
 msgid "Path to directory in which your library of books is stored"
 msgstr "Ścieżka do katalogu w którym przechowywana jest biblioteka książek"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:563
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:565
 msgid "The language in which to display the user interface"
 msgstr "Język wyświetlania interfejsu użytkownika"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:565
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:567
 msgid "The default output format for ebook conversions."
 msgstr "Domyślny format wyjściowy dla konwersji e-książek"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:569
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:571
 msgid "Ordered list of formats to prefer for input."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:571
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:573
 msgid "Read metadata from files"
 msgstr "Wczytaj metadane z plików"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:573
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:575
 msgid "The priority of worker processes"
 msgstr ""
 

src/calibre/translations/ru.po

@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.55\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-29 01:20+0000\n"
+"POT-Creation-Date: 2009-10-02 05:30+0000\n"
-"PO-Revision-Date: 2009-09-28 07:27+0000\n"
+"PO-Revision-Date: 2009-10-02 05:13+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: American English <kde-i18n-doc@lists.kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-09-30 06:42+0000\n"
+"X-Launchpad-Export-Date: 2009-10-03 06:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-Language: Russian\n"
@@ -101,8 +101,8 @@ msgstr "Ничего не делает"
 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:219
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:261
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:111
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:120
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:118
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:21
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:124
@@ -567,7 +567,7 @@ msgstr "Не хватает свободного места на карте па
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:686
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:434
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1007
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1011
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1334
@@ -1161,7 +1161,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/fb2ml.py:122
 #: /home/kovid/work/calibre/src/calibre/ebooks/pml/pmlml.py:111
 #: /home/kovid/work/calibre/src/calibre/ebooks/rb/rbml.py:98
-#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/txtml.py:77
 msgid "Table of Contents:"
 msgstr ""
 
@@ -1540,7 +1540,7 @@ msgstr "Комментарии"
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:1012
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:1072
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Tags"
 msgstr "Эпилог"
 
@@ -1548,7 +1548,7 @@ msgstr "Эпилог"
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:166
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:354
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Series"
 msgstr "Серия"
 
@@ -2283,51 +2283,68 @@ msgstr ""
 msgid "Choose Files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:53
 msgid "Searching in"
 msgstr "Поиск"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:164
 msgid "Adding..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:177
 msgid "Searching in all sub-directories..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:244
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:190
+msgid "Path error"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:191
+msgid "The specified directory could not be processed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:195
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
+msgid "No books"
+msgstr "Нет книг"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:196
+msgid "No books found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:262
 msgid "Added"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:257
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:275
 msgid "Adding failed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:258
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:276
 msgid ""
 "The add books process seems to have hung. Try restarting calibre and adding "
 "the books in smaller increments, until you find the problem book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:270
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:288
 msgid "Duplicates found!"
 msgstr "Есть повторения!"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:289
 msgid ""
 "Books with the same title as the following already exist in the database. "
 "Add them anyway?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:292
 msgid "Adding duplicates..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:353
 msgid "Saving..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/add.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/add.py:406
 msgid "Saved"
 msgstr "Сохранено"
 
@@ -2384,7 +2401,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:39
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:28
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:38
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:51
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:41
@@ -2931,7 +2948,7 @@ msgid "RB Output"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder.py:76
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1329
 msgid "Choose the format to view"
 msgstr "Выберете для просмотра формат"
 
@@ -3075,23 +3092,23 @@ msgstr ""
 msgid "Level &3 TOC (XPath expression):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
 msgid "Do not add &detected chapters to the Table of Contents"
 msgstr "Не добавлять определенные главы в Оглавление"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
 msgid "Number of &links to add to Table of Contents"
 msgstr "Количество ссылок добавляемых в Оглавление"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
 msgid "Chapter &threshold"
 msgstr "Конечная Глава"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:65
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
 msgid "&Force use of auto-generated Table of Contents"
 msgstr "Принудительно автомотическая генерации Оглавления"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:66
+#: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:67
 msgid "TOC &Filter:"
 msgstr ""
 
@@ -3299,10 +3316,6 @@ msgstr ""
 msgid "Send specific format to storage card B"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/device.py:482
-msgid "No books"
-msgstr "Нет книг"
-
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:483
 msgid "selected to send"
 msgstr "Отослать выбранное"
@@ -3444,7 +3457,7 @@ msgstr "Путь"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:216
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:344
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Formats"
 msgstr "Форматы"
 
@@ -5199,7 +5212,7 @@ msgid "Save to disk in a single directory"
 msgstr "Сохранить на диск в одну директорию"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1424
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1431
 msgid "Save only %s format to disk"
 msgstr "Сохранять на диск только формат %s"
 
@@ -5234,12 +5247,12 @@ msgid "Bad database location"
 msgstr "Плохое расположение базы данных"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:428
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:477
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:478
 msgid "Calibre Library"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:438
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1567
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1574
 msgid "Choose a location for your ebook library."
 msgstr "Выбрите расположение Вашей библиотеки электронных книг."
 
@@ -5436,25 +5449,29 @@ msgstr " загружено."
 msgid "Cannot convert"
 msgstr "Не преобразуется"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1335
+msgid "Starting conversion of %d book(s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "No book selected"
 msgstr "Нет выбранных книг"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1323
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1366
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1373
 msgid "Cannot view"
 msgstr "Невозможно просмотреть"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1334
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1341
 msgid "Cannot open folder"
 msgstr "Не могу открыть папку"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1351
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1358
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1352
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1359
 msgid ""
 "You are attempting to open %d books. Opening too many books at once can be "
 "slow and have a negative effect on the responsiveness of your computer. Once "
@@ -5462,31 +5479,31 @@ msgid ""
 "continue?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1374
 msgid "%s has no available formats."
 msgstr "%s неизвестный формат."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1408
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1415
 msgid "Cannot configure"
 msgstr "Невозможно настроить"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1409
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1416
 msgid "Cannot configure while there are running jobs."
 msgstr "Пока запущено задание, не могу настроить"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1452
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1459
 msgid "No detailed info available"
 msgstr "Нет доступной подробной информации"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1453
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1460
 msgid "No detailed information is available for books on the device."
 msgstr "Не доступна подробная информация книг на устройстве"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1505
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1512
 msgid "Error talking to device"
 msgstr "Ошибка согласования устройства"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1506
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1513
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -5494,30 +5511,30 @@ msgstr ""
 "Была временная ошибка общения с устройством. Пожалуста, переподключите "
 "устройство или перегрузите его."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1547
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1554
 msgid "Conversion Error"
 msgstr "Ошибка преобразования"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1537
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using third party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1548
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1555
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1576
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1583
 msgid "Invalid library location"
 msgstr "Неверное расположение библиотеки"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1577
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1584
 msgid "Could not access %s. Using %s as the library."
 msgstr "Нет доступа к %s. Использование %s в качестве библиотеки."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1624
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1631
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
@@ -5525,22 +5542,22 @@ msgstr ""
 "является результато труда многих добровольцев по всему миру. Если Вы сочли "
 "его полезным, будьте добры пожертвовать на его развитие."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1648
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1655
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Имеется активное задание. Вы все равно хотите выйти?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1651
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1658
 msgid ""
 " is communicating with the device!<br>\n"
 "                      Quitting may cause corruption on the device.<br>\n"
 "                      Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1655
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1662
 msgid "WARNING: Active jobs"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: Активные задания"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1706
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1713
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -5548,7 +5565,7 @@ msgstr ""
 "продолжит работать в трее. Для завершения работы выберите<b>Quit</b> в "
 "контекстном меню трея."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1725
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1732
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -5556,11 +5573,11 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Последняя версия: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1733
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1740
 msgid "Update available"
 msgstr "Доступно обновление"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1734
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1741
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -5570,52 +5587,52 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">новые возможности</a>. "
 "Посетить страницу?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1752
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1759
 msgid "Use the library located at the specified path."
 msgstr "Использовать библиотеку по указанному пути."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1754
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1761
 msgid "Start minimized to system tray."
 msgstr "Старт минимизированным в трей"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1756
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1763
 msgid "Log debugging information to console"
 msgstr "Выводить отладочную информацию на консоль"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1758
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1765
 msgid "Do not check for updates"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1806
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1813
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1808
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1815
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1809
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1816
 msgid "%s is already running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1812
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1819
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1821
 msgid "upper right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1816
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1823
 msgid "lower right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1819
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1826
 msgid "try rebooting your computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1833
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1840
 msgid "try deleting the file"
 msgstr ""
 
@@ -5804,57 +5821,52 @@ msgstr ""
 msgid "Click to browse books by tags"
 msgstr "Кликнуть просмотра книг по тэгам"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Authors"
 msgstr "Авторы"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:115
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:122
 msgid "Publishers"
 msgstr "Публикация"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:34
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:63
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:106
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:182
-msgid "Starting conversion of %d books"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:64
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:184
 msgid "Convert book %d of %d (%s)"
 msgstr "Конвертация книги %d из %d (%s)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:90
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:204
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:202
 msgid "Could not convert some books"
 msgstr "Не могу конвертировать некоторые книги"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:205
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:203
 msgid ""
 "Could not convert %d of %d books, because no suitable source format was "
 "found."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:121
 msgid "Queueing books for bulk conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:183
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:181
 msgid "Queueing "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:235
 msgid "You must set a username and password for %s"
 msgstr "Нужно проставить имя пользователя и пароль для %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:240
 msgid "Fetch news from "
 msgstr "Выбрать новости из "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:253
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:251
 msgid "Convert existing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:252
 msgid ""
 "The following books have already been converted to %s format. Do you wish to "
 "reconvert them?"
@@ -6315,7 +6327,7 @@ msgstr ""
 msgid "Could not move library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:541
 msgid "welcome wizard"
 msgstr ""
 
@@ -7020,57 +7032,57 @@ msgstr ""
 "\n"
 "Запуск calibre content server."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:45
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:47
 msgid "%sUsage%s: %s\n"
 msgstr "%sИсп.%s: %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:89
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:91
 msgid "Created by "
 msgstr "Создано "
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:90
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:92
 msgid ""
 "Whenever you pass arguments to %prog that have spaces in them, enclose the "
 "arguments in quotation marks."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:553
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:555
 msgid "Path to the database in which books are stored"
 msgstr "Пудь к базе данных в которой хранятся книги"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:555
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:557
 msgid "Pattern to guess metadata from filenames"
 msgstr "Шаблон для получения метаданных из имени файла"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:557
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:559
 msgid "Access key for isbndb.com"
 msgstr "Ключ доступа к isbndb.com"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:559
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:561
 msgid "Default timeout for network operations (seconds)"
 msgstr "Таймаут для сетевых операций по умолчанию (сек)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:561
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:563
 msgid "Path to directory in which your library of books is stored"
 msgstr "Пудь к директории в которой хранятся книги"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:563
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:565
 msgid "The language in which to display the user interface"
 msgstr "Язык для отображения пользовательского интерфейса"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:565
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:567
 msgid "The default output format for ebook conversions."
 msgstr "Формат книги по умолчанию после преобразования."
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:569
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:571
 msgid "Ordered list of formats to prefer for input."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:571
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:573
 msgid "Read metadata from files"
 msgstr "Читать метаданные из файлов"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:573
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:575
 msgid "The priority of worker processes"
 msgstr "Приоритет рабочих процессов"
 

src/calibre/utils/PythonMagickWand.py

@@ -81,8 +81,8 @@ if isosx:
     else:
         _lib = util.find_library('Wand')
 elif iswindows:
-    _lib = os.path.join(os.path.dirname(sys.executable), 'CORE_RL_wand_.dll') \
+    flib = os.path.join(os.path.dirname(sys.executable), 'DLLs', 'CORE_RL_wand_.dll')
-           if isfrozen else 'CORE_RL_wand_'
+    _lib = flib if isfrozen else 'CORE_RL_wand_'
 else:
     if isfrozen:
         _lib = os.path.join(sys.frozen_path, 'libMagickWand.so.2')

src/calibre/utils/config.py

@@ -411,7 +411,11 @@ class Config(ConfigInterface):
         if os.path.exists(self.config_file_path):
             try:
                 with ExclusiveFile(self.config_file_path) as f:
-                    src = f.read().decode('utf-8')
+                    try:
+                        src = f.read().decode('utf-8')
+                    except ValueError:
+                        print "Failed to parse", self.config_file_path
+                        traceback.print_exc()
             except LockError:
                 raise IOError('Could not lock config file: %s'%self.config_file_path)
         return self.option_set.parse_string(src)

src/calibre/utils/ipc/job.py

@@ -131,7 +131,7 @@ class BaseJob(object):
 
     @property
     def details(self):
-        return self.log_file.read().decode('utf-8')
+        return self.log_file.read().decode('utf-8', 'replace')
 
 
 class ParallelJob(BaseJob):

src/calibre/utils/lzx/lzc.h

@@ -15,6 +15,9 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
+
+#pragma once
+
 typedef struct lz_info lz_info;
 typedef int (*get_chars_t)(lz_info *lzi, int n, unsigned char *buf);
 typedef int (*output_match_t)(lz_info *lzi, int match_pos, int match_len);

src/calibre/utils/lzx/lzxc.h

@@ -16,6 +16,8 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+#pragma once
+
 #ifdef _MSC_VER
 #include "msstdint.h"
 #endif

src/calibre/utils/lzx/lzxd.h

@@ -10,10 +10,10 @@
  * For further details, see the file COPYING.LIB distributed with libmspack
  */
 
+#pragma once
+
 #include <sys/types.h>
 
-#ifndef MSPACK_LZX_H
-#define MSPACK_LZX_H 1
 
 /* LZX compression / decompression definitions */
 
@@ -166,4 +166,3 @@ extern int lzxd_decompress(struct lzxd_stream *lzx, off_t out_bytes);
  */
 void lzxd_free(struct lzxd_stream *lzx);
 
-#endif

src/calibre/utils/lzx/lzxmodule.h

@@ -3,13 +3,10 @@
  *
  * Common declarations for Python module C glue code.
  */
+#pragma once
 
 #include <Python.h>
 
-#ifndef LZXMODULE_H
-#define LZXMODULE_H
-
 extern PyObject *LZXError;
 extern PyTypeObject CompressorType;
 
-#endif /* LZXMODULE_H */

src/calibre/utils/lzx/mspack.h

@@ -115,8 +115,7 @@
  * - #MSPACK_ERR_DECRUNCH indicates an error occured during decompression.
  */
 
-#ifndef LIB_MSPACK_H
+#pragma once
-#define LIB_MSPACK_H 1
 
 #ifdef __cplusplus
 extern "C" {
@@ -1479,4 +1478,3 @@ struct mskwaj_decompressor {
 };
 #endif
 
-#endif

src/calibre/utils/lzx/msstdint.h

@@ -29,17 +29,12 @@
 // 
 ///////////////////////////////////////////////////////////////////////////////
 
+#pragma once
+
 #ifndef _MSC_VER // [
 #error "Use this header only with Microsoft Visual C++ compilers!"
 #endif // _MSC_VER ]
 
-#ifndef _MSC_STDINT_H_ // [
-#define _MSC_STDINT_H_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
 #include <limits.h>
 
 // For Visual Studio 6 in C++ mode wrap <wchar.h> include with 'extern "C++" {}'
@@ -228,5 +223,3 @@ typedef uint64_t  uintmax_t;
 
 #endif // __STDC_CONSTANT_MACROS ]
 
-
-#endif // _MSC_STDINT_H_ ]

src/calibre/utils/lzx/system.h

@@ -7,8 +7,7 @@
  * For further details, see the file COPYING.LIB distributed with libmspack
  */
 
-#ifndef MSPACK_SYSTEM_H
+#pragma once
-#define MSPACK_SYSTEM_H 1
 
 #ifdef _MSC_VER
 #define inline
@@ -62,5 +61,3 @@ static inline size_t strlen(const char *s) {
   return e - s;
 }
 #endif
-            
-#endif

src/calibre/utils/msdes/d3des.h

@@ -10,6 +10,8 @@
  *	(GEnie : OUTER; CIS : [71755,204])
  */
  
+#pragma once
+
 #undef D2_DES		
 #undef D3_DES		
  

src/calibre/utils/msdes/spr.h

@@ -21,6 +21,8 @@
  | URL: http://www.gnu.org/licenses/gpl.html
 */
 
+#pragma once
+
 static unsigned long SP1[64] = {
 0x02080800L, 0x00080000L, 0x02000002L, 0x02080802L,
 0x02000000L, 0x00080802L, 0x00080002L, 0x02000002L,

src/calibre/web/feeds/recipes/__init__.py

@@ -6,7 +6,7 @@ Builtin recipes.
 '''
 recipe_modules = ['recipe_' + r for r in (
            'newsweek', 'atlantic', 'economist', 'portfolio', 'the_register',
-           'usatoday', 'outlook_india', 'bbc', 'greader', 'wsj',
+           'usatoday', 'bbc', 'greader', 'wsj', #'outlook_india',
            'wired', 'globe_and_mail', 'smh', 'espn', 'business_week', 'miami_herald',
            'ars_technica', 'upi', 'new_yorker', 'irish_times', 'lanacion',
            'discover_magazine', 'scientific_american', 'new_york_review_of_books',
@@ -59,7 +59,7 @@ recipe_modules = ['recipe_' + r for r in (
            'intelligencer', 'theoldfoodie', 'hln_be', 'honvedelem',
            'the_new_republic', 'philly', 'salon', 'tweakers', 'smashing',
            'thestar', 'business_standard', 'lemonde_dip', 'javalobby',
-           'serverside', 'infoworld'
+           'serverside', 'infoworld', 'sanjosemercurynews',
           )]
 
 

src/calibre/web/feeds/recipes/recipe_chr_mon.py

@@ -1,5 +1,6 @@
 
 import re
+from calibre import strftime
 from calibre.web.feeds.news import BasicNewsRecipe
 
 class ChristianScienceMonitor(BasicNewsRecipe):
@@ -7,43 +8,77 @@ class ChristianScienceMonitor(BasicNewsRecipe):
     title = 'Christian Science Monitor'
     description = 'Providing context and clarity on national and international news, peoples and cultures'
     max_articles_per_feed = 20
-    __author__ = 'Kovid Goyal'
+    __author__ = 'Kovid Goyal and Sujata Raman'
     language = 'en'
-
+    encoding = 'utf-8'
     no_stylesheets = True
     use_embedded_content   = False
-  
 
-    
+
-    preprocess_regexps = [ (re.compile(i[0], re.IGNORECASE | re.DOTALL), i[1]) for i in 
+
+    preprocess_regexps = [ (re.compile(i[0], re.IGNORECASE | re.DOTALL), i[1]) for i in
         [
         (r'<body.*?<div id="story"', lambda match : '<body><div id="story"'),
         (r'<div class="pubdate">.*?</div>', lambda m: ''),
         (r'Full HTML version of this story which may include photos, graphics, and related links.*</body>',
               lambda match : '</body>'),
         ]]
-     
 
-    def parse_index(self):
+    extra_css      = '''
-        soup = self.index_to_soup('http://www.csmonitor.com/textedition')
+                        h1{ color:#000000;font-family: Georgia,Times,"Times New Roman",serif; font-size: large}
-        feeds = []
+                        .sub{ color:#000000;font-family: Georgia,Times,"Times New Roman",serif; font-size: small;}
-        for tag in soup.findAll(['h2', 'p']):
+                        .byline{ font-family:Arial,Helvetica,sans-serif ; color:#999999; font-size: x-small;}
-            if tag.name == 'h2':
+                        .postdate{color:#999999 ;  font-family:Arial,Helvetica,sans-serif ; font-size: x-small; }
-                title = self.tag_to_string(tag)
+                        h3{color:#999999 ;  font-family:Arial,Helvetica,sans-serif ; font-size: x-small; }
-                feeds.append((title, []))
+                        .photoCutline{ color:#333333 ; font-family:Arial,Helvetica,sans-serif ; font-size: x-small; }
-            elif tag.has_key('class') and tag['class'] == 'story' and feeds:
+                        .photoCredit{ color:#999999 ; font-family:Arial,Helvetica,sans-serif ; font-size: x-small; }
-                a = tag.find('a')
+                        #story{font-family:Arial,Tahoma,Verdana,Helvetica,sans-serif ; font-size: small; }
-                if a is not None and a.has_key('href'):
+                        #main{font-family:Arial,Tahoma,Verdana,Helvetica,sans-serif ; font-size: small; }
-                    art = {
+                        #photo-details{ font-family:Arial,Helvetica,sans-serif ; color:#999999; font-size: x-small;}
-                         'title': self.tag_to_string(a),
+                        span.name{color:#205B87;font-family: Georgia,Times,"Times New Roman",serif; font-size: x-small}
-                         'url'  : 'http://www.csmonitor.com'+a['href'],
+                        p#dateline{color:#444444 ;  font-family:Arial,Helvetica,sans-serif ; font-style:italic;}
-                         'date' : '',
+                        '''
-                         }
+    feeds          = [
-                    a.extract()
+                        (u'Top Stories' , u'http://rss.csmonitor.com/feeds/top'),
-                    art['description'] = self.tag_to_string(tag).strip()
+                        (u'World' , u'http://rss.csmonitor.com/feeds/world'),
-                    feeds[-1][1].append(art)
+                        (u'USA' , u'http://rss.csmonitor.com/feeds/usa'),
-        return feeds
+                        (u'Commentary' , u'http://rss.csmonitor.com/feeds/commentary'),
-      
+                        (u'Money' , u'http://rss.csmonitor.com/feeds/wam'),
+                        (u'Learning' , u'http://rss.csmonitor.com/feeds/learning'),
+                        (u'Living', u'http://rss.csmonitor.com/feeds/living'),
+                        (u'Innovation', u'http://rss.csmonitor.com/feeds/scitech'),
+                        (u'Gardening', u'http://rss.csmonitor.com/feeds/gardening'),
+                        (u'Environment',u'http://rss.csmonitor.com/feeds/environment'),
+                        (u'Arts', u'http://rss.csmonitor.com/feeds/arts'),
+                        (u'Books', u'http://rss.csmonitor.com/feeds/books'),
+                        (u'Home Forum' , u'http://rss.csmonitor.com/feeds/homeforum')
+                     ]
+
+    keep_only_tags = [
+                        dict(name='div', attrs={'id':['story','main']}),
+                        ]
+
+    remove_tags    = [
+                        dict(name='div', attrs={'id':['story-tools','videoPlayer','storyRelatedBottom','enlarge-photo','photo-paginate']}),
+                        dict(name='div', attrs={'class':[ 'spacer3','divvy spacer7','comment','storyIncludeBottom']}),
+                        dict(name='ul', attrs={'class':[ 'centerliststories']}) ,
+                        dict(name='form', attrs={'id':[ 'commentform']}) ,
+                    ]
+
+
+    def find_articles(self, section):
+        ans = []
+        for x in section.findAll('head4'):
+            title = ' '.join(x.findAll(text=True)).strip()
+            a = x.find('a')
+            if not a: continue
+            href = a['href']
+            ans.append({'title':title, 'url':href, 'description':'', 'date': strftime('%a, %d %b')})
+
+        #for x in ans:
+        #    x['url'] += '/output/print'
+        return ans
+
     def postprocess_html(self, soup, first_fetch):
         html = soup.find('html')
         if html is None:

src/calibre/web/feeds/recipes/recipe_daily_mail.py

@@ -5,15 +5,28 @@ class TheDailyMail(BasicNewsRecipe):
     oldest_article = 2
     language = 'en_GB'
 
-    author = 'RufusA'
+    author = 'RufusA and Sujata Raman'
     simultaneous_downloads= 1
     max_articles_per_feed = 50
 
-    extra_css = 'h1 {text-align: left;}'
+    extra_css = '''#js-article-text{font-family:Arial,Helvetica,sans-serif;}
+                    h1{font-size:x-large; font-weight:bold;}
+                    a.author{color:#003580;}
+                    .js-article-text{font-size:50%;}
+                    .imageCaption{font-size:x-small; font-weight:bold}
+
+
+                '''
+
+    remove_tags = [ dict(name='div', attrs={'class':['article-icon-links-container','print-or-mail-links cleared',
+                                                     'social-links cleared','explore-links','relatedItems','intellicrumbs box','travel','moduleHalf']}),
+                    dict(name='div', attrs={'id':['link-unit-wrapper','pushdown-ad','reader-comments','googleAds',]}),
+                    dict(name='h3', attrs={'class':['social-links-title']}),
+                     dict(name='span', attrs={'class':['clickToEnlargeTop']}),
+                    ]
+    #remove_tags_before  = dict(name='div', attrs={'id':'content'})
+    keep_only_tags = [dict(name='div', attrs={'id':'js-article-text'})]
 
-    remove_tags = [ dict(name='ul', attrs={'class':'article-icons-links'}) ]
-    remove_tags_after  = dict(name='h3', attrs={'class':'social-links-title'})
-    remove_tags_before  = dict(name='div', attrs={'id':'content'})
     no_stylesheets = True
 
     feeds          = [
@@ -27,8 +40,11 @@ class TheDailyMail(BasicNewsRecipe):
 	(u'Money', u'http://www.dailymail.co.uk/money/index.rss'),
 	(u'Property', u'http://www.dailymail.co.uk/property/index.rss'),
 	(u'Motoring', u'http://www.dailymail.co.uk/motoring/index.rss'),
-	(u'Travel', u'http://www.dailymail.co.uk/travel/index.rss')]
+	(u'Travel', u'http://www.dailymail.co.uk/travel/index.rss')
+        ]
+
+    #def print_version(self, url):
+    #    main = url.partition('?')[0]
+    #    return main + '?printingPage=true'
+
 
-    def print_version(self, url):
-        main = url.partition('?')[0]
-        return main + '?printingPage=true'

src/calibre/web/feeds/recipes/recipe_honoluluadvertiser.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env  python
+# -*- coding: cp1252 -*-
 
 __license__   = 'GPL v3'
 __copyright__ = '2009, Darko Miletic <darko.miletic at gmail.com>'
@@ -10,28 +11,62 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class Honoluluadvertiser(BasicNewsRecipe):
     title                 = 'Honolulu Advertiser'
-    __author__            = 'Darko Miletic'
+    __author__            = 'Darko Miletic and Sujata Raman'
     description           = "Latest national and local Hawaii sports news from The Honolulu Advertiser."
     publisher             = 'Honolulu Advertiser'
     category              = 'news, Honolulu, Hawaii'
     oldest_article        = 2
-    language              = 'en'
+    language = 'en'
+
     max_articles_per_feed = 100
     no_stylesheets        = True
     use_embedded_content  = False
     encoding              = 'cp1252'
+    remove_javascript     = True
+    cover_url             = 'http://www.honoluluadvertiser.com/graphics/frontpage/frontpage.jpg'
 
-    conversion_options = {
+    html2lrf_options = [
-                             'comments'  : description
+                          '--comment'       , description
-                            ,'tags'      : category
+                        , '--category'      , category
-                            ,'language'  : language
+                        , '--publisher'     , publisher
-                            ,'publisher' : publisher
+                        ]
-                         }
 
-    keep_only_tags = [dict(name='td')]
+    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"'
 
-    remove_tags = [dict(name=['object','link'])]
+    keep_only_tags = [dict(name='div', attrs={'class':["hon_article_top","article-bodytext","hon_article_photo","storyphoto","article"]}),
-    remove_attributes = ['style']
+                      dict(name='div', attrs={'id':["storycontentleft","article"]})
+                      ]
+
+    remove_tags = [dict(name=['object','link','embed']),
+                   dict(name='div', attrs={'class':["article-tools","titleBar","invisiblespacer","articleflex-container","hon_newslist","categoryheader","columnframe","subHeadline","poster-container"]}),
+                   dict(name='div', attrs={'align':["right"]}),
+                   dict(name='div', attrs={'id':["pluckcomments"]}),
+                   dict(name='td', attrs={'class':["prepsfacts"]}),
+                   dict(name='img', attrs={'height':["1"]}),
+                   dict(name='img', attrs={'alt':["Advertisement"]}),
+                   dict(name='img', attrs={'src':["/gcicommonfiles/sr/graphics/common/adlabel_horz.gif","/gcicommonfiles/sr/graphics/common/icon_whatsthis.gif",]}),
+                   ]
+
+    extra_css = '''
+                    h1{font-family:Arial,Helvetica,sans-serif; font-size:large; color:#000000; }
+                    .hon_article_timestamp{font-family:Arial,Helvetica,sans-serif; font-size:70%; }
+                    .postedStoryDate{font-family:Arial,Helvetica,sans-serif; font-size:30%; }
+                    .postedDate{font-family:Arial,Helvetica,sans-serif; font-size:30%; }
+                    .credit{font-family:Arial,Helvetica,sans-serif; font-size:30%; }
+                    .hon_article_top{font-family:Arial,Helvetica,sans-serif; color:#666666; font-size:30%; font-weight:bold;}
+                    .grayBackground{font-family:Arial,Helvetica,sans-serif; color:#666666; font-size:30%;}
+                    .hon_photocaption{font-family:Arial,Helvetica,sans-serif; font-size:30%; }
+                    .photoCaption{font-family:Arial,Helvetica,sans-serif; font-size:30%; }
+                    .hon_photocredit{font-family:Arial,Helvetica,sans-serif; font-size:30%; color:#666666;}
+                    .storyphoto{font-family:Arial,Helvetica,sans-serif; font-size:30%; color:#666666;}
+                    .article-bodytext{font-family:Arial,Helvetica,sans-serif; font-size:xx-small; }
+                    .storycontentleft{font-family:Arial,Helvetica,sans-serif; font-size:xx-small; }
+                    #article{font-family:Arial,Helvetica,sans-serif; font-size:xx-small; }
+                    .contentarea{font-family:Arial,Helvetica,sans-serif; font-size:xx-small; }
+                    .storytext{font-family:Verdana,Arial,Helvetica,sans-serif; font-size:xx-small;}
+                    .storyHeadline{font-family:Arial,Helvetica,sans-serif; font-size:large; color:#000000; font-weight:bold;}
+                    .source{font-family:Arial,Helvetica,sans-serif; color:#333333; font-style: italic; font-weight:bold; }
+                '''
 
     feeds = [
               (u'Breaking news', u'http://www.honoluluadvertiser.com/apps/pbcs.dll/section?Category=RSS01&MIME=XML' )
@@ -43,13 +78,19 @@ class Honoluluadvertiser(BasicNewsRecipe):
             ]
 
     def preprocess_html(self, soup):
-        st = soup.find('td')
+        for item in soup.findAll(style=True):
-        if st:
+            del item['style']
-           st.name = 'div'
+        mtag = '\n<meta http-equiv="Content-Language" content="en"/>\n'
+        soup.head.insert(0,mtag)
+
+        for tag in soup.findAll(name=['span','table','font']):
+               tag.name = 'div'
+
         return soup
 
-    def print_version(self, url):
+
-        ubody, sep, rest = url.rpartition('?source')
+   # def print_version(self, url):
-        root, sep2, article_id = ubody.partition('/article/')
+   #     ubody, sep, rest = url.rpartition('/-1/')
-        return u'http://www.honoluluadvertiser.com/apps/pbcs.dll/article?AID=/' + article_id + '&template=printart'
+   #     root, sep2, article_id = ubody.partition('/article/')
+   #     return u'http://www.honoluluadvertiser.com/apps/pbcs.dll/article?AID=/' + article_id + '&template=printart'
 

src/calibre/web/feeds/recipes/recipe_miami_herald.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env  python
 
 __license__   = 'GPL v3'
 __copyright__ = '2009, Darko Miletic <darko.miletic at gmail.com>'
@@ -10,7 +9,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class TheMiamiHerald(BasicNewsRecipe):
     title                 = 'The Miami Herald'
-    __author__            = 'Darko Miletic'
+    __author__            = 'Darko Miletic and Sujata Raman'
     description           = "Miami-Dade and Broward's source for the latest breaking local news on sports, weather, business, jobs, real estate, shopping, health, travel, entertainment, & more."
     oldest_article        = 1
     max_articles_per_feed = 100
@@ -22,19 +21,28 @@ class TheMiamiHerald(BasicNewsRecipe):
     use_embedded_content  = False
     encoding              = 'cp1252'
     remove_javascript     = True
-    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"'
 
-    html2lrf_options = [
+    extra_css = '''
-                          '--comment'       , description
+                h1{font-family:Arial,Helvetica,sans-serif; font-size:large; color:#1A272F; }
-                        , '--category'      , category
+                .subheadline{font-family:Arial,Helvetica,sans-serif; font-size:30%; color: #666666;}
-                        , '--publisher'     , publisher
+                #storyBodyContent{font-family:Arial,Helvetica,sans-serif; font-size:xx-small; }
-                        ]
+                .byline{font-family:Arial,Helvetica,sans-serif; font-size:30%; color:#58595B; }
+                .credit_line{font-family:Arial,Helvetica,sans-serif; font-size:30%; color:#58595B; }
+                .storyPublishDate{font-family:Arial,Helvetica,sans-serif; font-size:30%; color:#666666; }
+                .shirttail{font-family:Arial,Helvetica,sans-serif; font-size:30%; color:#666666;font-style:italic }
+                .imageCaption{font-family:Arial,Helvetica,sans-serif; font-size:30%; color:#666666; }
+                '''
 
+    keep_only_tags = [dict(name='div', attrs={'id':['storyBody','storyPhotoContentArea']}),
+                      ]
+
+    remove_tags = [dict(name=['object','link','embed']),
+                   dict(name='div', attrs={'class':["imageBuyButton","shareLinksArea","storyTools","spill_navigation pagination","circPromoArea","storyTools_footer","storyYahooContentMatch"]}) ,
+                   dict(name='div', attrs={'id':["pluck","mlt","storyAssets"]}) ]
 
-    keep_only_tags = [dict(name='div', attrs={'id':'pageContainer'})]
 
     feeds = [
-              (u'Breaking News'  , u'http://www.miamiherald.com/416/index.xml' )
+             (u'Breaking News'  , u'http://www.miamiherald.com/416/index.xml' )
              ,(u'Miami-Dade' , u'http://www.miamiherald.com/460/index.xml' )
              ,(u'Broward' , u'http://www.miamiherald.com/467/index.xml' )
              ,(u'Florida Keys' , u'http://www.miamiherald.com/505/index.xml' )
@@ -49,6 +57,26 @@ class TheMiamiHerald(BasicNewsRecipe):
              ,(u'Environment' , u'http://www.miamiherald.com/573/index.xml' )
             ]
 
-    def print_version(self, url):
+
-        return url.replace('/story/','/v-print/story/')
+
+
+
+    def get_article_url(self, article):
+        ans = article.get('guid', None)
+        print ans
+        try:
+            self.log('Looking for full story link in', ans)
+            soup = self.index_to_soup(ans)
+            x = soup.find(text="Full Story")
+
+            if x is not None:
+                a = x.parent
+                if a and a.has_key('href'):
+                    ans = 'http://www.miamiherald.com'+a['href']
+                    self.log('Found full story link', ans)
+        except:
+            pass
+        return ans
+
+
 

src/calibre/web/feeds/recipes/recipe_moscow_times.py

@@ -10,18 +10,64 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class Moscowtimes(BasicNewsRecipe):
     title                 = u'The Moscow Times'
-    __author__            = 'Darko Miletic'
+    __author__            = 'Darko Miletic and Sujata Raman'
     description           = 'News from Russia'
     language = 'en'
-    
+    lang = 'en'
     oldest_article        = 7
     max_articles_per_feed = 100
     no_stylesheets        = True
     use_embedded_content  = False
+    #encoding = 'utf-8'
+    encoding =  'cp1252'
+    remove_javascript = True
 
+    conversion_options = {
+          'comment'          : description
+        , 'language'         : lang
+    }
+
+    extra_css      = '''
+                        h1{ color:#0066B3; font-family: Georgia,serif ; font-size: large}
+                        .article_date{ font-family:Arial,Tahoma,Verdana,Helvetica,sans-serif ; color:#000000; font-size: x-small;}
+                        .autors{color:#999999 ; font-weight: bold ; font-family:Arial,Tahoma,Verdana,Helvetica,sans-serif ; font-size: x-small; }
+                        .photoautors{ color:#999999 ; font-family:Arial,Tahoma,Verdana,Helvetica,sans-serif ; font-size: x-small; }
+                        .text{font-family:Arial,Tahoma,Verdana,Helvetica,sans-serif ; font-size:75%; }
+                        '''
     feeds          = [
-                        (u'The Moscow Times'     , u'http://www.themoscowtimes.com/rss.xml'     )
+                        (u'The Moscow Times Top Stories' , u'http://www.themoscowtimes.com/rss/top'),
+                        (u'The Moscow Times Current Issue' , u'http://www.themoscowtimes.com/rss/issue'),
+                        (u'The Moscow Times News' , u'http://www.themoscowtimes.com/rss/news'),
+                        (u'The Moscow Times Business' , u'http://www.themoscowtimes.com/rss/business'),
+                        (u'The Moscow Times Art and Ideas' , u'http://www.themoscowtimes.com/rss/art'),
+                        (u'The Moscow Times Opinion' , u'http://www.themoscowtimes.com/rss/opinion')
                      ]
 
-    def print_version(self, url):
+    keep_only_tags = [
-        return url + '&print=Y'
+                        dict(name='div', attrs={'class':['newstextblock']})
+                    ]
+
+    remove_tags    = [
+                        dict(name='div', attrs={'class':['photo_nav']})
+                    ]
+
+    def preprocess_html(self, soup):
+        soup.html['xml:lang'] = self.lang
+        soup.html['lang']     = self.lang
+        mtag = '<meta http-equiv="Content-Type" content="text/html; charset=' + self.encoding + '">'
+        soup.head.insert(0,mtag)
+
+        return self.adeify_images(soup)
+
+
+    def get_cover_url(self):
+
+        href =  'http://www.themoscowtimes.com/pdf/'
+
+        soup = self.index_to_soup(href)
+        div = soup.find('div',attrs={'class':'left'})
+        a = div.find('a')
+        print a
+        if a :
+           cover_url = a.img['src']
+        return cover_url

src/calibre/web/feeds/recipes/recipe_msdnmag_en.py

@@ -18,38 +18,19 @@ class MSDNMagazine_en(BasicNewsRecipe):
     no_stylesheets        = True
     use_embedded_content  = False
     encoding              = 'utf-8'
-    remove_javascript     = True
+    language              = 'en'
-    current_issue         = 'http://msdn.microsoft.com/en-us/magazine/default.aspx'
-    language = 'en'
 
 
-    html2lrf_options = [
-                          '--comment', description
-                        , '--category', category
-                        , '--publisher', publisher
-                        ]
-
-    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"'
 
     feeds = [(u'Articles', u'http://msdn.microsoft.com/en-us/magazine/rss/default.aspx?z=z&iss=1')]
 
-    keep_only_tags = [dict(name='div', attrs={'class':'topic'})]
+    keep_only_tags = [dict(name='div', attrs={'class':'navpage'})]
 
     remove_tags = [
                      dict(name=['object','link','base','table'])
                     ,dict(name='div', attrs={'class':'MTPS_CollapsibleRegion'})
                   ]
-
+    remove_tags_after = dict(name='div', attrs={'class':'navpage'})
-    def get_cover_url(self):
-        cover_url = None
-        soup = self.index_to_soup(self.current_issue)
-        link_item = soup.find('span',attrs={'class':'ContentsImageSpacer'})
-        if link_item:
-           imgt = link_item.find('img')
-           if imgt:
-              cover_url = imgt['src']
-        return cover_url
-
 
     def preprocess_html(self, soup):
         for item in soup.findAll('div',attrs={'class':['FeatureSmallHead','ColumnTypeSubTitle']}):

src/calibre/web/feeds/recipes/recipe_newsweek.py

@@ -1,45 +1,51 @@
-#!/usr/bin/env  python
-
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
+    
 import re
 from calibre import strftime
 from calibre.ebooks.BeautifulSoup import BeautifulSoup
 from calibre.web.feeds.news import BasicNewsRecipe
-
+    
 class Newsweek(BasicNewsRecipe):
+    
 
     title          = 'Newsweek'
     __author__     = 'Kovid Goyal and Sujata Raman'
     description    = 'Weekly news and current affairs in the US'
     no_stylesheets = True
 
-    extra_css      = '''
+    extra_css = '''
-                        h1{color:#383733;font-family:Arial,Helvetica,sans-serif;font-size:large;}
+                    h1{font-family:Arial,Helvetica,sans-serif; font-size:large; color:#383733;}
-                        .deck{font-family:Georgia,"Century Schoolbook","Times New Roman",Times,serif;color:#383733;font-size:small;}
+                    .deck{font-family:Georgia,sans-serif; color:#383733;}
-                        .articleInfo{color:#474537;font-family:Arial,Helvetica,sans-serif; font-size:xx-small;}
+                    .bylineDate{font-family:georgia ; color:#58544A; font-size:x-small;}
-                        .authorName{color:#B61900;font-family:Arial,Helvetica,sans-serif;font-size:medium;}
+                    .authorInfo{font-family:arial,helvetica,sans-serif; color:#0066CC; font-size:x-small;}
-                        .authorInfo{color:#0066CC;font-family:Arial,Helvetica,sans-serif;font-size:xx-small;}
+                    .articleUpdated{font-family:arial,helvetica,sans-serif; color:#73726C; font-size:x-small;}
-                        .articleUpdated{ font-size:xx-small; color:#73726C; font-family:Arial,Helvetica,sans-serif;}
+                    .issueDate{font-family:arial,helvetica,sans-serif; color:#73726C; font-size:x-small; font-style:italic;}
-                        .issueDate{font-family :Arial,Helvetica,sans-serif;font-size:xx-small;font-style:italic;}
+                    h5{font-family:arial,helvetica,sans-serif; color:#73726C; font-size:x-small;}
-                        .story{color:#333333; font-family:Georgia,"Century Schoolbook","Times New Roman",Times,serif;font-size:small;}
+                    h6{font-family:arial,helvetica,sans-serif; color:#73726C; font-size:x-small;}
-                        .photoCredit{color:#999999;font-family:Arial,Helvetica,sans-serif;font-size:xx-small;}
+                    .story{font-family:georgia,sans-serif ; color:#363636;}
-                        .photoCaption{color:#0A0A09;font-family:Arial,Helvetica,sans-serif;font-size:xx-small;font-weight:bold;}'''
+                    .photoCredit{color:#999999; font-family:Arial,Helvetica,sans-serif;font-size:x-small;}
-
+                    .photoCaption{color:#0A0A09;font-family:Arial,Helvetica,sans-serif;font-size:x-small;}
+                    .fwArticle{font-family:Arial,Helvetica,sans-serif;font-size:x-small;font-weight:bold;}
+                    '''
+   
     encoding       = 'utf-8'
     language = 'en'
 
     remove_tags = [
             {'class':['fwArticle noHr','fwArticle','subinfo','hdlBulletItem','head-content','navbar','link', 'ad', 'sponsorLinksArticle', 'mm-content',
-                'inline-social-links-wrapper', 'email-article',
+                'inline-social-links-wrapper', 'email-article','ToolBox',
                 'inlineComponentRight',
                 'comments-and-social-links-wrapper', 'EmailArticleBlock']},
             {'id' : ['footer', 'ticker-data', 'topTenVertical',
                 'digg-top-five', 'mesothorax', 'nw-comments',
                 'ToolBox', 'EmailMain']},
             {'class': re.compile('related-cloud')},
+            dict(name='li', attrs={'id':['slug_bigbox']})
             ]
-    keep_only_tags = [{'class':['article HorizontalHeader', 'articlecontent']}]
+
+  
+    keep_only_tags = [{'class':['article HorizontalHeader', 'articlecontent','photoBox']}, ]
     recursions = 1
     match_regexps = [r'http://www.newsweek.com/id/\S+/page/\d+']
 
@@ -177,3 +183,4 @@ class Newsweek(BasicNewsRecipe):
                 if article.description is None :
                     article.description = extractDescription(article.href)
         return
+

src/calibre/web/feeds/recipes/recipe_ourdailybread.py

@@ -10,10 +10,11 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class OurDailyBread(BasicNewsRecipe):
     title                 = 'Our Daily Bread'
-    __author__            = 'Darko Miletic'
+    __author__            = 'Darko Miletic and Sujata Raman'
     description           = 'Religion'
     oldest_article        = 15
     language = 'en'
+    lang = 'en'
 
     max_articles_per_feed = 100
     no_stylesheets        = True
@@ -21,16 +22,43 @@ class OurDailyBread(BasicNewsRecipe):
     category              = 'religion'
     encoding              = 'utf-8'
     extra_css             = ' #devoTitle{font-size: x-large; font-weight: bold} '
-    
+
-    conversion_options = {  
+    conversion_options = {
                              'comments'    : description
                             ,'tags'        : category
                             ,'language'    : 'en'
                          }
-                         
+
     keep_only_tags = [dict(name='div', attrs={'class':['altbg','text']})]
 
+    remove_tags = [dict(name='div', attrs={'id':['ctl00_cphPrimary_pnlBookCover']}),
+                   dict(name='div', attrs={'class':['devotionalLinks']})
+                   ]
+    extra_css = '''
+                .text{font-family:Arial,Helvetica,sans-serif;font-size:x-small;}
+                .devotionalTitle{font-family:Arial,Helvetica,sans-serif; font-size:large; font-weight: bold;}
+                .devotionalDate{font-family:Arial,Helvetica,sans-serif; font-size:xx-small;}
+                .devotionalVerse{font-family:Arial,Helvetica,sans-serif; font-size:xx-small; }
+                '''
+
     feeds          = [(u'Our Daily Bread', u'http://www.rbc.org/rss.ashx?id=50398')]
 
     def preprocess_html(self, soup):
+        soup.html['xml:lang'] = self.lang
+        soup.html['lang']     = self.lang
+        mtag = '<meta http-equiv="Content-Type" content="text/html; charset=' + self.encoding + '">'
+        soup.head.insert(0,mtag)
+
         return self.adeify_images(soup)
+
+    def get_cover_url(self):
+
+        href =  'http://www.rbc.org/index.aspx'
+
+        soup = self.index_to_soup(href)
+        a = soup.find('a',attrs={'id':'ctl00_hlTodaysDevotionalImage'})
+
+        if a :
+           cover_url = a.img['src']
+
+        return cover_url

src/calibre/web/feeds/recipes/recipe_sanjosemercurynews.py

@@ -0,0 +1,47 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2009, Darko Miletic <darko.miletic at gmail.com>'
+'''
+www.mercurynews.com
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class MercuryNews(BasicNewsRecipe):
+    title                 = 'San Jose Mercury News'
+    __author__            = 'Darko Miletic'
+    description           = 'News from San Jose'
+    publisher             = 'San Jose Mercury News'
+    category              = 'news, politics, USA, San Jose, California'
+    oldest_article        = 2
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    encoding              = 'utf-8'
+    language              = 'en'
+
+    conversion_options = {
+                          'comment'   : description
+                        , 'tags'      : category
+                        , 'publisher' : publisher
+                        , 'language'  : language
+                        }
+
+    keep_only_tags    =[
+                         dict(name='h1', attrs={'id':'articleTitle'})
+                         ,dict(name='div', attrs={'id':'articleBody'})
+                       ]
+    remove_tags = [
+                      dict(name='div',attrs={'class':'articleEmbeddedAdBox'})
+                     ,dict(name=['link','iframe','object'])
+                     ,dict(name='div',attrs={'id':'articleViewerGroup'})
+                  ]
+
+    feeds = [
+              (u'News'      , u'http://feeds.mercurynews.com/mngi/rss/CustomRssServlet/568/200735.xml')
+             ,(u'Politics'  , u'http://feeds.mercurynews.com/mngi/rss/CustomRssServlet/568/200740.xml')
+             ,(u'Local News', u'http://feeds.mercurynews.com/mngi/rss/CustomRssServlet/568/200748.xml')
+             ,(u'Editorials', u'http://feeds.mercurynews.com/mngi/rss/CustomRssServlet/568/200766.xml')
+             ,(u'Opinion'   , u'http://feeds.mercurynews.com/mngi/rss/CustomRssServlet/568/200224.xml')
+            ]

src/calibre/web/feeds/recipes/recipe_straitstimes.py

@@ -19,23 +19,19 @@ class StraitsTimes(BasicNewsRecipe):
     encoding               = 'cp1252'
     publisher              = 'Singapore Press Holdings Ltd.'
     category               = 'news, politics, singapore, asia'
-    language = 'en'
+    language               = 'en'
+    extra_css              = ' .top_headline{font-size: x-large; font-weight: bold} '
 
+    conversion_options = {
+                             'comments'  : description
+                            ,'tags'      : category
+                            ,'language'  : language
+                            ,'publisher' : publisher
+                         }
 
-    html2lrf_options = [
+    remove_tags = [dict(name=['object','link','map'])]
-                          '--comment', description
-                        , '--category', category
-                        , '--publisher', publisher
-                        , '--ignore-tables'
-                        ]
 
-    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\nlinearize_tables=True'
+    keep_only_tags = [dict(name='div', attrs={'class':['top_headline','story_text']})]
-
-    remove_tags = [
-                     dict(name=['object','link'])
-                    ,dict(name='table', attrs={'width':'980'})
-                    ,dict(name='td'   , attrs={'class':'padlrt10'})
-                  ]
 
     feeds = [
                (u'Singapore'       , u'http://www.straitstimes.com/STI/STIFILES/rss/break_singapore.xml' )
@@ -52,6 +48,3 @@ class StraitsTimes(BasicNewsRecipe):
             del item['style']
         return soup
 
-    def print_version(self, url):
-        return url.replace('http://www.straitstimes.com','http://www.straitstimes.com/print')
-

src/calibre/web/feeds/recipes/recipe_thestar.py

@@ -17,10 +17,10 @@ class TheTorontoStar(BasicNewsRecipe):
     max_articles_per_feed = 100
     no_stylesheets        = True
     use_embedded_content  = False
+    delay                 = 2
     publisher             = 'The Toronto Star'
     category              = "Toronto Star,Canada's largest daily newspaper,breaking news,classifieds,careers,GTA,Toronto Maple Leafs,sports,Toronto,news,editorial,The Star,Ontario,information,columnists,business,entertainment,births,deaths,automotive,rentals,weather,archives,Torstar,technology,Joseph Atkinson"
     encoding              = 'utf-8'
-    extra_css             = ' .headlineArticle{font-size: x-large; font-weight: bold} .navbar{text-align:center} '
 
     conversion_options = {
                              'comments'    : description
@@ -28,8 +28,8 @@ class TheTorontoStar(BasicNewsRecipe):
                             ,'publisher'   : publisher
                          }
 
-    keep_only_tags = [dict(name='div', attrs={'id':'AssetWebPart1'})]
+    keep_only_tags = [dict(name='div', attrs={'class':'ts-article'})]
-    remove_attributes= ['style']
+    remove_tags_before = dict(name='div',attrs={'id':'ts-article_header'})
 
     feeds          = [
                         (u'News'         , u'http://www.thestar.com/rss/0?searchMode=Query&categories=296'    )
@@ -43,5 +43,7 @@ class TheTorontoStar(BasicNewsRecipe):
                      ]
 
     def print_version(self, url):
-        return url.replace('/article/','/printArticle/')
+        artl = url.rpartition('--')[0]
+        artid = artl.rpartition('/')[2]
+        return 'http://www.thestar.com/printarticle/' + artid
 

src/calibre/web/feeds/recipes/recipe_toronto_sun.py

@@ -0,0 +1,50 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2009, Darko Miletic <darko.miletic at gmail.com>'
+'''
+www.torontosun.com
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class TorontoSun(BasicNewsRecipe):
+    title                 = 'Toronto SUN'
+    __author__            = 'Darko Miletic'
+    description           = 'News from Canada'
+    publisher             = 'Toronto Sun'
+    category              = 'news, politics, Canada'
+    oldest_article        = 2
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    encoding              = 'cp1252'
+    language              = 'en_CA'
+
+    conversion_options = {
+                          'comment'   : description
+                        , 'tags'      : category
+                        , 'publisher' : publisher
+                        , 'language'  : language
+                        }
+
+    keep_only_tags    =[
+                         dict(name='div', attrs={'class':'articleHead'})
+                         ,dict(name='div', attrs={'id':'channelContent'})
+                       ]
+    remove_tags = [
+                      dict(name='div',attrs={'class':['leftBox','bottomBox clear','bottomBox','breadCrumb']})
+                     ,dict(name=['link','iframe','object'])
+                     ,dict(name='a',attrs={'rel':'swap'})
+                     ,dict(name='ul',attrs={'class':'tabs dl contentSwap'})
+                  ]
+
+    remove_tags_after = dict(name='div',attrs={'class':'bottomBox clear'})
+
+    feeds = [
+              (u'News'       , u'http://www.torontosun.com/news/rss.xml'           )
+             ,(u'Canada'     , u'http://www.torontosun.com/news/canada/rss.xml'    )
+             ,(u'Columnists' , u'http://www.torontosun.com/news/columnists/rss.xml')
+             ,(u'World'      , u'http://www.torontosun.com/news/world/rss.xml'     )
+             ,(u'Money'      , u'http://www.torontosun.com/money/rss.xml'          )
+            ]

src/cherrypy/lib/httpauth.py

@@ -8,7 +8,7 @@ Usage:
     First use 'doAuth' to request the client authentication for a
     certain resource. You should send an httplib.UNAUTHORIZED response to the
     client so he knows he has to authenticate itself.
-    
+
     Then use 'parseAuthorization' to retrieve the 'auth_map' used in
     'checkResponse'.
 
@@ -30,27 +30,27 @@ __license__ = """
 Copyright (c) 2005, Tiago Cogumbreiro <cogumbreiro@users.sf.net>
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification, 
+Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-    * Redistributions of source code must retain the above copyright notice, 
+    * Redistributions of source code must retain the above copyright notice,
       this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, 
+    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation 
+      this list of conditions and the following disclaimer in the documentation
       and/or other materials provided with the distribution.
-    * Neither the name of Sylvain Hellegouarch nor the names of his contributors 
+    * Neither the name of Sylvain Hellegouarch nor the names of his contributors
-      may be used to endorse or promote products derived from this software 
+      may be used to endorse or promote products derived from this software
       without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 """
 
@@ -83,6 +83,7 @@ SUPPORTED_QOP = (AUTH, AUTH_INT)
 #
 DIGEST_AUTH_ENCODERS = {
     MD5: lambda val: md5(val).hexdigest(),
+    'md5': lambda val:md5(val).hexdigest(),
     MD5_SESS: lambda val: md5(val).hexdigest(),
 #    SHA: lambda val: sha(val).hexdigest(),
 }
@@ -125,7 +126,7 @@ def doAuth (realm):
     """'doAuth' function returns the challenge string b giving priority over
     Digest and fallback to Basic authentication when the browser doesn't
     support the first one.
-    
+
     This should be set in the HTTP header under the key 'WWW-Authenticate'."""
 
     return digestAuth (realm) + " " + basicAuth (realm)
@@ -195,7 +196,7 @@ def parseAuthorization (credentials):
 #
 def md5SessionKey (params, password):
     """
-    If the "algorithm" directive's value is "MD5-sess", then A1 
+    If the "algorithm" directive's value is "MD5-sess", then A1
     [the session key] is calculated only once - on the first request by the
     client following receipt of a WWW-Authenticate challenge from the server.
 
@@ -340,24 +341,24 @@ AUTH_RESPONSES = {
 def checkResponse (auth_map, password, method = "GET", encrypt=None, **kwargs):
     """'checkResponse' compares the auth_map with the password and optionally
     other arguments that each implementation might need.
-    
+
     If the response is of type 'Basic' then the function has the following
     signature:
-    
+
     checkBasicResponse (auth_map, password) -> bool
-    
+
     If the response is of type 'Digest' then the function has the following
     signature:
-    
+
     checkDigestResponse (auth_map, password, method = 'GET', A1 = None) -> bool
-    
+
     The 'A1' argument is only used in MD5_SESS algorithm based responses.
     Check md5SessionKey() for more info.
     """
     global AUTH_RESPONSES
     checker = AUTH_RESPONSES[auth_map["auth_scheme"]]
     return checker (auth_map, password, method=method, encrypt=encrypt, **kwargs)
- 
+